diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index d560b630485..2eb34700c5c 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -200,7 +200,7 @@
     <location>zend</location>
     <name>Zend Framework</name>
     <license>BSD</license>
-    <version>1.10.6</version>
+    <version>1.12.16</version>
     <licenseversion></licenseversion>
   </library>
   <library>
diff --git a/lib/zend/Zend/Acl.php b/lib/zend/Zend/Acl.php
new file mode 100644
index 00000000000..a5d169f56ac
--- /dev/null
+++ b/lib/zend/Zend/Acl.php
@@ -0,0 +1,1242 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Acl_Resource_Interface
+ */
+require_once 'Zend/Acl/Resource/Interface.php';
+
+
+/**
+ * @see Zend_Acl_Role_Registry
+ */
+require_once 'Zend/Acl/Role/Registry.php';
+
+
+/**
+ * @see Zend_Acl_Assert_Interface
+ */
+require_once 'Zend/Acl/Assert/Interface.php';
+
+
+/**
+ * @see Zend_Acl_Role
+ */
+require_once 'Zend/Acl/Role.php';
+
+
+/**
+ * @see Zend_Acl_Resource
+ */
+require_once 'Zend/Acl/Resource.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Acl
+{
+    /**
+     * Rule type: allow
+     */
+    const TYPE_ALLOW = 'TYPE_ALLOW';
+
+    /**
+     * Rule type: deny
+     */
+    const TYPE_DENY  = 'TYPE_DENY';
+
+    /**
+     * Rule operation: add
+     */
+    const OP_ADD = 'OP_ADD';
+
+    /**
+     * Rule operation: remove
+     */
+    const OP_REMOVE = 'OP_REMOVE';
+
+    /**
+     * Role registry
+     *
+     * @var Zend_Acl_Role_Registry
+     */
+    protected $_roleRegistry = null;
+
+    /**
+     * Resource tree
+     *
+     * @var array
+     */
+    protected $_resources = array();
+
+    /**
+     * @var Zend_Acl_Role_Interface
+     */
+    protected $_isAllowedRole     = null;
+
+    /**
+     * @var Zend_Acl_Resource_Interface
+     */
+    protected $_isAllowedResource = null;
+
+    /**
+     * @var String
+     */
+    protected $_isAllowedPrivilege = null;
+
+    /**
+     * ACL rules; whitelist (deny everything to all) by default
+     *
+     * @var array
+     */
+    protected $_rules = array(
+        'allResources' => array(
+            'allRoles' => array(
+                'allPrivileges' => array(
+                    'type'   => self::TYPE_DENY,
+                    'assert' => null
+                    ),
+                'byPrivilegeId' => array()
+                ),
+            'byRoleId' => array()
+            ),
+        'byResourceId' => array()
+        );
+
+    /**
+     * Adds a Role having an identifier unique to the registry
+     *
+     * The $parents parameter may be a reference to, or the string identifier for,
+     * a Role existing in the registry, or $parents may be passed as an array of
+     * these - mixing string identifiers and objects is ok - to indicate the Roles
+     * from which the newly added Role will directly inherit.
+     *
+     * In order to resolve potential ambiguities with conflicting rules inherited
+     * from different parents, the most recently added parent takes precedence over
+     * parents that were previously added. In other words, the first parent added
+     * will have the least priority, and the last parent added will have the
+     * highest priority.
+     *
+     * @param  Zend_Acl_Role_Interface|string       $role
+     * @param  Zend_Acl_Role_Interface|string|array $parents
+     * @uses   Zend_Acl_Role_Registry::add()
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function addRole($role, $parents = null)
+    {
+        if (is_string($role)) {
+            $role = new Zend_Acl_Role($role);
+        }
+
+        if (!$role instanceof Zend_Acl_Role_Interface) {
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception('addRole() expects $role to be of type Zend_Acl_Role_Interface');
+        }
+
+
+        $this->_getRoleRegistry()->add($role, $parents);
+
+        return $this;
+    }
+
+    /**
+     * Returns the identified Role
+     *
+     * The $role parameter can either be a Role or Role identifier.
+     *
+     * @param  Zend_Acl_Role_Interface|string $role
+     * @uses   Zend_Acl_Role_Registry::get()
+     * @return Zend_Acl_Role_Interface
+     */
+    public function getRole($role)
+    {
+        return $this->_getRoleRegistry()->get($role);
+    }
+
+    /**
+     * Returns true if and only if the Role exists in the registry
+     *
+     * The $role parameter can either be a Role or a Role identifier.
+     *
+     * @param  Zend_Acl_Role_Interface|string $role
+     * @uses   Zend_Acl_Role_Registry::has()
+     * @return boolean
+     */
+    public function hasRole($role)
+    {
+        return $this->_getRoleRegistry()->has($role);
+    }
+
+    /**
+     * Returns true if and only if $role inherits from $inherit
+     *
+     * Both parameters may be either a Role or a Role identifier. If
+     * $onlyParents is true, then $role must inherit directly from
+     * $inherit in order to return true. By default, this method looks
+     * through the entire inheritance DAG to determine whether $role
+     * inherits from $inherit through its ancestor Roles.
+     *
+     * @param  Zend_Acl_Role_Interface|string $role
+     * @param  Zend_Acl_Role_Interface|string $inherit
+     * @param  boolean                        $onlyParents
+     * @uses   Zend_Acl_Role_Registry::inherits()
+     * @return boolean
+     */
+    public function inheritsRole($role, $inherit, $onlyParents = false)
+    {
+        return $this->_getRoleRegistry()->inherits($role, $inherit, $onlyParents);
+    }
+
+    /**
+     * Removes the Role from the registry
+     *
+     * The $role parameter can either be a Role or a Role identifier.
+     *
+     * @param  Zend_Acl_Role_Interface|string $role
+     * @uses   Zend_Acl_Role_Registry::remove()
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function removeRole($role)
+    {
+        $this->_getRoleRegistry()->remove($role);
+
+        if ($role instanceof Zend_Acl_Role_Interface) {
+            $roleId = $role->getRoleId();
+        } else {
+            $roleId = $role;
+        }
+
+        foreach ($this->_rules['allResources']['byRoleId'] as $roleIdCurrent => $rules) {
+            if ($roleId === $roleIdCurrent) {
+                unset($this->_rules['allResources']['byRoleId'][$roleIdCurrent]);
+            }
+        }
+        foreach ($this->_rules['byResourceId'] as $resourceIdCurrent => $visitor) {
+            if (array_key_exists('byRoleId', $visitor)) {
+                foreach ($visitor['byRoleId'] as $roleIdCurrent => $rules) {
+                    if ($roleId === $roleIdCurrent) {
+                        unset($this->_rules['byResourceId'][$resourceIdCurrent]['byRoleId'][$roleIdCurrent]);
+                    }
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes all Roles from the registry
+     *
+     * @uses   Zend_Acl_Role_Registry::removeAll()
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function removeRoleAll()
+    {
+        $this->_getRoleRegistry()->removeAll();
+
+        foreach ($this->_rules['allResources']['byRoleId'] as $roleIdCurrent => $rules) {
+            unset($this->_rules['allResources']['byRoleId'][$roleIdCurrent]);
+        }
+        foreach ($this->_rules['byResourceId'] as $resourceIdCurrent => $visitor) {
+            foreach ($visitor['byRoleId'] as $roleIdCurrent => $rules) {
+                unset($this->_rules['byResourceId'][$resourceIdCurrent]['byRoleId'][$roleIdCurrent]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds a Resource having an identifier unique to the ACL
+     *
+     * The $parent parameter may be a reference to, or the string identifier for,
+     * the existing Resource from which the newly added Resource will inherit.
+     *
+     * @param  Zend_Acl_Resource_Interface|string $resource
+     * @param  Zend_Acl_Resource_Interface|string $parent
+     * @throws Zend_Acl_Exception
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function addResource($resource, $parent = null)
+    {
+        if (is_string($resource)) {
+            $resource = new Zend_Acl_Resource($resource);
+        }
+
+        if (!$resource instanceof Zend_Acl_Resource_Interface) {
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception('addResource() expects $resource to be of type Zend_Acl_Resource_Interface');
+        }
+
+        $resourceId = $resource->getResourceId();
+
+        if ($this->has($resourceId)) {
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception("Resource id '$resourceId' already exists in the ACL");
+        }
+
+        $resourceParent = null;
+
+        if (null !== $parent) {
+            try {
+                if ($parent instanceof Zend_Acl_Resource_Interface) {
+                    $resourceParentId = $parent->getResourceId();
+                } else {
+                    $resourceParentId = $parent;
+                }
+                $resourceParent = $this->get($resourceParentId);
+            } catch (Zend_Acl_Exception $e) {
+                require_once 'Zend/Acl/Exception.php';
+                throw new Zend_Acl_Exception("Parent Resource id '$resourceParentId' does not exist", 0, $e);
+            }
+            $this->_resources[$resourceParentId]['children'][$resourceId] = $resource;
+        }
+
+        $this->_resources[$resourceId] = array(
+            'instance' => $resource,
+            'parent'   => $resourceParent,
+            'children' => array()
+            );
+
+        return $this;
+    }
+
+    /**
+     * Adds a Resource having an identifier unique to the ACL
+     *
+     * The $parent parameter may be a reference to, or the string identifier for,
+     * the existing Resource from which the newly added Resource will inherit.
+     *
+     * @deprecated in version 1.9.1 and will be available till 2.0.  New code
+     *             should use addResource() instead.
+     *
+     * @param  Zend_Acl_Resource_Interface        $resource
+     * @param  Zend_Acl_Resource_Interface|string $parent
+     * @throws Zend_Acl_Exception
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function add(Zend_Acl_Resource_Interface $resource, $parent = null)
+    {
+        return $this->addResource($resource, $parent);
+    }
+
+    /**
+     * Returns the identified Resource
+     *
+     * The $resource parameter can either be a Resource or a Resource identifier.
+     *
+     * @param  Zend_Acl_Resource_Interface|string $resource
+     * @throws Zend_Acl_Exception
+     * @return Zend_Acl_Resource_Interface
+     */
+    public function get($resource)
+    {
+        if ($resource instanceof Zend_Acl_Resource_Interface) {
+            $resourceId = $resource->getResourceId();
+        } else {
+            $resourceId = (string) $resource;
+        }
+
+        if (!$this->has($resource)) {
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception("Resource '$resourceId' not found");
+        }
+
+        return $this->_resources[$resourceId]['instance'];
+    }
+
+    /**
+     * Returns true if and only if the Resource exists in the ACL
+     *
+     * The $resource parameter can either be a Resource or a Resource identifier.
+     *
+     * @param  Zend_Acl_Resource_Interface|string $resource
+     * @return boolean
+     */
+    public function has($resource)
+    {
+        if ($resource instanceof Zend_Acl_Resource_Interface) {
+            $resourceId = $resource->getResourceId();
+        } else {
+            $resourceId = (string) $resource;
+        }
+
+        return isset($this->_resources[$resourceId]);
+    }
+
+    /**
+     * Returns true if and only if $resource inherits from $inherit
+     *
+     * Both parameters may be either a Resource or a Resource identifier. If
+     * $onlyParent is true, then $resource must inherit directly from
+     * $inherit in order to return true. By default, this method looks
+     * through the entire inheritance tree to determine whether $resource
+     * inherits from $inherit through its ancestor Resources.
+     *
+     * @param  Zend_Acl_Resource_Interface|string $resource
+     * @param  Zend_Acl_Resource_Interface|string $inherit
+     * @param  boolean                            $onlyParent
+     * @throws Zend_Acl_Resource_Registry_Exception
+     * @return boolean
+     */
+    public function inherits($resource, $inherit, $onlyParent = false)
+    {
+        try {
+            $resourceId     = $this->get($resource)->getResourceId();
+            $inheritId = $this->get($inherit)->getResourceId();
+        } catch (Zend_Acl_Exception $e) {
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e);
+        }
+
+        if (null !== $this->_resources[$resourceId]['parent']) {
+            $parentId = $this->_resources[$resourceId]['parent']->getResourceId();
+            if ($inheritId === $parentId) {
+                return true;
+            } else if ($onlyParent) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+
+        while (null !== $this->_resources[$parentId]['parent']) {
+            $parentId = $this->_resources[$parentId]['parent']->getResourceId();
+            if ($inheritId === $parentId) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes a Resource and all of its children
+     *
+     * The $resource parameter can either be a Resource or a Resource identifier.
+     *
+     * @param  Zend_Acl_Resource_Interface|string $resource
+     * @throws Zend_Acl_Exception
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function remove($resource)
+    {
+        try {
+            $resourceId = $this->get($resource)->getResourceId();
+        } catch (Zend_Acl_Exception $e) {
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e);
+        }
+
+        $resourcesRemoved = array($resourceId);
+        if (null !== ($resourceParent = $this->_resources[$resourceId]['parent'])) {
+            unset($this->_resources[$resourceParent->getResourceId()]['children'][$resourceId]);
+        }
+        foreach ($this->_resources[$resourceId]['children'] as $childId => $child) {
+            $this->remove($childId);
+            $resourcesRemoved[] = $childId;
+        }
+
+        foreach ($resourcesRemoved as $resourceIdRemoved) {
+            foreach ($this->_rules['byResourceId'] as $resourceIdCurrent => $rules) {
+                if ($resourceIdRemoved === $resourceIdCurrent) {
+                    unset($this->_rules['byResourceId'][$resourceIdCurrent]);
+                }
+            }
+        }
+
+        unset($this->_resources[$resourceId]);
+
+        return $this;
+    }
+
+    /**
+     * Removes all Resources
+     *
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function removeAll()
+    {
+        foreach ($this->_resources as $resourceId => $resource) {
+            foreach ($this->_rules['byResourceId'] as $resourceIdCurrent => $rules) {
+                if ($resourceId === $resourceIdCurrent) {
+                    unset($this->_rules['byResourceId'][$resourceIdCurrent]);
+                }
+            }
+        }
+
+        $this->_resources = array();
+
+        return $this;
+    }
+
+    /**
+     * Adds an "allow" rule to the ACL
+     *
+     * @param  Zend_Acl_Role_Interface|string|array     $roles
+     * @param  Zend_Acl_Resource_Interface|string|array $resources
+     * @param  string|array                             $privileges
+     * @param  Zend_Acl_Assert_Interface                $assert
+     * @uses   Zend_Acl::setRule()
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function allow($roles = null, $resources = null, $privileges = null, Zend_Acl_Assert_Interface $assert = null)
+    {
+        return $this->setRule(self::OP_ADD, self::TYPE_ALLOW, $roles, $resources, $privileges, $assert);
+    }
+
+    /**
+     * Adds a "deny" rule to the ACL
+     *
+     * @param  Zend_Acl_Role_Interface|string|array     $roles
+     * @param  Zend_Acl_Resource_Interface|string|array $resources
+     * @param  string|array                             $privileges
+     * @param  Zend_Acl_Assert_Interface                $assert
+     * @uses   Zend_Acl::setRule()
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function deny($roles = null, $resources = null, $privileges = null, Zend_Acl_Assert_Interface $assert = null)
+    {
+        return $this->setRule(self::OP_ADD, self::TYPE_DENY, $roles, $resources, $privileges, $assert);
+    }
+
+    /**
+     * Removes "allow" permissions from the ACL
+     *
+     * @param  Zend_Acl_Role_Interface|string|array     $roles
+     * @param  Zend_Acl_Resource_Interface|string|array $resources
+     * @param  string|array                             $privileges
+     * @uses   Zend_Acl::setRule()
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function removeAllow($roles = null, $resources = null, $privileges = null)
+    {
+        return $this->setRule(self::OP_REMOVE, self::TYPE_ALLOW, $roles, $resources, $privileges);
+    }
+
+    /**
+     * Removes "deny" restrictions from the ACL
+     *
+     * @param  Zend_Acl_Role_Interface|string|array     $roles
+     * @param  Zend_Acl_Resource_Interface|string|array $resources
+     * @param  string|array                             $privileges
+     * @uses   Zend_Acl::setRule()
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function removeDeny($roles = null, $resources = null, $privileges = null)
+    {
+        return $this->setRule(self::OP_REMOVE, self::TYPE_DENY, $roles, $resources, $privileges);
+    }
+
+    /**
+     * Performs operations on ACL rules
+     *
+     * The $operation parameter may be either OP_ADD or OP_REMOVE, depending on whether the
+     * user wants to add or remove a rule, respectively:
+     *
+     * OP_ADD specifics:
+     *
+     *      A rule is added that would allow one or more Roles access to [certain $privileges
+     *      upon] the specified Resource(s).
+     *
+     * OP_REMOVE specifics:
+     *
+     *      The rule is removed only in the context of the given Roles, Resources, and privileges.
+     *      Existing rules to which the remove operation does not apply would remain in the
+     *      ACL.
+     *
+     * The $type parameter may be either TYPE_ALLOW or TYPE_DENY, depending on whether the
+     * rule is intended to allow or deny permission, respectively.
+     *
+     * The $roles and $resources parameters may be references to, or the string identifiers for,
+     * existing Resources/Roles, or they may be passed as arrays of these - mixing string identifiers
+     * and objects is ok - to indicate the Resources and Roles to which the rule applies. If either
+     * $roles or $resources is null, then the rule applies to all Roles or all Resources, respectively.
+     * Both may be null in order to work with the default rule of the ACL.
+     *
+     * The $privileges parameter may be used to further specify that the rule applies only
+     * to certain privileges upon the Resource(s) in question. This may be specified to be a single
+     * privilege with a string, and multiple privileges may be specified as an array of strings.
+     *
+     * If $assert is provided, then its assert() method must return true in order for
+     * the rule to apply. If $assert is provided with $roles, $resources, and $privileges all
+     * equal to null, then a rule having a type of:
+     *
+     *      TYPE_ALLOW will imply a type of TYPE_DENY, and
+     *
+     *      TYPE_DENY will imply a type of TYPE_ALLOW
+     *
+     * when the rule's assertion fails. This is because the ACL needs to provide expected
+     * behavior when an assertion upon the default ACL rule fails.
+     *
+     * @param  string                                   $operation
+     * @param  string                                   $type
+     * @param  Zend_Acl_Role_Interface|string|array     $roles
+     * @param  Zend_Acl_Resource_Interface|string|array $resources
+     * @param  string|array                             $privileges
+     * @param  Zend_Acl_Assert_Interface                $assert
+     * @throws Zend_Acl_Exception
+     * @uses   Zend_Acl_Role_Registry::get()
+     * @uses   Zend_Acl::get()
+     * @return Zend_Acl Provides a fluent interface
+     */
+    public function setRule($operation, $type, $roles = null, $resources = null, $privileges = null,
+                            Zend_Acl_Assert_Interface $assert = null)
+    {
+        // ensure that the rule type is valid; normalize input to uppercase
+        $type = strtoupper($type);
+        if (self::TYPE_ALLOW !== $type && self::TYPE_DENY !== $type) {
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception("Unsupported rule type; must be either '" . self::TYPE_ALLOW . "' or '"
+                                       . self::TYPE_DENY . "'");
+        }
+
+        // ensure that all specified Roles exist; normalize input to array of Role objects or null
+        if (!is_array($roles)) {
+            $roles = array($roles);
+        } else if (0 === count($roles)) {
+            $roles = array(null);
+        }
+        $rolesTemp = $roles;
+        $roles = array();
+        foreach ($rolesTemp as $role) {
+            if (null !== $role) {
+                $roles[] = $this->_getRoleRegistry()->get($role);
+            } else {
+                $roles[] = null;
+            }
+        }
+        unset($rolesTemp);
+
+        // ensure that all specified Resources exist; normalize input to array of Resource objects or null
+        if ($resources !== null) {
+            if (!is_array($resources)) {
+                $resources = array($resources);
+            } else if (0 === count($resources)) {
+                $resources = array(null);
+            }
+            $resourcesTemp = $resources;
+            $resources = array();
+            foreach ($resourcesTemp as $resource) {
+                if (null !== $resource) {
+                    $resources[] = $this->get($resource);
+                } else {
+                    $resources[] = null;
+                }
+            }
+            unset($resourcesTemp, $resource);
+        } else {
+            $allResources = array(); // this might be used later if resource iteration is required
+            foreach ($this->_resources as $rTarget) {
+                $allResources[] = $rTarget['instance'];
+            }
+            unset($rTarget);
+        }
+
+        // normalize privileges to array
+        if (null === $privileges) {
+            $privileges = array();
+        } else if (!is_array($privileges)) {
+            $privileges = array($privileges);
+        }
+
+        switch ($operation) {
+
+            // add to the rules
+            case self::OP_ADD:
+                if ($resources !== null) {
+                    // this block will iterate the provided resources
+                    foreach ($resources as $resource) {
+                        foreach ($roles as $role) {
+                            $rules =& $this->_getRules($resource, $role, true);
+                            if (0 === count($privileges)) {
+                                $rules['allPrivileges']['type']   = $type;
+                                $rules['allPrivileges']['assert'] = $assert;
+                                if (!isset($rules['byPrivilegeId'])) {
+                                    $rules['byPrivilegeId'] = array();
+                                }
+                            } else {
+                                foreach ($privileges as $privilege) {
+                                    $rules['byPrivilegeId'][$privilege]['type']   = $type;
+                                    $rules['byPrivilegeId'][$privilege]['assert'] = $assert;
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    // this block will apply to all resources in a global rule
+                    foreach ($roles as $role) {
+                        $rules =& $this->_getRules(null, $role, true);
+                        if (0 === count($privileges)) {
+                            $rules['allPrivileges']['type']   = $type;
+                            $rules['allPrivileges']['assert'] = $assert;
+                        } else {
+                            foreach ($privileges as $privilege) {
+                                $rules['byPrivilegeId'][$privilege]['type']   = $type;
+                                $rules['byPrivilegeId'][$privilege]['assert'] = $assert;
+                            }
+                        }
+                    }
+                }
+                break;
+
+            // remove from the rules
+            case self::OP_REMOVE:
+                if ($resources !== null) {
+                    // this block will iterate the provided resources
+                    foreach ($resources as $resource) {
+                        foreach ($roles as $role) {
+                            $rules =& $this->_getRules($resource, $role);
+                            if (null === $rules) {
+                                continue;
+                            }
+                            if (0 === count($privileges)) {
+                                if (null === $resource && null === $role) {
+                                    if ($type === $rules['allPrivileges']['type']) {
+                                        $rules = array(
+                                            'allPrivileges' => array(
+                                                'type'   => self::TYPE_DENY,
+                                                'assert' => null
+                                                ),
+                                            'byPrivilegeId' => array()
+                                            );
+                                    }
+                                    continue;
+                                }
+
+                                if (isset($rules['allPrivileges']['type']) &&
+                                    $type === $rules['allPrivileges']['type'])
+                                {
+                                    unset($rules['allPrivileges']);
+                                }
+                            } else {
+                                foreach ($privileges as $privilege) {
+                                    if (isset($rules['byPrivilegeId'][$privilege]) &&
+                                        $type === $rules['byPrivilegeId'][$privilege]['type'])
+                                    {
+                                        unset($rules['byPrivilegeId'][$privilege]);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    // this block will apply to all resources in a global rule
+                    foreach ($roles as $role) {
+                        /**
+                         * since null (all resources) was passed to this setRule() call, we need
+                         * clean up all the rules for the global allResources, as well as the indivually
+                         * set resources (per privilege as well)
+                         */
+                        foreach (array_merge(array(null), $allResources) as $resource) {
+                            $rules =& $this->_getRules($resource, $role, true);
+                            if (null === $rules) {
+                                continue;
+                            }
+                            if (0 === count($privileges)) {
+                                if (null === $role) {
+                                    if ($type === $rules['allPrivileges']['type']) {
+                                        $rules = array(
+                                            'allPrivileges' => array(
+                                                'type'   => self::TYPE_DENY,
+                                                'assert' => null
+                                                ),
+                                            'byPrivilegeId' => array()
+                                            );
+                                    }
+                                    continue;
+                                }
+
+                                if (isset($rules['allPrivileges']['type']) && $type === $rules['allPrivileges']['type']) {
+                                    unset($rules['allPrivileges']);
+                                }
+                            } else {
+                                foreach ($privileges as $privilege) {
+                                    if (isset($rules['byPrivilegeId'][$privilege]) &&
+                                        $type === $rules['byPrivilegeId'][$privilege]['type'])
+                                    {
+                                        unset($rules['byPrivilegeId'][$privilege]);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                break;
+
+            default:
+                require_once 'Zend/Acl/Exception.php';
+                throw new Zend_Acl_Exception("Unsupported operation; must be either '" . self::OP_ADD . "' or '"
+                                           . self::OP_REMOVE . "'");
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns true if and only if the Role has access to the Resource
+     *
+     * The $role and $resource parameters may be references to, or the string identifiers for,
+     * an existing Resource and Role combination.
+     *
+     * If either $role or $resource is null, then the query applies to all Roles or all Resources,
+     * respectively. Both may be null to query whether the ACL has a "blacklist" rule
+     * (allow everything to all). By default, Zend_Acl creates a "whitelist" rule (deny
+     * everything to all), and this method would return false unless this default has
+     * been overridden (i.e., by executing $acl->allow()).
+     *
+     * If a $privilege is not provided, then this method returns false if and only if the
+     * Role is denied access to at least one privilege upon the Resource. In other words, this
+     * method returns true if and only if the Role is allowed all privileges on the Resource.
+     *
+     * This method checks Role inheritance using a depth-first traversal of the Role registry.
+     * The highest priority parent (i.e., the parent most recently added) is checked first,
+     * and its respective parents are checked similarly before the lower-priority parents of
+     * the Role are checked.
+     *
+     * @param  Zend_Acl_Role_Interface|string     $role
+     * @param  Zend_Acl_Resource_Interface|string $resource
+     * @param  string                             $privilege
+     * @uses   Zend_Acl::get()
+     * @uses   Zend_Acl_Role_Registry::get()
+     * @return boolean
+     */
+    public function isAllowed($role = null, $resource = null, $privilege = null)
+    {
+        // reset role & resource to null
+        $this->_isAllowedRole = null;
+        $this->_isAllowedResource = null;
+        $this->_isAllowedPrivilege = null;
+
+        if (null !== $role) {
+            // keep track of originally called role
+            $this->_isAllowedRole = $role;
+            $role = $this->_getRoleRegistry()->get($role);
+            if (!$this->_isAllowedRole instanceof Zend_Acl_Role_Interface) {
+                $this->_isAllowedRole = $role;
+            }
+        }
+
+        if (null !== $resource) {
+            // keep track of originally called resource
+            $this->_isAllowedResource = $resource;
+            $resource = $this->get($resource);
+            if (!$this->_isAllowedResource instanceof Zend_Acl_Resource_Interface) {
+                $this->_isAllowedResource = $resource;
+            }
+        }
+
+        if (null === $privilege) {
+            // query on all privileges
+            do {
+                // depth-first search on $role if it is not 'allRoles' pseudo-parent
+                if (null !== $role && null !== ($result = $this->_roleDFSAllPrivileges($role, $resource, $privilege))) {
+                    return $result;
+                }
+
+                // look for rule on 'allRoles' psuedo-parent
+                if (null !== ($rules = $this->_getRules($resource, null))) {
+                    foreach ($rules['byPrivilegeId'] as $privilege => $rule) {
+                        if (self::TYPE_DENY === ($ruleTypeOnePrivilege = $this->_getRuleType($resource, null, $privilege))) {
+                            return false;
+                        }
+                    }
+                    if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, null, null))) {
+                        return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
+                    }
+                }
+
+                // try next Resource
+                $resource = $this->_resources[$resource->getResourceId()]['parent'];
+
+            } while (true); // loop terminates at 'allResources' pseudo-parent
+        } else {
+            $this->_isAllowedPrivilege = $privilege;
+            // query on one privilege
+            do {
+                // depth-first search on $role if it is not 'allRoles' pseudo-parent
+                if (null !== $role && null !== ($result = $this->_roleDFSOnePrivilege($role, $resource, $privilege))) {
+                    return $result;
+                }
+
+                // look for rule on 'allRoles' pseudo-parent
+                if (null !== ($ruleType = $this->_getRuleType($resource, null, $privilege))) {
+                    return self::TYPE_ALLOW === $ruleType;
+                } else if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, null, null))) {
+                    return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
+                }
+
+                // try next Resource
+                $resource = $this->_resources[$resource->getResourceId()]['parent'];
+
+            } while (true); // loop terminates at 'allResources' pseudo-parent
+        }
+    }
+
+    /**
+     * Returns the Role registry for this ACL
+     *
+     * If no Role registry has been created yet, a new default Role registry
+     * is created and returned.
+     *
+     * @return Zend_Acl_Role_Registry
+     */
+    protected function _getRoleRegistry()
+    {
+        if (null === $this->_roleRegistry) {
+            $this->_roleRegistry = new Zend_Acl_Role_Registry();
+        }
+        return $this->_roleRegistry;
+    }
+
+    /**
+     * Performs a depth-first search of the Role DAG, starting at $role, in order to find a rule
+     * allowing/denying $role access to all privileges upon $resource
+     *
+     * This method returns true if a rule is found and allows access. If a rule exists and denies access,
+     * then this method returns false. If no applicable rule is found, then this method returns null.
+     *
+     * @param  Zend_Acl_Role_Interface     $role
+     * @param  Zend_Acl_Resource_Interface $resource
+     * @return boolean|null
+     */
+    protected function _roleDFSAllPrivileges(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null)
+    {
+        $dfs = array(
+            'visited' => array(),
+            'stack'   => array()
+            );
+
+        if (null !== ($result = $this->_roleDFSVisitAllPrivileges($role, $resource, $dfs))) {
+            return $result;
+        }
+
+        while (null !== ($role = array_pop($dfs['stack']))) {
+            if (!isset($dfs['visited'][$role->getRoleId()])) {
+                if (null !== ($result = $this->_roleDFSVisitAllPrivileges($role, $resource, $dfs))) {
+                    return $result;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Visits an $role in order to look for a rule allowing/denying $role access to all privileges upon $resource
+     *
+     * This method returns true if a rule is found and allows access. If a rule exists and denies access,
+     * then this method returns false. If no applicable rule is found, then this method returns null.
+     *
+     * This method is used by the internal depth-first search algorithm and may modify the DFS data structure.
+     *
+     * @param  Zend_Acl_Role_Interface     $role
+     * @param  Zend_Acl_Resource_Interface $resource
+     * @param  array                  $dfs
+     * @return boolean|null
+     * @throws Zend_Acl_Exception
+     */
+    protected function _roleDFSVisitAllPrivileges(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null,
+                                                 &$dfs = null)
+    {
+        if (null === $dfs) {
+            /**
+             * @see Zend_Acl_Exception
+             */
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception('$dfs parameter may not be null');
+        }
+
+        if (null !== ($rules = $this->_getRules($resource, $role))) {
+            foreach ($rules['byPrivilegeId'] as $privilege => $rule) {
+                if (self::TYPE_DENY === ($ruleTypeOnePrivilege = $this->_getRuleType($resource, $role, $privilege))) {
+                    return false;
+                }
+            }
+            if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, $role, null))) {
+                return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
+            }
+        }
+
+        $dfs['visited'][$role->getRoleId()] = true;
+        foreach ($this->_getRoleRegistry()->getParents($role) as $roleParentId => $roleParent) {
+            $dfs['stack'][] = $roleParent;
+        }
+
+        return null;
+    }
+
+    /**
+     * Performs a depth-first search of the Role DAG, starting at $role, in order to find a rule
+     * allowing/denying $role access to a $privilege upon $resource
+     *
+     * This method returns true if a rule is found and allows access. If a rule exists and denies access,
+     * then this method returns false. If no applicable rule is found, then this method returns null.
+     *
+     * @param  Zend_Acl_Role_Interface     $role
+     * @param  Zend_Acl_Resource_Interface $resource
+     * @param  string                      $privilege
+     * @return boolean|null
+     * @throws Zend_Acl_Exception
+     */
+    protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null,
+                                            $privilege = null)
+    {
+        if (null === $privilege) {
+            /**
+             * @see Zend_Acl_Exception
+             */
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception('$privilege parameter may not be null');
+        }
+
+        $dfs = array(
+            'visited' => array(),
+            'stack'   => array()
+            );
+
+        if (null !== ($result = $this->_roleDFSVisitOnePrivilege($role, $resource, $privilege, $dfs))) {
+            return $result;
+        }
+
+        while (null !== ($role = array_pop($dfs['stack']))) {
+            if (!isset($dfs['visited'][$role->getRoleId()])) {
+                if (null !== ($result = $this->_roleDFSVisitOnePrivilege($role, $resource, $privilege, $dfs))) {
+                    return $result;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Visits an $role in order to look for a rule allowing/denying $role access to a $privilege upon $resource
+     *
+     * This method returns true if a rule is found and allows access. If a rule exists and denies access,
+     * then this method returns false. If no applicable rule is found, then this method returns null.
+     *
+     * This method is used by the internal depth-first search algorithm and may modify the DFS data structure.
+     *
+     * @param  Zend_Acl_Role_Interface     $role
+     * @param  Zend_Acl_Resource_Interface $resource
+     * @param  string                      $privilege
+     * @param  array                       $dfs
+     * @return boolean|null
+     * @throws Zend_Acl_Exception
+     */
+    protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null,
+                                                $privilege = null, &$dfs = null)
+    {
+        if (null === $privilege) {
+            /**
+             * @see Zend_Acl_Exception
+             */
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception('$privilege parameter may not be null');
+        }
+
+        if (null === $dfs) {
+            /**
+             * @see Zend_Acl_Exception
+             */
+            require_once 'Zend/Acl/Exception.php';
+            throw new Zend_Acl_Exception('$dfs parameter may not be null');
+        }
+
+        if (null !== ($ruleTypeOnePrivilege = $this->_getRuleType($resource, $role, $privilege))) {
+            return self::TYPE_ALLOW === $ruleTypeOnePrivilege;
+        } else if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, $role, null))) {
+            return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
+        }
+
+        $dfs['visited'][$role->getRoleId()] = true;
+        foreach ($this->_getRoleRegistry()->getParents($role) as $roleParentId => $roleParent) {
+            $dfs['stack'][] = $roleParent;
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the rule type associated with the specified Resource, Role, and privilege
+     * combination.
+     *
+     * If a rule does not exist or its attached assertion fails, which means that
+     * the rule is not applicable, then this method returns null. Otherwise, the
+     * rule type applies and is returned as either TYPE_ALLOW or TYPE_DENY.
+     *
+     * If $resource or $role is null, then this means that the rule must apply to
+     * all Resources or Roles, respectively.
+     *
+     * If $privilege is null, then the rule must apply to all privileges.
+     *
+     * If all three parameters are null, then the default ACL rule type is returned,
+     * based on whether its assertion method passes.
+     *
+     * @param  Zend_Acl_Resource_Interface $resource
+     * @param  Zend_Acl_Role_Interface     $role
+     * @param  string                      $privilege
+     * @return string|null
+     */
+    protected function _getRuleType(Zend_Acl_Resource_Interface $resource = null, Zend_Acl_Role_Interface $role = null,
+                                    $privilege = null)
+    {
+        // get the rules for the $resource and $role
+        if (null === ($rules = $this->_getRules($resource, $role))) {
+            return null;
+        }
+
+        // follow $privilege
+        if (null === $privilege) {
+            if (isset($rules['allPrivileges'])) {
+                $rule = $rules['allPrivileges'];
+            } else {
+                return null;
+            }
+        } else if (!isset($rules['byPrivilegeId'][$privilege])) {
+            return null;
+        } else {
+            $rule = $rules['byPrivilegeId'][$privilege];
+        }
+
+        // check assertion first
+        if ($rule['assert']) {
+            $assertion = $rule['assert'];
+            $assertionValue = $assertion->assert(
+                $this,
+                ($this->_isAllowedRole instanceof Zend_Acl_Role_Interface) ? $this->_isAllowedRole : $role,
+                ($this->_isAllowedResource instanceof Zend_Acl_Resource_Interface) ? $this->_isAllowedResource : $resource,
+                $this->_isAllowedPrivilege
+                );
+        }
+
+        if (null === $rule['assert'] || $assertionValue) {
+            return $rule['type'];
+        } else if (null !== $resource || null !== $role || null !== $privilege) {
+            return null;
+        } else if (self::TYPE_ALLOW === $rule['type']) {
+            return self::TYPE_DENY;
+        } else {
+            return self::TYPE_ALLOW;
+        }
+    }
+
+    /**
+     * Returns the rules associated with a Resource and a Role, or null if no such rules exist
+     *
+     * If either $resource or $role is null, this means that the rules returned are for all Resources or all Roles,
+     * respectively. Both can be null to return the default rule set for all Resources and all Roles.
+     *
+     * If the $create parameter is true, then a rule set is first created and then returned to the caller.
+     *
+     * @param  Zend_Acl_Resource_Interface $resource
+     * @param  Zend_Acl_Role_Interface     $role
+     * @param  boolean                     $create
+     * @return array|null
+     */
+    protected function &_getRules(Zend_Acl_Resource_Interface $resource = null, Zend_Acl_Role_Interface $role = null,
+                                  $create = false)
+    {
+        // create a reference to null
+        $null = null;
+        $nullRef =& $null;
+
+        // follow $resource
+        do {
+            if (null === $resource) {
+                $visitor =& $this->_rules['allResources'];
+                break;
+            }
+            $resourceId = $resource->getResourceId();
+            if (!isset($this->_rules['byResourceId'][$resourceId])) {
+                if (!$create) {
+                    return $nullRef;
+                }
+                $this->_rules['byResourceId'][$resourceId] = array();
+            }
+            $visitor =& $this->_rules['byResourceId'][$resourceId];
+        } while (false);
+
+
+        // follow $role
+        if (null === $role) {
+            if (!isset($visitor['allRoles'])) {
+                if (!$create) {
+                    return $nullRef;
+                }
+                $visitor['allRoles']['byPrivilegeId'] = array();
+            }
+            return $visitor['allRoles'];
+        }
+        $roleId = $role->getRoleId();
+        if (!isset($visitor['byRoleId'][$roleId])) {
+            if (!$create) {
+                return $nullRef;
+            }
+            $visitor['byRoleId'][$roleId]['byPrivilegeId'] = array();
+            $visitor['byRoleId'][$roleId]['allPrivileges'] = array('type' => null, 'assert' => null);
+        }
+        return $visitor['byRoleId'][$roleId];
+    }
+
+
+    /**
+     * @return array of registered roles (Deprecated)
+     * @deprecated Deprecated since version 1.10 (December 2009)
+     */
+    public function getRegisteredRoles()
+    {
+        trigger_error('The method getRegisteredRoles() was deprecated as of '
+                    . 'version 1.0, and may be removed. You\'re encouraged '
+                    . 'to use getRoles() instead.');
+
+        return $this->_getRoleRegistry()->getRoles();
+    }
+
+    /**
+     * Returns an array of registered roles.
+     *
+     * Note that this method does not return instances of registered roles,
+     * but only the role identifiers.
+     *
+     * @return array of registered roles
+     */
+    public function getRoles()
+    {
+        return array_keys($this->_getRoleRegistry()->getRoles());
+    }
+
+    /**
+     * @return array of registered resources
+     */
+    public function getResources()
+    {
+        return array_keys($this->_resources);
+    }
+
+}
+
diff --git a/lib/zend/Zend/Acl/Assert/Interface.php b/lib/zend/Zend/Acl/Assert/Interface.php
new file mode 100644
index 00000000000..e3d02565fc6
--- /dev/null
+++ b/lib/zend/Zend/Acl/Assert/Interface.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Acl
+ */
+require_once 'Zend/Acl.php';
+
+
+/**
+ * @see Zend_Acl_Role_Interface
+ */
+require_once 'Zend/Acl/Role/Interface.php';
+
+
+/**
+ * @see Zend_Acl_Resource_Interface
+ */
+require_once 'Zend/Acl/Resource/Interface.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Acl_Assert_Interface
+{
+    /**
+     * Returns true if and only if the assertion conditions are met
+     *
+     * This method is passed the ACL, Role, Resource, and privilege to which the authorization query applies. If the
+     * $role, $resource, or $privilege parameters are null, it means that the query applies to all Roles, Resources, or
+     * privileges, respectively.
+     *
+     * @param  Zend_Acl                    $acl
+     * @param  Zend_Acl_Role_Interface     $role
+     * @param  Zend_Acl_Resource_Interface $resource
+     * @param  string                      $privilege
+     * @return boolean
+     */
+    public function assert(Zend_Acl $acl, Zend_Acl_Role_Interface $role = null, Zend_Acl_Resource_Interface $resource = null,
+                           $privilege = null);
+}
diff --git a/lib/zend/Zend/Acl/Exception.php b/lib/zend/Zend/Acl/Exception.php
new file mode 100644
index 00000000000..0a19832fb8f
--- /dev/null
+++ b/lib/zend/Zend/Acl/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Acl_Exception extends Zend_Exception
+{}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php b/lib/zend/Zend/Acl/Resource.php
similarity index 50%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php
rename to lib/zend/Zend/Acl/Resource.php
index 12f3fe50e63..1d40d4d05f4 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php
+++ b/lib/zend/Zend/Acl/Resource.php
@@ -13,65 +13,62 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+
 /**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
+ * @see Zend_Acl_Resource_Interface
  */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
+require_once 'Zend/Acl/Resource/Interface.php';
+
 
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Response_IpLocation_CityType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
+class Zend_Acl_Resource implements Zend_Acl_Resource_Interface
 {
     /**
+     * Unique id of Resource
+     *
      * @var string
      */
-    public $countryCode = null;
+    protected $_resourceId;
 
     /**
-     * @var string
+     * Sets the Resource identifier
+     *
+     * @param  string $resourceId
      */
-    public $cityCode = null;
-
-    /**
-     * @var string
-     */
-    public $cityName = null;
-
-    /**
-     * @return string
-     */
-    public function getCountryCode()
+    public function __construct($resourceId)
     {
-        return $this->countryCode;
+        $this->_resourceId = (string) $resourceId;
     }
 
     /**
+     * Defined by Zend_Acl_Resource_Interface; returns the Resource identifier
+     *
      * @return string
      */
-    public function getCityCode()
+    public function getResourceId()
     {
-        return $this->cityCode;
+        return $this->_resourceId;
     }
 
     /**
+     * Defined by Zend_Acl_Resource_Interface; returns the Resource identifier
+     * Proxies to getResourceId()
+     *
      * @return string
      */
-    public function getCityName()
+    public function __toString()
     {
-        return $this->cityName;
+        return $this->getResourceId();
     }
 }
diff --git a/lib/zend/Zend/Acl/Resource/Interface.php b/lib/zend/Zend/Acl/Resource/Interface.php
new file mode 100644
index 00000000000..dcf10586d51
--- /dev/null
+++ b/lib/zend/Zend/Acl/Resource/Interface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Acl_Resource_Interface
+{
+    /**
+     * Returns the string identifier of the Resource
+     *
+     * @return string
+     */
+    public function getResourceId();
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php b/lib/zend/Zend/Acl/Role.php
similarity index 50%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php
rename to lib/zend/Zend/Acl/Role.php
index 0441e1c8220..b36f519ebc9 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php
+++ b/lib/zend/Zend/Acl/Role.php
@@ -13,48 +13,62 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+
 /**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
+ * @see Zend_Acl_Role_Interface
  */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php';
+require_once 'Zend/Acl/Role/Interface.php';
+
 
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
+class Zend_Acl_Role implements Zend_Acl_Role_Interface
 {
     /**
-     * returns the session id
-     * @return string
+     * Unique id of Role
+     *
+     * @var string
      */
-    public function getSessionId()
+    protected $_roleId;
+
+    /**
+     * Sets the Role identifier
+     *
+     * @param  string $roleId
+     */
+    public function __construct($roleId)
     {
-        if (isset($this->return->sessionId)) {
-            return $this->return->sessionId;
-        }
-        return null;
+        $this->_roleId = (string) $roleId;
     }
 
     /**
-     * prints the session on casting to string
+     * Defined by Zend_Acl_Role_Interface; returns the Role identifier
+     *
+     * @return string
+     */
+    public function getRoleId()
+    {
+        return $this->_roleId;
+    }
+
+    /**
+     * Defined by Zend_Acl_Role_Interface; returns the Role identifier
+     * Proxies to getRoleId()
      *
      * @return string
      */
     public function __toString()
     {
-        return $this->getSessionId();
+        return $this->getRoleId();
     }
 }
diff --git a/lib/zend/Zend/Acl/Role/Interface.php b/lib/zend/Zend/Acl/Role/Interface.php
new file mode 100644
index 00000000000..e2510003ce5
--- /dev/null
+++ b/lib/zend/Zend/Acl/Role/Interface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Acl_Role_Interface
+{
+    /**
+     * Returns the string identifier of the Role
+     *
+     * @return string
+     */
+    public function getRoleId();
+}
diff --git a/lib/zend/Zend/Acl/Role/Registry.php b/lib/zend/Zend/Acl/Role/Registry.php
new file mode 100644
index 00000000000..d9d57f33799
--- /dev/null
+++ b/lib/zend/Zend/Acl/Role/Registry.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Acl_Role_Interface
+ */
+require_once 'Zend/Acl/Role/Interface.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Acl_Role_Registry
+{
+    /**
+     * Internal Role registry data storage
+     *
+     * @var array
+     */
+    protected $_roles = array();
+
+    /**
+     * Adds a Role having an identifier unique to the registry
+     *
+     * The $parents parameter may be a reference to, or the string identifier for,
+     * a Role existing in the registry, or $parents may be passed as an array of
+     * these - mixing string identifiers and objects is ok - to indicate the Roles
+     * from which the newly added Role will directly inherit.
+     *
+     * In order to resolve potential ambiguities with conflicting rules inherited
+     * from different parents, the most recently added parent takes precedence over
+     * parents that were previously added. In other words, the first parent added
+     * will have the least priority, and the last parent added will have the
+     * highest priority.
+     *
+     * @param  Zend_Acl_Role_Interface              $role
+     * @param  Zend_Acl_Role_Interface|string|array $parents
+     * @throws Zend_Acl_Role_Registry_Exception
+     * @return Zend_Acl_Role_Registry Provides a fluent interface
+     */
+    public function add(Zend_Acl_Role_Interface $role, $parents = null)
+    {
+        $roleId = $role->getRoleId();
+
+        if ($this->has($roleId)) {
+            /**
+             * @see Zend_Acl_Role_Registry_Exception
+             */
+            require_once 'Zend/Acl/Role/Registry/Exception.php';
+            throw new Zend_Acl_Role_Registry_Exception("Role id '$roleId' already exists in the registry");
+        }
+
+        $roleParents = array();
+
+        if (null !== $parents) {
+            if (!is_array($parents)) {
+                $parents = array($parents);
+            }
+            /**
+             * @see Zend_Acl_Role_Registry_Exception
+             */
+            require_once 'Zend/Acl/Role/Registry/Exception.php';
+            foreach ($parents as $parent) {
+                try {
+                    if ($parent instanceof Zend_Acl_Role_Interface) {
+                        $roleParentId = $parent->getRoleId();
+                    } else {
+                        $roleParentId = $parent;
+                    }
+                    $roleParent = $this->get($roleParentId);
+                } catch (Zend_Acl_Role_Registry_Exception $e) {
+                    throw new Zend_Acl_Role_Registry_Exception("Parent Role id '$roleParentId' does not exist", 0, $e);
+                }
+                $roleParents[$roleParentId] = $roleParent;
+                $this->_roles[$roleParentId]['children'][$roleId] = $role;
+            }
+        }
+
+        $this->_roles[$roleId] = array(
+            'instance' => $role,
+            'parents'  => $roleParents,
+            'children' => array()
+            );
+
+        return $this;
+    }
+
+    /**
+     * Returns the identified Role
+     *
+     * The $role parameter can either be a Role or a Role identifier.
+     *
+     * @param  Zend_Acl_Role_Interface|string $role
+     * @throws Zend_Acl_Role_Registry_Exception
+     * @return Zend_Acl_Role_Interface
+     */
+    public function get($role)
+    {
+        if ($role instanceof Zend_Acl_Role_Interface) {
+            $roleId = $role->getRoleId();
+        } else {
+            $roleId = (string) $role;
+        }
+
+        if (!$this->has($role)) {
+            /**
+             * @see Zend_Acl_Role_Registry_Exception
+             */
+            require_once 'Zend/Acl/Role/Registry/Exception.php';
+            throw new Zend_Acl_Role_Registry_Exception("Role '$roleId' not found");
+        }
+
+        return $this->_roles[$roleId]['instance'];
+    }
+
+    /**
+     * Returns true if and only if the Role exists in the registry
+     *
+     * The $role parameter can either be a Role or a Role identifier.
+     *
+     * @param  Zend_Acl_Role_Interface|string $role
+     * @return boolean
+     */
+    public function has($role)
+    {
+        if ($role instanceof Zend_Acl_Role_Interface) {
+            $roleId = $role->getRoleId();
+        } else {
+            $roleId = (string) $role;
+        }
+
+        return isset($this->_roles[$roleId]);
+    }
+
+    /**
+     * Returns an array of an existing Role's parents
+     *
+     * The array keys are the identifiers of the parent Roles, and the values are
+     * the parent Role instances. The parent Roles are ordered in this array by
+     * ascending priority. The highest priority parent Role, last in the array,
+     * corresponds with the parent Role most recently added.
+     *
+     * If the Role does not have any parents, then an empty array is returned.
+     *
+     * @param  Zend_Acl_Role_Interface|string $role
+     * @uses   Zend_Acl_Role_Registry::get()
+     * @return array
+     */
+    public function getParents($role)
+    {
+        $roleId = $this->get($role)->getRoleId();
+
+        return $this->_roles[$roleId]['parents'];
+    }
+
+    /**
+     * Returns true if and only if $role inherits from $inherit
+     *
+     * Both parameters may be either a Role or a Role identifier. If
+     * $onlyParents is true, then $role must inherit directly from
+     * $inherit in order to return true. By default, this method looks
+     * through the entire inheritance DAG to determine whether $role
+     * inherits from $inherit through its ancestor Roles.
+     *
+     * @param  Zend_Acl_Role_Interface|string $role
+     * @param  Zend_Acl_Role_Interface|string $inherit
+     * @param  boolean                        $onlyParents
+     * @throws Zend_Acl_Role_Registry_Exception
+     * @return boolean
+     */
+    public function inherits($role, $inherit, $onlyParents = false)
+    {
+        /**
+         * @see Zend_Acl_Role_Registry_Exception
+         */
+        require_once 'Zend/Acl/Role/Registry/Exception.php';
+        try {
+            $roleId     = $this->get($role)->getRoleId();
+            $inheritId = $this->get($inherit)->getRoleId();
+        } catch (Zend_Acl_Role_Registry_Exception $e) {
+            throw new Zend_Acl_Role_Registry_Exception($e->getMessage(), $e->getCode(), $e);
+        }
+
+        $inherits = isset($this->_roles[$roleId]['parents'][$inheritId]);
+
+        if ($inherits || $onlyParents) {
+            return $inherits;
+        }
+
+        foreach ($this->_roles[$roleId]['parents'] as $parentId => $parent) {
+            if ($this->inherits($parentId, $inheritId)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes the Role from the registry
+     *
+     * The $role parameter can either be a Role or a Role identifier.
+     *
+     * @param  Zend_Acl_Role_Interface|string $role
+     * @throws Zend_Acl_Role_Registry_Exception
+     * @return Zend_Acl_Role_Registry Provides a fluent interface
+     */
+    public function remove($role)
+    {
+        /**
+         * @see Zend_Acl_Role_Registry_Exception
+         */
+        require_once 'Zend/Acl/Role/Registry/Exception.php';
+        try {
+            $roleId = $this->get($role)->getRoleId();
+        } catch (Zend_Acl_Role_Registry_Exception $e) {
+            throw new Zend_Acl_Role_Registry_Exception($e->getMessage(), $e->getCode(), $e);
+        }
+
+        foreach ($this->_roles[$roleId]['children'] as $childId => $child) {
+            unset($this->_roles[$childId]['parents'][$roleId]);
+        }
+        foreach ($this->_roles[$roleId]['parents'] as $parentId => $parent) {
+            unset($this->_roles[$parentId]['children'][$roleId]);
+        }
+
+        unset($this->_roles[$roleId]);
+
+        return $this;
+    }
+
+    /**
+     * Removes all Roles from the registry
+     *
+     * @return Zend_Acl_Role_Registry Provides a fluent interface
+     */
+    public function removeAll()
+    {
+        $this->_roles = array();
+
+        return $this;
+    }
+
+    public function getRoles()
+    {
+        return $this->_roles;
+    }
+
+}
diff --git a/lib/zend/Zend/Acl/Role/Registry/Exception.php b/lib/zend/Zend/Acl/Role/Registry/Exception.php
new file mode 100644
index 00000000000..a2e906a98a2
--- /dev/null
+++ b/lib/zend/Zend/Acl/Role/Registry/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Acl_Exception
+ */
+require_once 'Zend/Acl/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Acl
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Acl_Role_Registry_Exception extends Zend_Acl_Exception
+{}
diff --git a/lib/zend/Zend/Amf/Adobe/Auth.php b/lib/zend/Zend/Amf/Adobe/Auth.php
old mode 100644
new mode 100755
index 33549890a09..76234e3ca6d
--- a/lib/zend/Zend/Amf/Adobe/Auth.php
+++ b/lib/zend/Zend/Amf/Adobe/Auth.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,12 +28,15 @@ require_once 'Zend/Acl.php';
 /** @see Zend_Auth_Result */
 require_once 'Zend/Auth/Result.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /**
  * This class implements authentication against XML file with roles for Flex Builder.
  *
  * @package    Zend_Amf
  * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract
@@ -61,7 +64,7 @@ class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract
     public function __construct($rolefile)
     {
         $this->_acl = new Zend_Acl();
-        $xml = simplexml_load_file($rolefile);
+        $xml = Zend_Xml_Security::scanFile($rolefile);
 /*
 Roles file format:
  <roles>
diff --git a/lib/zend/Zend/Amf/Adobe/DbInspector.php b/lib/zend/Zend/Amf/Adobe/DbInspector.php
old mode 100644
new mode 100755
index d756787ad6f..a25c3a2b165
--- a/lib/zend/Zend/Amf/Adobe/DbInspector.php
+++ b/lib/zend/Zend/Amf/Adobe/DbInspector.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Adobe_DbInspector
diff --git a/lib/zend/Zend/Amf/Adobe/Introspector.php b/lib/zend/Zend/Amf/Adobe/Introspector.php
old mode 100644
new mode 100755
index f746e38f470..3eb76c490cc
--- a/lib/zend/Zend/Amf/Adobe/Introspector.php
+++ b/lib/zend/Zend/Amf/Adobe/Introspector.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Server/Reflection.php';
  *
  * @package    Zend_Amf
  * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Adobe_Introspector
@@ -283,7 +283,12 @@ class Zend_Amf_Adobe_Introspector
             return 'Unknown';
         }
 
-        if (in_array($typename, array('int', 'integer', 'bool', 'boolean', 'float', 'string', 'object', 'Unknown', 'stdClass', 'array'))) {
+        // Arrays
+        if ('array' == $typename) {
+            return 'Unknown[]';
+        }
+
+        if (in_array($typename, array('int', 'integer', 'bool', 'boolean', 'float', 'string', 'object', 'Unknown', 'stdClass'))) {
             return $typename;
         }
 
diff --git a/lib/zend/Zend/Amf/Auth/Abstract.php b/lib/zend/Zend/Amf/Auth/Abstract.php
old mode 100644
new mode 100755
index 617d2b412c4..180568d3fcc
--- a/lib/zend/Zend/Amf/Auth/Abstract.php
+++ b/lib/zend/Zend/Amf/Auth/Abstract.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Auth/Adapter/Interface.php';
  *
  * @package    Zend_Amf
  * @subpackage Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Amf_Auth_Abstract implements Zend_Auth_Adapter_Interface
diff --git a/lib/zend/Zend/Amf/Constants.php b/lib/zend/Zend/Amf/Constants.php
index 4cf60025a1a..723d8ba4fd3 100644
--- a/lib/zend/Zend/Amf/Constants.php
+++ b/lib/zend/Zend/Amf/Constants.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  * deserialization to detect the AMF marker and encoding types.
  *
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 final class Zend_Amf_Constants
diff --git a/lib/zend/Zend/Amf/Exception.php b/lib/zend/Zend/Amf/Exception.php
index fa45da335d5..5738cdd95d3 100644
--- a/lib/zend/Zend/Amf/Exception.php
+++ b/lib/zend/Zend/Amf/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@ require_once 'Zend/Exception.php';
 
 /**
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Exception extends Zend_Exception
diff --git a/lib/zend/Zend/Amf/Parse/Amf0/Deserializer.php b/lib/zend/Zend/Amf/Parse/Amf0/Deserializer.php
index e80492d6b16..6d8fa7f55d9 100644
--- a/lib/zend/Zend/Amf/Parse/Amf0/Deserializer.php
+++ b/lib/zend/Zend/Amf/Parse/Amf0/Deserializer.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -23,6 +23,9 @@
 /** Zend_Amf_Constants */
 require_once 'Zend/Amf/Constants.php';
 
+/** Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /** @see Zend_Amf_Parse_Deserializer */
 require_once 'Zend/Amf/Parse/Deserializer.php';
 
@@ -33,7 +36,7 @@ require_once 'Zend/Amf/Parse/Deserializer.php';
  * @todo       Class could be implemented as Factory Class with each data type it's own class
  * @package    Zend_Amf
  * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer
@@ -248,7 +251,7 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer
     public function readXmlString()
     {
         $string = $this->_stream->readLongUTF();
-        return simplexml_load_string($string);
+        return Zend_Xml_Security::scan($string); //simplexml_load_string($string);
     }
 
     /**
diff --git a/lib/zend/Zend/Amf/Parse/Amf0/Serializer.php b/lib/zend/Zend/Amf/Parse/Amf0/Serializer.php
index 9ecc352b8e5..0a578c12911 100644
--- a/lib/zend/Zend/Amf/Parse/Amf0/Serializer.php
+++ b/lib/zend/Zend/Amf/Parse/Amf0/Serializer.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Amf/Parse/Serializer.php';
  * @uses       Zend_Amf_Parse_Serializer
  * @package    Zend_Amf
  * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer
@@ -63,8 +63,8 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer
      */
     public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false)
     {
-        // Workaround for PHP5 with E_STRICT enabled complaining about "Only 
-        // variables should be passed by reference" 
+        // Workaround for PHP5 with E_STRICT enabled complaining about "Only
+        // variables should be passed by reference"
         if ((null === $data) && ($dataByVal !== false)) {
             $data = &$dataByVal;
         }
@@ -127,7 +127,7 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer
                 case (is_bool($data)):
                     $markerType = Zend_Amf_Constants::AMF0_BOOLEAN;
                     break;
-                case (is_string($data) && (strlen($data) > 65536)):
+                case (is_string($data) && (($this->_mbStringFunctionsOverloaded ? mb_strlen($data, '8bit') : strlen($data)) > 65536)):
                     $markerType = Zend_Amf_Constants::AMF0_LONGSTRING;
                     break;
                 case (is_string($data)):
@@ -187,23 +187,23 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer
      * Check if the given object is in the reference table, write the reference if it exists,
      * otherwise add the object to the reference table
      *
-     * @param mixed $object object reference to check for reference
-     * @param $markerType AMF type of the object to write
-     * @param mixed $objectByVal object to check for reference
+     * @param mixed  $object object reference to check for reference
+     * @param string $markerType AMF type of the object to write
+     * @param mixed  $objectByVal object to check for reference
      * @return Boolean true, if the reference was written, false otherwise
      */
-    protected function writeObjectReference(&$object, $markerType, $objectByVal = false) 
+    protected function writeObjectReference(&$object, $markerType, $objectByVal = false)
     {
-        // Workaround for PHP5 with E_STRICT enabled complaining about "Only 
+        // Workaround for PHP5 with E_STRICT enabled complaining about "Only
         // variables should be passed by reference"
         if ((null === $object) && ($objectByVal !== false)) {
             $object = &$objectByVal;
         }
 
-        if ($markerType == Zend_Amf_Constants::AMF0_OBJECT 
-            || $markerType == Zend_Amf_Constants::AMF0_MIXEDARRAY 
-            || $markerType == Zend_Amf_Constants::AMF0_ARRAY 
-            || $markerType == Zend_Amf_Constants::AMF0_TYPEDOBJECT 
+        if ($markerType == Zend_Amf_Constants::AMF0_OBJECT
+            || $markerType == Zend_Amf_Constants::AMF0_MIXEDARRAY
+            || $markerType == Zend_Amf_Constants::AMF0_ARRAY
+            || $markerType == Zend_Amf_Constants::AMF0_TYPEDOBJECT
         ) {
             $ref = array_search($object, $this->_referenceObjects, true);
             //handle object reference
diff --git a/lib/zend/Zend/Amf/Parse/Amf3/Deserializer.php b/lib/zend/Zend/Amf/Parse/Amf3/Deserializer.php
index 0144798eb80..9bcc272af30 100644
--- a/lib/zend/Zend/Amf/Parse/Amf3/Deserializer.php
+++ b/lib/zend/Zend/Amf/Parse/Amf3/Deserializer.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -23,6 +23,9 @@
 /** Zend_Amf_Parse_Deserializer */
 require_once 'Zend/Amf/Parse/Deserializer.php';
 
+/** Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /** Zend_Amf_Parse_TypeLoader */
 require_once 'Zend/Amf/Parse/TypeLoader.php';
 
@@ -34,7 +37,7 @@ require_once 'Zend/Amf/Parse/TypeLoader.php';
  * @todo       Class could be implemented as Factory Class with each data type it's own class.
  * @package    Zend_Amf
  * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer
@@ -225,7 +228,7 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer
         $timestamp = floor($this->_stream->readDouble() / 1000);
 
         require_once 'Zend/Date.php';
-        $dateTime  = new Zend_Date((int) $timestamp);
+        $dateTime  = new Zend_Date($timestamp);
         $this->_referenceObjects[] = $dateTime;
         return $dateTime;
     }
@@ -385,6 +388,7 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer
             }
 
             // Add properties back to the return object.
+            if (!is_array($properties)) $properties = array();
             foreach($properties as $key=>$value) {
                 if($key) {
                     $returnObject->$key = $value;
@@ -416,6 +420,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer
         $xmlReference = $this->readInteger();
         $length = $xmlReference >> 1;
         $string = $this->_stream->readBytes($length);
-        return simplexml_load_string($string);
+        return Zend_Xml_Security::scan($string); 
     }
 }
diff --git a/lib/zend/Zend/Amf/Parse/Amf3/Serializer.php b/lib/zend/Zend/Amf/Parse/Amf3/Serializer.php
index 80d191bf5aa..3ce47b7f7cb 100644
--- a/lib/zend/Zend/Amf/Parse/Amf3/Serializer.php
+++ b/lib/zend/Zend/Amf/Parse/Amf3/Serializer.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -35,7 +35,7 @@ require_once 'Zend/Amf/Parse/TypeLoader.php';
  *
  * @package    Zend_Amf
  * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
@@ -45,7 +45,7 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
      * @var string
      */
     protected $_strEmpty = '';
-    
+
     /**
      * An array of reference objects per amf body
      * @var array
@@ -78,7 +78,7 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
      */
     public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false)
     {
-        // Workaround for PHP5 with E_STRICT enabled complaining about "Only 
+        // Workaround for PHP5 with E_STRICT enabled complaining about "Only
         // variables should be passed by reference"
         if ((null === $data) && ($dataByVal !== false)) {
             $data = &$dataByVal;
@@ -215,7 +215,7 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
      * @return Zend_Amf_Parse_Amf3_Serializer
      */
     protected function writeBinaryString(&$string){
-        $ref = strlen($string) << 1 | 0x01;
+        $ref = ($this->_mbStringFunctionsOverloaded ? mb_strlen($string, '8bit') : strlen($string)) << 1 | 0x01;
         $this->writeInteger($ref);
         $this->_stream->writeBytes($string);
 
@@ -230,15 +230,17 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
      */
     public function writeString(&$string)
     {
-        $len = strlen($string);
+        $len = $this->_mbStringFunctionsOverloaded ? mb_strlen($string, '8bit') : strlen($string);
         if(!$len){
             $this->writeInteger(0x01);
             return $this;
         }
 
-        $ref = array_search($string, $this->_referenceStrings, true);
-        if($ref === false){
-            $this->_referenceStrings[] = $string;
+        $ref = array_key_exists($string, $this->_referenceStrings) 
+             ? $this->_referenceStrings[$string] 
+             : false;
+        if ($ref === false){
+            $this->_referenceStrings[$string] = count($this->_referenceStrings);
             $this->writeBinaryString($string);
         } else {
             $ref <<= 1;
@@ -380,13 +382,16 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
      */
     protected function writeObjectReference(&$object, $objectByVal = false)
     {
-        // Workaround for PHP5 with E_STRICT enabled complaining about "Only 
+        // Workaround for PHP5 with E_STRICT enabled complaining about "Only
         // variables should be passed by reference"
         if ((null === $object) && ($objectByVal !== false)) {
             $object = &$objectByVal;
         }
 
-        $ref = array_search($object, $this->_referenceObjects,true);
+        $hash = spl_object_hash($object);
+        $ref = array_key_exists($hash, $this->_referenceObjects) 
+             ? $this->_referenceObjects[$hash] 
+             : false;
 
         // quickly handle object references
         if ($ref !== false){
@@ -394,7 +399,7 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
             $this->writeInteger($ref);
             return true;
         }
-        $this->_referenceObjects[] = $object;
+        $this->_referenceObjects[$hash] = count($this->_referenceObjects);
         return false;
     }
 
diff --git a/lib/zend/Zend/Amf/Parse/Deserializer.php b/lib/zend/Zend/Amf/Parse/Deserializer.php
index a72aa15ed2f..e6d4b1a853d 100644
--- a/lib/zend/Zend/Amf/Parse/Deserializer.php
+++ b/lib/zend/Zend/Amf/Parse/Deserializer.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,7 +30,7 @@
  * @see        http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Amf_Parse_Deserializer
diff --git a/lib/zend/Zend/Amf/Parse/InputStream.php b/lib/zend/Zend/Amf/Parse/InputStream.php
index ec8c88a19a7..25929651549 100644
--- a/lib/zend/Zend/Amf/Parse/InputStream.php
+++ b/lib/zend/Zend/Amf/Parse/InputStream.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Amf/Util/BinaryStream.php';
  *
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream
diff --git a/lib/zend/Zend/Amf/Parse/OutputStream.php b/lib/zend/Zend/Amf/Parse/OutputStream.php
index d06e75076c1..c6979baadce 100644
--- a/lib/zend/Zend/Amf/Parse/OutputStream.php
+++ b/lib/zend/Zend/Amf/Parse/OutputStream.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Amf/Util/BinaryStream.php';
  * @uses       Zend_Amf_Util_BinaryStream
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream
diff --git a/lib/zend/Zend/Amf/Parse/Resource/MysqlResult.php b/lib/zend/Zend/Amf/Parse/Resource/MysqlResult.php
old mode 100644
new mode 100755
index b3e004662f1..aed35a9d3f8
--- a/lib/zend/Zend/Amf/Parse/Resource/MysqlResult.php
+++ b/lib/zend/Zend/Amf/Parse/Resource/MysqlResult.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Parse_Resource_MysqlResult
diff --git a/lib/zend/Zend/Amf/Parse/Resource/MysqliResult.php b/lib/zend/Zend/Amf/Parse/Resource/MysqliResult.php
index fbb9caefed3..45f53d4b73d 100644
--- a/lib/zend/Zend/Amf/Parse/Resource/MysqliResult.php
+++ b/lib/zend/Zend/Amf/Parse/Resource/MysqliResult.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Parse_Resource_MysqliResult
diff --git a/lib/zend/Zend/Amf/Parse/Resource/Stream.php b/lib/zend/Zend/Amf/Parse/Resource/Stream.php
old mode 100644
new mode 100755
index 3fcd560ef19..b8afa148ac2
--- a/lib/zend/Zend/Amf/Parse/Resource/Stream.php
+++ b/lib/zend/Zend/Amf/Parse/Resource/Stream.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -25,7 +25,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Parse_Resource_Stream
diff --git a/lib/zend/Zend/Amf/Parse/Serializer.php b/lib/zend/Zend/Amf/Parse/Serializer.php
index 2a0e4a9bf8c..7bf75f65bd1 100644
--- a/lib/zend/Zend/Amf/Parse/Serializer.php
+++ b/lib/zend/Zend/Amf/Parse/Serializer.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -25,7 +25,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Amf_Parse_Serializer
@@ -37,6 +37,13 @@ abstract class Zend_Amf_Parse_Serializer
      */
     protected $_stream;
 
+    /**
+     * str* functions overloaded using mbstring.func_overload
+     *
+     * @var bool
+     */
+    protected $mbStringFunctionsOverloaded;
+
     /**
      * Constructor
      *
@@ -46,6 +53,7 @@ abstract class Zend_Amf_Parse_Serializer
     public function __construct(Zend_Amf_Parse_OutputStream $stream)
     {
         $this->_stream = $stream;
+        $this->_mbStringFunctionsOverloaded = function_exists('mb_strlen') && (ini_get('mbstring.func_overload') !== '') && ((int)ini_get('mbstring.func_overload') & 2);
     }
 
     /**
diff --git a/lib/zend/Zend/Amf/Parse/TypeLoader.php b/lib/zend/Zend/Amf/Parse/TypeLoader.php
index 5eda3b0ec2d..05c8db42f92 100644
--- a/lib/zend/Zend/Amf/Parse/TypeLoader.php
+++ b/lib/zend/Zend/Amf/Parse/TypeLoader.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -47,7 +47,7 @@ require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php';
  * @todo       PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace
  * @package    Zend_Amf
  * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 final class Zend_Amf_Parse_TypeLoader
diff --git a/lib/zend/Zend/Amf/Request.php b/lib/zend/Zend/Amf/Request.php
index 0fa7f3e8e70..c5da936ef05 100644
--- a/lib/zend/Zend/Amf/Request.php
+++ b/lib/zend/Zend/Amf/Request.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -40,7 +40,7 @@ require_once 'Zend/Amf/Value/MessageBody.php';
  *
  * @todo       Currently not checking if the object needs to be Type Mapped to a server object.
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Request
diff --git a/lib/zend/Zend/Amf/Request/Http.php b/lib/zend/Zend/Amf/Request/Http.php
index 30059f06045..e5675058e95 100644
--- a/lib/zend/Zend/Amf/Request/Http.php
+++ b/lib/zend/Zend/Amf/Request/Http.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Request
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Amf/Request.php';
  *
  * @package    Zend_Amf
  * @subpackage Request
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Request_Http extends Zend_Amf_Request
diff --git a/lib/zend/Zend/Amf/Response.php b/lib/zend/Zend/Amf/Response.php
index d069ecf9cb3..00e75010566 100644
--- a/lib/zend/Zend/Amf/Response.php
+++ b/lib/zend/Zend/Amf/Response.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Amf/Parse/Amf0/Serializer.php';
  * Handles converting the PHP object ready for response back into AMF
  *
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Response
@@ -95,7 +95,7 @@ class Zend_Amf_Response
             $stream->writeByte($header->mustRead);
             $stream->writeLong(Zend_Amf_Constants::UNKNOWN_CONTENT_LENGTH);
             if (is_object($header->data)) {
-                // Workaround for PHP5 with E_STRICT enabled complaining about 
+                // Workaround for PHP5 with E_STRICT enabled complaining about
                 // "Only variables should be passed by reference"
                 $placeholder = null;
                 $serializer->writeTypeMarker($placeholder, null, $header->data);
@@ -115,7 +115,7 @@ class Zend_Amf_Response
             $bodyData = $body->getData();
             $markerType = ($this->_objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) ? null : Zend_Amf_Constants::AMF0_AMF3;
             if (is_object($bodyData)) {
-                // Workaround for PHP5 with E_STRICT enabled complaining about 
+                // Workaround for PHP5 with E_STRICT enabled complaining about
                 // "Only variables should be passed by reference"
                 $placeholder = null;
                 $serializer->writeTypeMarker($placeholder, $markerType, $bodyData);
diff --git a/lib/zend/Zend/Amf/Response/Http.php b/lib/zend/Zend/Amf/Response/Http.php
index 961ffdf84ae..4182f6aa8ad 100644
--- a/lib/zend/Zend/Amf/Response/Http.php
+++ b/lib/zend/Zend/Amf/Response/Http.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,7 +28,7 @@ require_once 'Zend/Amf/Response.php';
  *
  * @package    Zend_Amf
  * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Response_Http extends Zend_Amf_Response
@@ -41,10 +41,33 @@ class Zend_Amf_Response_Http extends Zend_Amf_Response
     public function getResponse()
     {
         if (!headers_sent()) {
-            header('Cache-Control: cache, must-revalidate');
-            header('Pragma: public');
+            if ($this->isIeOverSsl()) {
+                header('Cache-Control: cache, must-revalidate');
+                header('Pragma: public');
+            } else {
+                header('Cache-Control: no-cache, must-revalidate');
+                header('Pragma: no-cache');
+            }
+            header('Expires: Thu, 19 Nov 1981 08:52:00 GMT');
             header('Content-Type: application/x-amf');
         }
         return parent::getResponse();
     }
+
+    protected function isIeOverSsl()
+    {
+        $ssl = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : false;
+        if (!$ssl || ($ssl == 'off')) {
+            // IIS reports "off", whereas other browsers simply don't populate
+            return false;
+        }
+
+        $ua  = $_SERVER['HTTP_USER_AGENT'];
+        if (!preg_match('/; MSIE \d+\.\d+;/', $ua)) {
+            // Not MicroSoft Internet Explorer
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/lib/zend/Zend/Amf/Server.php b/lib/zend/Zend/Amf/Server.php
index 241041f3e17..0f87286031d 100644
--- a/lib/zend/Zend/Amf/Server.php
+++ b/lib/zend/Zend/Amf/Server.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -52,7 +52,7 @@ require_once 'Zend/Auth.php';
  * @todo       Make the reflection methods cache and autoload.
  * @package    Zend_Amf
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Server implements Zend_Server_Interface
@@ -108,7 +108,7 @@ class Zend_Amf_Server implements Zend_Server_Interface
     protected $_session = false;
 
     /**
-     * Namespace allows all AMF calls to not clobber other php session variables
+     * Namespace allows all AMF calls to not clobber other PHP session variables
      * @var Zend_Session_NameSpace default session namespace zend_amf
      */
     protected $_sesionNamespace = 'zend_amf';
@@ -142,12 +142,18 @@ class Zend_Amf_Server implements Zend_Server_Interface
     /**
      * Set authentication adapter
      *
+     * If the authentication adapter implements a "getAcl()" method, populate 
+     * the ACL of this instance with it (if none exists already).
+     *
      * @param  Zend_Amf_Auth_Abstract $auth
      * @return Zend_Amf_Server
      */
     public function setAuth(Zend_Amf_Auth_Abstract $auth)
     {
         $this->_auth = $auth;
+        if ((null === $this->getAcl()) && method_exists($auth, 'getAcl')) {
+            $this->setAcl($auth->getAcl());
+        }
         return $this;
     }
    /**
@@ -300,12 +306,12 @@ class Zend_Amf_Server implements Zend_Server_Interface
                 $source = $mapped;
             }
         }
-        $qualifiedName = empty($source) ? $method : $source.".".$method;
+        $qualifiedName = empty($source) ? $method : $source . '.' . $method;
 
         if (!isset($this->_table[$qualifiedName])) {
             // if source is null a method that was not defined was called.
             if ($source) {
-                $className = str_replace(".", "_", $source);
+                $className = str_replace('.', '_', $source);
                 if(class_exists($className, false) && !isset($this->_classAllowed[$className])) {
                     require_once 'Zend/Amf/Server/Exception.php';
                     throw new Zend_Amf_Server_Exception('Can not call "' . $className . '" - use setClass()');
@@ -317,8 +323,12 @@ class Zend_Amf_Server implements Zend_Server_Interface
                     throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist: '.$e->getMessage(), 0, $e);
                 }
                 // Add the new loaded class to the server.
+                    require_once 'Zend/Amf/Server/Exception.php';
                 $this->setClass($className, $source);
-            } else {
+            }
+
+            if (!isset($this->_table[$qualifiedName])) {
+                // Source is null or doesn't contain specified method
                 require_once 'Zend/Amf/Server/Exception.php';
                 throw new Zend_Amf_Server_Exception('Method "' . $method . '" does not exist');
             }
@@ -331,6 +341,8 @@ class Zend_Amf_Server implements Zend_Server_Interface
             $params = array_merge($params, $argv);
         }
 
+        $params = $this->_castParameters($info, $params);
+
         if ($info instanceof Zend_Server_Reflection_Function) {
             $func = $info->getName();
             $this->_checkAcl(null, $func);
@@ -491,66 +503,60 @@ class Zend_Amf_Server implements Zend_Server_Interface
         // set response encoding
         $response->setObjectEncoding($objectEncoding);
 
-        $responseBody = $request->getAmfBodies();
-
-        $handleAuth = false;
-        if ($this->_auth) {
-            $headers = $request->getAmfHeaders();
-            if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) &&
-                isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)) {
-                $handleAuth = true;
+        // Authenticate, if we have credential headers
+        $error   = false;
+        $headers = $request->getAmfHeaders();
+        if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) 
+            && isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)
+            && isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)
+        ) {
+            try {
+                if ($this->_handleAuth(
+                        $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid,
+                        $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password
+                )) {
+                    // use RequestPersistentHeader to clear credentials
+                    $response->addAmfHeader(
+                        new Zend_Amf_Value_MessageHeader(
+                            Zend_Amf_Constants::PERSISTENT_HEADER,
+                            false,
+                            new Zend_Amf_Value_MessageHeader(
+                                Zend_Amf_Constants::CREDENTIALS_HEADER,
+                                false, null
+                            )
+                        )
+                    );
+                }
+            } catch (Exception $e) {
+                // Error during authentication; report it
+                $error = $this->_errorMessage(
+                    $objectEncoding, 
+                    '', 
+                    $e->getMessage(),
+                    $e->getTraceAsString(),
+                    $e->getCode(),
+                    $e->getLine()
+                );
+                $responseType = Zend_AMF_Constants::STATUS_METHOD;
             }
         }
 
         // Iterate through each of the service calls in the AMF request
-        foreach($responseBody as $body)
+        foreach($request->getAmfBodies() as $body)
         {
+            if ($error) {
+                // Error during authentication; just report it and be done
+                $responseURI = $body->getResponseURI() . $responseType;
+                $newBody     = new Zend_Amf_Value_MessageBody($responseURI, null, $error);
+                $response->addAmfBody($newBody);
+                continue;
+            }
             try {
-                if ($handleAuth) {
-                    if ($this->_handleAuth(
-                        $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid,
-                        $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)) {
-                        // use RequestPersistentHeader to clear credentials
-                        $response->addAmfHeader(
-                            new Zend_Amf_Value_MessageHeader(
-                                Zend_Amf_Constants::PERSISTENT_HEADER,
-                                false,
-                                new Zend_Amf_Value_MessageHeader(
-                                    Zend_Amf_Constants::CREDENTIALS_HEADER,
-                                    false, null)));
-                        $handleAuth = false;
-                    }
-                }
-
-                if ($objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) {
-                    // AMF0 Object Encoding
-                    $targetURI = $body->getTargetURI();
-                    $message = '';
-
-                    // Split the target string into its values.
-                    $source = substr($targetURI, 0, strrpos($targetURI, '.'));
-
-                    if ($source) {
-                        // Break off method name from namespace into source
-                        $method = substr(strrchr($targetURI, '.'), 1);
-                        $return = $this->_dispatch($method, $body->getData(), $source);
-                    } else {
-                        // Just have a method name.
-                        $return = $this->_dispatch($targetURI, $body->getData());
-                    }
-                } else {
-                    // AMF3 read message type
-                    $message = $body->getData();
-                    if ($message instanceof Zend_Amf_Value_Messaging_CommandMessage) {
-                        // async call with command message
-                        $return = $this->_loadCommandMessage($message);
-                    } elseif ($message instanceof Zend_Amf_Value_Messaging_RemotingMessage) {
-                        require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
-                        $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message);
-                        $return->body = $this->_dispatch($message->operation, $message->body, $message->source);
-                    } else {
-                        // Amf3 message sent with netConnection
+                switch ($objectEncoding) {
+                    case Zend_Amf_Constants::AMF0_OBJECT_ENCODING:
+                        // AMF0 Object Encoding
                         $targetURI = $body->getTargetURI();
+                        $message = '';
 
                         // Split the target string into its values.
                         $source = substr($targetURI, 0, strrpos($targetURI, '.'));
@@ -563,7 +569,35 @@ class Zend_Amf_Server implements Zend_Server_Interface
                             // Just have a method name.
                             $return = $this->_dispatch($targetURI, $body->getData());
                         }
-                    }
+                        break;
+                    case Zend_Amf_Constants::AMF3_OBJECT_ENCODING:
+                    default:
+                        // AMF3 read message type
+                        $message = $body->getData();
+                        if ($message instanceof Zend_Amf_Value_Messaging_CommandMessage) {
+                            // async call with command message
+                            $return = $this->_loadCommandMessage($message);
+                        } elseif ($message instanceof Zend_Amf_Value_Messaging_RemotingMessage) {
+                            require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
+                            $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message);
+                            $return->body = $this->_dispatch($message->operation, $message->body, $message->source);
+                        } else {
+                            // Amf3 message sent with netConnection
+                            $targetURI = $body->getTargetURI();
+
+                            // Split the target string into its values.
+                            $source = substr($targetURI, 0, strrpos($targetURI, '.'));
+
+                            if ($source) {
+                                // Break off method name from namespace into source
+                                $method = substr(strrchr($targetURI, '.'), 1);
+                                $return = $this->_dispatch($method, $body->getData(), $source);
+                            } else {
+                                // Just have a method name.
+                                $return = $this->_dispatch($targetURI, $body->getData());
+                            }
+                        }
+                        break;
                 }
                 $responseType = Zend_AMF_Constants::RESULT_METHOD;
             } catch (Exception $e) {
@@ -607,7 +641,7 @@ class Zend_Amf_Server implements Zend_Server_Interface
     public function handle($request = null)
     {
         // Check if request was passed otherwise get it from the server
-        if (is_null($request) || !$request instanceof Zend_Amf_Request) {
+        if ($request === null || !$request instanceof Zend_Amf_Request) {
             $request = $this->getRequest();
         } else {
             $this->setRequest($request);
@@ -733,9 +767,9 @@ class Zend_Amf_Server implements Zend_Server_Interface
             throw new Zend_Amf_Server_Exception('Invalid method or class; must be a classname or object');
         }
 
-        $argv = null;
+        $args = null;
         if (2 < func_num_args()) {
-            $argv = array_slice(func_get_args(), 2);
+            $args = array_slice(func_get_args(), 2);
         }
 
         // Use the class name as the name space by default.
@@ -746,7 +780,7 @@ class Zend_Amf_Server implements Zend_Server_Interface
 
         $this->_classAllowed[is_object($class) ? get_class($class) : $class] = true;
 
-        $this->_methods[] = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
+        $this->_methods[] = Zend_Server_Reflection::reflectClass($class, $args, $namespace);
         $this->_buildDispatchTable();
 
         return $this;
@@ -930,4 +964,85 @@ class Zend_Amf_Server implements Zend_Server_Interface
     {
         return array_keys($this->_table);
     }
+
+    /**
+     * Cast parameters
+     *
+     * Takes the provided parameters from the request, and attempts to cast them
+     * to objects, if the prototype defines any as explicit object types
+     * 
+     * @param  Reflection $reflectionMethod 
+     * @param  array $params 
+     * @return array
+     */
+    protected function _castParameters($reflectionMethod, array $params)
+    {
+        $prototypes = $reflectionMethod->getPrototypes();
+        $nonObjectTypes = array(
+            'null',
+            'mixed',
+            'void',
+            'unknown',
+            'bool',
+            'boolean',
+            'number',
+            'int',
+            'integer',
+            'double',
+            'float',
+            'string',
+            'array',
+            'object',
+            'stdclass',
+        );
+        $types      = array();
+        foreach ($prototypes as $prototype) {
+            foreach ($prototype->getParameters() as $parameter) {
+                $type = $parameter->getType();
+                if (in_array(strtolower($type), $nonObjectTypes)) {
+                    continue;
+                }
+                $position = $parameter->getPosition();
+                $types[$position] = $type;
+            }
+        }
+
+        if (empty($types)) {
+            return $params;
+        }
+
+        foreach ($params as $position => $value) {
+            if (!isset($types[$position])) {
+                // No specific type to cast to? done
+                continue;
+            }
+
+            $type = $types[$position];
+
+            if (!class_exists($type)) {
+                // Not a class, apparently. done
+                continue;
+            }
+
+            if ($value instanceof $type) {
+                // Already of the right type? done
+                continue;
+            }
+
+            if (!is_array($value) && !is_object($value)) {
+                // Can't cast scalars to objects easily; done
+                continue;
+            }
+
+            // Create instance, and loop through value to set
+            $object = new $type;
+            foreach ($value as $property => $defined) {
+                $object->{$property} = $defined;
+            }
+
+            $params[$position] = $object;
+        }
+
+        return $params;
+    }
 }
diff --git a/lib/zend/Zend/Amf/Server/Exception.php b/lib/zend/Zend/Amf/Server/Exception.php
index 10fe6762857..d9532ac1123 100644
--- a/lib/zend/Zend/Amf/Server/Exception.php
+++ b/lib/zend/Zend/Amf/Server/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Amf/Exception.php';
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Server_Exception extends Zend_Amf_Exception
diff --git a/lib/zend/Zend/Amf/Util/BinaryStream.php b/lib/zend/Zend/Amf/Util/BinaryStream.php
index fefc271de99..b56820a62fa 100644
--- a/lib/zend/Zend/Amf/Util/BinaryStream.php
+++ b/lib/zend/Zend/Amf/Util/BinaryStream.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Util
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -25,7 +25,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Util
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Util_BinaryStream
@@ -50,6 +50,11 @@ class Zend_Amf_Util_BinaryStream
      */
     protected $_needle;
 
+    /**
+     * @var bool str* functions overloaded using mbstring.func_overload?
+     */
+    protected $_mbStringFunctionsOverloaded;
+
     /**
      * Constructor
      *
@@ -69,7 +74,8 @@ class Zend_Amf_Util_BinaryStream
 
         $this->_stream       = $stream;
         $this->_needle       = 0;
-        $this->_streamLength = strlen($stream);
+        $this->_mbStringFunctionsOverloaded = function_exists('mb_strlen') && (ini_get('mbstring.func_overload') !== '') && ((int)ini_get('mbstring.func_overload') & 2);
+        $this->_streamLength = $this->_mbStringFunctionsOverloaded ? mb_strlen($stream, '8bit') : strlen($stream);
         $this->_bigEndian    = (pack('l', 1) === "\x00\x00\x00\x01");
     }
 
@@ -97,7 +103,7 @@ class Zend_Amf_Util_BinaryStream
             require_once 'Zend/Amf/Exception.php';
             throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length);
         }
-        $bytes = substr($this->_stream, $this->_needle, $length);
+        $bytes = $this->_mbStringFunctionsOverloaded ? mb_substr($this->_stream, $this->_needle, $length, '8bit') : substr($this->_stream, $this->_needle, $length);
         $this->_needle+= $length;
         return $bytes;
     }
@@ -120,12 +126,18 @@ class Zend_Amf_Util_BinaryStream
      * Reads a signed byte
      *
      * @return int Value is in the range of -128 to 127.
+     * @throws Zend_Amf_Exception
      */
     public function readByte()
     {
         if (($this->_needle + 1) > $this->_streamLength) {
             require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length);
+            throw new Zend_Amf_Exception(
+                'Buffer underrun at needle position: '
+                . $this->_needle
+                . ' while requesting length: '
+                . $this->_streamLength
+            );
         }
 
         return ord($this->_stream{$this->_needle++});
@@ -184,7 +196,7 @@ class Zend_Amf_Util_BinaryStream
      */
     public function writeUtf($stream)
     {
-        $this->writeInt(strlen($stream));
+        $this->writeInt($this->_mbStringFunctionsOverloaded ? mb_strlen($stream, '8bit') : strlen($stream));
         $this->_stream.= $stream;
         return $this;
     }
@@ -209,7 +221,7 @@ class Zend_Amf_Util_BinaryStream
      */
     public function writeLongUtf($stream)
     {
-        $this->writeLong(strlen($stream));
+        $this->writeLong($this->_mbStringFunctionsOverloaded ? mb_strlen($stream, '8bit') : strlen($stream));
         $this->_stream.= $stream;
     }
 
@@ -255,7 +267,7 @@ class Zend_Amf_Util_BinaryStream
      */
     public function readDouble()
     {
-        $bytes = substr($this->_stream, $this->_needle, 8);
+        $bytes = $this->_mbStringFunctionsOverloaded ? mb_substr($this->_stream, $this->_needle, 8, '8bit') : substr($this->_stream, $this->_needle, 8);
         $this->_needle+= 8;
 
         if (!$this->_bigEndian) {
diff --git a/lib/zend/Zend/Amf/Value/ByteArray.php b/lib/zend/Zend/Amf/Value/ByteArray.php
index 3555f300f35..32ebf268b81 100644
--- a/lib/zend/Zend/Amf/Value/ByteArray.php
+++ b/lib/zend/Zend/Amf/Value/ByteArray.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -25,7 +25,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_ByteArray
diff --git a/lib/zend/Zend/Amf/Value/MessageBody.php b/lib/zend/Zend/Amf/Value/MessageBody.php
index 4d4e67ed300..59cacba52be 100644
--- a/lib/zend/Zend/Amf/Value/MessageBody.php
+++ b/lib/zend/Zend/Amf/Value/MessageBody.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_MessageBody
diff --git a/lib/zend/Zend/Amf/Value/MessageHeader.php b/lib/zend/Zend/Amf/Value/MessageHeader.php
index 3058db1e0f4..bdbbba2a7db 100644
--- a/lib/zend/Zend/Amf/Value/MessageHeader.php
+++ b/lib/zend/Zend/Amf/Value/MessageHeader.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,7 +28,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_MessageHeader
diff --git a/lib/zend/Zend/Amf/Value/Messaging/AbstractMessage.php b/lib/zend/Zend/Amf/Value/Messaging/AbstractMessage.php
index fab2b9d6e5e..acb5a0c6c8e 100644
--- a/lib/zend/Zend/Amf/Value/Messaging/AbstractMessage.php
+++ b/lib/zend/Zend/Amf/Value/Messaging/AbstractMessage.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_Messaging_AbstractMessage
diff --git a/lib/zend/Zend/Amf/Value/Messaging/AcknowledgeMessage.php b/lib/zend/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
index 8f54c333077..eb081bd4e25 100644
--- a/lib/zend/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
+++ b/lib/zend/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_Messaging_AcknowledgeMessage extends Zend_Amf_Value_Messaging_AsyncMessage
diff --git a/lib/zend/Zend/Amf/Value/Messaging/ArrayCollection.php b/lib/zend/Zend/Amf/Value/Messaging/ArrayCollection.php
old mode 100644
new mode 100755
index 0b1b9301a42..a759f58e53e
--- a/lib/zend/Zend/Amf/Value/Messaging/ArrayCollection.php
+++ b/lib/zend/Zend/Amf/Value/Messaging/ArrayCollection.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,9 +27,9 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Amf_Value_Messaging_ArrayCollection
+class Zend_Amf_Value_Messaging_ArrayCollection extends ArrayObject
 {
 }
diff --git a/lib/zend/Zend/Amf/Value/Messaging/AsyncMessage.php b/lib/zend/Zend/Amf/Value/Messaging/AsyncMessage.php
index 8787e57ce03..d052cb60ac3 100644
--- a/lib/zend/Zend/Amf/Value/Messaging/AsyncMessage.php
+++ b/lib/zend/Zend/Amf/Value/Messaging/AsyncMessage.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,7 +30,7 @@ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php';
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_Messaging_AsyncMessage extends Zend_Amf_Value_Messaging_AbstractMessage
diff --git a/lib/zend/Zend/Amf/Value/Messaging/CommandMessage.php b/lib/zend/Zend/Amf/Value/Messaging/CommandMessage.php
index 05f4534883e..f4500da18dc 100644
--- a/lib/zend/Zend/Amf/Value/Messaging/CommandMessage.php
+++ b/lib/zend/Zend/Amf/Value/Messaging/CommandMessage.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -36,7 +36,7 @@ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_AsyncMessage
diff --git a/lib/zend/Zend/Amf/Value/Messaging/ErrorMessage.php b/lib/zend/Zend/Amf/Value/Messaging/ErrorMessage.php
index d3f7f950e8b..a6eaf166fb4 100644
--- a/lib/zend/Zend/Amf/Value/Messaging/ErrorMessage.php
+++ b/lib/zend/Zend/Amf/Value/Messaging/ErrorMessage.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,7 +30,7 @@ require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_Messaging_ErrorMessage extends Zend_Amf_Value_Messaging_AcknowledgeMessage
diff --git a/lib/zend/Zend/Amf/Value/Messaging/RemotingMessage.php b/lib/zend/Zend/Amf/Value/Messaging/RemotingMessage.php
index 075fe9ee125..43c1e1e889b 100644
--- a/lib/zend/Zend/Amf/Value/Messaging/RemotingMessage.php
+++ b/lib/zend/Zend/Amf/Value/Messaging/RemotingMessage.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php';
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_Messaging_RemotingMessage extends Zend_Amf_Value_Messaging_AbstractMessage
diff --git a/lib/zend/Zend/Amf/Value/TraitsInfo.php b/lib/zend/Zend/Amf/Value/TraitsInfo.php
index c92ffc21d37..64d3c990ea0 100644
--- a/lib/zend/Zend/Amf/Value/TraitsInfo.php
+++ b/lib/zend/Zend/Amf/Value/TraitsInfo.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -25,7 +25,7 @@
  *
  * @package    Zend_Amf
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Amf_Value_TraitsInfo
diff --git a/lib/zend/Zend/Auth.php b/lib/zend/Zend/Auth.php
index 39659507e82..0b4b00ffb44 100644
--- a/lib/zend/Zend/Auth.php
+++ b/lib/zend/Zend/Auth.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -23,7 +23,7 @@
 /**
  * @category   Zend
  * @package    Zend_Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Auth
diff --git a/lib/zend/Zend/Auth/Adapter/Digest.php b/lib/zend/Zend/Auth/Adapter/Digest.php
new file mode 100644
index 00000000000..f52b651e7a6
--- /dev/null
+++ b/lib/zend/Zend/Auth/Adapter/Digest.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Adapter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Auth_Adapter_Interface
+ */
+require_once 'Zend/Auth/Adapter/Interface.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Adapter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface
+{
+    /**
+     * Filename against which authentication queries are performed
+     *
+     * @var string
+     */
+    protected $_filename;
+
+    /**
+     * Digest authentication realm
+     *
+     * @var string
+     */
+    protected $_realm;
+
+    /**
+     * Digest authentication user
+     *
+     * @var string
+     */
+    protected $_username;
+
+    /**
+     * Password for the user of the realm
+     *
+     * @var string
+     */
+    protected $_password;
+
+    /**
+     * Sets adapter options
+     *
+     * @param  mixed $filename
+     * @param  mixed $realm
+     * @param  mixed $username
+     * @param  mixed $password
+     */
+    public function __construct($filename = null, $realm = null, $username = null, $password = null)
+    {
+        $options = array('filename', 'realm', 'username', 'password');
+        foreach ($options as $option) {
+            if (null !== $$option) {
+                $methodName = 'set' . ucfirst($option);
+                $this->$methodName($$option);
+            }
+        }
+    }
+
+    /**
+     * Returns the filename option value or null if it has not yet been set
+     *
+     * @return string|null
+     */
+    public function getFilename()
+    {
+        return $this->_filename;
+    }
+
+    /**
+     * Sets the filename option value
+     *
+     * @param  mixed $filename
+     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
+     */
+    public function setFilename($filename)
+    {
+        $this->_filename = (string) $filename;
+        return $this;
+    }
+
+    /**
+     * Returns the realm option value or null if it has not yet been set
+     *
+     * @return string|null
+     */
+    public function getRealm()
+    {
+        return $this->_realm;
+    }
+
+    /**
+     * Sets the realm option value
+     *
+     * @param  mixed $realm
+     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
+     */
+    public function setRealm($realm)
+    {
+        $this->_realm = (string) $realm;
+        return $this;
+    }
+
+    /**
+     * Returns the username option value or null if it has not yet been set
+     *
+     * @return string|null
+     */
+    public function getUsername()
+    {
+        return $this->_username;
+    }
+
+    /**
+     * Sets the username option value
+     *
+     * @param  mixed $username
+     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
+     */
+    public function setUsername($username)
+    {
+        $this->_username = (string) $username;
+        return $this;
+    }
+
+    /**
+     * Returns the password option value or null if it has not yet been set
+     *
+     * @return string|null
+     */
+    public function getPassword()
+    {
+        return $this->_password;
+    }
+
+    /**
+     * Sets the password option value
+     *
+     * @param  mixed $password
+     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
+     */
+    public function setPassword($password)
+    {
+        $this->_password = (string) $password;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Auth_Adapter_Interface
+     *
+     * @throws Zend_Auth_Adapter_Exception
+     * @return Zend_Auth_Result
+     */
+    public function authenticate()
+    {
+        $optionsRequired = array('filename', 'realm', 'username', 'password');
+        foreach ($optionsRequired as $optionRequired) {
+            if (null === $this->{"_$optionRequired"}) {
+                /**
+                 * @see Zend_Auth_Adapter_Exception
+                 */
+                require_once 'Zend/Auth/Adapter/Exception.php';
+                throw new Zend_Auth_Adapter_Exception("Option '$optionRequired' must be set before authentication");
+            }
+        }
+
+        if (false === ($fileHandle = @fopen($this->_filename, 'r'))) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception("Cannot open '$this->_filename' for reading");
+        }
+
+        $id       = "$this->_username:$this->_realm";
+        $idLength = strlen($id);
+
+        $result = array(
+            'code'  => Zend_Auth_Result::FAILURE,
+            'identity' => array(
+                'realm'    => $this->_realm,
+                'username' => $this->_username,
+                ),
+            'messages' => array()
+            );
+
+        while ($line = trim(fgets($fileHandle))) {
+            if (substr($line, 0, $idLength) === $id) {
+                if ($this->_secureStringCompare(substr($line, -32), md5("$this->_username:$this->_realm:$this->_password"))) {
+                    $result['code'] = Zend_Auth_Result::SUCCESS;
+                } else {
+                    $result['code'] = Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID;
+                    $result['messages'][] = 'Password incorrect';
+                }
+                return new Zend_Auth_Result($result['code'], $result['identity'], $result['messages']);
+            }
+        }
+
+        $result['code'] = Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND;
+        $result['messages'][] = "Username '$this->_username' and realm '$this->_realm' combination not found";
+        return new Zend_Auth_Result($result['code'], $result['identity'], $result['messages']);
+    }
+
+    /**
+     * Securely compare two strings for equality while avoided C level memcmp()
+     * optimisations capable of leaking timing information useful to an attacker
+     * attempting to iteratively guess the unknown string (e.g. password) being
+     * compared against.
+     *
+     * @param string $a
+     * @param string $b
+     * @return bool
+     */
+    protected function _secureStringCompare($a, $b)
+    {
+        if (strlen($a) !== strlen($b)) {
+            return false;
+        }
+        $result = 0;
+        for ($i = 0; $i < strlen($a); $i++) {
+            $result |= ord($a[$i]) ^ ord($b[$i]);
+        }
+        return $result == 0;
+    }
+}
diff --git a/lib/zend/Zend/Auth/Adapter/Exception.php b/lib/zend/Zend/Auth/Adapter/Exception.php
new file mode 100644
index 00000000000..03216493065
--- /dev/null
+++ b/lib/zend/Zend/Auth/Adapter/Exception.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Adapter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Zend_Auth_Exception
+ */
+require_once 'Zend/Auth/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Adapter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Auth_Adapter_Exception extends Zend_Auth_Exception
+{}
diff --git a/lib/zend/Zend/Auth/Adapter/Http.php b/lib/zend/Zend/Auth/Adapter/Http.php
new file mode 100644
index 00000000000..8b320d69d4f
--- /dev/null
+++ b/lib/zend/Zend/Auth/Adapter/Http.php
@@ -0,0 +1,868 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter_Http
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Auth_Adapter_Interface
+ */
+require_once 'Zend/Auth/Adapter/Interface.php';
+
+
+/**
+ * HTTP Authentication Adapter
+ *
+ * Implements a pretty good chunk of RFC 2617.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter_Http
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @todo       Support auth-int
+ * @todo       Track nonces, nonce-count, opaque for replay protection and stale support
+ * @todo       Support Authentication-Info header
+ */
+class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface
+{
+    /**
+     * Reference to the HTTP Request object
+     *
+     * @var Zend_Controller_Request_Http
+     */
+    protected $_request;
+
+    /**
+     * Reference to the HTTP Response object
+     *
+     * @var Zend_Controller_Response_Http
+     */
+    protected $_response;
+
+    /**
+     * Object that looks up user credentials for the Basic scheme
+     *
+     * @var Zend_Auth_Adapter_Http_Resolver_Interface
+     */
+    protected $_basicResolver;
+
+    /**
+     * Object that looks up user credentials for the Digest scheme
+     *
+     * @var Zend_Auth_Adapter_Http_Resolver_Interface
+     */
+    protected $_digestResolver;
+
+    /**
+     * List of authentication schemes supported by this class
+     *
+     * @var array
+     */
+    protected $_supportedSchemes = array('basic', 'digest');
+
+    /**
+     * List of schemes this class will accept from the client
+     *
+     * @var array
+     */
+    protected $_acceptSchemes;
+
+    /**
+     * Space-delimited list of protected domains for Digest Auth
+     *
+     * @var string
+     */
+    protected $_domains;
+
+    /**
+     * The protection realm to use
+     *
+     * @var string
+     */
+    protected $_realm;
+
+    /**
+     * Nonce timeout period
+     *
+     * @var integer
+     */
+    protected $_nonceTimeout;
+
+    /**
+     * Whether to send the opaque value in the header. True by default
+     *
+     * @var boolean
+     */
+    protected $_useOpaque;
+
+    /**
+     * List of the supported digest algorithms. I want to support both MD5 and
+     * MD5-sess, but MD5-sess won't make it into the first version.
+     *
+     * @var array
+     */
+    protected $_supportedAlgos = array('MD5');
+
+    /**
+     * The actual algorithm to use. Defaults to MD5
+     *
+     * @var string
+     */
+    protected $_algo;
+
+    /**
+     * List of supported qop options. My intetion is to support both 'auth' and
+     * 'auth-int', but 'auth-int' won't make it into the first version.
+     *
+     * @var array
+     */
+    protected $_supportedQops = array('auth');
+
+    /**
+     * Whether or not to do Proxy Authentication instead of origin server
+     * authentication (send 407's instead of 401's). Off by default.
+     *
+     * @var boolean
+     */
+    protected $_imaProxy;
+
+    /**
+     * Flag indicating the client is IE and didn't bother to return the opaque string
+     *
+     * @var boolean
+     */
+    protected $_ieNoOpaque;
+
+    /**
+     * Constructor
+     *
+     * @param  array $config Configuration settings:
+     *    'accept_schemes' => 'basic'|'digest'|'basic digest'
+     *    'realm' => <string>
+     *    'digest_domains' => <string> Space-delimited list of URIs
+     *    'nonce_timeout' => <int>
+     *    'use_opaque' => <bool> Whether to send the opaque value in the header
+     *    'alogrithm' => <string> See $_supportedAlgos. Default: MD5
+     *    'proxy_auth' => <bool> Whether to do authentication as a Proxy
+     * @throws Zend_Auth_Adapter_Exception
+     */
+    public function __construct(array $config)
+    {
+        if (!extension_loaded('hash')) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception(__CLASS__  . ' requires the \'hash\' extension');
+        }
+
+        $this->_request  = null;
+        $this->_response = null;
+        $this->_ieNoOpaque = false;
+
+
+        if (empty($config['accept_schemes'])) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception('Config key \'accept_schemes\' is required');
+        }
+
+        $schemes = explode(' ', $config['accept_schemes']);
+        $this->_acceptSchemes = array_intersect($schemes, $this->_supportedSchemes);
+        if (empty($this->_acceptSchemes)) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception('No supported schemes given in \'accept_schemes\'. Valid values: '
+                                                . implode(', ', $this->_supportedSchemes));
+        }
+
+        // Double-quotes are used to delimit the realm string in the HTTP header,
+        // and colons are field delimiters in the password file.
+        if (empty($config['realm']) ||
+            !ctype_print($config['realm']) ||
+            strpos($config['realm'], ':') !== false ||
+            strpos($config['realm'], '"') !== false) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception('Config key \'realm\' is required, and must contain only printable '
+                                                . 'characters, excluding quotation marks and colons');
+        } else {
+            $this->_realm = $config['realm'];
+        }
+
+        if (in_array('digest', $this->_acceptSchemes)) {
+            if (empty($config['digest_domains']) ||
+                !ctype_print($config['digest_domains']) ||
+                strpos($config['digest_domains'], '"') !== false) {
+                /**
+                 * @see Zend_Auth_Adapter_Exception
+                 */
+                require_once 'Zend/Auth/Adapter/Exception.php';
+                throw new Zend_Auth_Adapter_Exception('Config key \'digest_domains\' is required, and must contain '
+                                                    . 'only printable characters, excluding quotation marks');
+            } else {
+                $this->_domains = $config['digest_domains'];
+            }
+
+            if (empty($config['nonce_timeout']) ||
+                !is_numeric($config['nonce_timeout'])) {
+                /**
+                 * @see Zend_Auth_Adapter_Exception
+                 */
+                require_once 'Zend/Auth/Adapter/Exception.php';
+                throw new Zend_Auth_Adapter_Exception('Config key \'nonce_timeout\' is required, and must be an '
+                                                    . 'integer');
+            } else {
+                $this->_nonceTimeout = (int) $config['nonce_timeout'];
+            }
+
+            // We use the opaque value unless explicitly told not to
+            if (isset($config['use_opaque']) && false == (bool) $config['use_opaque']) {
+                $this->_useOpaque = false;
+            } else {
+                $this->_useOpaque = true;
+            }
+
+            if (isset($config['algorithm']) && in_array($config['algorithm'], $this->_supportedAlgos)) {
+                $this->_algo = $config['algorithm'];
+            } else {
+                $this->_algo = 'MD5';
+            }
+        }
+
+        // Don't be a proxy unless explicitly told to do so
+        if (isset($config['proxy_auth']) && true == (bool) $config['proxy_auth']) {
+            $this->_imaProxy = true;  // I'm a Proxy
+        } else {
+            $this->_imaProxy = false;
+        }
+    }
+
+    /**
+     * Setter for the _basicResolver property
+     *
+     * @param  Zend_Auth_Adapter_Http_Resolver_Interface $resolver
+     * @return Zend_Auth_Adapter_Http Provides a fluent interface
+     */
+    public function setBasicResolver(Zend_Auth_Adapter_Http_Resolver_Interface $resolver)
+    {
+        $this->_basicResolver = $resolver;
+
+        return $this;
+    }
+
+    /**
+     * Getter for the _basicResolver property
+     *
+     * @return Zend_Auth_Adapter_Http_Resolver_Interface
+     */
+    public function getBasicResolver()
+    {
+        return $this->_basicResolver;
+    }
+
+    /**
+     * Setter for the _digestResolver property
+     *
+     * @param  Zend_Auth_Adapter_Http_Resolver_Interface $resolver
+     * @return Zend_Auth_Adapter_Http Provides a fluent interface
+     */
+    public function setDigestResolver(Zend_Auth_Adapter_Http_Resolver_Interface $resolver)
+    {
+        $this->_digestResolver = $resolver;
+
+        return $this;
+    }
+
+    /**
+     * Getter for the _digestResolver property
+     *
+     * @return Zend_Auth_Adapter_Http_Resolver_Interface
+     */
+    public function getDigestResolver()
+    {
+        return $this->_digestResolver;
+    }
+
+    /**
+     * Setter for the Request object
+     *
+     * @param  Zend_Controller_Request_Http $request
+     * @return Zend_Auth_Adapter_Http Provides a fluent interface
+     */
+    public function setRequest(Zend_Controller_Request_Http $request)
+    {
+        $this->_request = $request;
+
+        return $this;
+    }
+
+    /**
+     * Getter for the Request object
+     *
+     * @return Zend_Controller_Request_Http
+     */
+    public function getRequest()
+    {
+        return $this->_request;
+    }
+
+    /**
+     * Setter for the Response object
+     *
+     * @param  Zend_Controller_Response_Http $response
+     * @return Zend_Auth_Adapter_Http Provides a fluent interface
+     */
+    public function setResponse(Zend_Controller_Response_Http $response)
+    {
+        $this->_response = $response;
+
+        return $this;
+    }
+
+    /**
+     * Getter for the Response object
+     *
+     * @return Zend_Controller_Response_Http
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Authenticate
+     *
+     * @throws Zend_Auth_Adapter_Exception
+     * @return Zend_Auth_Result
+     */
+    public function authenticate()
+    {
+        if (empty($this->_request) ||
+            empty($this->_response)) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception('Request and Response objects must be set before calling '
+                                                . 'authenticate()');
+        }
+
+        if ($this->_imaProxy) {
+            $getHeader = 'Proxy-Authorization';
+        } else {
+            $getHeader = 'Authorization';
+        }
+
+        $authHeader = $this->_request->getHeader($getHeader);
+        if (!$authHeader) {
+            return $this->_challengeClient();
+        }
+
+        list($clientScheme) = explode(' ', $authHeader);
+        $clientScheme = strtolower($clientScheme);
+
+        // The server can issue multiple challenges, but the client should
+        // answer with only the selected auth scheme.
+        if (!in_array($clientScheme, $this->_supportedSchemes)) {
+            $this->_response->setHttpResponseCode(400);
+            return new Zend_Auth_Result(
+                Zend_Auth_Result::FAILURE_UNCATEGORIZED,
+                array(),
+                array('Client requested an incorrect or unsupported authentication scheme')
+            );
+        }
+
+        // client sent a scheme that is not the one required
+        if (!in_array($clientScheme, $this->_acceptSchemes)) {
+            // challenge again the client
+            return $this->_challengeClient();
+        }
+
+        switch ($clientScheme) {
+            case 'basic':
+                $result = $this->_basicAuth($authHeader);
+                break;
+            case 'digest':
+                $result = $this->_digestAuth($authHeader);
+            break;
+            default:
+                /**
+                 * @see Zend_Auth_Adapter_Exception
+                 */
+                require_once 'Zend/Auth/Adapter/Exception.php';
+                throw new Zend_Auth_Adapter_Exception('Unsupported authentication scheme');
+        }
+
+        return $result;
+    }
+
+    /**
+     * Challenge Client
+     *
+     * Sets a 401 or 407 Unauthorized response code, and creates the
+     * appropriate Authenticate header(s) to prompt for credentials.
+     *
+     * @return Zend_Auth_Result Always returns a non-identity Auth result
+     */
+    protected function _challengeClient()
+    {
+        if ($this->_imaProxy) {
+            $statusCode = 407;
+            $headerName = 'Proxy-Authenticate';
+        } else {
+            $statusCode = 401;
+            $headerName = 'WWW-Authenticate';
+        }
+
+        $this->_response->setHttpResponseCode($statusCode);
+
+        // Send a challenge in each acceptable authentication scheme
+        if (in_array('basic', $this->_acceptSchemes)) {
+            $this->_response->setHeader($headerName, $this->_basicHeader());
+        }
+        if (in_array('digest', $this->_acceptSchemes)) {
+            $this->_response->setHeader($headerName, $this->_digestHeader());
+        }
+        return new Zend_Auth_Result(
+            Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID,
+            array(),
+            array('Invalid or absent credentials; challenging client')
+        );
+    }
+
+    /**
+     * Basic Header
+     *
+     * Generates a Proxy- or WWW-Authenticate header value in the Basic
+     * authentication scheme.
+     *
+     * @return string Authenticate header value
+     */
+    protected function _basicHeader()
+    {
+        return 'Basic realm="' . $this->_realm . '"';
+    }
+
+    /**
+     * Digest Header
+     *
+     * Generates a Proxy- or WWW-Authenticate header value in the Digest
+     * authentication scheme.
+     *
+     * @return string Authenticate header value
+     */
+    protected function _digestHeader()
+    {
+        $wwwauth = 'Digest realm="' . $this->_realm . '", '
+                 . 'domain="' . $this->_domains . '", '
+                 . 'nonce="' . $this->_calcNonce() . '", '
+                 . ($this->_useOpaque ? 'opaque="' . $this->_calcOpaque() . '", ' : '')
+                 . 'algorithm="' . $this->_algo . '", '
+                 . 'qop="' . implode(',', $this->_supportedQops) . '"';
+
+        return $wwwauth;
+    }
+
+    /**
+     * Basic Authentication
+     *
+     * @param  string $header Client's Authorization header
+     * @throws Zend_Auth_Adapter_Exception
+     * @return Zend_Auth_Result
+     */
+    protected function _basicAuth($header)
+    {
+        if (empty($header)) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required');
+        }
+        if (empty($this->_basicResolver)) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception('A basicResolver object must be set before doing Basic '
+                                                . 'authentication');
+        }
+
+        // Decode the Authorization header
+        $auth = substr($header, strlen('Basic '));
+        $auth = base64_decode($auth);
+        if (!$auth) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception('Unable to base64_decode Authorization header value');
+        }
+
+        // See ZF-1253. Validate the credentials the same way the digest
+        // implementation does. If invalid credentials are detected,
+        // re-challenge the client.
+        if (!ctype_print($auth)) {
+            return $this->_challengeClient();
+        }
+        // Fix for ZF-1515: Now re-challenges on empty username or password
+        $creds = array_filter(explode(':', $auth));
+        if (count($creds) != 2) {
+            return $this->_challengeClient();
+        }
+
+        $password = $this->_basicResolver->resolve($creds[0], $this->_realm);
+        if ($password && $this->_secureStringCompare($password, $creds[1])) {
+            $identity = array('username'=>$creds[0], 'realm'=>$this->_realm);
+            return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
+        } else {
+            return $this->_challengeClient();
+        }
+    }
+
+    /**
+     * Digest Authentication
+     *
+     * @param  string $header Client's Authorization header
+     * @throws Zend_Auth_Adapter_Exception
+     * @return Zend_Auth_Result Valid auth result only on successful auth
+     */
+    protected function _digestAuth($header)
+    {
+        if (empty($header)) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required');
+        }
+        if (empty($this->_digestResolver)) {
+            /**
+             * @see Zend_Auth_Adapter_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Exception.php';
+            throw new Zend_Auth_Adapter_Exception('A digestResolver object must be set before doing Digest authentication');
+        }
+
+        $data = $this->_parseDigestAuth($header);
+        if ($data === false) {
+            $this->_response->setHttpResponseCode(400);
+            return new Zend_Auth_Result(
+                Zend_Auth_Result::FAILURE_UNCATEGORIZED,
+                array(),
+                array('Invalid Authorization header format')
+            );
+        }
+
+        // See ZF-1052. This code was a bit too unforgiving of invalid
+        // usernames. Now, if the username is bad, we re-challenge the client.
+        if ('::invalid::' == $data['username']) {
+            return $this->_challengeClient();
+        }
+
+        // Verify that the client sent back the same nonce
+        if ($this->_calcNonce() != $data['nonce']) {
+            return $this->_challengeClient();
+        }
+        // The opaque value is also required to match, but of course IE doesn't
+        // play ball.
+        if (!$this->_ieNoOpaque && $this->_calcOpaque() != $data['opaque']) {
+            return $this->_challengeClient();
+        }
+
+        // Look up the user's password hash. If not found, deny access.
+        // This makes no assumptions about how the password hash was
+        // constructed beyond that it must have been built in such a way as
+        // to be recreatable with the current settings of this object.
+        $ha1 = $this->_digestResolver->resolve($data['username'], $data['realm']);
+        if ($ha1 === false) {
+            return $this->_challengeClient();
+        }
+
+        // If MD5-sess is used, a1 value is made of the user's password
+        // hash with the server and client nonce appended, separated by
+        // colons.
+        if ($this->_algo == 'MD5-sess') {
+            $ha1 = hash('md5', $ha1 . ':' . $data['nonce'] . ':' . $data['cnonce']);
+        }
+
+        // Calculate h(a2). The value of this hash depends on the qop
+        // option selected by the client and the supported hash functions
+        switch ($data['qop']) {
+            case 'auth':
+                $a2 = $this->_request->getMethod() . ':' . $data['uri'];
+                break;
+            case 'auth-int':
+                // Should be REQUEST_METHOD . ':' . uri . ':' . hash(entity-body),
+                // but this isn't supported yet, so fall through to default case
+            default:
+                /**
+                 * @see Zend_Auth_Adapter_Exception
+                 */
+                require_once 'Zend/Auth/Adapter/Exception.php';
+                throw new Zend_Auth_Adapter_Exception('Client requested an unsupported qop option');
+        }
+        // Using hash() should make parameterizing the hash algorithm
+        // easier
+        $ha2 = hash('md5', $a2);
+
+
+        // Calculate the server's version of the request-digest. This must
+        // match $data['response']. See RFC 2617, section 3.2.2.1
+        $message = $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' . $ha2;
+        $digest  = hash('md5', $ha1 . ':' . $message);
+
+        // If our digest matches the client's let them in, otherwise return
+        // a 401 code and exit to prevent access to the protected resource.
+        if ($this->_secureStringCompare($digest, $data['response'])) {
+            $identity = array('username'=>$data['username'], 'realm'=>$data['realm']);
+            return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
+        } else {
+            return $this->_challengeClient();
+        }
+    }
+
+    /**
+     * Calculate Nonce
+     *
+     * @return string The nonce value
+     */
+    protected function _calcNonce()
+    {
+        // Once subtle consequence of this timeout calculation is that it
+        // actually divides all of time into _nonceTimeout-sized sections, such
+        // that the value of timeout is the point in time of the next
+        // approaching "boundary" of a section. This allows the server to
+        // consistently generate the same timeout (and hence the same nonce
+        // value) across requests, but only as long as one of those
+        // "boundaries" is not crossed between requests. If that happens, the
+        // nonce will change on its own, and effectively log the user out. This
+        // would be surprising if the user just logged in.
+        $timeout = ceil(time() / $this->_nonceTimeout) * $this->_nonceTimeout;
+
+        $nonce = hash('md5', $timeout . ':' . $this->_request->getServer('HTTP_USER_AGENT') . ':' . __CLASS__);
+        return $nonce;
+    }
+
+    /**
+     * Calculate Opaque
+     *
+     * The opaque string can be anything; the client must return it exactly as
+     * it was sent. It may be useful to store data in this string in some
+     * applications. Ideally, a new value for this would be generated each time
+     * a WWW-Authenticate header is sent (in order to reduce predictability),
+     * but we would have to be able to create the same exact value across at
+     * least two separate requests from the same client.
+     *
+     * @return string The opaque value
+     */
+    protected function _calcOpaque()
+    {
+        return hash('md5', 'Opaque Data:' . __CLASS__);
+    }
+
+    /**
+     * Parse Digest Authorization header
+     *
+     * @param  string $header Client's Authorization: HTTP header
+     * @return array|false Data elements from header, or false if any part of
+     *         the header is invalid
+     */
+    protected function _parseDigestAuth($header)
+    {
+        $temp = null;
+        $data = array();
+
+        // See ZF-1052. Detect invalid usernames instead of just returning a
+        // 400 code.
+        $ret = preg_match('/username="([^"]+)"/', $header, $temp);
+        if (!$ret || empty($temp[1])
+                  || !ctype_print($temp[1])
+                  || strpos($temp[1], ':') !== false) {
+            $data['username'] = '::invalid::';
+        } else {
+            $data['username'] = $temp[1];
+        }
+        $temp = null;
+
+        $ret = preg_match('/realm="([^"]+)"/', $header, $temp);
+        if (!$ret || empty($temp[1])) {
+            return false;
+        }
+        if (!ctype_print($temp[1]) || strpos($temp[1], ':') !== false) {
+            return false;
+        } else {
+            $data['realm'] = $temp[1];
+        }
+        $temp = null;
+
+        $ret = preg_match('/nonce="([^"]+)"/', $header, $temp);
+        if (!$ret || empty($temp[1])) {
+            return false;
+        }
+        if (!ctype_xdigit($temp[1])) {
+            return false;
+        } else {
+            $data['nonce'] = $temp[1];
+        }
+        $temp = null;
+
+        $ret = preg_match('/uri="([^"]+)"/', $header, $temp);
+        if (!$ret || empty($temp[1])) {
+            return false;
+        }
+        // Section 3.2.2.5 in RFC 2617 says the authenticating server must
+        // verify that the URI field in the Authorization header is for the
+        // same resource requested in the Request Line.
+        $rUri = @parse_url($this->_request->getRequestUri());
+        $cUri = @parse_url($temp[1]);
+        if (false === $rUri || false === $cUri) {
+            return false;
+        } else {
+            // Make sure the path portion of both URIs is the same
+            if ($rUri['path'] != $cUri['path']) {
+                return false;
+            }
+            // Section 3.2.2.5 seems to suggest that the value of the URI
+            // Authorization field should be made into an absolute URI if the
+            // Request URI is absolute, but it's vague, and that's a bunch of
+            // code I don't want to write right now.
+            $data['uri'] = $temp[1];
+        }
+        $temp = null;
+
+        $ret = preg_match('/response="([^"]+)"/', $header, $temp);
+        if (!$ret || empty($temp[1])) {
+            return false;
+        }
+        if (32 != strlen($temp[1]) || !ctype_xdigit($temp[1])) {
+            return false;
+        } else {
+            $data['response'] = $temp[1];
+        }
+        $temp = null;
+
+        // The spec says this should default to MD5 if omitted. OK, so how does
+        // that square with the algo we send out in the WWW-Authenticate header,
+        // if it can easily be overridden by the client?
+        $ret = preg_match('/algorithm="?(' . $this->_algo . ')"?/', $header, $temp);
+        if ($ret && !empty($temp[1])
+                 && in_array($temp[1], $this->_supportedAlgos)) {
+            $data['algorithm'] = $temp[1];
+        } else {
+            $data['algorithm'] = 'MD5';  // = $this->_algo; ?
+        }
+        $temp = null;
+
+        // Not optional in this implementation
+        $ret = preg_match('/cnonce="([^"]+)"/', $header, $temp);
+        if (!$ret || empty($temp[1])) {
+            return false;
+        }
+        if (!ctype_print($temp[1])) {
+            return false;
+        } else {
+            $data['cnonce'] = $temp[1];
+        }
+        $temp = null;
+
+        // If the server sent an opaque value, the client must send it back
+        if ($this->_useOpaque) {
+            $ret = preg_match('/opaque="([^"]+)"/', $header, $temp);
+            if (!$ret || empty($temp[1])) {
+
+                // Big surprise: IE isn't RFC 2617-compliant.
+                if (false !== strpos($this->_request->getHeader('User-Agent'), 'MSIE')) {
+                    $temp[1] = '';
+                    $this->_ieNoOpaque = true;
+                } else {
+                    return false;
+                }
+            }
+            // This implementation only sends MD5 hex strings in the opaque value
+            if (!$this->_ieNoOpaque &&
+                (32 != strlen($temp[1]) || !ctype_xdigit($temp[1]))) {
+                return false;
+            } else {
+                $data['opaque'] = $temp[1];
+            }
+            $temp = null;
+        }
+
+        // Not optional in this implementation, but must be one of the supported
+        // qop types
+        $ret = preg_match('/qop="?(' . implode('|', $this->_supportedQops) . ')"?/', $header, $temp);
+        if (!$ret || empty($temp[1])) {
+            return false;
+        }
+        if (!in_array($temp[1], $this->_supportedQops)) {
+            return false;
+        } else {
+            $data['qop'] = $temp[1];
+        }
+        $temp = null;
+
+        // Not optional in this implementation. The spec says this value
+        // shouldn't be a quoted string, but apparently some implementations
+        // quote it anyway. See ZF-1544.
+        $ret = preg_match('/nc="?([0-9A-Fa-f]{8})"?/', $header, $temp);
+        if (!$ret || empty($temp[1])) {
+            return false;
+        }
+        if (8 != strlen($temp[1]) || !ctype_xdigit($temp[1])) {
+            return false;
+        } else {
+            $data['nc'] = $temp[1];
+        }
+        $temp = null;
+
+        return $data;
+    }
+
+    /**
+     * Securely compare two strings for equality while avoided C level memcmp()
+     * optimisations capable of leaking timing information useful to an attacker
+     * attempting to iteratively guess the unknown string (e.g. password) being
+     * compared against.
+     *
+     * @param string $a
+     * @param string $b
+     * @return bool
+     */
+    protected function _secureStringCompare($a, $b)
+    {
+        if (strlen($a) !== strlen($b)) {
+            return false;
+        }
+        $result = 0;
+        for ($i = 0; $i < strlen($a); $i++) {
+            $result |= ord($a[$i]) ^ ord($b[$i]);
+        }
+        return $result == 0;
+    }
+}
diff --git a/lib/zend/Zend/Auth/Adapter/Http/Resolver/Exception.php b/lib/zend/Zend/Auth/Adapter/Http/Resolver/Exception.php
new file mode 100644
index 00000000000..e7e2a4e8262
--- /dev/null
+++ b/lib/zend/Zend/Auth/Adapter/Http/Resolver/Exception.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter_Http
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Auth_Exception
+ */
+require_once 'Zend/Auth/Exception.php';
+
+
+/**
+ * HTTP Auth Resolver Exception
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter_Http
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Auth_Adapter_Http_Resolver_Exception extends Zend_Auth_Exception
+{}
diff --git a/lib/zend/Zend/Auth/Adapter/Http/Resolver/File.php b/lib/zend/Zend/Auth/Adapter/Http/Resolver/File.php
new file mode 100644
index 00000000000..8f8b64ce30b
--- /dev/null
+++ b/lib/zend/Zend/Auth/Adapter/Http/Resolver/File.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter_Http
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Auth_Adapter_Http_Resolver_Interface
+ */
+require_once 'Zend/Auth/Adapter/Http/Resolver/Interface.php';
+
+
+/**
+ * HTTP Authentication File Resolver
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter_Http
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Resolver_Interface
+{
+    /**
+     * Path to credentials file
+     *
+     * @var string
+     */
+    protected $_file;
+
+    /**
+     * Constructor
+     *
+     * @param  string $path Complete filename where the credentials are stored
+     */
+    public function __construct($path = '')
+    {
+        if (!empty($path)) {
+            $this->setFile($path);
+        }
+    }
+
+    /**
+     * Set the path to the credentials file
+     *
+     * @param  string $path
+     * @throws Zend_Auth_Adapter_Http_Resolver_Exception
+     * @return Zend_Auth_Adapter_Http_Resolver_File Provides a fluent interface
+     */
+    public function setFile($path)
+    {
+        if (empty($path) || !is_readable($path)) {
+            /**
+             * @see Zend_Auth_Adapter_Http_Resolver_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
+            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Path not readable: ' . $path);
+        }
+        $this->_file = $path;
+
+        return $this;
+    }
+
+    /**
+     * Returns the path to the credentials file
+     *
+     * @return string
+     */
+    public function getFile()
+    {
+        return $this->_file;
+    }
+
+    /**
+     * Resolve credentials
+     *
+     * Only the first matching username/realm combination in the file is
+     * returned. If the file contains credentials for Digest authentication,
+     * the returned string is the password hash, or h(a1) from RFC 2617. The
+     * returned string is the plain-text password for Basic authentication.
+     *
+     * The expected format of the file is:
+     *   username:realm:sharedSecret
+     *
+     * That is, each line consists of the user's username, the applicable
+     * authentication realm, and the password or hash, each delimited by
+     * colons.
+     *
+     * @param  string $username Username
+     * @param  string $realm    Authentication Realm
+     * @throws Zend_Auth_Adapter_Http_Resolver_Exception
+     * @return string|false User's shared secret, if the user is found in the
+     *         realm, false otherwise.
+     */
+    public function resolve($username, $realm)
+    {
+        if (empty($username)) {
+            /**
+             * @see Zend_Auth_Adapter_Http_Resolver_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
+            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username is required');
+        } else if (!ctype_print($username) || strpos($username, ':') !== false) {
+            /**
+             * @see Zend_Auth_Adapter_Http_Resolver_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
+            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username must consist only of printable characters, '
+                                                              . 'excluding the colon');
+        }
+        if (empty($realm)) {
+            /**
+             * @see Zend_Auth_Adapter_Http_Resolver_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
+            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm is required');
+        } else if (!ctype_print($realm) || strpos($realm, ':') !== false) {
+            /**
+             * @see Zend_Auth_Adapter_Http_Resolver_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
+            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm must consist only of printable characters, '
+                                                              . 'excluding the colon.');
+        }
+
+        // Open file, read through looking for matching credentials
+        $fp = @fopen($this->_file, 'r');
+        if (!$fp) {
+            /**
+             * @see Zend_Auth_Adapter_Http_Resolver_Exception
+             */
+            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
+            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Unable to open password file: ' . $this->_file);
+        }
+
+        // No real validation is done on the contents of the password file. The
+        // assumption is that we trust the administrators to keep it secure.
+        while (($line = fgetcsv($fp, 512, ':')) !== false) {
+            if ($line[0] == $username && $line[1] == $realm) {
+                $password = $line[2];
+                fclose($fp);
+                return $password;
+            }
+        }
+
+        fclose($fp);
+        return false;
+    }
+}
diff --git a/lib/zend/Zend/Auth/Adapter/Http/Resolver/Interface.php b/lib/zend/Zend/Auth/Adapter/Http/Resolver/Interface.php
new file mode 100644
index 00000000000..4326ee8202f
--- /dev/null
+++ b/lib/zend/Zend/Auth/Adapter/Http/Resolver/Interface.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter_Http
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Auth HTTP Resolver Interface
+ *
+ * Defines an interace to resolve a username/realm combination into a shared
+ * secret usable by HTTP Authentication.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter_Http
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Auth_Adapter_Http_Resolver_Interface
+{
+    /**
+     * Resolve username/realm to password/hash/etc.
+     *
+     * @param  string $username Username
+     * @param  string $realm    Authentication Realm
+     * @return string|false User's shared secret, if the user is found in the
+     *         realm, false otherwise.
+     */
+    public function resolve($username, $realm);
+}
diff --git a/lib/zend/Zend/Auth/Adapter/Interface.php b/lib/zend/Zend/Auth/Adapter/Interface.php
new file mode 100644
index 00000000000..4a9d50a0a56
--- /dev/null
+++ b/lib/zend/Zend/Auth/Adapter/Interface.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Auth_Result
+ */
+require_once 'Zend/Auth/Result.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Zend_Auth_Adapter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Auth_Adapter_Interface
+{
+    /**
+     * Performs an authentication attempt
+     *
+     * @throws Zend_Auth_Adapter_Exception If authentication cannot be performed
+     * @return Zend_Auth_Result
+     */
+    public function authenticate();
+}
diff --git a/lib/zend/Zend/Auth/Exception.php b/lib/zend/Zend/Auth/Exception.php
new file mode 100644
index 00000000000..8cdc41bbf96
--- /dev/null
+++ b/lib/zend/Zend/Auth/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Auth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Auth_Exception extends Zend_Exception
+{}
diff --git a/lib/zend/Zend/Auth/Result.php b/lib/zend/Zend/Auth/Result.php
new file mode 100644
index 00000000000..6f81a9a9e1a
--- /dev/null
+++ b/lib/zend/Zend/Auth/Result.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Auth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Auth_Result
+{
+    /**
+     * General Failure
+     */
+    const FAILURE                        =  0;
+
+    /**
+     * Failure due to identity not being found.
+     */
+    const FAILURE_IDENTITY_NOT_FOUND     = -1;
+
+    /**
+     * Failure due to identity being ambiguous.
+     */
+    const FAILURE_IDENTITY_AMBIGUOUS     = -2;
+
+    /**
+     * Failure due to invalid credential being supplied.
+     */
+    const FAILURE_CREDENTIAL_INVALID     = -3;
+
+    /**
+     * Failure due to uncategorized reasons.
+     */
+    const FAILURE_UNCATEGORIZED          = -4;
+
+    /**
+     * Authentication success.
+     */
+    const SUCCESS                        =  1;
+
+    /**
+     * Authentication result code
+     *
+     * @var int
+     */
+    protected $_code;
+
+    /**
+     * The identity used in the authentication attempt
+     *
+     * @var mixed
+     */
+    protected $_identity;
+
+    /**
+     * An array of string reasons why the authentication attempt was unsuccessful
+     *
+     * If authentication was successful, this should be an empty array.
+     *
+     * @var array
+     */
+    protected $_messages;
+
+    /**
+     * Sets the result code, identity, and failure messages
+     *
+     * @param int   $code
+     * @param mixed $identity
+     * @param array $messages
+     */
+    public function __construct($code, $identity, array $messages = array())
+    {
+        $code = (int) $code;
+
+        if ($code < self::FAILURE_UNCATEGORIZED) {
+            $code = self::FAILURE;
+        } elseif ($code > self::SUCCESS ) {
+            $code = 1;
+        }
+
+        $this->_code     = $code;
+        $this->_identity = $identity;
+        $this->_messages = $messages;
+    }
+
+    /**
+     * Returns whether the result represents a successful authentication attempt
+     *
+     * @return boolean
+     */
+    public function isValid()
+    {
+        return ($this->_code > 0) ? true : false;
+    }
+
+    /**
+     * getCode() - Get the result code for this authentication attempt
+     *
+     * @return int
+     */
+    public function getCode()
+    {
+        return $this->_code;
+    }
+
+    /**
+     * Returns the identity used in the authentication attempt
+     *
+     * @return mixed
+     */
+    public function getIdentity()
+    {
+        return $this->_identity;
+    }
+
+    /**
+     * Returns an array of string reasons why the authentication attempt was unsuccessful
+     *
+     * If authentication was successful, this method returns an empty array.
+     *
+     * @return array
+     */
+    public function getMessages()
+    {
+        return $this->_messages;
+    }
+}
diff --git a/lib/zend/Zend/Auth/Storage/Exception.php b/lib/zend/Zend/Auth/Storage/Exception.php
new file mode 100644
index 00000000000..542b6708a79
--- /dev/null
+++ b/lib/zend/Zend/Auth/Storage/Exception.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Storage
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Auth_Exception
+ */
+require_once 'Zend/Auth/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Storage
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Auth_Storage_Exception extends Zend_Auth_Exception
+{}
diff --git a/lib/zend/Zend/Auth/Storage/Interface.php b/lib/zend/Zend/Auth/Storage/Interface.php
new file mode 100644
index 00000000000..7ca92ebfff9
--- /dev/null
+++ b/lib/zend/Zend/Auth/Storage/Interface.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Storage
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Storage
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Auth_Storage_Interface
+{
+    /**
+     * Returns true if and only if storage is empty
+     *
+     * @throws Zend_Auth_Storage_Exception If it is impossible to determine whether storage is empty
+     * @return boolean
+     */
+    public function isEmpty();
+
+    /**
+     * Returns the contents of storage
+     *
+     * Behavior is undefined when storage is empty.
+     *
+     * @throws Zend_Auth_Storage_Exception If reading contents from storage is impossible
+     * @return mixed
+     */
+    public function read();
+
+    /**
+     * Writes $contents to storage
+     *
+     * @param  mixed $contents
+     * @throws Zend_Auth_Storage_Exception If writing $contents to storage is impossible
+     * @return void
+     */
+    public function write($contents);
+
+    /**
+     * Clears contents from storage
+     *
+     * @throws Zend_Auth_Storage_Exception If clearing contents from storage is impossible
+     * @return void
+     */
+    public function clear();
+}
diff --git a/lib/zend/Zend/Auth/Storage/NonPersistent.php b/lib/zend/Zend/Auth/Storage/NonPersistent.php
new file mode 100644
index 00000000000..6cdf0c7de43
--- /dev/null
+++ b/lib/zend/Zend/Auth/Storage/NonPersistent.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Storage
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Auth_Storage_Interface
+ */
+require_once 'Zend/Auth/Storage/Interface.php';
+
+
+/**
+ * Non-Persistent Auth Storage
+ *
+ * Since HTTP Authentication happens again on each request, this will always be
+ * re-populated. So there's no need to use sessions, this simple value class
+ * will hold the data for rest of the current request.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Storage
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Auth_Storage_NonPersistent implements Zend_Auth_Storage_Interface
+{
+    /**
+     * Holds the actual auth data
+     */
+    protected $_data;
+
+    /**
+     * Returns true if and only if storage is empty
+     *
+     * @throws Zend_Auth_Storage_Exception If it is impossible to determine whether storage is empty
+     * @return boolean
+     */
+    public function isEmpty()
+    {
+        return empty($this->_data);
+    }
+
+    /**
+     * Returns the contents of storage
+     * Behavior is undefined when storage is empty.
+     *
+     * @throws Zend_Auth_Storage_Exception If reading contents from storage is impossible
+     * @return mixed
+     */
+    public function read()
+    {
+        return $this->_data;
+    }
+
+    /**
+     * Writes $contents to storage
+     *
+     * @param  mixed $contents
+     * @throws Zend_Auth_Storage_Exception If writing $contents to storage is impossible
+     * @return void
+     */
+    public function write($contents)
+    {
+        $this->_data = $contents;
+    }
+
+    /**
+     * Clears contents from storage
+     *
+     * @throws Zend_Auth_Storage_Exception If clearing contents from storage is impossible
+     * @return void
+     */
+    public function clear()
+    {
+        $this->_data = null;
+    }
+}
diff --git a/lib/zend/Zend/Auth/Storage/Session.php b/lib/zend/Zend/Auth/Storage/Session.php
new file mode 100644
index 00000000000..c3680f6faf7
--- /dev/null
+++ b/lib/zend/Zend/Auth/Storage/Session.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Storage
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Auth_Storage_Interface
+ */
+require_once 'Zend/Auth/Storage/Interface.php';
+
+
+/**
+ * @see Zend_Session
+ */
+require_once 'Zend/Session.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Auth
+ * @subpackage Storage
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Auth_Storage_Session implements Zend_Auth_Storage_Interface
+{
+    /**
+     * Default session namespace
+     */
+    const NAMESPACE_DEFAULT = 'Zend_Auth';
+
+    /**
+     * Default session object member name
+     */
+    const MEMBER_DEFAULT = 'storage';
+
+    /**
+     * Object to proxy $_SESSION storage
+     *
+     * @var Zend_Session_Namespace
+     */
+    protected $_session;
+
+    /**
+     * Session namespace
+     *
+     * @var mixed
+     */
+    protected $_namespace;
+
+    /**
+     * Session object member
+     *
+     * @var mixed
+     */
+    protected $_member;
+
+    /**
+     * Sets session storage options and initializes session namespace object
+     *
+     * @param mixed $namespace
+     * @param mixed $member
+     */
+    public function __construct($namespace = self::NAMESPACE_DEFAULT, $member = self::MEMBER_DEFAULT)
+    {
+        $this->_namespace = $namespace;
+        $this->_member    = $member;
+        $this->_session   = new Zend_Session_Namespace($this->_namespace);
+    }
+
+    /**
+     * Returns the session namespace
+     *
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->_namespace;
+    }
+
+    /**
+     * Returns the name of the session object member
+     *
+     * @return string
+     */
+    public function getMember()
+    {
+        return $this->_member;
+    }
+
+    /**
+     * Defined by Zend_Auth_Storage_Interface
+     *
+     * @return boolean
+     */
+    public function isEmpty()
+    {
+        return !isset($this->_session->{$this->_member});
+    }
+
+    /**
+     * Defined by Zend_Auth_Storage_Interface
+     *
+     * @return mixed
+     */
+    public function read()
+    {
+        return $this->_session->{$this->_member};
+    }
+
+    /**
+     * Defined by Zend_Auth_Storage_Interface
+     *
+     * @param  mixed $contents
+     * @return void
+     */
+    public function write($contents)
+    {
+        $this->_session->{$this->_member} = $contents;
+    }
+
+    /**
+     * Defined by Zend_Auth_Storage_Interface
+     *
+     * @return void
+     */
+    public function clear()
+    {
+        unset($this->_session->{$this->_member});
+    }
+}
diff --git a/lib/zend/Zend/Cache.php b/lib/zend/Zend/Cache.php
new file mode 100644
index 00000000000..dc818f30e57
--- /dev/null
+++ b/lib/zend/Zend/Cache.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Cache
+{
+
+    /**
+     * Standard frontends
+     *
+     * @var array
+     */
+    public static $standardFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
+
+    /**
+     * Standard backends
+     *
+     * @var array
+     */
+    public static $standardBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform',
+                                            'Xcache', 'TwoLevels', 'WinCache', 'ZendServer_Disk', 'ZendServer_ShMem');
+
+    /**
+     * Standard backends which implement the ExtendedInterface
+     *
+     * @var array
+     */
+    public static $standardExtendedBackends = array('File', 'Apc', 'TwoLevels', 'Memcached', 'Libmemcached', 'Sqlite', 'WinCache');
+
+    /**
+     * Only for backward compatibility (may be removed in next major release)
+     *
+     * @var array
+     * @deprecated
+     */
+    public static $availableFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
+
+    /**
+     * Only for backward compatibility (may be removed in next major release)
+     *
+     * @var array
+     * @deprecated
+     */
+    public static $availableBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform', 'Xcache', 'WinCache', 'TwoLevels');
+
+    /**
+     * Consts for clean() method
+     */
+    const CLEANING_MODE_ALL              = 'all';
+    const CLEANING_MODE_OLD              = 'old';
+    const CLEANING_MODE_MATCHING_TAG     = 'matchingTag';
+    const CLEANING_MODE_NOT_MATCHING_TAG = 'notMatchingTag';
+    const CLEANING_MODE_MATCHING_ANY_TAG = 'matchingAnyTag';
+
+    /**
+     * Factory
+     *
+     * @param mixed  $frontend        frontend name (string) or Zend_Cache_Frontend_ object
+     * @param mixed  $backend         backend name (string) or Zend_Cache_Backend_ object
+     * @param array  $frontendOptions associative array of options for the corresponding frontend constructor
+     * @param array  $backendOptions  associative array of options for the corresponding backend constructor
+     * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name
+     * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name
+     * @param boolean $autoload if true, there will no require_once for backend and frontend (useful only for custom backends/frontends)
+     * @throws Zend_Cache_Exception
+     * @return Zend_Cache_Core|Zend_Cache_Frontend
+     */
+    public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array(), $customFrontendNaming = false, $customBackendNaming = false, $autoload = false)
+    {
+        if (is_string($backend)) {
+            $backendObject = self::_makeBackend($backend, $backendOptions, $customBackendNaming, $autoload);
+        } else {
+            if ((is_object($backend)) && (in_array('Zend_Cache_Backend_Interface', class_implements($backend)))) {
+                $backendObject = $backend;
+            } else {
+                self::throwException('backend must be a backend name (string) or an object which implements Zend_Cache_Backend_Interface');
+            }
+        }
+        if (is_string($frontend)) {
+            $frontendObject = self::_makeFrontend($frontend, $frontendOptions, $customFrontendNaming, $autoload);
+        } else {
+            if (is_object($frontend)) {
+                $frontendObject = $frontend;
+            } else {
+                self::throwException('frontend must be a frontend name (string) or an object');
+            }
+        }
+        $frontendObject->setBackend($backendObject);
+        return $frontendObject;
+    }
+
+    /**
+     * Backend Constructor
+     *
+     * @param string  $backend
+     * @param array   $backendOptions
+     * @param boolean $customBackendNaming
+     * @param boolean $autoload
+     * @return Zend_Cache_Backend
+     */
+    public static function _makeBackend($backend, $backendOptions, $customBackendNaming = false, $autoload = false)
+    {
+        if (!$customBackendNaming) {
+            $backend  = self::_normalizeName($backend);
+        }
+        if (in_array($backend, Zend_Cache::$standardBackends)) {
+            // we use a standard backend
+            $backendClass = 'Zend_Cache_Backend_' . $backend;
+            // security controls are explicit
+            require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
+        } else {
+            // we use a custom backend
+            if (!preg_match('~^[\w\\\\]+$~D', $backend)) {
+                Zend_Cache::throwException("Invalid backend name [$backend]");
+            }
+            if (!$customBackendNaming) {
+                // we use this boolean to avoid an API break
+                $backendClass = 'Zend_Cache_Backend_' . $backend;
+            } else {
+                $backendClass = $backend;
+            }
+            if (!$autoload) {
+                $file = str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
+                if (!(self::_isReadable($file))) {
+                    self::throwException("file $file not found in include_path");
+                }
+                require_once $file;
+            }
+        }
+        return new $backendClass($backendOptions);
+    }
+
+    /**
+     * Frontend Constructor
+     *
+     * @param string  $frontend
+     * @param array   $frontendOptions
+     * @param boolean $customFrontendNaming
+     * @param boolean $autoload
+     * @return Zend_Cache_Core|Zend_Cache_Frontend
+     */
+    public static function _makeFrontend($frontend, $frontendOptions = array(), $customFrontendNaming = false, $autoload = false)
+    {
+        if (!$customFrontendNaming) {
+            $frontend = self::_normalizeName($frontend);
+        }
+        if (in_array($frontend, self::$standardFrontends)) {
+            // we use a standard frontend
+            // For perfs reasons, with frontend == 'Core', we can interact with the Core itself
+            $frontendClass = 'Zend_Cache_' . ($frontend != 'Core' ? 'Frontend_' : '') . $frontend;
+            // security controls are explicit
+            require_once str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
+        } else {
+            // we use a custom frontend
+            if (!preg_match('~^[\w\\\\]+$~D', $frontend)) {
+                Zend_Cache::throwException("Invalid frontend name [$frontend]");
+            }
+            if (!$customFrontendNaming) {
+                // we use this boolean to avoid an API break
+                $frontendClass = 'Zend_Cache_Frontend_' . $frontend;
+            } else {
+                $frontendClass = $frontend;
+            }
+            if (!$autoload) {
+                $file = str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
+                if (!(self::_isReadable($file))) {
+                    self::throwException("file $file not found in include_path");
+                }
+                require_once $file;
+            }
+        }
+        return new $frontendClass($frontendOptions);
+    }
+
+    /**
+     * Throw an exception
+     *
+     * Note : for perf reasons, the "load" of Zend/Cache/Exception is dynamic
+     * @param  string $msg  Message for the exception
+     * @throws Zend_Cache_Exception
+     */
+    public static function throwException($msg, Exception $e = null)
+    {
+        // For perfs reasons, we use this dynamic inclusion
+        require_once 'Zend/Cache/Exception.php';
+        throw new Zend_Cache_Exception($msg, 0, $e);
+    }
+
+    /**
+     * Normalize frontend and backend names to allow multiple words TitleCased
+     *
+     * @param  string $name  Name to normalize
+     * @return string
+     */
+    protected static function _normalizeName($name)
+    {
+        $name = ucfirst(strtolower($name));
+        $name = str_replace(array('-', '_', '.'), ' ', $name);
+        $name = ucwords($name);
+        $name = str_replace(' ', '', $name);
+        if (stripos($name, 'ZendServer') === 0) {
+            $name = 'ZendServer_' . substr($name, strlen('ZendServer'));
+        }
+
+        return $name;
+    }
+
+    /**
+     * Returns TRUE if the $filename is readable, or FALSE otherwise.
+     * This function uses the PHP include_path, where PHP's is_readable()
+     * does not.
+     *
+     * Note : this method comes from Zend_Loader (see #ZF-2891 for details)
+     *
+     * @param string   $filename
+     * @return boolean
+     */
+    private static function _isReadable($filename)
+    {
+        if (!$fh = @fopen($filename, 'r', true)) {
+            return false;
+        }
+        @fclose($fh);
+        return true;
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend.php b/lib/zend/Zend/Cache/Backend.php
new file mode 100644
index 00000000000..83f1af5f121
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend.php
@@ -0,0 +1,288 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend
+{
+    /**
+     * Frontend or Core directives
+     *
+     * =====> (int) lifetime :
+     * - Cache lifetime (in seconds)
+     * - If null, the cache is valid forever
+     *
+     * =====> (int) logging :
+     * - if set to true, a logging is activated throw Zend_Log
+     *
+     * @var array directives
+     */
+    protected $_directives = array(
+        'lifetime' => 3600,
+        'logging'  => false,
+        'logger'   => null
+    );
+
+    /**
+     * Available options
+     *
+     * @var array available options
+     */
+    protected $_options = array();
+
+    /**
+     * Constructor
+     *
+     * @param  array $options Associative array of options
+     */
+    public function __construct(array $options = array())
+    {
+        foreach ($options as $name => $value) {
+            $this->setOption($name, $value);
+        }
+    }
+
+    /**
+     * Set the frontend directives
+     *
+     * @param  array $directives Assoc of directives
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setDirectives($directives)
+    {
+        if (!is_array($directives)) Zend_Cache::throwException('Directives parameter must be an array');
+        while (list($name, $value) = each($directives)) {
+            if (!is_string($name)) {
+                Zend_Cache::throwException("Incorrect option name : $name");
+            }
+            $name = strtolower($name);
+            if (array_key_exists($name, $this->_directives)) {
+                $this->_directives[$name] = $value;
+            }
+
+        }
+
+        $this->_loggerSanity();
+    }
+
+    /**
+     * Set an option
+     *
+     * @param  string $name
+     * @param  mixed  $value
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setOption($name, $value)
+    {
+        if (!is_string($name)) {
+            Zend_Cache::throwException("Incorrect option name : $name");
+        }
+        $name = strtolower($name);
+        if (array_key_exists($name, $this->_options)) {
+            $this->_options[$name] = $value;
+        }
+    }
+
+    /**
+     * Returns an option
+     *
+     * @param string $name Optional, the options name to return
+     * @throws Zend_Cache_Exceptions
+     * @return mixed
+     */
+    public function getOption($name)
+    {
+        $name = strtolower($name);
+
+        if (array_key_exists($name, $this->_options)) {
+            return $this->_options[$name];
+        }
+
+        if (array_key_exists($name, $this->_directives)) {
+            return $this->_directives[$name];
+        }
+
+        Zend_Cache::throwException("Incorrect option name : {$name}");
+    }
+
+    /**
+     * Get the life time
+     *
+     * if $specificLifetime is not false, the given specific life time is used
+     * else, the global lifetime is used
+     *
+     * @param  int $specificLifetime
+     * @return int Cache life time
+     */
+    public function getLifetime($specificLifetime)
+    {
+        if ($specificLifetime === false) {
+            return $this->_directives['lifetime'];
+        }
+        return $specificLifetime;
+    }
+
+    /**
+     * Return true if the automatic cleaning is available for the backend
+     *
+     * DEPRECATED : use getCapabilities() instead
+     *
+     * @deprecated
+     * @return boolean
+     */
+    public function isAutomaticCleaningAvailable()
+    {
+        return true;
+    }
+
+    /**
+     * Determine system TMP directory and detect if we have read access
+     *
+     * inspired from Zend_File_Transfer_Adapter_Abstract
+     *
+     * @return string
+     * @throws Zend_Cache_Exception if unable to determine directory
+     */
+    public function getTmpDir()
+    {
+        $tmpdir = array();
+        foreach (array($_ENV, $_SERVER) as $tab) {
+            foreach (array('TMPDIR', 'TEMP', 'TMP', 'windir', 'SystemRoot') as $key) {
+                if (isset($tab[$key]) && is_string($tab[$key])) {
+                    if (($key == 'windir') or ($key == 'SystemRoot')) {
+                        $dir = realpath($tab[$key] . '\\temp');
+                    } else {
+                        $dir = realpath($tab[$key]);
+                    }
+                    if ($this->_isGoodTmpDir($dir)) {
+                        return $dir;
+                    }
+                }
+            }
+        }
+        $upload = ini_get('upload_tmp_dir');
+        if ($upload) {
+            $dir = realpath($upload);
+            if ($this->_isGoodTmpDir($dir)) {
+                return $dir;
+            }
+        }
+        if (function_exists('sys_get_temp_dir')) {
+            $dir = sys_get_temp_dir();
+            if ($this->_isGoodTmpDir($dir)) {
+                return $dir;
+            }
+        }
+        // Attemp to detect by creating a temporary file
+        $tempFile = tempnam(md5(uniqid(rand(), TRUE)), '');
+        if ($tempFile) {
+            $dir = realpath(dirname($tempFile));
+            unlink($tempFile);
+            if ($this->_isGoodTmpDir($dir)) {
+                return $dir;
+            }
+        }
+        if ($this->_isGoodTmpDir('/tmp')) {
+            return '/tmp';
+        }
+        if ($this->_isGoodTmpDir('\\temp')) {
+            return '\\temp';
+        }
+        Zend_Cache::throwException('Could not determine temp directory, please specify a cache_dir manually');
+    }
+
+    /**
+     * Verify if the given temporary directory is readable and writable
+     *
+     * @param string $dir temporary directory
+     * @return boolean true if the directory is ok
+     */
+    protected function _isGoodTmpDir($dir)
+    {
+        if (is_readable($dir)) {
+            if (is_writable($dir)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Make sure if we enable logging that the Zend_Log class
+     * is available.
+     * Create a default log object if none is set.
+     *
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    protected function _loggerSanity()
+    {
+        if (!isset($this->_directives['logging']) || !$this->_directives['logging']) {
+            return;
+        }
+
+        if (isset($this->_directives['logger'])) {
+            if ($this->_directives['logger'] instanceof Zend_Log) {
+                return;
+            }
+            Zend_Cache::throwException('Logger object is not an instance of Zend_Log class.');
+        }
+
+        // Create a default logger to the standard output stream
+        require_once 'Zend/Log.php';
+        require_once 'Zend/Log/Writer/Stream.php';
+        require_once 'Zend/Log/Filter/Priority.php';
+        $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output'));
+        $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<='));
+        $this->_directives['logger'] = $logger;
+    }
+
+    /**
+     * Log a message at the WARN (4) priority.
+     *
+     * @param  string $message
+     * @param  int    $priority
+     * @return void
+     */
+    protected function _log($message, $priority = 4)
+    {
+        if (!$this->_directives['logging']) {
+            return;
+        }
+
+        if (!isset($this->_directives['logger'])) {
+            Zend_Cache::throwException('Logging is enabled but logger is not set.');
+        }
+        $logger = $this->_directives['logger'];
+        if (!$logger instanceof Zend_Log) {
+            Zend_Cache::throwException('Logger object is not an instance of Zend_Log class.');
+        }
+        $logger->log($message, $priority);
+    }
+}
diff --git a/lib/zend/Zend/Cache/Backend/Apc.php b/lib/zend/Zend/Cache/Backend/Apc.php
new file mode 100644
index 00000000000..5a09becdcfd
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/Apc.php
@@ -0,0 +1,355 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/ExtendedInterface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Log message
+     */
+    const TAGS_UNSUPPORTED_BY_CLEAN_OF_APC_BACKEND = 'Zend_Cache_Backend_Apc::clean() : tags are unsupported by the Apc backend';
+    const TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND =  'Zend_Cache_Backend_Apc::save() : tags are unsupported by the Apc backend';
+
+    /**
+     * Constructor
+     *
+     * @param  array $options associative array of options
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        if (!extension_loaded('apc')) {
+            Zend_Cache::throwException('The apc extension must be loaded for using this backend !');
+        }
+        parent::__construct($options);
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * WARNING $doNotTestCacheValidity=true is unsupported by the Apc backend
+     *
+     * @param  string  $id                     cache id
+     * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
+     * @return string cached datas (or false)
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $tmp = apc_fetch($id);
+        if (is_array($tmp)) {
+            return $tmp[0];
+        }
+        return false;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id cache id
+     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        $tmp = apc_fetch($id);
+        if (is_array($tmp)) {
+            return $tmp[1];
+        }
+        return false;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param string $data datas to cache
+     * @param string $id cache id
+     * @param array $tags array of strings, the cache record will be tagged by each string entry
+     * @param int $specificLifetime if != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        $lifetime = $this->getLifetime($specificLifetime);
+        $result = apc_store($id, array($data, time(), $lifetime), $lifetime);
+        if (count($tags) > 0) {
+            $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
+        }
+        return $result;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id cache id
+     * @return boolean true if no problem
+     */
+    public function remove($id)
+    {
+        return apc_delete($id);
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => unsupported
+     * 'matchingTag'    => unsupported
+     * 'notMatchingTag' => unsupported
+     * 'matchingAnyTag' => unsupported
+     *
+     * @param  string $mode clean mode
+     * @param  array  $tags array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean true if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+                return apc_clear_cache('user');
+                break;
+            case Zend_Cache::CLEANING_MODE_OLD:
+                $this->_log("Zend_Cache_Backend_Apc::clean() : CLEANING_MODE_OLD is unsupported by the Apc backend");
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_APC_BACKEND);
+                break;
+            default:
+                Zend_Cache::throwException('Invalid mode for clean() method');
+                break;
+        }
+    }
+
+    /**
+     * Return true if the automatic cleaning is available for the backend
+     *
+     * DEPRECATED : use getCapabilities() instead
+     *
+     * @deprecated
+     * @return boolean
+     */
+    public function isAutomaticCleaningAvailable()
+    {
+        return false;
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @throws Zend_Cache_Exception
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        $mem = apc_sma_info(true);
+        $memSize    = $mem['num_seg'] * $mem['seg_size'];
+        $memAvailable= $mem['avail_mem'];
+        $memUsed = $memSize - $memAvailable;
+        if ($memSize == 0) {
+            Zend_Cache::throwException('can\'t get apc memory size');
+        }
+        if ($memUsed > $memSize) {
+            return 100;
+        }
+        return ((int) (100. * ($memUsed / $memSize)));
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        $ids      = array();
+        $iterator = new APCIterator('user', null, APC_ITER_KEY);
+        foreach ($iterator as $item) {
+            $ids[] = $item['key'];
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        $tmp = apc_fetch($id);
+        if (is_array($tmp)) {
+            $data = $tmp[0];
+            $mtime = $tmp[1];
+            if (!isset($tmp[2])) {
+                // because this record is only with 1.7 release
+                // if old cache records are still there...
+                return false;
+            }
+            $lifetime = $tmp[2];
+            return array(
+                'expire' => $mtime + $lifetime,
+                'tags' => array(),
+                'mtime' => $mtime
+            );
+        }
+        return false;
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        $tmp = apc_fetch($id);
+        if (is_array($tmp)) {
+            $data = $tmp[0];
+            $mtime = $tmp[1];
+            if (!isset($tmp[2])) {
+                // because this record is only with 1.7 release
+                // if old cache records are still there...
+                return false;
+            }
+            $lifetime = $tmp[2];
+            $newLifetime = $lifetime - (time() - $mtime) + $extraLifetime;
+            if ($newLifetime <=0) {
+                return false;
+            }
+            apc_store($id, array($data, time(), $newLifetime), $newLifetime);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        return array(
+            'automatic_cleaning' => false,
+            'tags' => false,
+            'expired_read' => false,
+            'priority' => false,
+            'infinite_lifetime' => false,
+            'get_list' => true
+        );
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/BlackHole.php b/lib/zend/Zend/Cache/Backend/BlackHole.php
new file mode 100644
index 00000000000..0fe1c9d0525
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/BlackHole.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/ExtendedInterface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_BlackHole
+    extends Zend_Cache_Backend
+    implements Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * @param  string $id cache id
+     * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
+     * @return string|false cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        return false;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id cache id
+     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        return false;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data             Datas to cache
+     * @param  string $id               Cache id
+     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        return true;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id cache id
+     * @return boolean true if no problem
+     */
+    public function remove($id)
+    {
+        return true;
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => remove too old cache entries ($tags is not used)
+     * 'matchingTag'    => remove cache entries matching all given tags
+     *                     ($tags can be an array of strings or a single string)
+     * 'notMatchingTag' => remove cache entries not matching one of the given tags
+     *                     ($tags can be an array of strings or a single string)
+     * 'matchingAnyTag' => remove cache entries matching any given tags
+     *                     ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode clean mode
+     * @param  tags array $tags array of tags
+     * @return boolean true if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        return true;
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        return array();
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param  array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        return array();
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @return int integer between 0 and 100
+     * @throws Zend_Cache_Exception
+     */
+    public function getFillingPercentage()
+    {
+        return 0;
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param  string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        return false;
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param  string $id cache id
+     * @param  int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        return false;
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        return array(
+            'automatic_cleaning' => true,
+            'tags'               => true,
+            'expired_read'       => true,
+            'priority'           => true,
+            'infinite_lifetime'  => true,
+            'get_list'           => true,
+        );
+    }
+
+    /**
+     * PUBLIC METHOD FOR UNIT TESTING ONLY !
+     *
+     * Force a cache record to expire
+     *
+     * @param string $id cache id
+     */
+    public function ___expire($id)
+    {
+    }
+}
diff --git a/lib/zend/Zend/Cache/Backend/ExtendedInterface.php b/lib/zend/Zend/Cache/Backend/ExtendedInterface.php
new file mode 100644
index 00000000000..0dd8bdf414c
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/ExtendedInterface.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/Interface.php';
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interface
+{
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds();
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags();
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array());
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array());
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array());
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage();
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id);
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime);
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities();
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/File.php b/lib/zend/Zend/Cache/Backend/File.php
new file mode 100644
index 00000000000..4e395da017c
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/File.php
@@ -0,0 +1,1037 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/ExtendedInterface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Available options
+     *
+     * =====> (string) cache_dir :
+     * - Directory where to put the cache files
+     *
+     * =====> (boolean) file_locking :
+     * - Enable / disable file_locking
+     * - Can avoid cache corruption under bad circumstances but it doesn't work on multithread
+     * webservers and on NFS filesystems for example
+     *
+     * =====> (boolean) read_control :
+     * - Enable / disable read control
+     * - If enabled, a control key is embeded in cache file and this key is compared with the one
+     * calculated after the reading.
+     *
+     * =====> (string) read_control_type :
+     * - Type of read control (only if read control is enabled). Available values are :
+     *   'md5' for a md5 hash control (best but slowest)
+     *   'crc32' for a crc32 hash control (lightly less safe but faster, better choice)
+     *   'adler32' for an adler32 hash control (excellent choice too, faster than crc32)
+     *   'strlen' for a length only test (fastest)
+     *
+     * =====> (int) hashed_directory_level :
+     * - Hashed directory level
+     * - Set the hashed directory structure level. 0 means "no hashed directory
+     * structure", 1 means "one level of directory", 2 means "two levels"...
+     * This option can speed up the cache only when you have many thousands of
+     * cache file. Only specific benchs can help you to choose the perfect value
+     * for you. Maybe, 1 or 2 is a good start.
+     *
+     * =====> (int) hashed_directory_umask :
+     * - deprecated
+     * - Permissions for hashed directory structure
+     *
+     * =====> (int) hashed_directory_perm :
+     * - Permissions for hashed directory structure
+     *
+     * =====> (string) file_name_prefix :
+     * - prefix for cache files
+     * - be really carefull with this option because a too generic value in a system cache dir
+     *   (like /tmp) can cause disasters when cleaning the cache
+     *
+     * =====> (int) cache_file_umask :
+     * - deprecated
+     * - Permissions for cache files
+     *
+     * =====> (int) cache_file_perm :
+     * - Permissions for cache files
+     *
+     * =====> (int) metatadatas_array_max_size :
+     * - max size for the metadatas array (don't change this value unless you
+     *   know what you are doing)
+     *
+     * @var array available options
+     */
+    protected $_options = array(
+        'cache_dir' => null,
+        'file_locking' => true,
+        'read_control' => true,
+        'read_control_type' => 'crc32',
+        'hashed_directory_level' => 0,
+        'hashed_directory_perm' => 0700,
+        'file_name_prefix' => 'zend_cache',
+        'cache_file_perm' => 0600,
+        'metadatas_array_max_size' => 100
+    );
+
+    /**
+     * Array of metadatas (each item is an associative array)
+     *
+     * @var array
+     */
+    protected $_metadatasArray = array();
+
+
+    /**
+     * Constructor
+     *
+     * @param  array $options associative array of options
+     * @throws Zend_Cache_Exception
+     */
+    public function __construct(array $options = array())
+    {
+        parent::__construct($options);
+        if ($this->_options['cache_dir'] !== null) { // particular case for this option
+            $this->setCacheDir($this->_options['cache_dir']);
+        } else {
+            $this->setCacheDir(self::getTmpDir() . DIRECTORY_SEPARATOR, false);
+        }
+        if (isset($this->_options['file_name_prefix'])) { // particular case for this option
+            if (!preg_match('~^[a-zA-Z0-9_]+$~D', $this->_options['file_name_prefix'])) {
+                Zend_Cache::throwException('Invalid file_name_prefix : must use only [a-zA-Z0-9_]');
+            }
+        }
+        if ($this->_options['metadatas_array_max_size'] < 10) {
+            Zend_Cache::throwException('Invalid metadatas_array_max_size, must be > 10');
+        }
+
+        if (isset($options['hashed_directory_umask'])) {
+            // See #ZF-12047
+            trigger_error("'hashed_directory_umask' is deprecated -> please use 'hashed_directory_perm' instead", E_USER_NOTICE);
+            if (!isset($options['hashed_directory_perm'])) {
+                $options['hashed_directory_perm'] = $options['hashed_directory_umask'];
+            }
+        }
+        if (isset($options['hashed_directory_perm']) && is_string($options['hashed_directory_perm'])) {
+            // See #ZF-4422
+            $this->_options['hashed_directory_perm'] = octdec($this->_options['hashed_directory_perm']);
+        }
+
+        if (isset($options['cache_file_umask'])) {
+            // See #ZF-12047
+            trigger_error("'cache_file_umask' is deprecated -> please use 'cache_file_perm' instead", E_USER_NOTICE);
+            if (!isset($options['cache_file_perm'])) {
+                $options['cache_file_perm'] = $options['cache_file_umask'];
+            }
+        }
+        if (isset($options['cache_file_perm']) && is_string($options['cache_file_perm'])) {
+            // See #ZF-4422
+            $this->_options['cache_file_perm'] = octdec($this->_options['cache_file_perm']);
+        }
+    }
+
+    /**
+     * Set the cache_dir (particular case of setOption() method)
+     *
+     * @param  string  $value
+     * @param  boolean $trailingSeparator If true, add a trailing separator is necessary
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setCacheDir($value, $trailingSeparator = true)
+    {
+        if (!is_dir($value)) {
+            Zend_Cache::throwException(sprintf('cache_dir "%s" must be a directory', $value));
+        }
+        if (!is_writable($value)) {
+            Zend_Cache::throwException(sprintf('cache_dir "%s" is not writable', $value));
+        }
+        if ($trailingSeparator) {
+            // add a trailing DIRECTORY_SEPARATOR if necessary
+            $value = rtrim(realpath($value), '\\/') . DIRECTORY_SEPARATOR;
+        }
+        $this->_options['cache_dir'] = $value;
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * @param string $id cache id
+     * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
+     * @return string|false cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        if (!($this->_test($id, $doNotTestCacheValidity))) {
+            // The cache is not hit !
+            return false;
+        }
+        $metadatas = $this->_getMetadatas($id);
+        $file = $this->_file($id);
+        $data = $this->_fileGetContents($file);
+        if ($this->_options['read_control']) {
+            $hashData = $this->_hash($data, $this->_options['read_control_type']);
+            $hashControl = $metadatas['hash'];
+            if ($hashData != $hashControl) {
+                // Problem detected by the read control !
+                $this->_log('Zend_Cache_Backend_File::load() / read_control : stored hash and computed hash do not match');
+                $this->remove($id);
+                return false;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param string $id cache id
+     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        clearstatcache();
+        return $this->_test($id, false);
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string      $data             Datas to cache
+     * @param  string      $id               Cache id
+     * @param  array       $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  boolean|int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        clearstatcache();
+        $file = $this->_file($id);
+        $path = $this->_path($id);
+        if ($this->_options['hashed_directory_level'] > 0) {
+            if (!is_writable($path)) {
+                // maybe, we just have to build the directory structure
+                $this->_recursiveMkdirAndChmod($id);
+            }
+            if (!is_writable($path)) {
+                return false;
+            }
+        }
+        if ($this->_options['read_control']) {
+            $hash = $this->_hash($data, $this->_options['read_control_type']);
+        } else {
+            $hash = '';
+        }
+        $metadatas = array(
+            'hash' => $hash,
+            'mtime' => time(),
+            'expire' => $this->_expireTime($this->getLifetime($specificLifetime)),
+            'tags' => $tags
+        );
+        $res = $this->_setMetadatas($id, $metadatas);
+        if (!$res) {
+            $this->_log('Zend_Cache_Backend_File::save() / error on saving metadata');
+            return false;
+        }
+        $res = $this->_filePutContents($file, $data);
+        return $res;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id cache id
+     * @return boolean true if no problem
+     */
+    public function remove($id)
+    {
+        $file = $this->_file($id);
+        $boolRemove   = $this->_remove($file);
+        $boolMetadata = $this->_delMetadatas($id);
+        return $boolMetadata && $boolRemove;
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     *
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param string $mode clean mode
+     * @param array $tags array of tags
+     * @return boolean true if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        // We use this protected method to hide the recursive stuff
+        clearstatcache();
+        return $this->_clean($this->_options['cache_dir'], $mode, $tags);
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        return $this->_get($this->_options['cache_dir'], 'ids', array());
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        return $this->_get($this->_options['cache_dir'], 'tags', array());
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        return $this->_get($this->_options['cache_dir'], 'matching', $tags);
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        return $this->_get($this->_options['cache_dir'], 'notMatching', $tags);
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        return $this->_get($this->_options['cache_dir'], 'matchingAny', $tags);
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @throws Zend_Cache_Exception
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        $free = disk_free_space($this->_options['cache_dir']);
+        $total = disk_total_space($this->_options['cache_dir']);
+        if ($total == 0) {
+            Zend_Cache::throwException('can\'t get disk_total_space');
+        } else {
+            if ($free >= $total) {
+                return 100;
+            }
+            return ((int) (100. * ($total - $free) / $total));
+        }
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        $metadatas = $this->_getMetadatas($id);
+        if (!$metadatas) {
+            return false;
+        }
+        if (time() > $metadatas['expire']) {
+            return false;
+        }
+        return array(
+            'expire' => $metadatas['expire'],
+            'tags' => $metadatas['tags'],
+            'mtime' => $metadatas['mtime']
+        );
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        $metadatas = $this->_getMetadatas($id);
+        if (!$metadatas) {
+            return false;
+        }
+        if (time() > $metadatas['expire']) {
+            return false;
+        }
+        $newMetadatas = array(
+            'hash' => $metadatas['hash'],
+            'mtime' => time(),
+            'expire' => $metadatas['expire'] + $extraLifetime,
+            'tags' => $metadatas['tags']
+        );
+        $res = $this->_setMetadatas($id, $newMetadatas);
+        if (!$res) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        return array(
+            'automatic_cleaning' => true,
+            'tags' => true,
+            'expired_read' => true,
+            'priority' => false,
+            'infinite_lifetime' => true,
+            'get_list' => true
+        );
+    }
+
+    /**
+     * PUBLIC METHOD FOR UNIT TESTING ONLY !
+     *
+     * Force a cache record to expire
+     *
+     * @param string $id cache id
+     */
+    public function ___expire($id)
+    {
+        $metadatas = $this->_getMetadatas($id);
+        if ($metadatas) {
+            $metadatas['expire'] = 1;
+            $this->_setMetadatas($id, $metadatas);
+        }
+    }
+
+    /**
+     * Get a metadatas record
+     *
+     * @param  string $id  Cache id
+     * @return array|false Associative array of metadatas
+     */
+    protected function _getMetadatas($id)
+    {
+        if (isset($this->_metadatasArray[$id])) {
+            return $this->_metadatasArray[$id];
+        } else {
+            $metadatas = $this->_loadMetadatas($id);
+            if (!$metadatas) {
+                return false;
+            }
+            $this->_setMetadatas($id, $metadatas, false);
+            return $metadatas;
+        }
+    }
+
+    /**
+     * Set a metadatas record
+     *
+     * @param  string $id        Cache id
+     * @param  array  $metadatas Associative array of metadatas
+     * @param  boolean $save     optional pass false to disable saving to file
+     * @return boolean True if no problem
+     */
+    protected function _setMetadatas($id, $metadatas, $save = true)
+    {
+        if (count($this->_metadatasArray) >= $this->_options['metadatas_array_max_size']) {
+            $n = (int) ($this->_options['metadatas_array_max_size'] / 10);
+            $this->_metadatasArray = array_slice($this->_metadatasArray, $n);
+        }
+        if ($save) {
+            $result = $this->_saveMetadatas($id, $metadatas);
+            if (!$result) {
+                return false;
+            }
+        }
+        $this->_metadatasArray[$id] = $metadatas;
+        return true;
+    }
+
+    /**
+     * Drop a metadata record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    protected function _delMetadatas($id)
+    {
+        if (isset($this->_metadatasArray[$id])) {
+            unset($this->_metadatasArray[$id]);
+        }
+        $file = $this->_metadatasFile($id);
+        return $this->_remove($file);
+    }
+
+    /**
+     * Clear the metadatas array
+     *
+     * @return void
+     */
+    protected function _cleanMetadatas()
+    {
+        $this->_metadatasArray = array();
+    }
+
+    /**
+     * Load metadatas from disk
+     *
+     * @param  string $id Cache id
+     * @return array|false Metadatas associative array
+     */
+    protected function _loadMetadatas($id)
+    {
+        $file = $this->_metadatasFile($id);
+        $result = $this->_fileGetContents($file);
+        if (!$result) {
+            return false;
+        }
+        $tmp = @unserialize($result);
+        return $tmp;
+    }
+
+    /**
+     * Save metadatas to disk
+     *
+     * @param  string $id        Cache id
+     * @param  array  $metadatas Associative array
+     * @return boolean True if no problem
+     */
+    protected function _saveMetadatas($id, $metadatas)
+    {
+        $file = $this->_metadatasFile($id);
+        $result = $this->_filePutContents($file, serialize($metadatas));
+        if (!$result) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Make and return a file name (with path) for metadatas
+     *
+     * @param  string $id Cache id
+     * @return string Metadatas file name (with path)
+     */
+    protected function _metadatasFile($id)
+    {
+        $path = $this->_path($id);
+        $fileName = $this->_idToFileName('internal-metadatas---' . $id);
+        return $path . $fileName;
+    }
+
+    /**
+     * Check if the given filename is a metadatas one
+     *
+     * @param  string $fileName File name
+     * @return boolean True if it's a metadatas one
+     */
+    protected function _isMetadatasFile($fileName)
+    {
+        $id = $this->_fileNameToId($fileName);
+        if (substr($id, 0, 21) == 'internal-metadatas---') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Remove a file
+     *
+     * If we can't remove the file (because of locks or any problem), we will touch
+     * the file to invalidate it
+     *
+     * @param  string $file Complete file path
+     * @return boolean True if ok
+     */
+    protected function _remove($file)
+    {
+        if (!is_file($file)) {
+            return false;
+        }
+        if (!@unlink($file)) {
+            # we can't remove the file (because of locks or any problem)
+            $this->_log("Zend_Cache_Backend_File::_remove() : we can't remove $file");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Clean some cache records (protected method used for recursive stuff)
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $dir  Directory to clean
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean True if no problem
+     */
+    protected function _clean($dir, $mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        if (!is_dir($dir)) {
+            return false;
+        }
+        $result = true;
+        $prefix = $this->_options['file_name_prefix'];
+        $glob = @glob($dir . $prefix . '--*');
+        if ($glob === false) {
+            // On some systems it is impossible to distinguish between empty match and an error.
+            return true;
+        }
+        $metadataFiles = array();
+        foreach ($glob as $file)  {
+            if (is_file($file)) {
+                $fileName = basename($file);
+                if ($this->_isMetadatasFile($fileName)) {
+                    // In CLEANING_MODE_ALL, we drop anything, even remainings old metadatas files.
+                    // To do that, we need to save the list of the metadata files first.
+                    if ($mode == Zend_Cache::CLEANING_MODE_ALL) {
+                        $metadataFiles[] = $file;
+                    }
+                    continue;
+                }
+                $id = $this->_fileNameToId($fileName);
+                $metadatas = $this->_getMetadatas($id);
+                if ($metadatas === FALSE) {
+                    $metadatas = array('expire' => 1, 'tags' => array());
+                }
+                switch ($mode) {
+                    case Zend_Cache::CLEANING_MODE_ALL:
+                        $result = $result && $this->remove($id);
+                        break;
+                    case Zend_Cache::CLEANING_MODE_OLD:
+                        if (time() > $metadatas['expire']) {
+                            $result = $this->remove($id) && $result;
+                        }
+                        break;
+                    case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+                        $matching = true;
+                        foreach ($tags as $tag) {
+                            if (!in_array($tag, $metadatas['tags'])) {
+                                $matching = false;
+                                break;
+                            }
+                        }
+                        if ($matching) {
+                            $result = $this->remove($id) && $result;
+                        }
+                        break;
+                    case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+                        $matching = false;
+                        foreach ($tags as $tag) {
+                            if (in_array($tag, $metadatas['tags'])) {
+                                $matching = true;
+                                break;
+                            }
+                        }
+                        if (!$matching) {
+                            $result = $this->remove($id) && $result;
+                        }
+                        break;
+                    case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                        $matching = false;
+                        foreach ($tags as $tag) {
+                            if (in_array($tag, $metadatas['tags'])) {
+                                $matching = true;
+                                break;
+                            }
+                        }
+                        if ($matching) {
+                            $result = $this->remove($id) && $result;
+                        }
+                        break;
+                    default:
+                        Zend_Cache::throwException('Invalid mode for clean() method');
+                        break;
+                }
+            }
+            if ((is_dir($file)) and ($this->_options['hashed_directory_level']>0)) {
+                // Recursive call
+                $result = $this->_clean($file . DIRECTORY_SEPARATOR, $mode, $tags) && $result;
+                if ($mode == Zend_Cache::CLEANING_MODE_ALL) {
+                    // we try to drop the structure too
+                    @rmdir($file);
+                }
+            }
+        }
+
+        // cycle through metadataFiles and delete orphaned ones
+        foreach ($metadataFiles as $file) {
+            if (file_exists($file)) {
+                $result = $this->_remove($file) && $result;
+            }
+        }
+
+        return $result;
+    }
+
+    protected function _get($dir, $mode, $tags = array())
+    {
+        if (!is_dir($dir)) {
+            return false;
+        }
+        $result = array();
+        $prefix = $this->_options['file_name_prefix'];
+        $glob = @glob($dir . $prefix . '--*');
+        if ($glob === false) {
+            // On some systems it is impossible to distinguish between empty match and an error.
+            return array();
+        }
+        foreach ($glob as $file)  {
+            if (is_file($file)) {
+                $fileName = basename($file);
+                $id = $this->_fileNameToId($fileName);
+                $metadatas = $this->_getMetadatas($id);
+                if ($metadatas === FALSE) {
+                    continue;
+                }
+                if (time() > $metadatas['expire']) {
+                    continue;
+                }
+                switch ($mode) {
+                    case 'ids':
+                        $result[] = $id;
+                        break;
+                    case 'tags':
+                        $result = array_unique(array_merge($result, $metadatas['tags']));
+                        break;
+                    case 'matching':
+                        $matching = true;
+                        foreach ($tags as $tag) {
+                            if (!in_array($tag, $metadatas['tags'])) {
+                                $matching = false;
+                                break;
+                            }
+                        }
+                        if ($matching) {
+                            $result[] = $id;
+                        }
+                        break;
+                    case 'notMatching':
+                        $matching = false;
+                        foreach ($tags as $tag) {
+                            if (in_array($tag, $metadatas['tags'])) {
+                                $matching = true;
+                                break;
+                            }
+                        }
+                        if (!$matching) {
+                            $result[] = $id;
+                        }
+                        break;
+                    case 'matchingAny':
+                        $matching = false;
+                        foreach ($tags as $tag) {
+                            if (in_array($tag, $metadatas['tags'])) {
+                                $matching = true;
+                                break;
+                            }
+                        }
+                        if ($matching) {
+                            $result[] = $id;
+                        }
+                        break;
+                    default:
+                        Zend_Cache::throwException('Invalid mode for _get() method');
+                        break;
+                }
+            }
+            if ((is_dir($file)) and ($this->_options['hashed_directory_level']>0)) {
+                // Recursive call
+                $recursiveRs =  $this->_get($file . DIRECTORY_SEPARATOR, $mode, $tags);
+                if ($recursiveRs === false) {
+                    $this->_log('Zend_Cache_Backend_File::_get() / recursive call : can\'t list entries of "'.$file.'"');
+                } else {
+                    $result = array_unique(array_merge($result, $recursiveRs));
+                }
+            }
+        }
+        return array_unique($result);
+    }
+
+    /**
+     * Compute & return the expire time
+     *
+     * @param  int $lifetime
+     * @return int expire time (unix timestamp)
+     */
+    protected function _expireTime($lifetime)
+    {
+        if ($lifetime === null) {
+            return 9999999999;
+        }
+        return time() + $lifetime;
+    }
+
+    /**
+     * Make a control key with the string containing datas
+     *
+     * @param  string $data        Data
+     * @param  string $controlType Type of control 'md5', 'crc32' or 'strlen'
+     * @throws Zend_Cache_Exception
+     * @return string Control key
+     */
+    protected function _hash($data, $controlType)
+    {
+        switch ($controlType) {
+        case 'md5':
+            return md5($data);
+        case 'crc32':
+            return crc32($data);
+        case 'strlen':
+            return strlen($data);
+        case 'adler32':
+            return hash('adler32', $data);
+        default:
+            Zend_Cache::throwException("Incorrect hash function : $controlType");
+        }
+    }
+
+    /**
+     * Transform a cache id into a file name and return it
+     *
+     * @param  string $id Cache id
+     * @return string File name
+     */
+    protected function _idToFileName($id)
+    {
+        $prefix = $this->_options['file_name_prefix'];
+        $result = $prefix . '---' . $id;
+        return $result;
+    }
+
+    /**
+     * Make and return a file name (with path)
+     *
+     * @param  string $id Cache id
+     * @return string File name (with path)
+     */
+    protected function _file($id)
+    {
+        $path = $this->_path($id);
+        $fileName = $this->_idToFileName($id);
+        return $path . $fileName;
+    }
+
+    /**
+     * Return the complete directory path of a filename (including hashedDirectoryStructure)
+     *
+     * @param  string $id Cache id
+     * @param  boolean $parts if true, returns array of directory parts instead of single string
+     * @return string Complete directory path
+     */
+    protected function _path($id, $parts = false)
+    {
+        $partsArray = array();
+        $root = $this->_options['cache_dir'];
+        $prefix = $this->_options['file_name_prefix'];
+        if ($this->_options['hashed_directory_level']>0) {
+            $hash = hash('adler32', $id);
+            for ($i=0 ; $i < $this->_options['hashed_directory_level'] ; $i++) {
+                $root = $root . $prefix . '--' . substr($hash, 0, $i + 1) . DIRECTORY_SEPARATOR;
+                $partsArray[] = $root;
+            }
+        }
+        if ($parts) {
+            return $partsArray;
+        } else {
+            return $root;
+        }
+    }
+
+    /**
+     * Make the directory strucuture for the given id
+     *
+     * @param string $id cache id
+     * @return boolean true
+     */
+    protected function _recursiveMkdirAndChmod($id)
+    {
+        if ($this->_options['hashed_directory_level'] <=0) {
+            return true;
+        }
+        $partsArray = $this->_path($id, true);
+        foreach ($partsArray as $part) {
+            if (!is_dir($part)) {
+                @mkdir($part, $this->_options['hashed_directory_perm']);
+                @chmod($part, $this->_options['hashed_directory_perm']); // see #ZF-320 (this line is required in some configurations)
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Test if the given cache id is available (and still valid as a cache record)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return boolean|mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    protected function _test($id, $doNotTestCacheValidity)
+    {
+        $metadatas = $this->_getMetadatas($id);
+        if (!$metadatas) {
+            return false;
+        }
+        if ($doNotTestCacheValidity || (time() <= $metadatas['expire'])) {
+            return $metadatas['mtime'];
+        }
+        return false;
+    }
+
+    /**
+     * Return the file content of the given file
+     *
+     * @param  string $file File complete path
+     * @return string File content (or false if problem)
+     */
+    protected function _fileGetContents($file)
+    {
+        $result = false;
+        if (!is_file($file)) {
+            return false;
+        }
+        $f = @fopen($file, 'rb');
+        if ($f) {
+            if ($this->_options['file_locking']) @flock($f, LOCK_SH);
+            $result = stream_get_contents($f);
+            if ($this->_options['file_locking']) @flock($f, LOCK_UN);
+            @fclose($f);
+        }
+        return $result;
+    }
+
+    /**
+     * Put the given string into the given file
+     *
+     * @param  string $file   File complete path
+     * @param  string $string String to put in file
+     * @return boolean true if no problem
+     */
+    protected function _filePutContents($file, $string)
+    {
+        $result = false;
+        $f = @fopen($file, 'ab+');
+        if ($f) {
+            if ($this->_options['file_locking']) @flock($f, LOCK_EX);
+            fseek($f, 0);
+            ftruncate($f, 0);
+            $tmp = @fwrite($f, $string);
+            if (!($tmp === FALSE)) {
+                $result = true;
+            }
+            @fclose($f);
+        }
+        @chmod($file, $this->_options['cache_file_perm']);
+        return $result;
+    }
+
+    /**
+     * Transform a file name into cache id and return it
+     *
+     * @param  string $fileName File name
+     * @return string Cache id
+     */
+    protected function _fileNameToId($fileName)
+    {
+        $prefix = $this->_options['file_name_prefix'];
+        return preg_replace('~^' . $prefix . '---(.*)$~', '$1', $fileName);
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/Interface.php b/lib/zend/Zend/Cache/Backend/Interface.php
new file mode 100644
index 00000000000..1bd72d8c163
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/Interface.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Cache_Backend_Interface
+{
+    /**
+     * Set the frontend directives
+     *
+     * @param array $directives assoc of directives
+     */
+    public function setDirectives($directives);
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * Note : return value is always "string" (unserialization is done by the core not by the backend)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return string|false cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false);
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id cache id
+     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id);
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data            Datas to cache
+     * @param  string $id              Cache id
+     * @param  array $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int   $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false);
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id);
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @return boolean true if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array());
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/Libmemcached.php b/lib/zend/Zend/Cache/Backend/Libmemcached.php
new file mode 100644
index 00000000000..623e75776cc
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/Libmemcached.php
@@ -0,0 +1,484 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/ExtendedInterface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_Libmemcached extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Default Server Values
+     */
+    const DEFAULT_HOST = '127.0.0.1';
+    const DEFAULT_PORT =  11211;
+    const DEFAULT_WEIGHT  = 1;
+
+    /**
+     * Log message
+     */
+    const TAGS_UNSUPPORTED_BY_CLEAN_OF_LIBMEMCACHED_BACKEND = 'Zend_Cache_Backend_Libmemcached::clean() : tags are unsupported by the Libmemcached backend';
+    const TAGS_UNSUPPORTED_BY_SAVE_OF_LIBMEMCACHED_BACKEND =  'Zend_Cache_Backend_Libmemcached::save() : tags are unsupported by the Libmemcached backend';
+
+    /**
+     * Available options
+     *
+     * =====> (array) servers :
+     * an array of memcached server ; each memcached server is described by an associative array :
+     * 'host' => (string) : the name of the memcached server
+     * 'port' => (int) : the port of the memcached server
+     * 'weight' => (int) : number of buckets to create for this server which in turn control its
+     *                     probability of it being selected. The probability is relative to the total
+     *                     weight of all servers.
+     * =====> (array) client :
+     * an array of memcached client options ; the memcached client is described by an associative array :
+     * @see http://php.net/manual/memcached.constants.php
+     * - The option name can be the name of the constant without the prefix 'OPT_'
+     *   or the integer value of this option constant
+     *
+     * @var array available options
+     */
+    protected $_options = array(
+        'servers' => array(array(
+            'host'   => self::DEFAULT_HOST,
+            'port'   => self::DEFAULT_PORT,
+            'weight' => self::DEFAULT_WEIGHT,
+        )),
+        'client' => array()
+    );
+
+    /**
+     * Memcached object
+     *
+     * @var mixed memcached object
+     */
+    protected $_memcache = null;
+
+    /**
+     * Constructor
+     *
+     * @param array $options associative array of options
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        if (!extension_loaded('memcached')) {
+            Zend_Cache::throwException('The memcached extension must be loaded for using this backend !');
+        }
+
+        // override default client options
+        $this->_options['client'] = array(
+            Memcached::OPT_DISTRIBUTION         => Memcached::DISTRIBUTION_CONSISTENT,
+            Memcached::OPT_HASH                 => Memcached::HASH_MD5,
+            Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
+        );
+
+        parent::__construct($options);
+
+        if (isset($this->_options['servers'])) {
+            $value = $this->_options['servers'];
+            if (isset($value['host'])) {
+                // in this case, $value seems to be a simple associative array (one server only)
+                $value = array(0 => $value); // let's transform it into a classical array of associative arrays
+            }
+            $this->setOption('servers', $value);
+        }
+        $this->_memcache = new Memcached;
+
+        // setup memcached client options
+        foreach ($this->_options['client'] as $name => $value) {
+            $optId = null;
+            if (is_int($name)) {
+                $optId = $name;
+            } else {
+                $optConst = 'Memcached::OPT_' . strtoupper($name);
+                if (defined($optConst)) {
+                    $optId = constant($optConst);
+                } else {
+                    $this->_log("Unknown memcached client option '{$name}' ({$optConst})");
+                }
+            }
+            if (null !== $optId) {
+                if (!$this->_memcache->setOption($optId, $value)) {
+                    $this->_log("Setting memcached client option '{$optId}' failed");
+                }
+            }
+        }
+
+        // setup memcached servers
+        $servers = array();
+        foreach ($this->_options['servers'] as $server) {
+            if (!array_key_exists('port', $server)) {
+                $server['port'] = self::DEFAULT_PORT;
+            }
+            if (!array_key_exists('weight', $server)) {
+                $server['weight'] = self::DEFAULT_WEIGHT;
+            }
+
+            $servers[] = array($server['host'], $server['port'], $server['weight']);
+        }
+        $this->_memcache->addServers($servers);
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return string|false cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $tmp = $this->_memcache->get($id);
+        if (isset($tmp[0])) {
+            return $tmp[0];
+        }
+        return false;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id Cache id
+     * @return int|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        $tmp = $this->_memcache->get($id);
+        if (isset($tmp[0], $tmp[1])) {
+            return (int)$tmp[1];
+        }
+        return false;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data             Datas to cache
+     * @param  string $id               Cache id
+     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean True if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        $lifetime = $this->getLifetime($specificLifetime);
+
+        // ZF-8856: using set because add needs a second request if item already exists
+        $result = @$this->_memcache->set($id, array($data, time(), $lifetime), $lifetime);
+        if ($result === false) {
+            $rsCode = $this->_memcache->getResultCode();
+            $rsMsg  = $this->_memcache->getResultMessage();
+            $this->_log("Memcached::set() failed: [{$rsCode}] {$rsMsg}");
+        }
+
+        if (count($tags) > 0) {
+            $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_LIBMEMCACHED_BACKEND);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id)
+    {
+        return $this->_memcache->delete($id);
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => unsupported
+     * 'matchingTag'    => unsupported
+     * 'notMatchingTag' => unsupported
+     * 'matchingAnyTag' => unsupported
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean True if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+                return $this->_memcache->flush();
+                break;
+            case Zend_Cache::CLEANING_MODE_OLD:
+                $this->_log("Zend_Cache_Backend_Libmemcached::clean() : CLEANING_MODE_OLD is unsupported by the Libmemcached backend");
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_LIBMEMCACHED_BACKEND);
+                break;
+               default:
+                Zend_Cache::throwException('Invalid mode for clean() method');
+                   break;
+        }
+    }
+
+    /**
+     * Return true if the automatic cleaning is available for the backend
+     *
+     * @return boolean
+     */
+    public function isAutomaticCleaningAvailable()
+    {
+        return false;
+    }
+
+    /**
+     * Set the frontend directives
+     *
+     * @param  array $directives Assoc of directives
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setDirectives($directives)
+    {
+        parent::setDirectives($directives);
+        $lifetime = $this->getLifetime(false);
+        if ($lifetime > 2592000) {
+            // #ZF-3490 : For the memcached backend, there is a lifetime limit of 30 days (2592000 seconds)
+            $this->_log('memcached backend has a limit of 30 days (2592000 seconds) for the lifetime');
+        }
+        if ($lifetime === null) {
+            // #ZF-4614 : we tranform null to zero to get the maximal lifetime
+            parent::setDirectives(array('lifetime' => 0));
+        }
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        $this->_log("Zend_Cache_Backend_Libmemcached::save() : getting the list of cache ids is unsupported by the Libmemcached backend");
+        return array();
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_LIBMEMCACHED_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_LIBMEMCACHED_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_LIBMEMCACHED_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_LIBMEMCACHED_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @throws Zend_Cache_Exception
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        $mems = $this->_memcache->getStats();
+        if ($mems === false) {
+            return 0;
+        }
+
+        $memSize = null;
+        $memUsed = null;
+        foreach ($mems as $key => $mem) {
+            if ($mem === false) {
+                $this->_log('can\'t get stat from ' . $key);
+                continue;
+            }
+
+            $eachSize = $mem['limit_maxbytes'];
+            $eachUsed = $mem['bytes'];
+            if ($eachUsed > $eachSize) {
+                $eachUsed = $eachSize;
+            }
+
+            $memSize += $eachSize;
+            $memUsed += $eachUsed;
+        }
+
+        if ($memSize === null || $memUsed === null) {
+            Zend_Cache::throwException('Can\'t get filling percentage');
+        }
+
+        return ((int) (100. * ($memUsed / $memSize)));
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        $tmp = $this->_memcache->get($id);
+        if (isset($tmp[0], $tmp[1], $tmp[2])) {
+            $data     = $tmp[0];
+            $mtime    = $tmp[1];
+            $lifetime = $tmp[2];
+            return array(
+                'expire' => $mtime + $lifetime,
+                'tags' => array(),
+                'mtime' => $mtime
+            );
+        }
+
+        return false;
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        $tmp = $this->_memcache->get($id);
+        if (isset($tmp[0], $tmp[1], $tmp[2])) {
+            $data     = $tmp[0];
+            $mtime    = $tmp[1];
+            $lifetime = $tmp[2];
+            $newLifetime = $lifetime - (time() - $mtime) + $extraLifetime;
+            if ($newLifetime <=0) {
+                return false;
+            }
+            // #ZF-5702 : we try replace() first becase set() seems to be slower
+            if (!($result = $this->_memcache->replace($id, array($data, time(), $newLifetime), $newLifetime))) {
+                $result = $this->_memcache->set($id, array($data, time(), $newLifetime), $newLifetime);
+                if ($result === false) {
+                    $rsCode = $this->_memcache->getResultCode();
+                    $rsMsg  = $this->_memcache->getResultMessage();
+                    $this->_log("Memcached::set() failed: [{$rsCode}] {$rsMsg}");
+                }
+            }
+            return $result;
+        }
+        return false;
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        return array(
+            'automatic_cleaning' => false,
+            'tags' => false,
+            'expired_read' => false,
+            'priority' => false,
+            'infinite_lifetime' => false,
+            'get_list' => false
+        );
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/Memcached.php b/lib/zend/Zend/Cache/Backend/Memcached.php
new file mode 100644
index 00000000000..9cb9916dd87
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/Memcached.php
@@ -0,0 +1,509 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/ExtendedInterface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_Memcached extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Default Values
+     */
+    const DEFAULT_HOST = '127.0.0.1';
+    const DEFAULT_PORT =  11211;
+    const DEFAULT_PERSISTENT = true;
+    const DEFAULT_WEIGHT  = 1;
+    const DEFAULT_TIMEOUT = 1;
+    const DEFAULT_RETRY_INTERVAL = 15;
+    const DEFAULT_STATUS = true;
+    const DEFAULT_FAILURE_CALLBACK = null;
+
+    /**
+     * Log message
+     */
+    const TAGS_UNSUPPORTED_BY_CLEAN_OF_MEMCACHED_BACKEND = 'Zend_Cache_Backend_Memcached::clean() : tags are unsupported by the Memcached backend';
+    const TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND =  'Zend_Cache_Backend_Memcached::save() : tags are unsupported by the Memcached backend';
+
+    /**
+     * Available options
+     *
+     * =====> (array) servers :
+     * an array of memcached server ; each memcached server is described by an associative array :
+     * 'host' => (string) : the name of the memcached server
+     * 'port' => (int) : the port of the memcached server
+     * 'persistent' => (bool) : use or not persistent connections to this memcached server
+     * 'weight' => (int) : number of buckets to create for this server which in turn control its
+     *                     probability of it being selected. The probability is relative to the total
+     *                     weight of all servers.
+     * 'timeout' => (int) : value in seconds which will be used for connecting to the daemon. Think twice
+     *                      before changing the default value of 1 second - you can lose all the
+     *                      advantages of caching if your connection is too slow.
+     * 'retry_interval' => (int) : controls how often a failed server will be retried, the default value
+     *                             is 15 seconds. Setting this parameter to -1 disables automatic retry.
+     * 'status' => (bool) : controls if the server should be flagged as online.
+     * 'failure_callback' => (callback) : Allows the user to specify a callback function to run upon
+     *                                    encountering an error. The callback is run before failover
+     *                                    is attempted. The function takes two parameters, the hostname
+     *                                    and port of the failed server.
+     *
+     * =====> (boolean) compression :
+     * true if you want to use on-the-fly compression
+     *
+     * =====> (boolean) compatibility :
+     * true if you use old memcache server or extension
+     *
+     * @var array available options
+     */
+    protected $_options = array(
+        'servers' => array(array(
+            'host' => self::DEFAULT_HOST,
+            'port' => self::DEFAULT_PORT,
+            'persistent' => self::DEFAULT_PERSISTENT,
+            'weight'  => self::DEFAULT_WEIGHT,
+            'timeout' => self::DEFAULT_TIMEOUT,
+            'retry_interval' => self::DEFAULT_RETRY_INTERVAL,
+            'status' => self::DEFAULT_STATUS,
+            'failure_callback' => self::DEFAULT_FAILURE_CALLBACK
+        )),
+        'compression' => false,
+        'compatibility' => false,
+    );
+
+    /**
+     * Memcache object
+     *
+     * @var mixed memcache object
+     */
+    protected $_memcache = null;
+
+    /**
+     * Constructor
+     *
+     * @param array $options associative array of options
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        if (!extension_loaded('memcache')) {
+            Zend_Cache::throwException('The memcache extension must be loaded for using this backend !');
+        }
+        parent::__construct($options);
+        if (isset($this->_options['servers'])) {
+            $value= $this->_options['servers'];
+            if (isset($value['host'])) {
+                // in this case, $value seems to be a simple associative array (one server only)
+                $value = array(0 => $value); // let's transform it into a classical array of associative arrays
+            }
+            $this->setOption('servers', $value);
+        }
+        $this->_memcache = new Memcache;
+        foreach ($this->_options['servers'] as $server) {
+            if (!array_key_exists('port', $server)) {
+                $server['port'] = self::DEFAULT_PORT;
+            }
+            if (!array_key_exists('persistent', $server)) {
+                $server['persistent'] = self::DEFAULT_PERSISTENT;
+            }
+            if (!array_key_exists('weight', $server)) {
+                $server['weight'] = self::DEFAULT_WEIGHT;
+            }
+            if (!array_key_exists('timeout', $server)) {
+                $server['timeout'] = self::DEFAULT_TIMEOUT;
+            }
+            if (!array_key_exists('retry_interval', $server)) {
+                $server['retry_interval'] = self::DEFAULT_RETRY_INTERVAL;
+            }
+            if (!array_key_exists('status', $server)) {
+                $server['status'] = self::DEFAULT_STATUS;
+            }
+            if (!array_key_exists('failure_callback', $server)) {
+                $server['failure_callback'] = self::DEFAULT_FAILURE_CALLBACK;
+            }
+            if ($this->_options['compatibility']) {
+                // No status for compatibility mode (#ZF-5887)
+                $this->_memcache->addServer($server['host'], $server['port'], $server['persistent'],
+                                        $server['weight'], $server['timeout'],
+                                        $server['retry_interval']);
+            } else {
+                $this->_memcache->addServer($server['host'], $server['port'], $server['persistent'],
+                                        $server['weight'], $server['timeout'],
+                                        $server['retry_interval'],
+                                        $server['status'], $server['failure_callback']);
+            }
+        }
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return string|false cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $tmp = $this->_memcache->get($id);
+        if (is_array($tmp) && isset($tmp[0])) {
+            return $tmp[0];
+        }
+        return false;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id Cache id
+     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        $tmp = $this->_memcache->get($id);
+        if (is_array($tmp)) {
+            return $tmp[1];
+        }
+        return false;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data             Datas to cache
+     * @param  string $id               Cache id
+     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean True if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        $lifetime = $this->getLifetime($specificLifetime);
+        if ($this->_options['compression']) {
+            $flag = MEMCACHE_COMPRESSED;
+        } else {
+            $flag = 0;
+        }
+
+        // ZF-8856: using set because add needs a second request if item already exists
+        $result = @$this->_memcache->set($id, array($data, time(), $lifetime), $flag, $lifetime);
+
+        if (count($tags) > 0) {
+            $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id)
+    {
+        return $this->_memcache->delete($id, 0);
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => unsupported
+     * 'matchingTag'    => unsupported
+     * 'notMatchingTag' => unsupported
+     * 'matchingAnyTag' => unsupported
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean True if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+                return $this->_memcache->flush();
+                break;
+            case Zend_Cache::CLEANING_MODE_OLD:
+                $this->_log("Zend_Cache_Backend_Memcached::clean() : CLEANING_MODE_OLD is unsupported by the Memcached backend");
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_MEMCACHED_BACKEND);
+                break;
+               default:
+                Zend_Cache::throwException('Invalid mode for clean() method');
+                   break;
+        }
+    }
+
+    /**
+     * Return true if the automatic cleaning is available for the backend
+     *
+     * @return boolean
+     */
+    public function isAutomaticCleaningAvailable()
+    {
+        return false;
+    }
+
+    /**
+     * Set the frontend directives
+     *
+     * @param  array $directives Assoc of directives
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setDirectives($directives)
+    {
+        parent::setDirectives($directives);
+        $lifetime = $this->getLifetime(false);
+        if ($lifetime > 2592000) {
+            // #ZF-3490 : For the memcached backend, there is a lifetime limit of 30 days (2592000 seconds)
+            $this->_log('memcached backend has a limit of 30 days (2592000 seconds) for the lifetime');
+        }
+        if ($lifetime === null) {
+            // #ZF-4614 : we tranform null to zero to get the maximal lifetime
+            parent::setDirectives(array('lifetime' => 0));
+        }
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        $this->_log("Zend_Cache_Backend_Memcached::save() : getting the list of cache ids is unsupported by the Memcache backend");
+        return array();
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @throws Zend_Cache_Exception
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        $mems = $this->_memcache->getExtendedStats();
+
+        $memSize = null;
+        $memUsed = null;
+        foreach ($mems as $key => $mem) {
+            if ($mem === false) {
+                $this->_log('can\'t get stat from ' . $key);
+                continue;
+            }
+
+            $eachSize = $mem['limit_maxbytes'];
+
+            /**
+             * Couchbase 1.x uses 'mem_used' instead of 'bytes'
+             * @see https://www.couchbase.com/issues/browse/MB-3466
+             */
+            $eachUsed = isset($mem['bytes']) ? $mem['bytes'] : $mem['mem_used'];
+            if ($eachUsed > $eachSize) {
+                $eachUsed = $eachSize;
+            }
+
+            $memSize += $eachSize;
+            $memUsed += $eachUsed;
+        }
+
+        if ($memSize === null || $memUsed === null) {
+            Zend_Cache::throwException('Can\'t get filling percentage');
+        }
+
+        return ((int) (100. * ($memUsed / $memSize)));
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        $tmp = $this->_memcache->get($id);
+        if (is_array($tmp)) {
+            $data = $tmp[0];
+            $mtime = $tmp[1];
+            if (!isset($tmp[2])) {
+                // because this record is only with 1.7 release
+                // if old cache records are still there...
+                return false;
+            }
+            $lifetime = $tmp[2];
+            return array(
+                'expire' => $mtime + $lifetime,
+                'tags' => array(),
+                'mtime' => $mtime
+            );
+        }
+        return false;
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        if ($this->_options['compression']) {
+            $flag = MEMCACHE_COMPRESSED;
+        } else {
+            $flag = 0;
+        }
+        $tmp = $this->_memcache->get($id);
+        if (is_array($tmp)) {
+            $data = $tmp[0];
+            $mtime = $tmp[1];
+            if (!isset($tmp[2])) {
+                // because this record is only with 1.7 release
+                // if old cache records are still there...
+                return false;
+            }
+            $lifetime = $tmp[2];
+            $newLifetime = $lifetime - (time() - $mtime) + $extraLifetime;
+            if ($newLifetime <=0) {
+                return false;
+            }
+            // #ZF-5702 : we try replace() first becase set() seems to be slower
+            if (!($result = $this->_memcache->replace($id, array($data, time(), $newLifetime), $flag, $newLifetime))) {
+                $result = $this->_memcache->set($id, array($data, time(), $newLifetime), $flag, $newLifetime);
+            }
+            return $result;
+        }
+        return false;
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        return array(
+            'automatic_cleaning' => false,
+            'tags' => false,
+            'expired_read' => false,
+            'priority' => false,
+            'infinite_lifetime' => false,
+            'get_list' => false
+        );
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/Sqlite.php b/lib/zend/Zend/Cache/Backend/Sqlite.php
new file mode 100644
index 00000000000..3e8ac8276b9
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/Sqlite.php
@@ -0,0 +1,678 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/ExtendedInterface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_Sqlite extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Available options
+     *
+     * =====> (string) cache_db_complete_path :
+     * - the complete path (filename included) of the SQLITE database
+     *
+     * ====> (int) automatic_vacuum_factor :
+     * - Disable / Tune the automatic vacuum process
+     * - The automatic vacuum process defragment the database file (and make it smaller)
+     *   when a clean() or delete() is called
+     *     0               => no automatic vacuum
+     *     1               => systematic vacuum (when delete() or clean() methods are called)
+     *     x (integer) > 1 => automatic vacuum randomly 1 times on x clean() or delete()
+     *
+     * @var array Available options
+     */
+    protected $_options = array(
+        'cache_db_complete_path' => null,
+        'automatic_vacuum_factor' => 10
+    );
+
+    /**
+     * DB ressource
+     *
+     * @var mixed $_db
+     */
+    private $_db = null;
+
+    /**
+     * Boolean to store if the structure has benn checked or not
+     *
+     * @var boolean $_structureChecked
+     */
+    private $_structureChecked = false;
+
+    /**
+     * Constructor
+     *
+     * @param  array $options Associative array of options
+     * @throws Zend_cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        parent::__construct($options);
+        if ($this->_options['cache_db_complete_path'] === null) {
+            Zend_Cache::throwException('cache_db_complete_path option has to set');
+        }
+        if (!extension_loaded('sqlite')) {
+            Zend_Cache::throwException("Cannot use SQLite storage because the 'sqlite' extension is not loaded in the current PHP environment");
+        }
+        $this->_getConnection();
+    }
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        @sqlite_close($this->_getConnection());
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return string|false Cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $this->_checkAndBuildStructure();
+        $sql = "SELECT content FROM cache WHERE id='$id'";
+        if (!$doNotTestCacheValidity) {
+            $sql = $sql . " AND (expire=0 OR expire>" . time() . ')';
+        }
+        $result = $this->_query($sql);
+        $row = @sqlite_fetch_array($result);
+        if ($row) {
+            return $row['content'];
+        }
+        return false;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param string $id Cache id
+     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        $this->_checkAndBuildStructure();
+        $sql = "SELECT lastModified FROM cache WHERE id='$id' AND (expire=0 OR expire>" . time() . ')';
+        $result = $this->_query($sql);
+        $row = @sqlite_fetch_array($result);
+        if ($row) {
+            return ((int) $row['lastModified']);
+        }
+        return false;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data             Datas to cache
+     * @param  string $id               Cache id
+     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @throws Zend_Cache_Exception
+     * @return boolean True if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        $this->_checkAndBuildStructure();
+        $lifetime = $this->getLifetime($specificLifetime);
+        $data = @sqlite_escape_string($data);
+        $mktime = time();
+        if ($lifetime === null) {
+            $expire = 0;
+        } else {
+            $expire = $mktime + $lifetime;
+        }
+        $this->_query("DELETE FROM cache WHERE id='$id'");
+        $sql = "INSERT INTO cache (id, content, lastModified, expire) VALUES ('$id', '$data', $mktime, $expire)";
+        $res = $this->_query($sql);
+        if (!$res) {
+            $this->_log("Zend_Cache_Backend_Sqlite::save() : impossible to store the cache id=$id");
+            return false;
+        }
+        $res = true;
+        foreach ($tags as $tag) {
+            $res = $this->_registerTag($id, $tag) && $res;
+        }
+        return $res;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id)
+    {
+        $this->_checkAndBuildStructure();
+        $res = $this->_query("SELECT COUNT(*) AS nbr FROM cache WHERE id='$id'");
+        $result1 = @sqlite_fetch_single($res);
+        $result2 = $this->_query("DELETE FROM cache WHERE id='$id'");
+        $result3 = $this->_query("DELETE FROM tag WHERE id='$id'");
+        $this->_automaticVacuum();
+        return ($result1 && $result2 && $result3);
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @return boolean True if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        $this->_checkAndBuildStructure();
+        $return = $this->_clean($mode, $tags);
+        $this->_automaticVacuum();
+        return $return;
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        $this->_checkAndBuildStructure();
+        $res = $this->_query("SELECT id FROM cache WHERE (expire=0 OR expire>" . time() . ")");
+        $result = array();
+        while ($id = @sqlite_fetch_single($res)) {
+            $result[] = $id;
+        }
+        return $result;
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        $this->_checkAndBuildStructure();
+        $res = $this->_query("SELECT DISTINCT(name) AS name FROM tag");
+        $result = array();
+        while ($id = @sqlite_fetch_single($res)) {
+            $result[] = $id;
+        }
+        return $result;
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        $first = true;
+        $ids = array();
+        foreach ($tags as $tag) {
+            $res = $this->_query("SELECT DISTINCT(id) AS id FROM tag WHERE name='$tag'");
+            if (!$res) {
+                return array();
+            }
+            $rows = @sqlite_fetch_all($res, SQLITE_ASSOC);
+            $ids2 = array();
+            foreach ($rows as $row) {
+                $ids2[] = $row['id'];
+            }
+            if ($first) {
+                $ids = $ids2;
+                $first = false;
+            } else {
+                $ids = array_intersect($ids, $ids2);
+            }
+        }
+        $result = array();
+        foreach ($ids as $id) {
+            $result[] = $id;
+        }
+        return $result;
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        $res = $this->_query("SELECT id FROM cache");
+        $rows = @sqlite_fetch_all($res, SQLITE_ASSOC);
+        $result = array();
+        foreach ($rows as $row) {
+            $id = $row['id'];
+            $matching = false;
+            foreach ($tags as $tag) {
+                $res = $this->_query("SELECT COUNT(*) AS nbr FROM tag WHERE name='$tag' AND id='$id'");
+                if (!$res) {
+                    return array();
+                }
+                $nbr = (int) @sqlite_fetch_single($res);
+                if ($nbr > 0) {
+                    $matching = true;
+                }
+            }
+            if (!$matching) {
+                $result[] = $id;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        $first = true;
+        $ids = array();
+        foreach ($tags as $tag) {
+            $res = $this->_query("SELECT DISTINCT(id) AS id FROM tag WHERE name='$tag'");
+            if (!$res) {
+                return array();
+            }
+            $rows = @sqlite_fetch_all($res, SQLITE_ASSOC);
+            $ids2 = array();
+            foreach ($rows as $row) {
+                $ids2[] = $row['id'];
+            }
+            if ($first) {
+                $ids = $ids2;
+                $first = false;
+            } else {
+                $ids = array_merge($ids, $ids2);
+            }
+        }
+        $result = array();
+        foreach ($ids as $id) {
+            $result[] = $id;
+        }
+        return $result;
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @throws Zend_Cache_Exception
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        $dir = dirname($this->_options['cache_db_complete_path']);
+        $free = disk_free_space($dir);
+        $total = disk_total_space($dir);
+        if ($total == 0) {
+            Zend_Cache::throwException('can\'t get disk_total_space');
+        } else {
+            if ($free >= $total) {
+                return 100;
+            }
+            return ((int) (100. * ($total - $free) / $total));
+        }
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        $tags = array();
+        $res = $this->_query("SELECT name FROM tag WHERE id='$id'");
+        if ($res) {
+            $rows = @sqlite_fetch_all($res, SQLITE_ASSOC);
+            foreach ($rows as $row) {
+                $tags[] = $row['name'];
+            }
+        }
+        $this->_query('CREATE TABLE cache (id TEXT PRIMARY KEY, content BLOB, lastModified INTEGER, expire INTEGER)');
+        $res = $this->_query("SELECT lastModified,expire FROM cache WHERE id='$id'");
+        if (!$res) {
+            return false;
+        }
+        $row = @sqlite_fetch_array($res, SQLITE_ASSOC);
+        return array(
+            'tags' => $tags,
+            'mtime' => $row['lastModified'],
+            'expire' => $row['expire']
+        );
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        $sql = "SELECT expire FROM cache WHERE id='$id' AND (expire=0 OR expire>" . time() . ')';
+        $res = $this->_query($sql);
+        if (!$res) {
+            return false;
+        }
+        $expire = @sqlite_fetch_single($res);
+        $newExpire = $expire + $extraLifetime;
+        $res = $this->_query("UPDATE cache SET lastModified=" . time() . ", expire=$newExpire WHERE id='$id'");
+        if ($res) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        return array(
+            'automatic_cleaning' => true,
+            'tags' => true,
+            'expired_read' => true,
+            'priority' => false,
+            'infinite_lifetime' => true,
+            'get_list' => true
+        );
+    }
+
+    /**
+     * PUBLIC METHOD FOR UNIT TESTING ONLY !
+     *
+     * Force a cache record to expire
+     *
+     * @param string $id Cache id
+     */
+    public function ___expire($id)
+    {
+        $time = time() - 1;
+        $this->_query("UPDATE cache SET lastModified=$time, expire=$time WHERE id='$id'");
+    }
+
+    /**
+     * Return the connection resource
+     *
+     * If we are not connected, the connection is made
+     *
+     * @throws Zend_Cache_Exception
+     * @return resource Connection resource
+     */
+    private function _getConnection()
+    {
+        if (is_resource($this->_db)) {
+            return $this->_db;
+        } else {
+            $this->_db = @sqlite_open($this->_options['cache_db_complete_path']);
+            if (!(is_resource($this->_db))) {
+                Zend_Cache::throwException("Impossible to open " . $this->_options['cache_db_complete_path'] . " cache DB file");
+            }
+            return $this->_db;
+        }
+    }
+
+    /**
+     * Execute an SQL query silently
+     *
+     * @param string $query SQL query
+     * @return mixed|false query results
+     */
+    private function _query($query)
+    {
+        $db = $this->_getConnection();
+        if (is_resource($db)) {
+            $res = @sqlite_query($db, $query);
+            if ($res === false) {
+                return false;
+            } else {
+                return $res;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Deal with the automatic vacuum process
+     *
+     * @return void
+     */
+    private function _automaticVacuum()
+    {
+        if ($this->_options['automatic_vacuum_factor'] > 0) {
+            $rand = rand(1, $this->_options['automatic_vacuum_factor']);
+            if ($rand == 1) {
+                $this->_query('VACUUM');
+            }
+        }
+    }
+
+    /**
+     * Register a cache id with the given tag
+     *
+     * @param  string $id  Cache id
+     * @param  string $tag Tag
+     * @return boolean True if no problem
+     */
+    private function _registerTag($id, $tag) {
+        $res = $this->_query("DELETE FROM TAG WHERE name='$tag' AND id='$id'");
+        $res = $this->_query("INSERT INTO tag (name, id) VALUES ('$tag', '$id')");
+        if (!$res) {
+            $this->_log("Zend_Cache_Backend_Sqlite::_registerTag() : impossible to register tag=$tag on id=$id");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Build the database structure
+     *
+     * @return false
+     */
+    private function _buildStructure()
+    {
+        $this->_query('DROP INDEX tag_id_index');
+        $this->_query('DROP INDEX tag_name_index');
+        $this->_query('DROP INDEX cache_id_expire_index');
+        $this->_query('DROP TABLE version');
+        $this->_query('DROP TABLE cache');
+        $this->_query('DROP TABLE tag');
+        $this->_query('CREATE TABLE version (num INTEGER PRIMARY KEY)');
+        $this->_query('CREATE TABLE cache (id TEXT PRIMARY KEY, content BLOB, lastModified INTEGER, expire INTEGER)');
+        $this->_query('CREATE TABLE tag (name TEXT, id TEXT)');
+        $this->_query('CREATE INDEX tag_id_index ON tag(id)');
+        $this->_query('CREATE INDEX tag_name_index ON tag(name)');
+        $this->_query('CREATE INDEX cache_id_expire_index ON cache(id, expire)');
+        $this->_query('INSERT INTO version (num) VALUES (1)');
+    }
+
+    /**
+     * Check if the database structure is ok (with the good version)
+     *
+     * @return boolean True if ok
+     */
+    private function _checkStructureVersion()
+    {
+        $result = $this->_query("SELECT num FROM version");
+        if (!$result) return false;
+        $row = @sqlite_fetch_array($result);
+        if (!$row) {
+            return false;
+        }
+        if (((int) $row['num']) != 1) {
+            // old cache structure
+            $this->_log('Zend_Cache_Backend_Sqlite::_checkStructureVersion() : old cache structure version detected => the cache is going to be dropped');
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @return boolean True if no problem
+     */
+    private function _clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+                $res1 = $this->_query('DELETE FROM cache');
+                $res2 = $this->_query('DELETE FROM tag');
+                return $res1 && $res2;
+                break;
+            case Zend_Cache::CLEANING_MODE_OLD:
+                $mktime = time();
+                $res1 = $this->_query("DELETE FROM tag WHERE id IN (SELECT id FROM cache WHERE expire>0 AND expire<=$mktime)");
+                $res2 = $this->_query("DELETE FROM cache WHERE expire>0 AND expire<=$mktime");
+                return $res1 && $res2;
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+                $ids = $this->getIdsMatchingTags($tags);
+                $result = true;
+                foreach ($ids as $id) {
+                    $result = $this->remove($id) && $result;
+                }
+                return $result;
+                break;
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+                $ids = $this->getIdsNotMatchingTags($tags);
+                $result = true;
+                foreach ($ids as $id) {
+                    $result = $this->remove($id) && $result;
+                }
+                return $result;
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                $ids = $this->getIdsMatchingAnyTags($tags);
+                $result = true;
+                foreach ($ids as $id) {
+                    $result = $this->remove($id) && $result;
+                }
+                return $result;
+                break;
+            default:
+                break;
+        }
+        return false;
+    }
+
+    /**
+     * Check if the database structure is ok (with the good version), if no : build it
+     *
+     * @throws Zend_Cache_Exception
+     * @return boolean True if ok
+     */
+    private function _checkAndBuildStructure()
+    {
+        if (!($this->_structureChecked)) {
+            if (!$this->_checkStructureVersion()) {
+                $this->_buildStructure();
+                if (!$this->_checkStructureVersion()) {
+                    Zend_Cache::throwException("Impossible to build cache structure in " . $this->_options['cache_db_complete_path']);
+                }
+            }
+            $this->_structureChecked = true;
+        }
+        return true;
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/Static.php b/lib/zend/Zend/Cache/Backend/Static.php
new file mode 100644
index 00000000000..9e3c99036fb
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/Static.php
@@ -0,0 +1,579 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/Interface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_Static
+    extends Zend_Cache_Backend
+    implements Zend_Cache_Backend_Interface
+{
+    const INNER_CACHE_NAME = 'zend_cache_backend_static_tagcache';
+
+    /**
+     * Static backend options
+     * @var array
+     */
+    protected $_options = array(
+        'public_dir'           => null,
+        'sub_dir'              => 'html',
+        'file_extension'       => '.html',
+        'index_filename'       => 'index',
+        'file_locking'         => true,
+        'cache_file_perm'      => 0600,
+        'cache_directory_perm' => 0700,
+        'debug_header'         => false,
+        'tag_cache'            => null,
+        'disable_caching'      => false
+    );
+
+    /**
+     * Cache for handling tags
+     * @var Zend_Cache_Core
+     */
+    protected $_tagCache = null;
+
+    /**
+     * Tagged items
+     * @var array
+     */
+    protected $_tagged = null;
+
+    /**
+     * Interceptor child method to handle the case where an Inner
+     * Cache object is being set since it's not supported by the
+     * standard backend interface
+     *
+     * @param  string $name
+     * @param  mixed $value
+     * @return Zend_Cache_Backend_Static
+     */
+    public function setOption($name, $value)
+    {
+        if ($name == 'tag_cache') {
+            $this->setInnerCache($value);
+        } else {
+            // See #ZF-12047 and #GH-91
+            if ($name == 'cache_file_umask') {
+                trigger_error(
+                    "'cache_file_umask' is deprecated -> please use 'cache_file_perm' instead",
+                    E_USER_NOTICE
+                );
+
+                $name = 'cache_file_perm';
+            }
+            if ($name == 'cache_directory_umask') {
+                trigger_error(
+                    "'cache_directory_umask' is deprecated -> please use 'cache_directory_perm' instead",
+                    E_USER_NOTICE
+                );
+
+                $name = 'cache_directory_perm';
+            }
+
+            parent::setOption($name, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve any option via interception of the parent's statically held
+     * options including the local option for a tag cache.
+     *
+     * @param  string $name
+     * @return mixed
+     */
+    public function getOption($name)
+    {
+        $name = strtolower($name);
+
+        if ($name == 'tag_cache') {
+            return $this->getInnerCache();
+        }
+
+        return parent::getOption($name);
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * Note : return value is always "string" (unserialization is done by the core not by the backend)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return string|false cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        if (($id = (string)$id) === '') {
+            $id = $this->_detectId();
+        } else {
+            $id = $this->_decodeId($id);
+        }
+        if (!$this->_verifyPath($id)) {
+            Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
+        }
+        if ($doNotTestCacheValidity) {
+            $this->_log("Zend_Cache_Backend_Static::load() : \$doNotTestCacheValidity=true is unsupported by the Static backend");
+        }
+
+        $fileName = basename($id);
+        if ($fileName === '') {
+            $fileName = $this->_options['index_filename'];
+        }
+        $pathName = $this->_options['public_dir'] . dirname($id);
+        $file     = rtrim($pathName, '/') . '/' . $fileName . $this->_options['file_extension'];
+        if (file_exists($file)) {
+            $content = file_get_contents($file);
+            return $content;
+        }
+
+        return false;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id cache id
+     * @return bool
+     */
+    public function test($id)
+    {
+        $id = $this->_decodeId($id);
+        if (!$this->_verifyPath($id)) {
+            Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
+        }
+
+        $fileName = basename($id);
+        if ($fileName === '') {
+            $fileName = $this->_options['index_filename'];
+        }
+        if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
+            $this->_tagged = $tagged;
+        } elseif (!$this->_tagged) {
+            return false;
+        }
+        $pathName = $this->_options['public_dir'] . dirname($id);
+
+        // Switch extension if needed
+        if (isset($this->_tagged[$id])) {
+            $extension = $this->_tagged[$id]['extension'];
+        } else {
+            $extension = $this->_options['file_extension'];
+        }
+        $file     = $pathName . '/' . $fileName . $extension;
+        if (file_exists($file)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data            Datas to cache
+     * @param  string $id              Cache id
+     * @param  array $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int   $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        if ($this->_options['disable_caching']) {
+            return true;
+        }
+        $extension = null;
+        if ($this->_isSerialized($data)) {
+            $data = unserialize($data);
+            $extension = '.' . ltrim($data[1], '.');
+            $data = $data[0];
+        }
+
+        clearstatcache();
+        if (($id = (string)$id) === '') {
+            $id = $this->_detectId();
+        } else {
+            $id = $this->_decodeId($id);
+        }
+
+        $fileName = basename($id);
+        if ($fileName === '') {
+            $fileName = $this->_options['index_filename'];
+        }
+
+        $pathName = realpath($this->_options['public_dir']) . dirname($id);
+        $this->_createDirectoriesFor($pathName);
+
+        if ($id === null || strlen($id) == 0) {
+            $dataUnserialized = unserialize($data);
+            $data = $dataUnserialized['data'];
+        }
+        $ext = $this->_options['file_extension'];
+        if ($extension) $ext = $extension;
+        $file = rtrim($pathName, '/') . '/' . $fileName . $ext;
+        if ($this->_options['file_locking']) {
+            $result = file_put_contents($file, $data, LOCK_EX);
+        } else {
+            $result = file_put_contents($file, $data);
+        }
+        @chmod($file, $this->_octdec($this->_options['cache_file_perm']));
+
+        if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
+            $this->_tagged = $tagged;
+        } elseif ($this->_tagged === null) {
+            $this->_tagged = array();
+        }
+        if (!isset($this->_tagged[$id])) {
+            $this->_tagged[$id] = array();
+        }
+        if (!isset($this->_tagged[$id]['tags'])) {
+            $this->_tagged[$id]['tags'] = array();
+        }
+        $this->_tagged[$id]['tags'] = array_unique(array_merge($this->_tagged[$id]['tags'], $tags));
+        $this->_tagged[$id]['extension'] = $ext;
+        $this->getInnerCache()->save($this->_tagged, self::INNER_CACHE_NAME);
+        return (bool) $result;
+    }
+
+    /**
+     * Recursively create the directories needed to write the static file
+     */
+    protected function _createDirectoriesFor($path)
+    {
+        if (!is_dir($path)) {
+            $oldUmask = umask(0);
+            if ( !@mkdir($path, $this->_octdec($this->_options['cache_directory_perm']), true)) {
+                $lastErr = error_get_last();
+                umask($oldUmask);
+                Zend_Cache::throwException("Can't create directory: {$lastErr['message']}");
+            }
+            umask($oldUmask);
+        }
+    }
+
+    /**
+     * Detect serialization of data (cannot predict since this is the only way
+     * to obey the interface yet pass in another parameter).
+     *
+     * In future, ZF 2.0, check if we can just avoid the interface restraints.
+     *
+     * This format is the only valid one possible for the class, so it's simple
+     * to just run a regular expression for the starting serialized format.
+     */
+    protected function _isSerialized($data)
+    {
+        return preg_match("/a:2:\{i:0;s:\d+:\"/", $data);
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id)
+    {
+        if (!$this->_verifyPath($id)) {
+            Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
+        }
+        $fileName = basename($id);
+        if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
+            $this->_tagged = $tagged;
+        } elseif (!$this->_tagged) {
+            return false;
+        }
+        if (isset($this->_tagged[$id])) {
+            $extension = $this->_tagged[$id]['extension'];
+        } else {
+            $extension = $this->_options['file_extension'];
+        }
+        if ($fileName === '') {
+            $fileName = $this->_options['index_filename'];
+        }
+        $pathName = $this->_options['public_dir'] . dirname($id);
+        $file     = realpath($pathName) . '/' . $fileName . $extension;
+        if (!file_exists($file)) {
+            return false;
+        }
+        return unlink($file);
+    }
+
+    /**
+     * Remove a cache record recursively for the given directory matching a
+     * REQUEST_URI based relative path (deletes the actual file matching this
+     * in addition to the matching directory)
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function removeRecursively($id)
+    {
+        if (!$this->_verifyPath($id)) {
+            Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
+        }
+        $fileName = basename($id);
+        if ($fileName === '') {
+            $fileName = $this->_options['index_filename'];
+        }
+        $pathName  = $this->_options['public_dir'] . dirname($id);
+        $file      = $pathName . '/' . $fileName . $this->_options['file_extension'];
+        $directory = $pathName . '/' . $fileName;
+        if (file_exists($directory)) {
+            if (!is_writable($directory)) {
+                return false;
+            }
+            if (is_dir($directory)) {
+                foreach (new DirectoryIterator($directory) as $file) {
+                    if (true === $file->isFile()) {
+                        if (false === unlink($file->getPathName())) {
+                            return false;
+                        }
+                    }
+                }
+            }
+            rmdir($directory);
+        }
+        if (file_exists($file)) {
+            if (!is_writable($file)) {
+                return false;
+            }
+            return unlink($file);
+        }
+        return true;
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @return boolean true if no problem
+     * @throws Zend_Exception
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        $result = false;
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                if (empty($tags)) {
+                    throw new Zend_Exception('Cannot use tag matching modes as no tags were defined');
+                }
+                if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
+                    $this->_tagged = $tagged;
+                } elseif (!$this->_tagged) {
+                    return true;
+                }
+                foreach ($tags as $tag) {
+                    $urls = array_keys($this->_tagged);
+                    foreach ($urls as $url) {
+                        if (isset($this->_tagged[$url]['tags']) && in_array($tag, $this->_tagged[$url]['tags'])) {
+                            $this->remove($url);
+                            unset($this->_tagged[$url]);
+                        }
+                    }
+                }
+                $this->getInnerCache()->save($this->_tagged, self::INNER_CACHE_NAME);
+                $result = true;
+                break;
+            case Zend_Cache::CLEANING_MODE_ALL:
+                if ($this->_tagged === null) {
+                    $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME);
+                    $this->_tagged = $tagged;
+                }
+                if ($this->_tagged === null || empty($this->_tagged)) {
+                    return true;
+                }
+                $urls = array_keys($this->_tagged);
+                foreach ($urls as $url) {
+                    $this->remove($url);
+                    unset($this->_tagged[$url]);
+                }
+                $this->getInnerCache()->save($this->_tagged, self::INNER_CACHE_NAME);
+                $result = true;
+                break;
+            case Zend_Cache::CLEANING_MODE_OLD:
+                $this->_log("Zend_Cache_Backend_Static : Selected Cleaning Mode Currently Unsupported By This Backend");
+                break;
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+                if (empty($tags)) {
+                    throw new Zend_Exception('Cannot use tag matching modes as no tags were defined');
+                }
+                if ($this->_tagged === null) {
+                    $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME);
+                    $this->_tagged = $tagged;
+                }
+                if ($this->_tagged === null || empty($this->_tagged)) {
+                    return true;
+                }
+                $urls = array_keys($this->_tagged);
+                foreach ($urls as $url) {
+                    $difference = array_diff($tags, $this->_tagged[$url]['tags']);
+                    if (count($tags) == count($difference)) {
+                        $this->remove($url);
+                        unset($this->_tagged[$url]);
+                    }
+                }
+                $this->getInnerCache()->save($this->_tagged, self::INNER_CACHE_NAME);
+                $result = true;
+                break;
+            default:
+                Zend_Cache::throwException('Invalid mode for clean() method');
+                break;
+        }
+        return $result;
+    }
+
+    /**
+     * Set an Inner Cache, used here primarily to store Tags associated
+     * with caches created by this backend. Note: If Tags are lost, the cache
+     * should be completely cleaned as the mapping of tags to caches will
+     * have been irrevocably lost.
+     *
+     * @param  Zend_Cache_Core
+     * @return void
+     */
+    public function setInnerCache(Zend_Cache_Core $cache)
+    {
+        $this->_tagCache = $cache;
+        $this->_options['tag_cache'] = $cache;
+    }
+
+    /**
+     * Get the Inner Cache if set
+     *
+     * @return Zend_Cache_Core
+     */
+    public function getInnerCache()
+    {
+        if ($this->_tagCache === null) {
+            Zend_Cache::throwException('An Inner Cache has not been set; use setInnerCache()');
+        }
+        return $this->_tagCache;
+    }
+
+    /**
+     * Verify path exists and is non-empty
+     *
+     * @param  string $path
+     * @return bool
+     */
+    protected function _verifyPath($path)
+    {
+        $path = realpath($path);
+        $base = realpath($this->_options['public_dir']);
+        return strncmp($path, $base, strlen($base)) !== 0;
+    }
+
+    /**
+     * Determine the page to save from the request
+     *
+     * @return string
+     */
+    protected function _detectId()
+    {
+        return $_SERVER['REQUEST_URI'];
+    }
+
+    /**
+     * Validate a cache id or a tag (security, reliable filenames, reserved prefixes...)
+     *
+     * Throw an exception if a problem is found
+     *
+     * @param  string $string Cache id or tag
+     * @throws Zend_Cache_Exception
+     * @return void
+     * @deprecated Not usable until perhaps ZF 2.0
+     */
+    protected static function _validateIdOrTag($string)
+    {
+        if (!is_string($string)) {
+            Zend_Cache::throwException('Invalid id or tag : must be a string');
+        }
+
+        // Internal only checked in Frontend - not here!
+        if (substr($string, 0, 9) == 'internal-') {
+            return;
+        }
+
+        // Validation assumes no query string, fragments or scheme included - only the path
+        if (!preg_match(
+                '/^(?:\/(?:(?:%[[:xdigit:]]{2}|[A-Za-z0-9-_.!~*\'()\[\]:@&=+$,;])*)?)+$/',
+                $string
+            )
+        ) {
+            Zend_Cache::throwException("Invalid id or tag '$string' : must be a valid URL path");
+        }
+    }
+
+    /**
+     * Detect an octal string and return its octal value for file permission ops
+     * otherwise return the non-string (assumed octal or decimal int already)
+     *
+     * @param string $val The potential octal in need of conversion
+     * @return int
+     */
+    protected function _octdec($val)
+    {
+        if (is_string($val) && decoct(octdec($val)) == $val) {
+            return octdec($val);
+        }
+        return $val;
+    }
+
+    /**
+     * Decode a request URI from the provided ID
+     *
+     * @param string $id
+     * @return string
+     */
+    protected function _decodeId($id)
+    {
+        return pack('H*', $id);
+    }
+}
diff --git a/lib/zend/Zend/Cache/Backend/Test.php b/lib/zend/Zend/Cache/Backend/Test.php
new file mode 100644
index 00000000000..d94e9734410
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/Test.php
@@ -0,0 +1,416 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/ExtendedInterface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_Test extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Available options
+     *
+     * @var array available options
+     */
+    protected $_options = array();
+
+    /**
+     * Frontend or Core directives
+     *
+     * @var array directives
+     */
+    protected $_directives = array();
+
+    /**
+     * Array to log actions
+     *
+     * @var array $_log
+     */
+    private $_log = array();
+
+    /**
+     * Current index for log array
+     *
+     * @var int $_index
+     */
+    private $_index = 0;
+
+    /**
+     * Constructor
+     *
+     * @param  array $options associative array of options
+     * @return void
+     */
+    public function __construct($options = array())
+    {
+        $this->_addLog('construct', array($options));
+    }
+
+    /**
+     * Set the frontend directives
+     *
+     * @param  array $directives assoc of directives
+     * @return void
+     */
+    public function setDirectives($directives)
+    {
+        $this->_addLog('setDirectives', array($directives));
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * For this test backend only, if $id == 'false', then the method will return false
+     * if $id == 'serialized', the method will return a serialized array
+     * ('foo' else)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return string Cached datas (or false)
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $this->_addLog('get', array($id, $doNotTestCacheValidity));
+
+        if ( $id == 'false'
+          || $id == 'd8523b3ee441006261eeffa5c3d3a0a7'
+          || $id == 'e83249ea22178277d5befc2c5e2e9ace'
+          || $id == '40f649b94977c0a6e76902e2a0b43587'
+          || $id == '88161989b73a4cbfd0b701c446115a99'
+          || $id == '205fc79cba24f0f0018eb92c7c8b3ba4'
+          || $id == '170720e35f38150b811f68a937fb042d')
+        {
+            return false;
+        }
+        if ($id=='serialized') {
+            return serialize(array('foo'));
+        }
+        if ($id=='serialized2') {
+            return serialize(array('headers' => array(), 'data' => 'foo'));
+        }
+        if ( $id == '71769f39054f75894288e397df04e445' || $id == '615d222619fb20b527168340cebd0578'
+          || $id == '8a02d218a5165c467e7a5747cc6bd4b6' || $id == '648aca1366211d17cbf48e65dc570bee'
+          || $id == '4a923ef02d7f997ca14d56dfeae25ea7') {
+            return serialize(array('foo', 'bar'));
+        }
+        if ( $id == 'f53c7d912cc523d9a65834c8286eceb9') {
+            return serialize(array('foobar'));
+        }
+        return 'foo';
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * For this test backend only, if $id == 'false', then the method will return false
+     * (123456 else)
+     *
+     * @param  string $id Cache id
+     * @return mixed|false false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        $this->_addLog('test', array($id));
+        if ($id=='false') {
+            return false;
+        }
+        if (($id=='3c439c922209e2cb0b54d6deffccd75a')) {
+            return false;
+        }
+        return 123456;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * For this test backend only, if $id == 'false', then the method will return false
+     * (true else)
+     *
+     * @param  string $data             Datas to cache
+     * @param  string $id               Cache id
+     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean True if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        $this->_addLog('save', array($data, $id, $tags));
+        if (substr($id,-5)=='false') {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * For this test backend only, if $id == 'false', then the method will return false
+     * (true else)
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id)
+    {
+        $this->_addLog('remove', array($id));
+        if (substr($id,-5)=='false') {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * For this test backend only, if $mode == 'false', then the method will return false
+     * (true else)
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @return boolean True if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        $this->_addLog('clean', array($mode, $tags));
+        if ($mode=='false') {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Get the last log
+     *
+     * @return string The last log
+     */
+    public function getLastLog()
+    {
+        return $this->_log[$this->_index - 1];
+    }
+
+    /**
+     * Get the log index
+     *
+     * @return int Log index
+     */
+    public function getLogIndex()
+    {
+        return $this->_index;
+    }
+
+    /**
+     * Get the complete log array
+     *
+     * @return array Complete log array
+     */
+    public function getAllLogs()
+    {
+        return $this->_log;
+    }
+
+    /**
+     * Return true if the automatic cleaning is available for the backend
+     *
+     * @return boolean
+     */
+    public function isAutomaticCleaningAvailable()
+    {
+        return true;
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        return array(
+            'prefix_id1', 'prefix_id2'
+        );
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        return array(
+            'tag1', 'tag2'
+        );
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        if ($tags == array('tag1', 'tag2')) {
+            return array('prefix_id1', 'prefix_id2');
+        }
+
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        if ($tags == array('tag3', 'tag4')) {
+            return array('prefix_id3', 'prefix_id4');
+        }
+
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        if ($tags == array('tag5', 'tag6')) {
+            return array('prefix_id5', 'prefix_id6');
+        }
+
+        return array();
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        return 50;
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        return false;
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        return true;
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        return array(
+            'automatic_cleaning' => true,
+            'tags'               => true,
+            'expired_read'       => false,
+            'priority'           => true,
+            'infinite_lifetime'  => true,
+            'get_list'           => true
+        );
+    }
+
+    /**
+     * Add an event to the log array
+     *
+     * @param  string $methodName MethodName
+     * @param  array  $args       Arguments
+     * @return void
+     */
+    private function _addLog($methodName, $args)
+    {
+        $this->_log[$this->_index] = array(
+            'methodName' => $methodName,
+            'args' => $args
+        );
+        $this->_index = $this->_index + 1;
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/TwoLevels.php b/lib/zend/Zend/Cache/Backend/TwoLevels.php
new file mode 100644
index 00000000000..135ff6ad8de
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/TwoLevels.php
@@ -0,0 +1,548 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Backend_ExtendedInterface
+ */
+require_once 'Zend/Cache/Backend/ExtendedInterface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+class Zend_Cache_Backend_TwoLevels extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Available options
+     *
+     * =====> (string) slow_backend :
+     * - Slow backend name
+     * - Must implement the Zend_Cache_Backend_ExtendedInterface
+     * - Should provide a big storage
+     *
+     * =====> (string) fast_backend :
+     * - Flow backend name
+     * - Must implement the Zend_Cache_Backend_ExtendedInterface
+     * - Must be much faster than slow_backend
+     *
+     * =====> (array) slow_backend_options :
+     * - Slow backend options (see corresponding backend)
+     *
+     * =====> (array) fast_backend_options :
+     * - Fast backend options (see corresponding backend)
+     *
+     * =====> (int) stats_update_factor :
+     * - Disable / Tune the computation of the fast backend filling percentage
+     * - When saving a record into cache :
+     *     1               => systematic computation of the fast backend filling percentage
+     *     x (integer) > 1 => computation of the fast backend filling percentage randomly 1 times on x cache write
+     *
+     * =====> (boolean) slow_backend_custom_naming :
+     * =====> (boolean) fast_backend_custom_naming :
+     * =====> (boolean) slow_backend_autoload :
+     * =====> (boolean) fast_backend_autoload :
+     * - See Zend_Cache::factory() method
+     *
+     * =====> (boolean) auto_fill_fast_cache
+     * - If true, automatically fill the fast cache when a cache record was not found in fast cache, but did
+     *   exist in slow cache. This can be usefull when a non-persistent cache like APC or Memcached got
+     *   purged for whatever reason.
+     * 
+     * =====> (boolean) auto_refresh_fast_cache
+     * - If true, auto refresh the fast cache when a cache record is hit
+     *
+     * @var array available options
+     */
+    protected $_options = array(
+        'slow_backend' => 'File',
+        'fast_backend' => 'Apc',
+        'slow_backend_options' => array(),
+        'fast_backend_options' => array(),
+        'stats_update_factor' => 10,
+        'slow_backend_custom_naming' => false,
+        'fast_backend_custom_naming' => false,
+        'slow_backend_autoload' => false,
+        'fast_backend_autoload' => false,
+        'auto_fill_fast_cache' => true,
+        'auto_refresh_fast_cache' => true
+    );
+
+    /**
+     * Slow Backend
+     *
+     * @var Zend_Cache_Backend_ExtendedInterface
+     */
+    protected $_slowBackend;
+
+    /**
+     * Fast Backend
+     *
+     * @var Zend_Cache_Backend_ExtendedInterface
+     */
+    protected $_fastBackend;
+
+    /**
+     * Cache for the fast backend filling percentage
+     *
+     * @var int
+     */
+    protected $_fastBackendFillingPercentage = null;
+
+    /**
+     * Constructor
+     *
+     * @param  array $options Associative array of options
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        parent::__construct($options);
+
+        if ($this->_options['slow_backend'] === null) {
+            Zend_Cache::throwException('slow_backend option has to set');
+        } elseif ($this->_options['slow_backend'] instanceof Zend_Cache_Backend_ExtendedInterface) {
+            $this->_slowBackend = $this->_options['slow_backend'];
+        } else {
+            $this->_slowBackend = Zend_Cache::_makeBackend(
+                $this->_options['slow_backend'],
+                $this->_options['slow_backend_options'],
+                $this->_options['slow_backend_custom_naming'],
+                $this->_options['slow_backend_autoload']
+            );
+            if (!in_array('Zend_Cache_Backend_ExtendedInterface', class_implements($this->_slowBackend))) {
+                Zend_Cache::throwException('slow_backend must implement the Zend_Cache_Backend_ExtendedInterface interface');
+            }
+        }
+
+        if ($this->_options['fast_backend'] === null) {
+            Zend_Cache::throwException('fast_backend option has to set');
+        } elseif ($this->_options['fast_backend'] instanceof Zend_Cache_Backend_ExtendedInterface) {
+            $this->_fastBackend = $this->_options['fast_backend'];
+        } else {
+            $this->_fastBackend = Zend_Cache::_makeBackend(
+                $this->_options['fast_backend'],
+                $this->_options['fast_backend_options'],
+                $this->_options['fast_backend_custom_naming'],
+                $this->_options['fast_backend_autoload']
+            );
+            if (!in_array('Zend_Cache_Backend_ExtendedInterface', class_implements($this->_fastBackend))) {
+                Zend_Cache::throwException('fast_backend must implement the Zend_Cache_Backend_ExtendedInterface interface');
+            }
+        }
+
+        $this->_slowBackend->setDirectives($this->_directives);
+        $this->_fastBackend->setDirectives($this->_directives);
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id cache id
+     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        $fastTest = $this->_fastBackend->test($id);
+        if ($fastTest) {
+            return $fastTest;
+        } else {
+            return $this->_slowBackend->test($id);
+        }
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data            Datas to cache
+     * @param  string $id              Cache id
+     * @param  array $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int   $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @param  int   $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false, $priority = 8)
+    {
+        $usage = $this->_getFastFillingPercentage('saving');
+        $boolFast = true;
+        $lifetime = $this->getLifetime($specificLifetime);
+        $preparedData = $this->_prepareData($data, $lifetime, $priority);
+        if (($priority > 0) && (10 * $priority >= $usage)) {
+            $fastLifetime = $this->_getFastLifetime($lifetime, $priority);
+            $boolFast = $this->_fastBackend->save($preparedData, $id, array(), $fastLifetime);
+            $boolSlow = $this->_slowBackend->save($preparedData, $id, $tags, $lifetime);
+        } else {
+            $boolSlow = $this->_slowBackend->save($preparedData, $id, $tags, $lifetime);
+            if ($boolSlow === true) {
+                $boolFast = $this->_fastBackend->remove($id);
+                if (!$boolFast && !$this->_fastBackend->test($id)) {
+                    // some backends return false on remove() even if the key never existed. (and it won't if fast is full)
+                    // all we care about is that the key doesn't exist now
+                    $boolFast = true;
+                }
+            }
+        }
+
+        return ($boolFast && $boolSlow);
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * Note : return value is always "string" (unserialization is done by the core not by the backend)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return string|false cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $resultFast = $this->_fastBackend->load($id, $doNotTestCacheValidity);
+        if ($resultFast === false) {
+            $resultSlow = $this->_slowBackend->load($id, $doNotTestCacheValidity);
+            if ($resultSlow === false) {
+                // there is no cache at all for this id
+                return false;
+            }
+        }
+        $array = $resultFast !== false ? unserialize($resultFast) : unserialize($resultSlow);
+        
+        //In case no cache entry was found in the FastCache and auto-filling is enabled, copy data to FastCache
+        if ($resultFast === false && $this->_options['auto_fill_fast_cache']) {
+            $preparedData = $this->_prepareData($array['data'], $array['lifetime'], $array['priority']);
+            $this->_fastBackend->save($preparedData, $id, array(), $array['lifetime']);
+        }
+        // maybe, we have to refresh the fast cache ?
+        elseif ($this->_options['auto_refresh_fast_cache']) {
+            if ($array['priority'] == 10) {
+                // no need to refresh the fast cache with priority = 10
+                return $array['data'];
+            }
+            $newFastLifetime = $this->_getFastLifetime($array['lifetime'], $array['priority'], time() - $array['expire']);
+            // we have the time to refresh the fast cache
+            $usage = $this->_getFastFillingPercentage('loading');
+            if (($array['priority'] > 0) && (10 * $array['priority'] >= $usage)) {
+                // we can refresh the fast cache
+                $preparedData = $this->_prepareData($array['data'], $array['lifetime'], $array['priority']);
+                $this->_fastBackend->save($preparedData, $id, array(), $newFastLifetime);
+            }
+        }
+        return $array['data'];
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id)
+    {
+        $boolFast = $this->_fastBackend->remove($id);
+        $boolSlow = $this->_slowBackend->remove($id);
+        return $boolFast && $boolSlow;
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean true if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        switch($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+                $boolFast = $this->_fastBackend->clean(Zend_Cache::CLEANING_MODE_ALL);
+                $boolSlow = $this->_slowBackend->clean(Zend_Cache::CLEANING_MODE_ALL);
+                return $boolFast && $boolSlow;
+                break;
+            case Zend_Cache::CLEANING_MODE_OLD:
+                return $this->_slowBackend->clean(Zend_Cache::CLEANING_MODE_OLD);
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+                $ids = $this->_slowBackend->getIdsMatchingTags($tags);
+                $res = true;
+                foreach ($ids as $id) {
+                    $bool = $this->remove($id);
+                    $res = $res && $bool;
+                }
+                return $res;
+                break;
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+                $ids = $this->_slowBackend->getIdsNotMatchingTags($tags);
+                $res = true;
+                foreach ($ids as $id) {
+                    $bool = $this->remove($id);
+                    $res = $res && $bool;
+                }
+                return $res;
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                $ids = $this->_slowBackend->getIdsMatchingAnyTags($tags);
+                $res = true;
+                foreach ($ids as $id) {
+                    $bool = $this->remove($id);
+                    $res = $res && $bool;
+                }
+                return $res;
+                break;
+            default:
+                Zend_Cache::throwException('Invalid mode for clean() method');
+                break;
+        }
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        return $this->_slowBackend->getIds();
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        return $this->_slowBackend->getTags();
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        return $this->_slowBackend->getIdsMatchingTags($tags);
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        return $this->_slowBackend->getIdsNotMatchingTags($tags);
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        return $this->_slowBackend->getIdsMatchingAnyTags($tags);
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        return $this->_slowBackend->getFillingPercentage();
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        return $this->_slowBackend->getMetadatas($id);
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        return $this->_slowBackend->touch($id, $extraLifetime);
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        $slowBackendCapabilities = $this->_slowBackend->getCapabilities();
+        return array(
+            'automatic_cleaning' => $slowBackendCapabilities['automatic_cleaning'],
+            'tags' => $slowBackendCapabilities['tags'],
+            'expired_read' => $slowBackendCapabilities['expired_read'],
+            'priority' => $slowBackendCapabilities['priority'],
+            'infinite_lifetime' => $slowBackendCapabilities['infinite_lifetime'],
+            'get_list' => $slowBackendCapabilities['get_list']
+        );
+    }
+
+    /**
+     * Prepare a serialized array to store datas and metadatas informations
+     *
+     * @param string $data data to store
+     * @param int $lifetime original lifetime
+     * @param int $priority priority
+     * @return string serialize array to store into cache
+     */
+    private function _prepareData($data, $lifetime, $priority)
+    {
+        $lt = $lifetime;
+        if ($lt === null) {
+            $lt = 9999999999;
+        }
+        return serialize(array(
+            'data' => $data,
+            'lifetime' => $lifetime,
+            'expire' => time() + $lt,
+            'priority' => $priority
+        ));
+    }
+
+    /**
+     * Compute and return the lifetime for the fast backend
+     *
+     * @param int $lifetime original lifetime
+     * @param int $priority priority
+     * @param int $maxLifetime maximum lifetime
+     * @return int lifetime for the fast backend
+     */
+    private function _getFastLifetime($lifetime, $priority, $maxLifetime = null)
+    {
+        if ($lifetime <= 0) {
+            // if no lifetime, we have an infinite lifetime
+            // we need to use arbitrary lifetimes
+            $fastLifetime = (int) (2592000 / (11 - $priority));
+        } else {
+            // prevent computed infinite lifetime (0) by ceil
+            $fastLifetime = (int) ceil($lifetime / (11 - $priority));
+        }
+
+        if ($maxLifetime >= 0 && $fastLifetime > $maxLifetime) {
+            return $maxLifetime;
+        }
+
+        return $fastLifetime;
+    }
+
+    /**
+     * PUBLIC METHOD FOR UNIT TESTING ONLY !
+     *
+     * Force a cache record to expire
+     *
+     * @param string $id cache id
+     */
+    public function ___expire($id)
+    {
+        $this->_fastBackend->remove($id);
+        $this->_slowBackend->___expire($id);
+    }
+
+    private function _getFastFillingPercentage($mode)
+    {
+
+        if ($mode == 'saving') {
+            // mode saving
+            if ($this->_fastBackendFillingPercentage === null) {
+                $this->_fastBackendFillingPercentage = $this->_fastBackend->getFillingPercentage();
+            } else {
+                $rand = rand(1, $this->_options['stats_update_factor']);
+                if ($rand == 1) {
+                    // we force a refresh
+                    $this->_fastBackendFillingPercentage = $this->_fastBackend->getFillingPercentage();
+                }
+            }
+        } else {
+            // mode loading
+            // we compute the percentage only if it's not available in cache
+            if ($this->_fastBackendFillingPercentage === null) {
+                $this->_fastBackendFillingPercentage = $this->_fastBackend->getFillingPercentage();
+            }
+        }
+        return $this->_fastBackendFillingPercentage;
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/WinCache.php b/lib/zend/Zend/Cache/Backend/WinCache.php
new file mode 100644
index 00000000000..06843fa39af
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/WinCache.php
@@ -0,0 +1,349 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/ExtendedInterface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_WinCache extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Log message
+     */
+    const TAGS_UNSUPPORTED_BY_CLEAN_OF_WINCACHE_BACKEND = 'Zend_Cache_Backend_WinCache::clean() : tags are unsupported by the WinCache backend';
+    const TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND =  'Zend_Cache_Backend_WinCache::save() : tags are unsupported by the WinCache backend';
+
+    /**
+     * Constructor
+     *
+     * @param  array $options associative array of options
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        if (!extension_loaded('wincache')) {
+            Zend_Cache::throwException('The wincache extension must be loaded for using this backend !');
+        }
+        parent::__construct($options);
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * WARNING $doNotTestCacheValidity=true is unsupported by the WinCache backend
+     *
+     * @param  string  $id                     cache id
+     * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
+     * @return string cached datas (or false)
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $tmp = wincache_ucache_get($id);
+        if (is_array($tmp)) {
+            return $tmp[0];
+        }
+        return false;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id cache id
+     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        $tmp = wincache_ucache_get($id);
+        if (is_array($tmp)) {
+            return $tmp[1];
+        }
+        return false;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param string $data datas to cache
+     * @param string $id cache id
+     * @param array $tags array of strings, the cache record will be tagged by each string entry
+     * @param int $specificLifetime if != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        $lifetime = $this->getLifetime($specificLifetime);
+        $result = wincache_ucache_set($id, array($data, time(), $lifetime), $lifetime);
+        if (count($tags) > 0) {
+            $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND);
+        }
+        return $result;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id cache id
+     * @return boolean true if no problem
+     */
+    public function remove($id)
+    {
+        return wincache_ucache_delete($id);
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => unsupported
+     * 'matchingTag'    => unsupported
+     * 'notMatchingTag' => unsupported
+     * 'matchingAnyTag' => unsupported
+     *
+     * @param  string $mode clean mode
+     * @param  array  $tags array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean true if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+                return wincache_ucache_clear();
+                break;
+            case Zend_Cache::CLEANING_MODE_OLD:
+                $this->_log("Zend_Cache_Backend_WinCache::clean() : CLEANING_MODE_OLD is unsupported by the WinCache backend");
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_WINCACHE_BACKEND);
+                break;
+            default:
+                Zend_Cache::throwException('Invalid mode for clean() method');
+                break;
+        }
+    }
+
+    /**
+     * Return true if the automatic cleaning is available for the backend
+     *
+     * DEPRECATED : use getCapabilities() instead
+     *
+     * @deprecated
+     * @return boolean
+     */
+    public function isAutomaticCleaningAvailable()
+    {
+        return false;
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @throws Zend_Cache_Exception
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        $mem = wincache_ucache_meminfo();
+        $memSize = $mem['memory_total'];
+        $memUsed = $memSize - $mem['memory_free'];
+        if ($memSize == 0) {
+            Zend_Cache::throwException('can\'t get WinCache memory size');
+        }
+        if ($memUsed > $memSize) {
+            return 100;
+        }
+        return ((int) (100. * ($memUsed / $memSize)));
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_WINCACHE_BACKEND);
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        $res = array();
+        $array = wincache_ucache_info();
+        $records = $array['ucache_entries'];
+        foreach ($records as $record) {
+            $res[] = $record['key_name'];
+        }
+        return $res;
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        $tmp = wincache_ucache_get($id);
+        if (is_array($tmp)) {
+            $data = $tmp[0];
+            $mtime = $tmp[1];
+            if (!isset($tmp[2])) {
+                return false;
+            }
+            $lifetime = $tmp[2];
+            return array(
+                'expire' => $mtime + $lifetime,
+                'tags' => array(),
+                'mtime' => $mtime
+            );
+        }
+        return false;
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        $tmp = wincache_ucache_get($id);
+        if (is_array($tmp)) {
+            $data = $tmp[0];
+            $mtime = $tmp[1];
+            if (!isset($tmp[2])) {
+                return false;
+            }
+            $lifetime = $tmp[2];
+            $newLifetime = $lifetime - (time() - $mtime) + $extraLifetime;
+            if ($newLifetime <=0) {
+                return false;
+            }
+            return wincache_ucache_set($id, array($data, time(), $newLifetime), $newLifetime);
+        }
+        return false;
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        return array(
+            'automatic_cleaning' => false,
+            'tags' => false,
+            'expired_read' => false,
+            'priority' => false,
+            'infinite_lifetime' => false,
+            'get_list' => true
+        );
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/Xcache.php b/lib/zend/Zend/Cache/Backend/Xcache.php
new file mode 100644
index 00000000000..4bc077fc923
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/Xcache.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/Interface.php';
+
+/**
+ * @see Zend_Cache_Backend
+ */
+require_once 'Zend/Cache/Backend.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_Xcache extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface
+{
+
+    /**
+     * Log message
+     */
+    const TAGS_UNSUPPORTED_BY_CLEAN_OF_XCACHE_BACKEND = 'Zend_Cache_Backend_Xcache::clean() : tags are unsupported by the Xcache backend';
+    const TAGS_UNSUPPORTED_BY_SAVE_OF_XCACHE_BACKEND =  'Zend_Cache_Backend_Xcache::save() : tags are unsupported by the Xcache backend';
+
+    /**
+     * Available options
+     *
+     * =====> (string) user :
+     * xcache.admin.user (necessary for the clean() method)
+     *
+     * =====> (string) password :
+     * xcache.admin.pass (clear, not MD5) (necessary for the clean() method)
+     *
+     * @var array available options
+     */
+    protected $_options = array(
+        'user' => null,
+        'password' => null
+    );
+
+    /**
+     * Constructor
+     *
+     * @param  array $options associative array of options
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        if (!extension_loaded('xcache')) {
+            Zend_Cache::throwException('The xcache extension must be loaded for using this backend !');
+        }
+        parent::__construct($options);
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * WARNING $doNotTestCacheValidity=true is unsupported by the Xcache backend
+     *
+     * @param  string  $id                     cache id
+     * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
+     * @return string cached datas (or false)
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        if ($doNotTestCacheValidity) {
+            $this->_log("Zend_Cache_Backend_Xcache::load() : \$doNotTestCacheValidity=true is unsupported by the Xcache backend");
+        }
+        $tmp = xcache_get($id);
+        if (is_array($tmp)) {
+            return $tmp[0];
+        }
+        return false;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id cache id
+     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        if (xcache_isset($id)) {
+            $tmp = xcache_get($id);
+            if (is_array($tmp)) {
+                return $tmp[1];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param string $data datas to cache
+     * @param string $id cache id
+     * @param array $tags array of strings, the cache record will be tagged by each string entry
+     * @param int $specificLifetime if != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        $lifetime = $this->getLifetime($specificLifetime);
+        $result = xcache_set($id, array($data, time()), $lifetime);
+        if (count($tags) > 0) {
+            $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_XCACHE_BACKEND);
+        }
+        return $result;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id cache id
+     * @return boolean true if no problem
+     */
+    public function remove($id)
+    {
+        return xcache_unset($id);
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => unsupported
+     * 'matchingTag'    => unsupported
+     * 'notMatchingTag' => unsupported
+     * 'matchingAnyTag' => unsupported
+     *
+     * @param  string $mode clean mode
+     * @param  array  $tags array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean true if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+                // Necessary because xcache_clear_cache() need basic authentification
+                $backup = array();
+                if (isset($_SERVER['PHP_AUTH_USER'])) {
+                    $backup['PHP_AUTH_USER'] = $_SERVER['PHP_AUTH_USER'];
+                }
+                if (isset($_SERVER['PHP_AUTH_PW'])) {
+                    $backup['PHP_AUTH_PW'] = $_SERVER['PHP_AUTH_PW'];
+                }
+                if ($this->_options['user']) {
+                    $_SERVER['PHP_AUTH_USER'] = $this->_options['user'];
+                }
+                if ($this->_options['password']) {
+                    $_SERVER['PHP_AUTH_PW'] = $this->_options['password'];
+                }
+
+                $cnt = xcache_count(XC_TYPE_VAR);
+                for ($i=0; $i < $cnt; $i++) {
+                    xcache_clear_cache(XC_TYPE_VAR, $i);
+                }
+
+                if (isset($backup['PHP_AUTH_USER'])) {
+                    $_SERVER['PHP_AUTH_USER'] = $backup['PHP_AUTH_USER'];
+                    $_SERVER['PHP_AUTH_PW'] = $backup['PHP_AUTH_PW'];
+                }
+                return true;
+                break;
+            case Zend_Cache::CLEANING_MODE_OLD:
+                $this->_log("Zend_Cache_Backend_Xcache::clean() : CLEANING_MODE_OLD is unsupported by the Xcache backend");
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_XCACHE_BACKEND);
+                break;
+            default:
+                Zend_Cache::throwException('Invalid mode for clean() method');
+                break;
+        }
+    }
+
+    /**
+     * Return true if the automatic cleaning is available for the backend
+     *
+     * @return boolean
+     */
+    public function isAutomaticCleaningAvailable()
+    {
+        return false;
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/ZendPlatform.php b/lib/zend/Zend/Cache/Backend/ZendPlatform.php
new file mode 100644
index 00000000000..31e9a7a22af
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/ZendPlatform.php
@@ -0,0 +1,317 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend.php';
+
+/**
+ * @see Zend_Cache_Backend_Interface
+ */
+require_once 'Zend/Cache/Backend/Interface.php';
+
+
+/**
+ * Impementation of Zend Cache Backend using the Zend Platform (Output Content Caching)
+ *
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_ZendPlatform extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface
+{
+    /**
+     * internal ZP prefix
+     */
+    const TAGS_PREFIX = "internal_ZPtag:";
+
+    /**
+     * Constructor
+     * Validate that the Zend Platform is loaded and licensed
+     *
+     * @param  array $options Associative array of options
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        if (!function_exists('accelerator_license_info')) {
+            Zend_Cache::throwException('The Zend Platform extension must be loaded for using this backend !');
+        }
+        if (!function_exists('accelerator_get_configuration')) {
+            $licenseInfo = accelerator_license_info();
+            Zend_Cache::throwException('The Zend Platform extension is not loaded correctly: '.$licenseInfo['failure_reason']);
+        }
+        $accConf = accelerator_get_configuration();
+        if (@!$accConf['output_cache_licensed']) {
+            Zend_Cache::throwException('The Zend Platform extension does not have the proper license to use content caching features');
+        }
+        if (@!$accConf['output_cache_enabled']) {
+            Zend_Cache::throwException('The Zend Platform content caching feature must be enabled for using this backend, set the \'zend_accelerator.output_cache_enabled\' directive to On !');
+        }
+        if (!is_writable($accConf['output_cache_dir'])) {
+            Zend_Cache::throwException('The cache copies directory \''. ini_get('zend_accelerator.output_cache_dir') .'\' must be writable !');
+        }
+        parent:: __construct($options);
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return string Cached data (or false)
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        // doNotTestCacheValidity implemented by giving zero lifetime to the cache
+        if ($doNotTestCacheValidity) {
+            $lifetime = 0;
+        } else {
+            $lifetime = $this->_directives['lifetime'];
+        }
+        $res = output_cache_get($id, $lifetime);
+        if($res) {
+            return $res[0];
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id Cache id
+     * @return mixed|false false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id)
+    {
+        $result = output_cache_get($id, $this->_directives['lifetime']);
+        if ($result) {
+            return $result[1];
+        }
+        return false;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data             Data to cache
+     * @param  string $id               Cache id
+     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        if (!($specificLifetime === false)) {
+            $this->_log("Zend_Cache_Backend_ZendPlatform::save() : non false specifc lifetime is unsuported for this backend");
+        }
+
+        $lifetime = $this->_directives['lifetime'];
+        $result1  = output_cache_put($id, array($data, time()));
+        $result2  = (count($tags) == 0);
+
+        foreach ($tags as $tag) {
+            $tagid = self::TAGS_PREFIX.$tag;
+            $old_tags = output_cache_get($tagid, $lifetime);
+            if ($old_tags === false) {
+                $old_tags = array();
+            }
+            $old_tags[$id] = $id;
+            output_cache_remove_key($tagid);
+            $result2 = output_cache_put($tagid, $old_tags);
+        }
+
+        return $result1 && $result2;
+    }
+
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id)
+    {
+        return output_cache_remove_key($id);
+    }
+
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     *                                               This mode is not supported in this backend
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => unsupported
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean True if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+            case Zend_Cache::CLEANING_MODE_OLD:
+                $cache_dir = ini_get('zend_accelerator.output_cache_dir');
+                if (!$cache_dir) {
+                    return false;
+                }
+                $cache_dir .= '/.php_cache_api/';
+                return $this->_clean($cache_dir, $mode);
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+                $idlist = null;
+                foreach ($tags as $tag) {
+                    $next_idlist = output_cache_get(self::TAGS_PREFIX.$tag, $this->_directives['lifetime']);
+                    if ($idlist) {
+                        $idlist = array_intersect_assoc($idlist, $next_idlist);
+                    } else {
+                        $idlist = $next_idlist;
+                    }
+                    if (count($idlist) == 0) {
+                        // if ID list is already empty - we may skip checking other IDs
+                        $idlist = null;
+                        break;
+                    }
+                }
+                if ($idlist) {
+                    foreach ($idlist as $id) {
+                        output_cache_remove_key($id);
+                    }
+                }
+                return true;
+                break;
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+                $this->_log("Zend_Cache_Backend_ZendPlatform::clean() : CLEANING_MODE_NOT_MATCHING_TAG is not supported by the Zend Platform backend");
+                return false;
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                $idlist = null;
+                foreach ($tags as $tag) {
+                    $next_idlist = output_cache_get(self::TAGS_PREFIX.$tag, $this->_directives['lifetime']);
+                    if ($idlist) {
+                        $idlist = array_merge_recursive($idlist, $next_idlist);
+                    } else {
+                        $idlist = $next_idlist;
+                    }
+                    if (count($idlist) == 0) {
+                        // if ID list is already empty - we may skip checking other IDs
+                        $idlist = null;
+                        break;
+                    }
+                }
+                if ($idlist) {
+                    foreach ($idlist as $id) {
+                        output_cache_remove_key($id);
+                    }
+                }
+                return true;
+                break;
+            default:
+                Zend_Cache::throwException('Invalid mode for clean() method');
+                break;
+        }
+    }
+
+    /**
+     * Clean a directory and recursivly go over it's subdirectories
+     *
+     * Remove all the cached files that need to be cleaned (according to mode and files mtime)
+     *
+     * @param  string $dir  Path of directory ot clean
+     * @param  string $mode The same parameter as in Zend_Cache_Backend_ZendPlatform::clean()
+     * @return boolean True if ok
+     */
+    private function _clean($dir, $mode)
+    {
+        $d = @dir($dir);
+        if (!$d) {
+            return false;
+        }
+        $result = true;
+        while (false !== ($file = $d->read())) {
+            if ($file == '.' || $file == '..') {
+                continue;
+            }
+            $file = $d->path . $file;
+            if (is_dir($file)) {
+                $result = ($this->_clean($file .'/', $mode)) && ($result);
+            } else {
+                if ($mode == Zend_Cache::CLEANING_MODE_ALL) {
+                    $result = ($this->_remove($file)) && ($result);
+                } else if ($mode == Zend_Cache::CLEANING_MODE_OLD) {
+                    // Files older than lifetime get deleted from cache
+                    if ($this->_directives['lifetime'] !== null) {
+                        if ((time() - @filemtime($file)) > $this->_directives['lifetime']) {
+                            $result = ($this->_remove($file)) && ($result);
+                        }
+                    }
+                }
+            }
+        }
+        $d->close();
+        return $result;
+    }
+
+    /**
+     * Remove a file
+     *
+     * If we can't remove the file (because of locks or any problem), we will touch
+     * the file to invalidate it
+     *
+     * @param  string $file Complete file path
+     * @return boolean True if ok
+     */
+    private function _remove($file)
+    {
+        if (!@unlink($file)) {
+            # If we can't remove the file (because of locks or any problem), we will touch
+            # the file to invalidate it
+            $this->_log("Zend_Cache_Backend_ZendPlatform::_remove() : we can't remove $file => we are going to try to invalidate it");
+            if ($this->_directives['lifetime'] === null) {
+                return false;
+            }
+            if (!file_exists($file)) {
+                return false;
+            }
+            return @touch($file, time() - 2*abs($this->_directives['lifetime']));
+        }
+        return true;
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Backend/ZendServer.php b/lib/zend/Zend/Cache/Backend/ZendServer.php
new file mode 100755
index 00000000000..ededaf5a9bc
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/ZendServer.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** @see Zend_Cache_Backend_Interface */
+require_once 'Zend/Cache/Backend/Interface.php';
+
+/** @see Zend_Cache_Backend */
+require_once 'Zend/Cache/Backend.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Cache_Backend_ZendServer extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface
+{
+    /**
+     * Available options
+     *
+     * =====> (string) namespace :
+     * Namespace to be used for chaching operations
+     *
+     * @var array available options
+     */
+    protected $_options = array(
+        'namespace' => 'zendframework'
+    );
+
+    /**
+     * Store data
+     *
+     * @param mixed  $data        Object to store
+     * @param string $id          Cache id
+     * @param int    $timeToLive  Time to live in seconds
+     * @throws Zend_Cache_Exception
+     */
+    abstract protected function _store($data, $id, $timeToLive);
+
+    /**
+     * Fetch data
+     *
+     * @param string $id          Cache id
+     * @throws Zend_Cache_Exception
+     */
+    abstract protected function _fetch($id);
+
+    /**
+     * Unset data
+     *
+     * @param string $id          Cache id
+     */
+    abstract protected function _unset($id);
+
+    /**
+     * Clear cache
+     */
+    abstract protected function _clear();
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * @param  string  $id                     cache id
+     * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
+     * @return string cached datas (or false)
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $tmp = $this->_fetch($id);
+        if ($tmp !== null) {
+            return $tmp;
+        }
+        return false;
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id cache id
+     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     * @throws Zend_Cache_Exception
+     */
+    public function test($id)
+    {
+        $tmp = $this->_fetch('internal-metadatas---' . $id);
+        if ($tmp !== false) {
+            if (!is_array($tmp) || !isset($tmp['mtime'])) {
+                Zend_Cache::throwException('Cache metadata for \'' . $id . '\' id is corrupted' );
+            }
+            return $tmp['mtime'];
+        }
+        return false;
+    }
+
+    /**
+     * Compute & return the expire time
+     *
+     * @return int expire time (unix timestamp)
+     */
+    private function _expireTime($lifetime)
+    {
+        if ($lifetime === null) {
+            return 9999999999;
+        }
+        return time() + $lifetime;
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param string $data datas to cache
+     * @param string $id cache id
+     * @param array $tags array of strings, the cache record will be tagged by each string entry
+     * @param int $specificLifetime if != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        $lifetime = $this->getLifetime($specificLifetime);
+        $metadatas = array(
+            'mtime' => time(),
+            'expire' => $this->_expireTime($lifetime),
+        );
+
+        if (count($tags) > 0) {
+            $this->_log('Zend_Cache_Backend_ZendServer::save() : tags are unsupported by the ZendServer backends');
+        }
+
+        return  $this->_store($data, $id, $lifetime) &&
+                $this->_store($metadatas, 'internal-metadatas---' . $id, $lifetime);
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id cache id
+     * @return boolean true if no problem
+     */
+    public function remove($id)
+    {
+        $result1 = $this->_unset($id);
+        $result2 = $this->_unset('internal-metadatas---' . $id);
+
+        return $result1 && $result2;
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => unsupported
+     * 'matchingTag'    => unsupported
+     * 'notMatchingTag' => unsupported
+     * 'matchingAnyTag' => unsupported
+     *
+     * @param  string $mode clean mode
+     * @param  array  $tags array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean true if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+                $this->_clear();
+                return true;
+                break;
+            case Zend_Cache::CLEANING_MODE_OLD:
+                $this->_log("Zend_Cache_Backend_ZendServer::clean() : CLEANING_MODE_OLD is unsupported by the Zend Server backends.");
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                $this->_clear();
+                $this->_log('Zend_Cache_Backend_ZendServer::clean() : tags are unsupported by the Zend Server backends.');
+                break;
+            default:
+                Zend_Cache::throwException('Invalid mode for clean() method');
+                break;
+        }
+    }
+}
diff --git a/lib/zend/Zend/Cache/Backend/ZendServer/Disk.php b/lib/zend/Zend/Cache/Backend/ZendServer/Disk.php
new file mode 100755
index 00000000000..54914fefff4
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/ZendServer/Disk.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** @see Zend_Cache_Backend_Interface */
+require_once 'Zend/Cache/Backend/Interface.php';
+
+/** @see Zend_Cache_Backend_ZendServer */
+require_once 'Zend/Cache/Backend/ZendServer.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_ZendServer_Disk extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface
+{
+    /**
+     * Constructor
+     *
+     * @param  array $options associative array of options
+     * @throws Zend_Cache_Exception
+     */
+    public function __construct(array $options = array())
+    {
+        if (!function_exists('zend_disk_cache_store')) {
+            Zend_Cache::throwException('Zend_Cache_ZendServer_Disk backend has to be used within Zend Server environment.');
+        }
+        parent::__construct($options);
+    }
+
+    /**
+     * Store data
+     *
+     * @param mixed  $data        Object to store
+     * @param string $id          Cache id
+     * @param int    $timeToLive  Time to live in seconds
+     * @return boolean true if no problem
+     */
+    protected function _store($data, $id, $timeToLive)
+    {
+        if (zend_disk_cache_store($this->_options['namespace'] . '::' . $id,
+                                  $data,
+                                  $timeToLive) === false) {
+            $this->_log('Store operation failed.');
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Fetch data
+     *
+     * @param string $id Cache id
+     * @return mixed|null
+     */
+    protected function _fetch($id)
+    {
+        return zend_disk_cache_fetch($this->_options['namespace'] . '::' . $id);
+    }
+
+    /**
+     * Unset data
+     *
+     * @param string $id          Cache id
+     * @return boolean true if no problem
+     */
+    protected function _unset($id)
+    {
+        return zend_disk_cache_delete($this->_options['namespace'] . '::' . $id);
+    }
+
+    /**
+     * Clear cache
+     */
+    protected function _clear()
+    {
+        zend_disk_cache_clear($this->_options['namespace']);
+    }
+}
diff --git a/lib/zend/Zend/Cache/Backend/ZendServer/ShMem.php b/lib/zend/Zend/Cache/Backend/ZendServer/ShMem.php
new file mode 100755
index 00000000000..83086dcd4ea
--- /dev/null
+++ b/lib/zend/Zend/Cache/Backend/ZendServer/ShMem.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** @see Zend_Cache_Backend_Interface */
+require_once 'Zend/Cache/Backend/Interface.php';
+
+/** @see Zend_Cache_Backend_ZendServer */
+require_once 'Zend/Cache/Backend/ZendServer.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Backend_ZendServer_ShMem extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface
+{
+    /**
+     * Constructor
+     *
+     * @param  array $options associative array of options
+     * @throws Zend_Cache_Exception
+     */
+    public function __construct(array $options = array())
+    {
+        if (!function_exists('zend_shm_cache_store')) {
+            Zend_Cache::throwException('Zend_Cache_ZendServer_ShMem backend has to be used within Zend Server environment.');
+        }
+        parent::__construct($options);
+    }
+
+    /**
+     * Store data
+     *
+     * @param mixed  $data       Object to store
+     * @param string $id         Cache id
+     * @param int    $timeToLive Time to live in seconds
+     * @return bool
+     */
+    protected function _store($data, $id, $timeToLive)
+    {
+        if (zend_shm_cache_store($this->_options['namespace'] . '::' . $id,
+                                  $data,
+                                  $timeToLive) === false) {
+            $this->_log('Store operation failed.');
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Fetch data
+     *
+     * @param string $id Cache id
+     * @return mixed|null
+     */
+    protected function _fetch($id)
+    {
+        return zend_shm_cache_fetch($this->_options['namespace'] . '::' . $id);
+    }
+
+    /**
+     * Unset data
+     *
+     * @param string $id          Cache id
+     * @return boolean true if no problem
+     */
+    protected function _unset($id)
+    {
+        return zend_shm_cache_delete($this->_options['namespace'] . '::' . $id);
+    }
+
+    /**
+     * Clear cache
+     */
+    protected function _clear()
+    {
+        zend_shm_cache_clear($this->_options['namespace']);
+    }
+}
diff --git a/lib/zend/Zend/Cache/Core.php b/lib/zend/Zend/Cache/Core.php
new file mode 100644
index 00000000000..685d5d52b65
--- /dev/null
+++ b/lib/zend/Zend/Cache/Core.php
@@ -0,0 +1,765 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Core
+{
+    /**
+     * Messages
+     */
+    const BACKEND_NOT_SUPPORTS_TAG = 'tags are not supported by the current backend';
+    const BACKEND_NOT_IMPLEMENTS_EXTENDED_IF = 'Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available';
+
+    /**
+     * Backend Object
+     *
+     * @var Zend_Cache_Backend_Interface $_backend
+     */
+    protected $_backend = null;
+
+    /**
+     * Available options
+     *
+     * ====> (boolean) write_control :
+     * - Enable / disable write control (the cache is read just after writing to detect corrupt entries)
+     * - Enable write control will lightly slow the cache writing but not the cache reading
+     * Write control can detect some corrupt cache files but maybe it's not a perfect control
+     *
+     * ====> (boolean) caching :
+     * - Enable / disable caching
+     * (can be very useful for the debug of cached scripts)
+     *
+     * =====> (string) cache_id_prefix :
+     * - prefix for cache ids (namespace)
+     *
+     * ====> (boolean) automatic_serialization :
+     * - Enable / disable automatic serialization
+     * - It can be used to save directly datas which aren't strings (but it's slower)
+     *
+     * ====> (int) automatic_cleaning_factor :
+     * - Disable / Tune the automatic cleaning process
+     * - The automatic cleaning process destroy too old (for the given life time)
+     *   cache files when a new cache file is written :
+     *     0               => no automatic cache cleaning
+     *     1               => systematic cache cleaning
+     *     x (integer) > 1 => automatic cleaning randomly 1 times on x cache write
+     *
+     * ====> (int) lifetime :
+     * - Cache lifetime (in seconds)
+     * - If null, the cache is valid forever.
+     *
+     * ====> (boolean) logging :
+     * - If set to true, logging is activated (but the system is slower)
+     *
+     * ====> (boolean) ignore_user_abort
+     * - If set to true, the core will set the ignore_user_abort PHP flag inside the
+     *   save() method to avoid cache corruptions in some cases (default false)
+     *
+     * @var array $_options available options
+     */
+    protected $_options = array(
+        'write_control'             => true,
+        'caching'                   => true,
+        'cache_id_prefix'           => null,
+        'automatic_serialization'   => false,
+        'automatic_cleaning_factor' => 10,
+        'lifetime'                  => 3600,
+        'logging'                   => false,
+        'logger'                    => null,
+        'ignore_user_abort'         => false
+    );
+
+    /**
+     * Array of options which have to be transfered to backend
+     *
+     * @var array $_directivesList
+     */
+    protected static $_directivesList = array('lifetime', 'logging', 'logger');
+
+    /**
+     * Not used for the core, just a sort a hint to get a common setOption() method (for the core and for frontends)
+     *
+     * @var array $_specificOptions
+     */
+    protected $_specificOptions = array();
+
+    /**
+     * Last used cache id
+     *
+     * @var string $_lastId
+     */
+    private $_lastId = null;
+
+    /**
+     * True if the backend implements Zend_Cache_Backend_ExtendedInterface
+     *
+     * @var boolean $_extendedBackend
+     */
+    protected $_extendedBackend = false;
+
+    /**
+     * Array of capabilities of the backend (only if it implements Zend_Cache_Backend_ExtendedInterface)
+     *
+     * @var array
+     */
+    protected $_backendCapabilities = array();
+
+    /**
+     * Constructor
+     *
+     * @param  array|Zend_Config $options Associative array of options or Zend_Config instance
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct($options = array())
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+        if (!is_array($options)) {
+            Zend_Cache::throwException("Options passed were not an array"
+            . " or Zend_Config instance.");
+        }
+        foreach ($options as $name => $value) {
+            $this->setOption($name, $value);
+        }
+        $this->_loggerSanity();
+    }
+
+    /**
+     * Set options using an instance of type Zend_Config
+     *
+     * @param Zend_Config $config
+     * @return Zend_Cache_Core
+     */
+    public function setConfig(Zend_Config $config)
+    {
+        $options = $config->toArray();
+        foreach ($options as $name => $value) {
+            $this->setOption($name, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * Set the backend
+     *
+     * @param  Zend_Cache_Backend $backendObject
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setBackend(Zend_Cache_Backend $backendObject)
+    {
+        $this->_backend= $backendObject;
+        // some options (listed in $_directivesList) have to be given
+        // to the backend too (even if they are not "backend specific")
+        $directives = array();
+        foreach (Zend_Cache_Core::$_directivesList as $directive) {
+            $directives[$directive] = $this->_options[$directive];
+        }
+        $this->_backend->setDirectives($directives);
+        if (in_array('Zend_Cache_Backend_ExtendedInterface', class_implements($this->_backend))) {
+            $this->_extendedBackend = true;
+            $this->_backendCapabilities = $this->_backend->getCapabilities();
+        }
+
+    }
+
+    /**
+     * Returns the backend
+     *
+     * @return Zend_Cache_Backend backend object
+     */
+    public function getBackend()
+    {
+        return $this->_backend;
+    }
+
+    /**
+     * Public frontend to set an option
+     *
+     * There is an additional validation (relatively to the protected _setOption method)
+     *
+     * @param  string $name  Name of the option
+     * @param  mixed  $value Value of the option
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setOption($name, $value)
+    {
+        if (!is_string($name)) {
+            Zend_Cache::throwException("Incorrect option name!");
+        }
+        $name = strtolower($name);
+        if (array_key_exists($name, $this->_options)) {
+            // This is a Core option
+            $this->_setOption($name, $value);
+            return;
+        }
+        if (array_key_exists($name, $this->_specificOptions)) {
+            // This a specic option of this frontend
+            $this->_specificOptions[$name] = $value;
+            return;
+        }
+    }
+
+    /**
+     * Public frontend to get an option value
+     *
+     * @param  string $name  Name of the option
+     * @throws Zend_Cache_Exception
+     * @return mixed option value
+     */
+    public function getOption($name)
+    {
+        $name = strtolower($name);
+
+        if (array_key_exists($name, $this->_options)) {
+            // This is a Core option
+            return $this->_options[$name];
+        }
+
+        if (array_key_exists($name, $this->_specificOptions)) {
+            // This a specic option of this frontend
+            return $this->_specificOptions[$name];
+        }
+
+        Zend_Cache::throwException("Incorrect option name : $name");
+    }
+
+    /**
+     * Set an option
+     *
+     * @param  string $name  Name of the option
+     * @param  mixed  $value Value of the option
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    private function _setOption($name, $value)
+    {
+        if (!is_string($name) || !array_key_exists($name, $this->_options)) {
+            Zend_Cache::throwException("Incorrect option name : $name");
+        }
+        if ($name == 'lifetime' && empty($value)) {
+            $value = null;
+        }
+        $this->_options[$name] = $value;
+    }
+
+    /**
+     * Force a new lifetime
+     *
+     * The new value is set for the core/frontend but for the backend too (directive)
+     *
+     * @param  int $newLifetime New lifetime (in seconds)
+     * @return void
+     */
+    public function setLifetime($newLifetime)
+    {
+        $this->_options['lifetime'] = $newLifetime;
+        $this->_backend->setDirectives(array(
+            'lifetime' => $newLifetime
+        ));
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @param  boolean $doNotUnserialize       Do not serialize (even if automatic_serialization is true) => for internal use
+     * @return mixed|false Cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false, $doNotUnserialize = false)
+    {
+        if (!$this->_options['caching']) {
+            return false;
+        }
+        $id = $this->_id($id); // cache id may need prefix
+        $this->_lastId = $id;
+        $this->_validateIdOrTag($id);
+
+        $this->_log("Zend_Cache_Core: load item '{$id}'", 7);
+        $data = $this->_backend->load($id, $doNotTestCacheValidity);
+        if ($data===false) {
+            // no cache available
+            return false;
+        }
+        if ((!$doNotUnserialize) && $this->_options['automatic_serialization']) {
+            // we need to unserialize before sending the result
+            return unserialize($data);
+        }
+        return $data;
+    }
+
+    /**
+     * Test if a cache is available for the given id
+     *
+     * @param  string $id Cache id
+     * @return int|false Last modified time of cache entry if it is available, false otherwise
+     */
+    public function test($id)
+    {
+        if (!$this->_options['caching']) {
+            return false;
+        }
+        $id = $this->_id($id); // cache id may need prefix
+        $this->_validateIdOrTag($id);
+        $this->_lastId = $id;
+
+        $this->_log("Zend_Cache_Core: test item '{$id}'", 7);
+        return $this->_backend->test($id);
+    }
+
+    /**
+     * Save some data in a cache
+     *
+     * @param  mixed $data           Data to put in cache (can be another type than string if automatic_serialization is on)
+     * @param  string $id             Cache id (if not set, the last cache id will be used)
+     * @param  array $tags           Cache tags
+     * @param  int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @param  int   $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
+     * @throws Zend_Cache_Exception
+     * @return boolean True if no problem
+     */
+    public function save($data, $id = null, $tags = array(), $specificLifetime = false, $priority = 8)
+    {
+        if (!$this->_options['caching']) {
+            return true;
+        }
+        if ($id === null) {
+            $id = $this->_lastId;
+        } else {
+            $id = $this->_id($id);
+        }
+        $this->_validateIdOrTag($id);
+        $this->_validateTagsArray($tags);
+        if ($this->_options['automatic_serialization']) {
+            // we need to serialize datas before storing them
+            $data = serialize($data);
+        } else {
+            if (!is_string($data)) {
+                Zend_Cache::throwException("Datas must be string or set automatic_serialization = true");
+            }
+        }
+
+        // automatic cleaning
+        if ($this->_options['automatic_cleaning_factor'] > 0) {
+            $rand = rand(1, $this->_options['automatic_cleaning_factor']);
+            if ($rand==1) {
+                //  new way                 || deprecated way
+                if ($this->_extendedBackend || method_exists($this->_backend, 'isAutomaticCleaningAvailable')) {
+                    $this->_log("Zend_Cache_Core::save(): automatic cleaning running", 7);
+                    $this->clean(Zend_Cache::CLEANING_MODE_OLD);
+                } else {
+                    $this->_log("Zend_Cache_Core::save(): automatic cleaning is not available/necessary with current backend", 4);
+                }
+            }
+        }
+
+        $this->_log("Zend_Cache_Core: save item '{$id}'", 7);
+        if ($this->_options['ignore_user_abort']) {
+            $abort = ignore_user_abort(true);
+        }
+        if (($this->_extendedBackend) && ($this->_backendCapabilities['priority'])) {
+            $result = $this->_backend->save($data, $id, $tags, $specificLifetime, $priority);
+        } else {
+            $result = $this->_backend->save($data, $id, $tags, $specificLifetime);
+        }
+        if ($this->_options['ignore_user_abort']) {
+            ignore_user_abort($abort);
+        }
+
+        if (!$result) {
+            // maybe the cache is corrupted, so we remove it !
+            $this->_log("Zend_Cache_Core::save(): failed to save item '{$id}' -> removing it", 4);
+            $this->_backend->remove($id);
+            return false;
+        }
+
+        if ($this->_options['write_control']) {
+            $data2 = $this->_backend->load($id, true);
+            if ($data!=$data2) {
+                $this->_log("Zend_Cache_Core::save(): write control of item '{$id}' failed -> removing it", 4);
+                $this->_backend->remove($id);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Remove a cache
+     *
+     * @param  string $id Cache id to remove
+     * @return boolean True if ok
+     */
+    public function remove($id)
+    {
+        if (!$this->_options['caching']) {
+            return true;
+        }
+        $id = $this->_id($id); // cache id may need prefix
+        $this->_validateIdOrTag($id);
+
+        $this->_log("Zend_Cache_Core: remove item '{$id}'", 7);
+        return $this->_backend->remove($id);
+    }
+
+    /**
+     * Clean cache entries
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => remove too old cache entries ($tags is not used)
+     * 'matchingTag'    => remove cache entries matching all given tags
+     *                     ($tags can be an array of strings or a single string)
+     * 'notMatchingTag' => remove cache entries not matching one of the given tags
+     *                     ($tags can be an array of strings or a single string)
+     * 'matchingAnyTag' => remove cache entries matching any given tags
+     *                     ($tags can be an array of strings or a single string)
+     *
+     * @param  string       $mode
+     * @param  array|string $tags
+     * @throws Zend_Cache_Exception
+     * @return boolean True if ok
+     */
+    public function clean($mode = 'all', $tags = array())
+    {
+        if (!$this->_options['caching']) {
+            return true;
+        }
+        if (!in_array($mode, array(Zend_Cache::CLEANING_MODE_ALL,
+                                   Zend_Cache::CLEANING_MODE_OLD,
+                                   Zend_Cache::CLEANING_MODE_MATCHING_TAG,
+                                   Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG,
+                                   Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG))) {
+            Zend_Cache::throwException('Invalid cleaning mode');
+        }
+        $this->_validateTagsArray($tags);
+
+        return $this->_backend->clean($mode, $tags);
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        if (!$this->_extendedBackend) {
+            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
+        }
+        if (!($this->_backendCapabilities['tags'])) {
+            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORTS_TAG);
+        }
+
+        $ids = $this->_backend->getIdsMatchingTags($tags);
+
+        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
+        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
+            $prefix    = & $this->_options['cache_id_prefix'];
+            $prefixLen = strlen($prefix);
+            foreach ($ids as &$id) {
+                if (strpos($id, $prefix) === 0) {
+                    $id = substr($id, $prefixLen);
+                }
+            }
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        if (!$this->_extendedBackend) {
+            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
+        }
+        if (!($this->_backendCapabilities['tags'])) {
+            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORTS_TAG);
+        }
+
+        $ids = $this->_backend->getIdsNotMatchingTags($tags);
+
+        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
+        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
+            $prefix    = & $this->_options['cache_id_prefix'];
+            $prefixLen = strlen($prefix);
+            foreach ($ids as &$id) {
+                if (strpos($id, $prefix) === 0) {
+                    $id = substr($id, $prefixLen);
+                }
+            }
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching any cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        if (!$this->_extendedBackend) {
+            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
+        }
+        if (!($this->_backendCapabilities['tags'])) {
+            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORTS_TAG);
+        }
+
+        $ids = $this->_backend->getIdsMatchingAnyTags($tags);
+
+        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
+        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
+            $prefix    = & $this->_options['cache_id_prefix'];
+            $prefixLen = strlen($prefix);
+            foreach ($ids as &$id) {
+                if (strpos($id, $prefix) === 0) {
+                    $id = substr($id, $prefixLen);
+                }
+            }
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        if (!$this->_extendedBackend) {
+            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
+        }
+
+        $ids = $this->_backend->getIds();
+
+        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
+        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
+            $prefix    = & $this->_options['cache_id_prefix'];
+            $prefixLen = strlen($prefix);
+            foreach ($ids as &$id) {
+                if (strpos($id, $prefix) === 0) {
+                    $id = substr($id, $prefixLen);
+                }
+            }
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        if (!$this->_extendedBackend) {
+            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
+        }
+        if (!($this->_backendCapabilities['tags'])) {
+            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORTS_TAG);
+        }
+        return $this->_backend->getTags();
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        if (!$this->_extendedBackend) {
+            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
+        }
+        return $this->_backend->getFillingPercentage();
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array will include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        if (!$this->_extendedBackend) {
+            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
+        }
+        $id = $this->_id($id); // cache id may need prefix
+        return $this->_backend->getMetadatas($id);
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        if (!$this->_extendedBackend) {
+            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
+        }
+        $id = $this->_id($id); // cache id may need prefix
+
+        $this->_log("Zend_Cache_Core: touch item '{$id}'", 7);
+        return $this->_backend->touch($id, $extraLifetime);
+    }
+
+    /**
+     * Validate a cache id or a tag (security, reliable filenames, reserved prefixes...)
+     *
+     * Throw an exception if a problem is found
+     *
+     * @param  string $string Cache id or tag
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    protected function _validateIdOrTag($string)
+    {
+        if (!is_string($string)) {
+            Zend_Cache::throwException('Invalid id or tag : must be a string');
+        }
+        if (substr($string, 0, 9) == 'internal-') {
+            Zend_Cache::throwException('"internal-*" ids or tags are reserved');
+        }
+        if (!preg_match('~^[a-zA-Z0-9_]+$~D', $string)) {
+            Zend_Cache::throwException("Invalid id or tag '$string' : must use only [a-zA-Z0-9_]");
+        }
+    }
+
+    /**
+     * Validate a tags array (security, reliable filenames, reserved prefixes...)
+     *
+     * Throw an exception if a problem is found
+     *
+     * @param  array $tags Array of tags
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    protected function _validateTagsArray($tags)
+    {
+        if (!is_array($tags)) {
+            Zend_Cache::throwException('Invalid tags array : must be an array');
+        }
+        foreach($tags as $tag) {
+            $this->_validateIdOrTag($tag);
+        }
+        reset($tags);
+    }
+
+    /**
+     * Make sure if we enable logging that the Zend_Log class
+     * is available.
+     * Create a default log object if none is set.
+     *
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    protected function _loggerSanity()
+    {
+        if (!isset($this->_options['logging']) || !$this->_options['logging']) {
+            return;
+        }
+
+        if (isset($this->_options['logger']) && $this->_options['logger'] instanceof Zend_Log) {
+            return;
+        }
+
+        // Create a default logger to the standard output stream
+        require_once 'Zend/Log.php';
+        require_once 'Zend/Log/Writer/Stream.php';
+        require_once 'Zend/Log/Filter/Priority.php';
+        $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output'));
+        $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<='));
+        $this->_options['logger'] = $logger;
+    }
+
+    /**
+     * Log a message at the WARN (4) priority.
+     *
+     * @param string $message
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    protected function _log($message, $priority = 4)
+    {
+        if (!$this->_options['logging']) {
+            return;
+        }
+        if (!(isset($this->_options['logger']) || $this->_options['logger'] instanceof Zend_Log)) {
+            Zend_Cache::throwException('Logging is enabled but logger is not set');
+        }
+        $logger = $this->_options['logger'];
+        $logger->log($message, $priority);
+    }
+
+    /**
+     * Make and return a cache id
+     *
+     * Checks 'cache_id_prefix' and returns new id with prefix or simply the id if null
+     *
+     * @param  string $id Cache id
+     * @return string Cache id (with or without prefix)
+     */
+    protected function _id($id)
+    {
+        if (($id !== null) && isset($this->_options['cache_id_prefix'])) {
+            return $this->_options['cache_id_prefix'] . $id; // return with prefix
+        }
+        return $id; // no prefix, just return the $id passed
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Exception.php b/lib/zend/Zend/Cache/Exception.php
new file mode 100644
index 00000000000..ee53b20671b
--- /dev/null
+++ b/lib/zend/Zend/Cache/Exception.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+/**
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Exception extends Zend_Exception {}
diff --git a/lib/zend/Zend/Cache/Frontend/Capture.php b/lib/zend/Zend/Cache/Frontend/Capture.php
new file mode 100644
index 00000000000..32ecc237eeb
--- /dev/null
+++ b/lib/zend/Zend/Cache/Frontend/Capture.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Core
+ */
+require_once 'Zend/Cache/Core.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Frontend_Capture extends Zend_Cache_Core
+{
+    /**
+     * Page identifiers
+     * @var array
+     */
+    protected $_idStack = array();
+
+    /**
+     * Tags
+     * @var array
+     */
+    protected $_tags = array();
+
+    protected $_extension = null;
+
+    /**
+     * Start the cache
+     *
+     * @param  string  $id Cache id
+     * @return mixed True if the cache is hit (false else) with $echoData=true (default) ; string else (datas)
+     */
+    public function start($id, array $tags, $extension = null)
+    {
+        $this->_tags = $tags;
+        $this->_extension = $extension;
+        ob_start(array($this, '_flush'));
+        ob_implicit_flush(false);
+        $this->_idStack[] = $id;
+        return false;
+    }
+
+    /**
+     * callback for output buffering
+     * (shouldn't really be called manually)
+     *
+     * @param  string $data Buffered output
+     * @return string Data to send to browser
+     */
+    public function _flush($data)
+    {
+        $id = array_pop($this->_idStack);
+        if ($id === null) {
+            Zend_Cache::throwException('use of _flush() without a start()');
+        }
+        if ($this->_extension) {
+            $this->save(serialize(array($data, $this->_extension)), $id, $this->_tags);
+        } else {
+            $this->save($data, $id, $this->_tags);
+        }
+        return $data;
+    }
+}
diff --git a/lib/zend/Zend/Cache/Frontend/Class.php b/lib/zend/Zend/Cache/Frontend/Class.php
new file mode 100644
index 00000000000..4740402ac73
--- /dev/null
+++ b/lib/zend/Zend/Cache/Frontend/Class.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Cache_Core
+ */
+require_once 'Zend/Cache/Core.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Zend_Cache_Frontend_Class extends Zend_Cache_Core
+{
+    /**
+     * Available options
+     *
+     * ====> (mixed) cached_entity :
+     * - if set to a class name, we will cache an abstract class and will use only static calls
+     * - if set to an object, we will cache this object methods
+     *
+     * ====> (boolean) cache_by_default :
+     * - if true, method calls will be cached by default
+     *
+     * ====> (array) cached_methods :
+     * - an array of method names which will be cached (even if cache_by_default = false)
+     *
+     * ====> (array) non_cached_methods :
+     * - an array of method names which won't be cached (even if cache_by_default = true)
+     *
+     * @var array available options
+     */
+    protected $_specificOptions = array(
+        'cached_entity'      => null,
+        'cache_by_default'   => true,
+        'cached_methods'     => array(),
+        'non_cached_methods' => array()
+    );
+
+    /**
+     * Tags array
+     *
+     * @var array
+     */
+    protected $_tags = array();
+
+    /**
+     * SpecificLifetime value
+     *
+     * false => no specific life time
+     *
+     * @var bool|int
+     */
+    protected $_specificLifetime = false;
+
+    /**
+     * The cached object or the name of the cached abstract class
+     *
+     * @var mixed
+     */
+    protected $_cachedEntity = null;
+
+     /**
+      * The class name of the cached object or cached abstract class
+      *
+      * Used to differentiate between different classes with the same method calls.
+      *
+      * @var string
+      */
+    protected $_cachedEntityLabel = '';
+
+    /**
+     * Priority (used by some particular backends)
+     *
+     * @var int
+     */
+    protected $_priority = 8;
+
+    /**
+     * Constructor
+     *
+     * @param  array $options Associative array of options
+     * @throws Zend_Cache_Exception
+     */
+    public function __construct(array $options = array())
+    {
+        foreach ($options as $name => $value) {
+            $this->setOption($name, $value);
+        }
+        if ($this->_specificOptions['cached_entity'] === null) {
+            Zend_Cache::throwException('cached_entity must be set !');
+        }
+        $this->setCachedEntity($this->_specificOptions['cached_entity']);
+        $this->setOption('automatic_serialization', true);
+    }
+
+    /**
+     * Set a specific life time
+     *
+     * @param  bool|int $specificLifetime
+     * @return void
+     */
+    public function setSpecificLifetime($specificLifetime = false)
+    {
+        $this->_specificLifetime = $specificLifetime;
+    }
+
+    /**
+     * Set the priority (used by some particular backends)
+     *
+     * @param int $priority integer between 0 (very low priority) and 10 (maximum priority)
+     */
+    public function setPriority($priority)
+    {
+        $this->_priority = $priority;
+    }
+
+    /**
+     * Public frontend to set an option
+     *
+     * Just a wrapper to get a specific behaviour for cached_entity
+     *
+     * @param  string $name  Name of the option
+     * @param  mixed  $value Value of the option
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setOption($name, $value)
+    {
+        if ($name == 'cached_entity') {
+            $this->setCachedEntity($value);
+        } else {
+            parent::setOption($name, $value);
+        }
+    }
+
+    /**
+     * Specific method to set the cachedEntity
+     *
+     * if set to a class name, we will cache an abstract class and will use only static calls
+     * if set to an object, we will cache this object methods
+     *
+     * @param mixed $cachedEntity
+     */
+    public function setCachedEntity($cachedEntity)
+    {
+        if (!is_string($cachedEntity) && !is_object($cachedEntity)) {
+            Zend_Cache::throwException(
+                'cached_entity must be an object or a class name'
+            );
+        }
+
+        $this->_cachedEntity                     = $cachedEntity;
+        $this->_specificOptions['cached_entity'] = $cachedEntity;
+
+        if (is_string($this->_cachedEntity)) {
+            $this->_cachedEntityLabel = $this->_cachedEntity;
+        } else {
+            $ro = new ReflectionObject($this->_cachedEntity);
+            $this->_cachedEntityLabel = $ro->getName();
+        }
+    }
+
+    /**
+     * Set the cache array
+     *
+     * @param  array $tags
+     * @return void
+     */
+    public function setTagsArray($tags = array())
+    {
+        $this->_tags = $tags;
+    }
+
+    /**
+     * Main method : call the specified method or get the result from cache
+     *
+     * @param  string $name       Method name
+     * @param  array  $parameters Method parameters
+     * @return mixed Result
+     * @throws Exception
+     */
+    public function __call($name, $parameters)
+    {
+        $callback = array($this->_cachedEntity, $name);
+
+        if (!is_callable($callback, false)) {
+            Zend_Cache::throwException('Invalid callback');
+        }
+
+        $cacheBool1 = $this->_specificOptions['cache_by_default'];
+        $cacheBool2 = in_array($name, $this->_specificOptions['cached_methods']);
+        $cacheBool3 = in_array($name, $this->_specificOptions['non_cached_methods']);
+        $cache      = (($cacheBool1 || $cacheBool2) && (!$cacheBool3));
+
+        if (!$cache) {
+            // We do not have not cache
+            return call_user_func_array($callback, $parameters);
+        }
+
+        $id = $this->makeId($name, $parameters);
+        if (($rs = $this->load($id)) && (array_key_exists(0, $rs))
+            && (array_key_exists(1, $rs))
+        ) {
+            // A cache is available
+            $output = $rs[0];
+            $return = $rs[1];
+        } else {
+            // A cache is not available (or not valid for this frontend)
+            ob_start();
+            ob_implicit_flush(false);
+
+            try {
+                $return = call_user_func_array($callback, $parameters);
+                $output = ob_get_clean();
+                $data   = array($output, $return);
+
+                $this->save(
+                    $data, $id, $this->_tags, $this->_specificLifetime,
+                    $this->_priority
+                );
+            } catch (Exception $e) {
+                ob_end_clean();
+                throw $e;
+            }
+        }
+
+        echo $output;
+        return $return;
+    }
+
+    /**
+     * ZF-9970
+     *
+     * @deprecated
+     */
+    private function _makeId($name, $args)
+    {
+        return $this->makeId($name, $args);
+    }
+
+    /**
+     * Make a cache id from the method name and parameters
+     *
+     * @param  string $name Method name
+     * @param  array  $args Method parameters
+     * @return string Cache id
+     */
+    public function makeId($name, array $args = array())
+    {
+        return md5($this->_cachedEntityLabel . '__' . $name . '__' . serialize($args));
+    }
+}
diff --git a/lib/zend/Zend/Cache/Frontend/File.php b/lib/zend/Zend/Cache/Frontend/File.php
new file mode 100644
index 00000000000..e5017c631ca
--- /dev/null
+++ b/lib/zend/Zend/Cache/Frontend/File.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Core
+ */
+require_once 'Zend/Cache/Core.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Frontend_File extends Zend_Cache_Core
+{
+
+    /**
+     * Consts for master_files_mode
+     */
+    const MODE_AND = 'AND';
+    const MODE_OR  = 'OR';
+
+    /**
+     * Available options
+     *
+     * ====> (string) master_file :
+     * - a complete path of the master file
+     * - deprecated (see master_files)
+     *
+     * ====> (array) master_files :
+     * - an array of complete path of master files
+     * - this option has to be set !
+     *
+     * ====> (string) master_files_mode :
+     * - Zend_Cache_Frontend_File::MODE_AND or Zend_Cache_Frontend_File::MODE_OR
+     * - if MODE_AND, then all master files have to be touched to get a cache invalidation
+     * - if MODE_OR (default), then a single touched master file is enough to get a cache invalidation
+     *
+     * ====> (boolean) ignore_missing_master_files
+     * - if set to true, missing master files are ignored silently
+     * - if set to false (default), an exception is thrown if there is a missing master file
+     * @var array available options
+     */
+    protected $_specificOptions = array(
+        'master_file' => null,
+        'master_files' => null,
+        'master_files_mode' => 'OR',
+        'ignore_missing_master_files' => false
+    );
+
+    /**
+     * Master file mtimes
+     *
+     * Array of int
+     *
+     * @var array
+     */
+    private $_masterFile_mtimes = null;
+
+    /**
+     * Constructor
+     *
+     * @param  array $options Associative array of options
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        foreach ($options as $name => $value) {
+            $this->setOption($name, $value);
+        }
+        if (!isset($this->_specificOptions['master_files'])) {
+            Zend_Cache::throwException('master_files option must be set');
+        }
+    }
+
+    /**
+     * Change the master_files option
+     *
+     * @param array $masterFiles the complete paths and name of the master files
+     */
+    public function setMasterFiles(array $masterFiles)
+    {
+        $this->_specificOptions['master_file']  = null; // to keep a compatibility
+        $this->_specificOptions['master_files'] = null;
+        $this->_masterFile_mtimes = array();
+
+        clearstatcache();
+        $i = 0;
+        foreach ($masterFiles as $masterFile) {
+            if (file_exists($masterFile)) {
+                $mtime = filemtime($masterFile);
+            } else {
+                $mtime = false;
+            }
+
+            if (!$this->_specificOptions['ignore_missing_master_files'] && !$mtime) {
+                Zend_Cache::throwException('Unable to read master_file : ' . $masterFile);
+            }
+
+            $this->_masterFile_mtimes[$i] = $mtime;
+            $this->_specificOptions['master_files'][$i] = $masterFile;
+            if ($i === 0) { // to keep a compatibility
+                $this->_specificOptions['master_file'] = $masterFile;
+            }
+
+            $i++;
+        }
+    }
+
+    /**
+     * Change the master_file option
+     *
+     * To keep the compatibility
+     *
+     * @deprecated
+     * @param string $masterFile the complete path and name of the master file
+     */
+    public function setMasterFile($masterFile)
+    {
+          $this->setMasterFiles(array($masterFile));
+    }
+
+    /**
+     * Public frontend to set an option
+     *
+     * Just a wrapper to get a specific behaviour for master_file
+     *
+     * @param  string $name  Name of the option
+     * @param  mixed  $value Value of the option
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setOption($name, $value)
+    {
+        if ($name == 'master_file') {
+            $this->setMasterFile($value);
+        } else if ($name == 'master_files') {
+            $this->setMasterFiles($value);
+        } else {
+            parent::setOption($name, $value);
+        }
+    }
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @param  boolean $doNotUnserialize       Do not serialize (even if automatic_serialization is true) => for internal use
+     * @return mixed|false Cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false, $doNotUnserialize = false)
+    {
+        if (!$doNotTestCacheValidity) {
+            if ($this->test($id)) {
+                return parent::load($id, true, $doNotUnserialize);
+            }
+            return false;
+        }
+        return parent::load($id, true, $doNotUnserialize);
+    }
+
+    /**
+     * Test if a cache is available for the given id
+     *
+     * @param  string $id Cache id
+     * @return int|false Last modified time of cache entry if it is available, false otherwise
+     */
+    public function test($id)
+    {
+        $lastModified = parent::test($id);
+        if ($lastModified) {
+            if ($this->_specificOptions['master_files_mode'] == self::MODE_AND) {
+                // MODE_AND
+                foreach($this->_masterFile_mtimes as $masterFileMTime) {
+                    if ($masterFileMTime) {
+                        if ($lastModified > $masterFileMTime) {
+                            return $lastModified;
+                        }
+                    }
+                }
+            } else {
+                // MODE_OR
+                $res = true;
+                foreach($this->_masterFile_mtimes as $masterFileMTime) {
+                    if ($masterFileMTime) {
+                        if ($lastModified <= $masterFileMTime) {
+                            return false;
+                        }
+                    }
+                }
+                return $lastModified;
+            }
+        }
+        return false;
+    }
+
+}
+
diff --git a/lib/zend/Zend/Cache/Frontend/Function.php b/lib/zend/Zend/Cache/Frontend/Function.php
new file mode 100644
index 00000000000..8af521bda69
--- /dev/null
+++ b/lib/zend/Zend/Cache/Frontend/Function.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Core
+ */
+require_once 'Zend/Cache/Core.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Frontend_Function extends Zend_Cache_Core
+{
+    /**
+     * This frontend specific options
+     *
+     * ====> (boolean) cache_by_default :
+     * - if true, function calls will be cached by default
+     *
+     * ====> (array) cached_functions :
+     * - an array of function names which will be cached (even if cache_by_default = false)
+     *
+     * ====> (array) non_cached_functions :
+     * - an array of function names which won't be cached (even if cache_by_default = true)
+     *
+     * @var array options
+     */
+    protected $_specificOptions = array(
+        'cache_by_default' => true,
+        'cached_functions' => array(),
+        'non_cached_functions' => array()
+    );
+
+    /**
+     * Constructor
+     *
+     * @param  array $options Associative array of options
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        foreach ($options as $name => $value) {
+            $this->setOption($name, $value);
+        }
+        $this->setOption('automatic_serialization', true);
+    }
+
+    /**
+     * Main method : call the specified function or get the result from cache
+     *
+     * @param  callback $callback         A valid callback
+     * @param  array    $parameters       Function parameters
+     * @param  array    $tags             Cache tags
+     * @param  int      $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @param  int      $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
+     * @return mixed Result
+     */
+    public function call($callback, array $parameters = array(), $tags = array(), $specificLifetime = false, $priority = 8)
+    {
+        if (!is_callable($callback, true, $name)) {
+            Zend_Cache::throwException('Invalid callback');
+        }
+
+        $cacheBool1 = $this->_specificOptions['cache_by_default'];
+        $cacheBool2 = in_array($name, $this->_specificOptions['cached_functions']);
+        $cacheBool3 = in_array($name, $this->_specificOptions['non_cached_functions']);
+        $cache = (($cacheBool1 || $cacheBool2) && (!$cacheBool3));
+        if (!$cache) {
+            // Caching of this callback is disabled
+            return call_user_func_array($callback, $parameters);
+        }
+
+        $id = $this->_makeId($callback, $parameters);
+        if ( ($rs = $this->load($id)) && isset($rs[0], $rs[1])) {
+            // A cache is available
+            $output = $rs[0];
+            $return = $rs[1];
+        } else {
+            // A cache is not available (or not valid for this frontend)
+            ob_start();
+            ob_implicit_flush(false);
+            $return = call_user_func_array($callback, $parameters);
+            $output = ob_get_clean();
+            $data = array($output, $return);
+            $this->save($data, $id, $tags, $specificLifetime, $priority);
+        }
+
+        echo $output;
+        return $return;
+    }
+
+    /**
+     * ZF-9970
+     *
+     * @deprecated
+     */
+    private function _makeId($callback, array $args)
+    {
+        return $this->makeId($callback, $args);
+    }
+
+    /**
+     * Make a cache id from the function name and parameters
+     *
+     * @param  callback $callback A valid callback
+     * @param  array    $args     Function parameters
+     * @throws Zend_Cache_Exception
+     * @return string Cache id
+     */
+    public function makeId($callback, array $args = array())
+    {
+        if (!is_callable($callback, true, $name)) {
+            Zend_Cache::throwException('Invalid callback');
+        }
+
+        // functions, methods and classnames are case-insensitive
+        $name = strtolower($name);
+
+        // generate a unique id for object callbacks
+        if (is_object($callback)) { // Closures & __invoke
+            $object = $callback;
+        } elseif (isset($callback[0])) { // array($object, 'method')
+            $object = $callback[0];
+        }
+        if (isset($object)) {
+            try {
+                $tmp = @serialize($callback);
+            } catch (Exception $e) {
+                Zend_Cache::throwException($e->getMessage());
+            }
+            if (!$tmp) {
+                $lastErr = error_get_last();
+                Zend_Cache::throwException("Can't serialize callback object to generate id: {$lastErr['message']}");
+            }
+            $name.= '__' . $tmp;
+        }
+
+        // generate a unique id for arguments
+        $argsStr = '';
+        if ($args) {
+            try {
+                $argsStr = @serialize(array_values($args));
+            } catch (Exception $e) {
+                Zend_Cache::throwException($e->getMessage());
+            }
+            if (!$argsStr) {
+                $lastErr = error_get_last();
+                throw Zend_Cache::throwException("Can't serialize arguments to generate id: {$lastErr['message']}");
+            }
+        }
+
+        return md5($name . $argsStr);
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Frontend/Output.php b/lib/zend/Zend/Cache/Frontend/Output.php
new file mode 100644
index 00000000000..99a8a64c9d8
--- /dev/null
+++ b/lib/zend/Zend/Cache/Frontend/Output.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Core
+ */
+require_once 'Zend/Cache/Core.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Frontend_Output extends Zend_Cache_Core
+{
+
+    private $_idStack = array();
+
+    /**
+     * Constructor
+     *
+     * @param  array $options Associative array of options
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        parent::__construct($options);
+        $this->_idStack = array();
+    }
+
+    /**
+     * Start the cache
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @param  boolean $echoData               If set to true, datas are sent to the browser if the cache is hit (simply returned else)
+     * @return mixed True if the cache is hit (false else) with $echoData=true (default) ; string else (datas)
+     */
+    public function start($id, $doNotTestCacheValidity = false, $echoData = true)
+    {
+        $data = $this->load($id, $doNotTestCacheValidity);
+        if ($data !== false) {
+            if ( $echoData ) {
+                echo($data);
+                return true;
+            } else {
+                return $data;
+            }
+        }
+        ob_start();
+        ob_implicit_flush(false);
+        $this->_idStack[] = $id;
+        return false;
+    }
+
+    /**
+     * Stop the cache
+     *
+     * @param  array   $tags             Tags array
+     * @param  int     $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @param  string  $forcedDatas      If not null, force written datas with this
+     * @param  boolean $echoData         If set to true, datas are sent to the browser
+     * @param  int     $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
+     * @return void
+     */
+    public function end($tags = array(), $specificLifetime = false, $forcedDatas = null, $echoData = true, $priority = 8)
+    {
+        if ($forcedDatas === null) {
+            $data = ob_get_clean();
+        } else {
+            $data =& $forcedDatas;
+        }
+        $id = array_pop($this->_idStack);
+        if ($id === null) {
+            Zend_Cache::throwException('use of end() without a start()');
+        }
+        $this->save($data, $id, $tags, $specificLifetime, $priority);
+        if ($echoData) {
+            echo($data);
+        }
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Frontend/Page.php b/lib/zend/Zend/Cache/Frontend/Page.php
new file mode 100644
index 00000000000..cc253d559c8
--- /dev/null
+++ b/lib/zend/Zend/Cache/Frontend/Page.php
@@ -0,0 +1,404 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Cache_Core
+ */
+require_once 'Zend/Cache/Core.php';
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Frontend
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Frontend_Page extends Zend_Cache_Core
+{
+    /**
+     * This frontend specific options
+     *
+     * ====> (boolean) http_conditional :
+     * - if true, http conditional mode is on
+     * WARNING : http_conditional OPTION IS NOT IMPLEMENTED FOR THE MOMENT (TODO)
+     *
+     * ====> (boolean) debug_header :
+     * - if true, a debug text is added before each cached pages
+     *
+     * ====> (boolean) content_type_memorization :
+     * - deprecated => use memorize_headers instead
+     * - if the Content-Type header is sent after the cache was started, the
+     *   corresponding value can be memorized and replayed when the cache is hit
+     *   (if false (default), the frontend doesn't take care of Content-Type header)
+     *
+     * ====> (array) memorize_headers :
+     * - an array of strings corresponding to some HTTP headers name. Listed headers
+     *   will be stored with cache datas and "replayed" when the cache is hit
+     *
+     * ====> (array) default_options :
+     * - an associative array of default options :
+     *     - (boolean) cache : cache is on by default if true
+     *     - (boolean) cacheWithXXXVariables  (XXXX = 'Get', 'Post', 'Session', 'Files' or 'Cookie') :
+     *       if true,  cache is still on even if there are some variables in this superglobal array
+     *       if false, cache is off if there are some variables in this superglobal array
+     *     - (boolean) makeIdWithXXXVariables (XXXX = 'Get', 'Post', 'Session', 'Files' or 'Cookie') :
+     *       if true, we have to use the content of this superglobal array to make a cache id
+     *       if false, the cache id won't be dependent of the content of this superglobal array
+     *     - (int) specific_lifetime : cache specific lifetime
+     *                                (false => global lifetime is used, null => infinite lifetime,
+     *                                 integer => this lifetime is used), this "lifetime" is probably only
+     *                                usefull when used with "regexps" array
+     *     - (array) tags : array of tags (strings)
+     *     - (int) priority : integer between 0 (very low priority) and 10 (maximum priority) used by
+     *                        some particular backends
+     *
+     * ====> (array) regexps :
+     * - an associative array to set options only for some REQUEST_URI
+     * - keys are (pcre) regexps
+     * - values are associative array with specific options to set if the regexp matchs on $_SERVER['REQUEST_URI']
+     *   (see default_options for the list of available options)
+     * - if several regexps match the $_SERVER['REQUEST_URI'], only the last one will be used
+     *
+     * @var array options
+     */
+    protected $_specificOptions = array(
+        'http_conditional' => false,
+        'debug_header' => false,
+        'content_type_memorization' => false,
+        'memorize_headers' => array(),
+        'default_options' => array(
+            'cache_with_get_variables' => false,
+            'cache_with_post_variables' => false,
+            'cache_with_session_variables' => false,
+            'cache_with_files_variables' => false,
+            'cache_with_cookie_variables' => false,
+            'make_id_with_get_variables' => true,
+            'make_id_with_post_variables' => true,
+            'make_id_with_session_variables' => true,
+            'make_id_with_files_variables' => true,
+            'make_id_with_cookie_variables' => true,
+            'cache' => true,
+            'specific_lifetime' => false,
+            'tags' => array(),
+            'priority' => null
+        ),
+        'regexps' => array()
+    );
+
+    /**
+     * Internal array to store some options
+     *
+     * @var array associative array of options
+     */
+    protected $_activeOptions = array();
+
+    /**
+     * If true, the page won't be cached
+     *
+     * @var boolean
+     */
+    protected $_cancel = false;
+
+    /**
+     * Constructor
+     *
+     * @param  array   $options                Associative array of options
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        foreach ($options as $name => $value) {
+            $name = strtolower($name);
+            switch ($name) {
+                case 'regexps':
+                    $this->_setRegexps($value);
+                    break;
+                case 'default_options':
+                    $this->_setDefaultOptions($value);
+                    break;
+                case 'content_type_memorization':
+                    $this->_setContentTypeMemorization($value);
+                    break;
+                default:
+                    $this->setOption($name, $value);
+            }
+        }
+        if (isset($this->_specificOptions['http_conditional'])) {
+            if ($this->_specificOptions['http_conditional']) {
+                Zend_Cache::throwException('http_conditional is not implemented for the moment !');
+            }
+        }
+        $this->setOption('automatic_serialization', true);
+    }
+
+    /**
+     * Specific setter for the 'default_options' option (with some additional tests)
+     *
+     * @param  array $options Associative array
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    protected function _setDefaultOptions($options)
+    {
+        if (!is_array($options)) {
+            Zend_Cache::throwException('default_options must be an array !');
+        }
+        foreach ($options as $key=>$value) {
+            if (!is_string($key)) {
+                Zend_Cache::throwException("invalid option [$key] !");
+            }
+            $key = strtolower($key);
+            if (isset($this->_specificOptions['default_options'][$key])) {
+                $this->_specificOptions['default_options'][$key] = $value;
+            }
+        }
+    }
+
+    /**
+     * Set the deprecated contentTypeMemorization option
+     *
+     * @param boolean $value value
+     * @return void
+     * @deprecated
+     */
+    protected function _setContentTypeMemorization($value)
+    {
+        $found = null;
+        foreach ($this->_specificOptions['memorize_headers'] as $key => $value) {
+            if (strtolower($value) == 'content-type') {
+                $found = $key;
+            }
+        }
+        if ($value) {
+            if (!$found) {
+                $this->_specificOptions['memorize_headers'][] = 'Content-Type';
+            }
+        } else {
+            if ($found) {
+                unset($this->_specificOptions['memorize_headers'][$found]);
+            }
+        }
+    }
+
+    /**
+     * Specific setter for the 'regexps' option (with some additional tests)
+     *
+     * @param  array $options Associative array
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    protected function _setRegexps($regexps)
+    {
+        if (!is_array($regexps)) {
+            Zend_Cache::throwException('regexps option must be an array !');
+        }
+        foreach ($regexps as $regexp=>$conf) {
+            if (!is_array($conf)) {
+                Zend_Cache::throwException('regexps option must be an array of arrays !');
+            }
+            $validKeys = array_keys($this->_specificOptions['default_options']);
+            foreach ($conf as $key=>$value) {
+                if (!is_string($key)) {
+                    Zend_Cache::throwException("unknown option [$key] !");
+                }
+                $key = strtolower($key);
+                if (!in_array($key, $validKeys)) {
+                    unset($regexps[$regexp][$key]);
+                }
+            }
+        }
+        $this->setOption('regexps', $regexps);
+    }
+
+    /**
+     * Start the cache
+     *
+     * @param  string  $id       (optional) A cache id (if you set a value here, maybe you have to use Output frontend instead)
+     * @param  boolean $doNotDie For unit testing only !
+     * @return boolean True if the cache is hit (false else)
+     */
+    public function start($id = false, $doNotDie = false)
+    {
+        $this->_cancel = false;
+        $lastMatchingRegexp = null;
+        if (isset($_SERVER['REQUEST_URI'])) {
+            foreach ($this->_specificOptions['regexps'] as $regexp => $conf) {
+                if (preg_match("`$regexp`", $_SERVER['REQUEST_URI'])) {
+                    $lastMatchingRegexp = $regexp;
+                }
+            }
+        }
+        $this->_activeOptions = $this->_specificOptions['default_options'];
+        if ($lastMatchingRegexp !== null) {
+            $conf = $this->_specificOptions['regexps'][$lastMatchingRegexp];
+            foreach ($conf as $key=>$value) {
+                $this->_activeOptions[$key] = $value;
+            }
+        }
+        if (!($this->_activeOptions['cache'])) {
+            return false;
+        }
+        if (!$id) {
+            $id = $this->_makeId();
+            if (!$id) {
+                return false;
+            }
+        }
+        $array = $this->load($id);
+        if ($array !== false) {
+            $data = $array['data'];
+            $headers = $array['headers'];
+            if (!headers_sent()) {
+                foreach ($headers as $key=>$headerCouple) {
+                    $name = $headerCouple[0];
+                    $value = $headerCouple[1];
+                    header("$name: $value");
+                }
+            }
+            if ($this->_specificOptions['debug_header']) {
+                echo 'DEBUG HEADER : This is a cached page !';
+            }
+            echo $data;
+            if ($doNotDie) {
+                return true;
+            }
+            die();
+        }
+        ob_start(array($this, '_flush'));
+        ob_implicit_flush(false);
+        return false;
+    }
+
+    /**
+     * Cancel the current caching process
+     */
+    public function cancel()
+    {
+        $this->_cancel = true;
+    }
+
+    /**
+     * callback for output buffering
+     * (shouldn't really be called manually)
+     *
+     * @param  string $data Buffered output
+     * @return string Data to send to browser
+     */
+    public function _flush($data)
+    {
+        if ($this->_cancel) {
+            return $data;
+        }
+        $contentType = null;
+        $storedHeaders = array();
+        $headersList = headers_list();
+        foreach($this->_specificOptions['memorize_headers'] as $key=>$headerName) {
+            foreach ($headersList as $headerSent) {
+                $tmp = explode(':', $headerSent);
+                $headerSentName = trim(array_shift($tmp));
+                if (strtolower($headerName) == strtolower($headerSentName)) {
+                    $headerSentValue = trim(implode(':', $tmp));
+                    $storedHeaders[] = array($headerSentName, $headerSentValue);
+                }
+            }
+        }
+        $array = array(
+            'data' => $data,
+            'headers' => $storedHeaders
+        );
+        $this->save($array, null, $this->_activeOptions['tags'], $this->_activeOptions['specific_lifetime'], $this->_activeOptions['priority']);
+        return $data;
+    }
+
+    /**
+     * Make an id depending on REQUEST_URI and superglobal arrays (depending on options)
+     *
+     * @return mixed|false a cache id (string), false if the cache should have not to be used
+     */
+    protected function _makeId()
+    {
+        $tmp = $_SERVER['REQUEST_URI'];
+        $array = explode('?', $tmp, 2);
+          $tmp = $array[0];
+        foreach (array('Get', 'Post', 'Session', 'Files', 'Cookie') as $arrayName) {
+            $tmp2 = $this->_makePartialId($arrayName, $this->_activeOptions['cache_with_' . strtolower($arrayName) . '_variables'], $this->_activeOptions['make_id_with_' . strtolower($arrayName) . '_variables']);
+            if ($tmp2===false) {
+                return false;
+            }
+            $tmp = $tmp . $tmp2;
+        }
+        return md5($tmp);
+    }
+
+    /**
+     * Make a partial id depending on options
+     *
+     * @param  string $arrayName Superglobal array name
+     * @param  bool   $bool1     If true, cache is still on even if there are some variables in the superglobal array
+     * @param  bool   $bool2     If true, we have to use the content of the superglobal array to make a partial id
+     * @return mixed|false Partial id (string) or false if the cache should have not to be used
+     */
+    protected function _makePartialId($arrayName, $bool1, $bool2)
+    {
+        switch ($arrayName) {
+        case 'Get':
+            $var = $_GET;
+            break;
+        case 'Post':
+            $var = $_POST;
+            break;
+        case 'Session':
+            if (isset($_SESSION)) {
+                $var = $_SESSION;
+            } else {
+                $var = null;
+            }
+            break;
+        case 'Cookie':
+            if (isset($_COOKIE)) {
+                $var = $_COOKIE;
+            } else {
+                $var = null;
+            }
+            break;
+        case 'Files':
+            $var = $_FILES;
+            break;
+        default:
+            return false;
+        }
+        if ($bool1) {
+            if ($bool2) {
+                return serialize($var);
+            }
+            return '';
+        }
+        if (count($var) > 0) {
+            return false;
+        }
+        return '';
+    }
+
+}
diff --git a/lib/zend/Zend/Cache/Manager.php b/lib/zend/Zend/Cache/Manager.php
new file mode 100644
index 00000000000..330ea954e85
--- /dev/null
+++ b/lib/zend/Zend/Cache/Manager.php
@@ -0,0 +1,308 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** @see Zend_Cache_Exception */
+require_once 'Zend/Cache/Exception.php';
+
+/** @see Zend_Cache */
+require_once 'Zend/Cache.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Cache_Manager
+{
+    /**
+     * Constant holding reserved name for default Page Cache
+     */
+    const PAGECACHE = 'page';
+
+    /**
+     * Constant holding reserved name for default Page Tag Cache
+     */
+    const PAGETAGCACHE = 'pagetag';
+
+    /**
+     * Array of caches stored by the Cache Manager instance
+     *
+     * @var array
+     */
+    protected $_caches = array();
+
+    /**
+     * Array of ready made configuration templates for lazy
+     * loading caches.
+     *
+     * @var array
+     */
+    protected $_optionTemplates = array(
+        // Simple Common Default
+        'default' => array(
+            'frontend' => array(
+                'name'    => 'Core',
+                'options' => array(
+                    'automatic_serialization' => true,
+                ),
+            ),
+            'backend' => array(
+                'name'    => 'File',
+                'options' => array(
+                    // use system temp dir by default of file backend
+                    // 'cache_dir' => '../cache',
+                ),
+            ),
+        ),
+
+        // Static Page HTML Cache
+        'page' => array(
+            'frontend' => array(
+                'name'    => 'Capture',
+                'options' => array(
+                    'ignore_user_abort' => true,
+                ),
+            ),
+            'backend' => array(
+                'name'    => 'Static',
+                'options' => array(
+                    'public_dir' => '../public',
+                ),
+            ),
+        ),
+
+        // Tag Cache
+        'pagetag' => array(
+            'frontend' => array(
+                'name'    => 'Core',
+                'options' => array(
+                    'automatic_serialization' => true,
+                    'lifetime' => null
+                ),
+            ),
+            'backend' => array(
+                'name'    => 'File',
+                'options' => array(
+                    // use system temp dir by default of file backend
+                    // 'cache_dir' => '../cache',
+                    // use default umask of file backend
+                    // 'cache_file_umask' => 0644
+                ),
+            ),
+        ),
+    );
+
+    /**
+     * Set a new cache for the Cache Manager to contain
+     *
+     * @param  string $name
+     * @param  Zend_Cache_Core $cache
+     * @return Zend_Cache_Manager
+     */
+    public function setCache($name, Zend_Cache_Core $cache)
+    {
+        $this->_caches[$name] = $cache;
+        return $this;
+    }
+
+    /**
+     * Check if the Cache Manager contains the named cache object, or a named
+     * configuration template to lazy load the cache object
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasCache($name)
+    {
+        if (isset($this->_caches[$name])
+            || $this->hasCacheTemplate($name)
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Fetch the named cache object, or instantiate and return a cache object
+     * using a named configuration template
+     *
+     * @param  string $name
+     * @return Zend_Cache_Core
+     */
+    public function getCache($name)
+    {
+        if (isset($this->_caches[$name])) {
+            return $this->_caches[$name];
+        }
+        if (isset($this->_optionTemplates[$name])) {
+            if ($name == self::PAGECACHE
+                && (!isset($this->_optionTemplates[$name]['backend']['options']['tag_cache'])
+                || !$this->_optionTemplates[$name]['backend']['options']['tag_cache'] instanceof Zend_Cache_Core)
+            ) {
+                $this->_optionTemplates[$name]['backend']['options']['tag_cache']
+                    = $this->getCache(self::PAGETAGCACHE);
+            }
+
+            $this->_caches[$name] = Zend_Cache::factory(
+                $this->_optionTemplates[$name]['frontend']['name'],
+                $this->_optionTemplates[$name]['backend']['name'],
+                isset($this->_optionTemplates[$name]['frontend']['options']) ? $this->_optionTemplates[$name]['frontend']['options'] : array(),
+                isset($this->_optionTemplates[$name]['backend']['options']) ? $this->_optionTemplates[$name]['backend']['options'] : array(),
+                isset($this->_optionTemplates[$name]['frontend']['customFrontendNaming']) ? $this->_optionTemplates[$name]['frontend']['customFrontendNaming'] : false,
+                isset($this->_optionTemplates[$name]['backend']['customBackendNaming']) ? $this->_optionTemplates[$name]['backend']['customBackendNaming'] : false,
+                isset($this->_optionTemplates[$name]['frontendBackendAutoload']) ? $this->_optionTemplates[$name]['frontendBackendAutoload'] : false
+            );
+
+            return $this->_caches[$name];
+        }
+    }
+
+    /**
+     * Fetch all available caches
+     *
+     * @return array An array of all available caches with it's names as key
+     */
+    public function getCaches()
+    {
+        $caches = $this->_caches;
+        foreach ($this->_optionTemplates as $name => $tmp) {
+            if (!isset($caches[$name])) {
+                $caches[$name] = $this->getCache($name);
+            }
+        }
+        return $caches;
+    }
+
+    /**
+     * Set a named configuration template from which a cache object can later
+     * be lazy loaded
+     *
+     * @param  string $name
+     * @param  array  $options
+     * @return Zend_Cache_Manager
+     * @throws Zend_Cache_Exception
+     */
+    public function setCacheTemplate($name, $options)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } elseif (!is_array($options)) {
+            require_once 'Zend/Cache/Exception.php';
+            throw new Zend_Cache_Exception('Options passed must be in'
+                . ' an associative array or instance of Zend_Config');
+        }
+        $this->_optionTemplates[$name] = $options;
+        return $this;
+    }
+
+    /**
+     * Check if the named configuration template
+     *
+     * @param  string $name
+     * @return bool
+     */
+    public function hasCacheTemplate($name)
+    {
+        if (isset($this->_optionTemplates[$name])) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get the named configuration template
+     *
+     * @param  string $name
+     * @return array
+     */
+    public function getCacheTemplate($name)
+    {
+        if (isset($this->_optionTemplates[$name])) {
+            return $this->_optionTemplates[$name];
+        }
+    }
+
+    /**
+     * Pass an array containing changes to be applied to a named
+     * configuration
+     * template
+     *
+     * @param  string $name
+     * @param  array $options
+     * @return Zend_Cache_Manager
+     * @throws Zend_Cache_Exception for invalid options format or if option templates do not have $name
+     */
+    public function setTemplateOptions($name, $options)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } elseif (!is_array($options)) {
+            require_once 'Zend/Cache/Exception.php';
+            throw new Zend_Cache_Exception('Options passed must be in'
+                . ' an associative array or instance of Zend_Config');
+        }
+        if (!isset($this->_optionTemplates[$name])) {
+            throw new Zend_Cache_Exception('A cache configuration template'
+                . 'does not exist with the name "' . $name . '"');
+        }
+        $this->_optionTemplates[$name]
+            = $this->_mergeOptions($this->_optionTemplates[$name], $options);
+        return $this;
+    }
+
+    /**
+     * Simple method to merge two configuration arrays
+     *
+     * @param  array $current
+     * @param  array $options
+     * @return array
+     */
+    protected function _mergeOptions(array $current, array $options)
+    {
+        if (isset($options['frontend']['name'])) {
+            $current['frontend']['name'] = $options['frontend']['name'];
+        }
+        if (isset($options['backend']['name'])) {
+            $current['backend']['name'] = $options['backend']['name'];
+        }
+        if (isset($options['frontend']['options'])) {
+            foreach ($options['frontend']['options'] as $key => $value) {
+                $current['frontend']['options'][$key] = $value;
+            }
+        }
+        if (isset($options['backend']['options'])) {
+            foreach ($options['backend']['options'] as $key => $value) {
+                $current['backend']['options'][$key] = $value;
+            }
+        }
+        if (isset($options['frontend']['customFrontendNaming'])) {
+            $current['frontend']['customFrontendNaming'] = $options['frontend']['customFrontendNaming'];
+        }
+        if (isset($options['backend']['customBackendNaming'])) {
+            $current['backend']['customBackendNaming'] = $options['backend']['customBackendNaming'];
+        }
+        if (isset($options['frontendBackendAutoload'])) {
+            $current['frontendBackendAutoload'] = $options['frontendBackendAutoload'];
+        }
+        return $current;
+    }
+}
diff --git a/lib/zend/Zend/Config.php b/lib/zend/Zend/Config.php
new file mode 100644
index 00000000000..a39a1f22559
--- /dev/null
+++ b/lib/zend/Zend/Config.php
@@ -0,0 +1,484 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config implements Countable, Iterator
+{
+    /**
+     * Whether in-memory modifications to configuration data are allowed
+     *
+     * @var boolean
+     */
+    protected $_allowModifications;
+
+    /**
+     * Iteration index
+     *
+     * @var integer
+     */
+    protected $_index;
+
+    /**
+     * Number of elements in configuration data
+     *
+     * @var integer
+     */
+    protected $_count;
+
+    /**
+     * Contains array of configuration data
+     *
+     * @var array
+     */
+    protected $_data;
+
+    /**
+     * Used when unsetting values during iteration to ensure we do not skip
+     * the next element
+     *
+     * @var boolean
+     */
+    protected $_skipNextIteration;
+
+    /**
+     * Contains which config file sections were loaded. This is null
+     * if all sections were loaded, a string name if one section is loaded
+     * and an array of string names if multiple sections were loaded.
+     *
+     * @var mixed
+     */
+    protected $_loadedSection;
+
+    /**
+     * This is used to track section inheritance. The keys are names of sections that
+     * extend other sections, and the values are the extended sections.
+     *
+     * @var array
+     */
+    protected $_extends = array();
+
+    /**
+     * Load file error string.
+     *
+     * Is null if there was no error while file loading
+     *
+     * @var string
+     */
+    protected $_loadFileErrorStr = null;
+
+    /**
+     * Zend_Config provides a property based interface to
+     * an array. The data are read-only unless $allowModifications
+     * is set to true on construction.
+     *
+     * Zend_Config also implements Countable and Iterator to
+     * facilitate easy access to the data.
+     *
+     * @param  array   $array
+     * @param  boolean $allowModifications
+     * @return void
+     */
+    public function __construct(array $array, $allowModifications = false)
+    {
+        $this->_allowModifications = (boolean) $allowModifications;
+        $this->_loadedSection = null;
+        $this->_index = 0;
+        $this->_data = array();
+        foreach ($array as $key => $value) {
+            if (is_array($value)) {
+                $this->_data[$key] = new self($value, $this->_allowModifications);
+            } else {
+                $this->_data[$key] = $value;
+            }
+        }
+        $this->_count = count($this->_data);
+    }
+
+    /**
+     * Retrieve a value and return $default if there is no element set.
+     *
+     * @param string $name
+     * @param mixed $default
+     * @return mixed
+     */
+    public function get($name, $default = null)
+    {
+        $result = $default;
+        if (array_key_exists($name, $this->_data)) {
+            $result = $this->_data[$name];
+        }
+        return $result;
+    }
+
+    /**
+     * Magic function so that $obj->value will work.
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        return $this->get($name);
+    }
+
+    /**
+     * Only allow setting of a property if $allowModifications
+     * was set to true on construction. Otherwise, throw an exception.
+     *
+     * @param  string $name
+     * @param  mixed  $value
+     * @throws Zend_Config_Exception
+     * @return void
+     */
+    public function __set($name, $value)
+    {
+        if ($this->_allowModifications) {
+            if (is_array($value)) {
+                $this->_data[$name] = new self($value, true);
+            } else {
+                $this->_data[$name] = $value;
+            }
+            $this->_count = count($this->_data);
+        } else {
+            /** @see Zend_Config_Exception */
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Zend_Config is read only');
+        }
+    }
+
+    /**
+     * Deep clone of this instance to ensure that nested Zend_Configs
+     * are also cloned.
+     *
+     * @return void
+     */
+    public function __clone()
+    {
+      $array = array();
+      foreach ($this->_data as $key => $value) {
+          if ($value instanceof Zend_Config) {
+              $array[$key] = clone $value;
+          } else {
+              $array[$key] = $value;
+          }
+      }
+      $this->_data = $array;
+    }
+
+    /**
+     * Return an associative array of the stored data.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = array();
+        $data = $this->_data;
+        foreach ($data as $key => $value) {
+            if ($value instanceof Zend_Config) {
+                $array[$key] = $value->toArray();
+            } else {
+                $array[$key] = $value;
+            }
+        }
+        return $array;
+    }
+
+    /**
+     * Support isset() overloading on PHP 5.1
+     *
+     * @param string $name
+     * @return boolean
+     */
+    public function __isset($name)
+    {
+        return isset($this->_data[$name]);
+    }
+
+    /**
+     * Support unset() overloading on PHP 5.1
+     *
+     * @param  string $name
+     * @throws Zend_Config_Exception
+     * @return void
+     */
+    public function __unset($name)
+    {
+        if ($this->_allowModifications) {
+            unset($this->_data[$name]);
+            $this->_count = count($this->_data);
+            $this->_skipNextIteration = true;
+        } else {
+            /** @see Zend_Config_Exception */
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Zend_Config is read only');
+        }
+
+    }
+
+    /**
+     * Defined by Countable interface
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return $this->_count;
+    }
+
+    /**
+     * Defined by Iterator interface
+     *
+     * @return mixed
+     */
+    public function current()
+    {
+        $this->_skipNextIteration = false;
+        return current($this->_data);
+    }
+
+    /**
+     * Defined by Iterator interface
+     *
+     * @return mixed
+     */
+    public function key()
+    {
+        return key($this->_data);
+    }
+
+    /**
+     * Defined by Iterator interface
+     *
+     */
+    public function next()
+    {
+        if ($this->_skipNextIteration) {
+            $this->_skipNextIteration = false;
+            return;
+        }
+        next($this->_data);
+        $this->_index++;
+    }
+
+    /**
+     * Defined by Iterator interface
+     *
+     */
+    public function rewind()
+    {
+        $this->_skipNextIteration = false;
+        reset($this->_data);
+        $this->_index = 0;
+    }
+
+    /**
+     * Defined by Iterator interface
+     *
+     * @return boolean
+     */
+    public function valid()
+    {
+        return $this->_index < $this->_count;
+    }
+
+    /**
+     * Returns the section name(s) loaded.
+     *
+     * @return mixed
+     */
+    public function getSectionName()
+    {
+        if(is_array($this->_loadedSection) && count($this->_loadedSection) == 1) {
+            $this->_loadedSection = $this->_loadedSection[0];
+        }
+        return $this->_loadedSection;
+    }
+
+    /**
+     * Returns true if all sections were loaded
+     *
+     * @return boolean
+     */
+    public function areAllSectionsLoaded()
+    {
+        return $this->_loadedSection === null;
+    }
+
+
+    /**
+     * Merge another Zend_Config with this one. The items
+     * in $merge will override the same named items in
+     * the current config.
+     *
+     * @param Zend_Config $merge
+     * @return Zend_Config
+     */
+    public function merge(Zend_Config $merge)
+    {
+        foreach($merge as $key => $item) {
+            if(array_key_exists($key, $this->_data)) {
+                if($item instanceof Zend_Config && $this->$key instanceof Zend_Config) {
+                    $this->$key = $this->$key->merge(new Zend_Config($item->toArray(), !$this->readOnly()));
+                } else {
+                    $this->$key = $item;
+                }
+            } else {
+                if($item instanceof Zend_Config) {
+                    $this->$key = new Zend_Config($item->toArray(), !$this->readOnly());
+                } else {
+                    $this->$key = $item;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Prevent any more modifications being made to this instance. Useful
+     * after merge() has been used to merge multiple Zend_Config objects
+     * into one object which should then not be modified again.
+     *
+     */
+    public function setReadOnly()
+    {
+        $this->_allowModifications = false;
+        foreach ($this->_data as $key => $value) {
+            if ($value instanceof Zend_Config) {
+                $value->setReadOnly();
+            }
+        }
+    }
+
+    /**
+     * Returns if this Zend_Config object is read only or not.
+     *
+     * @return boolean
+     */
+    public function readOnly()
+    {
+        return !$this->_allowModifications;
+    }
+
+    /**
+     * Get the current extends
+     *
+     * @return array
+     */
+    public function getExtends()
+    {
+        return $this->_extends;
+    }
+
+    /**
+     * Set an extend for Zend_Config_Writer
+     *
+     * @param  string $extendingSection
+     * @param  string $extendedSection
+     * @return void
+     */
+    public function setExtend($extendingSection, $extendedSection = null)
+    {
+        if ($extendedSection === null && isset($this->_extends[$extendingSection])) {
+            unset($this->_extends[$extendingSection]);
+        } else if ($extendedSection !== null) {
+            $this->_extends[$extendingSection] = $extendedSection;
+        }
+    }
+
+    /**
+     * Throws an exception if $extendingSection may not extend $extendedSection,
+     * and tracks the section extension if it is valid.
+     *
+     * @param  string $extendingSection
+     * @param  string $extendedSection
+     * @throws Zend_Config_Exception
+     * @return void
+     */
+    protected function _assertValidExtend($extendingSection, $extendedSection)
+    {
+        // detect circular section inheritance
+        $extendedSectionCurrent = $extendedSection;
+        while (array_key_exists($extendedSectionCurrent, $this->_extends)) {
+            if ($this->_extends[$extendedSectionCurrent] == $extendingSection) {
+                /** @see Zend_Config_Exception */
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception('Illegal circular inheritance detected');
+            }
+            $extendedSectionCurrent = $this->_extends[$extendedSectionCurrent];
+        }
+        // remember that this section extends another section
+        $this->_extends[$extendingSection] = $extendedSection;
+    }
+
+    /**
+     * Handle any errors from simplexml_load_file or parse_ini_file
+     *
+     * @param integer $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param integer $errline
+     */
+    public function _loadFileErrorHandler($errno, $errstr, $errfile, $errline)
+    {
+        if ($this->_loadFileErrorStr === null) {
+            $this->_loadFileErrorStr = $errstr;
+        } else {
+            $this->_loadFileErrorStr .= (PHP_EOL . $errstr);
+        }
+    }
+
+    /**
+     * Merge two arrays recursively, overwriting keys of the same name
+     * in $firstArray with the value in $secondArray.
+     *
+     * @param  mixed $firstArray  First array
+     * @param  mixed $secondArray Second array to merge into first array
+     * @return array
+     */
+    protected function _arrayMergeRecursive($firstArray, $secondArray)
+    {
+        if (is_array($firstArray) && is_array($secondArray)) {
+            foreach ($secondArray as $key => $value) {
+                if (isset($firstArray[$key])) {
+                    $firstArray[$key] = $this->_arrayMergeRecursive($firstArray[$key], $value);
+                } else {
+                    if($key === 0) {
+                        $firstArray= array(0=>$this->_arrayMergeRecursive($firstArray, $value));
+                    } else {
+                        $firstArray[$key] = $value;
+                    }
+                }
+            }
+        } else {
+            $firstArray = $secondArray;
+        }
+
+        return $firstArray;
+    }
+}
diff --git a/lib/zend/Zend/Config/Exception.php b/lib/zend/Zend/Config/Exception.php
new file mode 100644
index 00000000000..253b3346825
--- /dev/null
+++ b/lib/zend/Zend/Config/Exception.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config_Exception extends Zend_Exception {}
diff --git a/lib/zend/Zend/Config/Ini.php b/lib/zend/Zend/Config/Ini.php
new file mode 100644
index 00000000000..b2fae01b431
--- /dev/null
+++ b/lib/zend/Zend/Config/Ini.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Config
+ */
+require_once 'Zend/Config.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config_Ini extends Zend_Config
+{
+    /**
+     * String that separates nesting levels of configuration data identifiers
+     *
+     * @var string
+     */
+    protected $_nestSeparator = '.';
+
+    /**
+     * String that separates the parent section name
+     *
+     * @var string
+     */
+    protected $_sectionSeparator = ':';
+
+    /**
+     * Whether to skip extends or not
+     *
+     * @var boolean
+     */
+    protected $_skipExtends = false;
+
+    /**
+     * Loads the section $section from the config file $filename for
+     * access facilitated by nested object properties.
+     *
+     * If the section name contains a ":" then the section name to the right
+     * is loaded and included into the properties. Note that the keys in
+     * this $section will override any keys of the same
+     * name in the sections that have been included via ":".
+     *
+     * If the $section is null, then all sections in the ini file are loaded.
+     *
+     * If any key includes a ".", then this will act as a separator to
+     * create a sub-property.
+     *
+     * example ini file:
+     *      [all]
+     *      db.connection = database
+     *      hostname = live
+     *
+     *      [staging : all]
+     *      hostname = staging
+     *
+     * after calling $data = new Zend_Config_Ini($file, 'staging'); then
+     *      $data->hostname === "staging"
+     *      $data->db->connection === "database"
+     *
+     * The $options parameter may be provided as either a boolean or an array.
+     * If provided as a boolean, this sets the $allowModifications option of
+     * Zend_Config. If provided as an array, there are three configuration
+     * directives that may be set. For example:
+     *
+     * $options = array(
+     *     'allowModifications' => false,
+     *     'nestSeparator'      => ':',
+     *     'skipExtends'        => false,
+     *      );
+     *
+     * @param  string        $filename
+     * @param  mixed         $section
+     * @param  boolean|array $options
+     * @throws Zend_Config_Exception
+     * @return void
+     */
+    public function __construct($filename, $section = null, $options = false)
+    {
+        if (empty($filename)) {
+            /**
+             * @see Zend_Config_Exception
+             */
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Filename is not set');
+        }
+
+        $allowModifications = false;
+        if (is_bool($options)) {
+            $allowModifications = $options;
+        } elseif (is_array($options)) {
+            if (isset($options['allowModifications'])) {
+                $allowModifications = (bool) $options['allowModifications'];
+            }
+            if (isset($options['nestSeparator'])) {
+                $this->_nestSeparator = (string) $options['nestSeparator'];
+            }
+            if (isset($options['skipExtends'])) {
+                $this->_skipExtends = (bool) $options['skipExtends'];
+            }
+        }
+
+        $iniArray = $this->_loadIniFile($filename);
+
+        if (null === $section) {
+            // Load entire file
+            $dataArray = array();
+            foreach ($iniArray as $sectionName => $sectionData) {
+                if(!is_array($sectionData)) {
+                    $dataArray = $this->_arrayMergeRecursive($dataArray, $this->_processKey(array(), $sectionName, $sectionData));
+                } else {
+                    $dataArray[$sectionName] = $this->_processSection($iniArray, $sectionName);
+                }
+            }
+            parent::__construct($dataArray, $allowModifications);
+        } else {
+            // Load one or more sections
+            if (!is_array($section)) {
+                $section = array($section);
+            }
+            $dataArray = array();
+            foreach ($section as $sectionName) {
+                if (!isset($iniArray[$sectionName])) {
+                    /**
+                     * @see Zend_Config_Exception
+                     */
+                    require_once 'Zend/Config/Exception.php';
+                    throw new Zend_Config_Exception("Section '$sectionName' cannot be found in $filename");
+                }
+                $dataArray = $this->_arrayMergeRecursive($this->_processSection($iniArray, $sectionName), $dataArray);
+
+            }
+            parent::__construct($dataArray, $allowModifications);
+        }
+
+        $this->_loadedSection = $section;
+    }
+
+    /**
+     * Load the INI file from disk using parse_ini_file(). Use a private error
+     * handler to convert any loading errors into a Zend_Config_Exception
+     *
+     * @param string $filename
+     * @throws Zend_Config_Exception
+     * @return array
+     */
+    protected function _parseIniFile($filename)
+    {
+        set_error_handler(array($this, '_loadFileErrorHandler'));
+        $iniArray = parse_ini_file($filename, true); // Warnings and errors are suppressed
+        restore_error_handler();
+
+        // Check if there was a error while loading file
+        if ($this->_loadFileErrorStr !== null) {
+            /**
+             * @see Zend_Config_Exception
+             */
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception($this->_loadFileErrorStr);
+        }
+
+        return $iniArray;
+    }
+
+    /**
+     * Load the ini file and preprocess the section separator (':' in the
+     * section name (that is used for section extension) so that the resultant
+     * array has the correct section names and the extension information is
+     * stored in a sub-key called ';extends'. We use ';extends' as this can
+     * never be a valid key name in an INI file that has been loaded using
+     * parse_ini_file().
+     *
+     * @param string $filename
+     * @throws Zend_Config_Exception
+     * @return array
+     */
+    protected function _loadIniFile($filename)
+    {
+        $loaded = $this->_parseIniFile($filename);
+        $iniArray = array();
+        foreach ($loaded as $key => $data)
+        {
+            $pieces = explode($this->_sectionSeparator, $key);
+            $thisSection = trim($pieces[0]);
+            switch (count($pieces)) {
+                case 1:
+                    $iniArray[$thisSection] = $data;
+                    break;
+
+                case 2:
+                    $extendedSection = trim($pieces[1]);
+                    $iniArray[$thisSection] = array_merge(array(';extends'=>$extendedSection), $data);
+                    break;
+
+                default:
+                    /**
+                     * @see Zend_Config_Exception
+                     */
+                    require_once 'Zend/Config/Exception.php';
+                    throw new Zend_Config_Exception("Section '$thisSection' may not extend multiple sections in $filename");
+            }
+        }
+
+        return $iniArray;
+    }
+
+    /**
+     * Process each element in the section and handle the ";extends" inheritance
+     * key. Passes control to _processKey() to handle the nest separator
+     * sub-property syntax that may be used within the key name.
+     *
+     * @param  array  $iniArray
+     * @param  string $section
+     * @param  array  $config
+     * @throws Zend_Config_Exception
+     * @return array
+     */
+    protected function _processSection($iniArray, $section, $config = array())
+    {
+        $thisSection = $iniArray[$section];
+
+        foreach ($thisSection as $key => $value) {
+            if (strtolower($key) == ';extends') {
+                if (isset($iniArray[$value])) {
+                    $this->_assertValidExtend($section, $value);
+
+                    if (!$this->_skipExtends) {
+                        $config = $this->_processSection($iniArray, $value, $config);
+                    }
+                } else {
+                    /**
+                     * @see Zend_Config_Exception
+                     */
+                    require_once 'Zend/Config/Exception.php';
+                    throw new Zend_Config_Exception("Parent section '$section' cannot be found");
+                }
+            } else {
+                $config = $this->_processKey($config, $key, $value);
+            }
+        }
+        return $config;
+    }
+
+    /**
+     * Assign the key's value to the property list. Handles the
+     * nest separator for sub-properties.
+     *
+     * @param  array  $config
+     * @param  string $key
+     * @param  string $value
+     * @throws Zend_Config_Exception
+     * @return array
+     */
+    protected function _processKey($config, $key, $value)
+    {
+        if (strpos($key, $this->_nestSeparator) !== false) {
+            $pieces = explode($this->_nestSeparator, $key, 2);
+            if (strlen($pieces[0]) && strlen($pieces[1])) {
+                if (!isset($config[$pieces[0]])) {
+                    if ($pieces[0] === '0' && !empty($config)) {
+                        // convert the current values in $config into an array
+                        $config = array($pieces[0] => $config);
+                    } else {
+                        $config[$pieces[0]] = array();
+                    }
+                } elseif (!is_array($config[$pieces[0]])) {
+                    /**
+                     * @see Zend_Config_Exception
+                     */
+                    require_once 'Zend/Config/Exception.php';
+                    throw new Zend_Config_Exception("Cannot create sub-key for '{$pieces[0]}' as key already exists");
+                }
+                $config[$pieces[0]] = $this->_processKey($config[$pieces[0]], $pieces[1], $value);
+            } else {
+                /**
+                 * @see Zend_Config_Exception
+                 */
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception("Invalid key '$key'");
+            }
+        } else {
+            $config[$key] = $value;
+        }
+        return $config;
+    }
+}
diff --git a/lib/zend/Zend/Config/Json.php b/lib/zend/Zend/Config/Json.php
new file mode 100755
index 00000000000..2c31fdc0140
--- /dev/null
+++ b/lib/zend/Zend/Config/Json.php
@@ -0,0 +1,242 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Config
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version   $Id$
+ */
+
+/**
+ * @see Zend_Config
+ */
+require_once 'Zend/Config.php';
+
+/**
+ * @see Zend_Json
+ */
+require_once 'Zend/Json.php';
+
+/**
+ * JSON Adapter for Zend_Config
+ *
+ * @category  Zend
+ * @package   Zend_Config
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config_Json extends Zend_Config
+{
+    /**
+     * Name of object key indicating section current section extends
+     */
+    const EXTENDS_NAME = "_extends";
+
+    /**
+     * Whether or not to ignore constants in the JSON string
+     *
+     * Note: if you do not have constant names in quotations in your JSON
+     * string, they may lead to syntax errors when parsing.
+     *
+     * @var bool
+     */
+    protected $_ignoreConstants = false;
+
+    /**
+     * Whether to skip extends or not
+     *
+     * @var boolean
+     */
+    protected $_skipExtends = false;
+
+    /**
+     * Loads the section $section from the config file encoded as JSON
+     *
+     * Sections are defined as properties of the main object
+     *
+     * In order to extend another section, a section defines the "_extends"
+     * property having a value of the section name from which the extending
+     * section inherits values.
+     *
+     * Note that the keys in $section will override any keys of the same
+     * name in the sections that have been included via "_extends".
+     *
+     * @param  string  $json     JSON file or string to process
+     * @param  mixed   $section Section to process
+     * @param  boolean $options Whether modifiacations are allowed at runtime
+     * @throws Zend_Config_Exception When JSON text is not set or cannot be loaded
+     * @throws Zend_Config_Exception When section $sectionName cannot be found in $json
+     */
+    public function __construct($json, $section = null, $options = false)
+    {
+        if (empty($json)) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Filename is not set');
+        }
+
+        $allowModifications = false;
+        if (is_bool($options)) {
+            $allowModifications = $options;
+        } elseif (is_array($options)) {
+            foreach ($options as $key => $value) {
+                switch (strtolower($key)) {
+                    case 'allow_modifications':
+                    case 'allowmodifications':
+                        $allowModifications = (bool) $value;
+                        break;
+                    case 'skip_extends':
+                    case 'skipextends':
+                        $this->_skipExtends = (bool) $value;
+                        break;
+                    case 'ignore_constants':
+                    case 'ignoreconstants':
+                        $this->_ignoreConstants = (bool) $value;
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        set_error_handler(array($this, '_loadFileErrorHandler')); // Warnings and errors are suppressed
+        if ($json[0] != '{') {
+            $json = file_get_contents($json);
+        }
+        restore_error_handler();
+
+        // Check if there was a error while loading file
+        if ($this->_loadFileErrorStr !== null) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception($this->_loadFileErrorStr);
+        }
+
+        // Replace constants
+        if (!$this->_ignoreConstants) {
+            $json = $this->_replaceConstants($json);
+        }
+
+        // Parse/decode
+        try {
+            $config = Zend_Json::decode($json);
+        } catch (Zend_Json_Exception $e) {
+            // decode failed
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception("Error parsing JSON data");
+        }
+
+        if ($section === null) {
+            $dataArray = array();
+            foreach ($config as $sectionName => $sectionData) {
+                $dataArray[$sectionName] = $this->_processExtends($config, $sectionName);
+            }
+
+            parent::__construct($dataArray, $allowModifications);
+        } elseif (is_array($section)) {
+            $dataArray = array();
+            foreach ($section as $sectionName) {
+                if (!isset($config[$sectionName])) {
+                    require_once 'Zend/Config/Exception.php';
+                    throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $sectionName));
+                }
+
+                $dataArray = array_merge($this->_processExtends($config, $sectionName), $dataArray);
+            }
+
+            parent::__construct($dataArray, $allowModifications);
+        } else {
+            if (!isset($config[$section])) {
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section));
+            }
+
+            $dataArray = $this->_processExtends($config, $section);
+            if (!is_array($dataArray)) {
+                // Section in the JSON data contains just one top level string
+                $dataArray = array($section => $dataArray);
+            }
+
+            parent::__construct($dataArray, $allowModifications);
+        }
+
+        $this->_loadedSection = $section;
+    }
+
+    /**
+     * Helper function to process each element in the section and handle
+     * the "_extends" inheritance attribute.
+     *
+     * @param  array            $data Data array to process
+     * @param  string           $section Section to process
+     * @param  array            $config  Configuration which was parsed yet
+     * @throws Zend_Config_Exception When $section cannot be found
+     * @return array
+     */
+    protected function _processExtends(array $data, $section, array $config = array())
+    {
+        if (!isset($data[$section])) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section));
+        }
+
+        $thisSection  = $data[$section];
+
+        if (is_array($thisSection) && isset($thisSection[self::EXTENDS_NAME])) {
+            if (is_array($thisSection[self::EXTENDS_NAME])) {
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception('Invalid extends clause: must be a string; array received');
+            }
+            $this->_assertValidExtend($section, $thisSection[self::EXTENDS_NAME]);
+
+            if (!$this->_skipExtends) {
+                $config = $this->_processExtends($data, $thisSection[self::EXTENDS_NAME], $config);
+            }
+            unset($thisSection[self::EXTENDS_NAME]);
+        }
+
+        $config = $this->_arrayMergeRecursive($config, $thisSection);
+
+        return $config;
+    }
+
+    /**
+     * Replace any constants referenced in a string with their values
+     *
+     * @param  string $value
+     * @return string
+     */
+    protected function _replaceConstants($value)
+    {
+        foreach ($this->_getConstants() as $constant) {
+            if (strstr($value, $constant)) {
+                // handle backslashes that may represent windows path names for instance
+                $replacement = str_replace('\\', '\\\\', constant($constant));
+                $value = str_replace($constant, $replacement, $value);
+            }
+        }
+        return $value;
+    }
+
+    /**
+     * Get (reverse) sorted list of defined constant names
+     *
+     * @return array
+     */
+    protected function _getConstants()
+    {
+        $constants = array_keys(get_defined_constants());
+        rsort($constants, SORT_STRING);
+        return $constants;
+    }
+}
diff --git a/lib/zend/Zend/Config/Writer.php b/lib/zend/Zend/Config/Writer.php
new file mode 100644
index 00000000000..8c255b3c847
--- /dev/null
+++ b/lib/zend/Zend/Config/Writer.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Config_Writer
+{
+    /**
+     * Option keys to skip when calling setOptions()
+     *
+     * @var array
+     */
+    protected $_skipOptions = array(
+        'options'
+    );
+
+    /**
+     * Config object to write
+     *
+     * @var Zend_Config
+     */
+    protected $_config = null;
+
+    /**
+     * Create a new adapter
+     *
+     * $options can only be passed as array or be omitted
+     *
+     * @param null|array $options
+     */
+    public function __construct(array $options = null)
+    {
+        if (is_array($options)) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * Set options via a Zend_Config instance
+     *
+     * @param  Zend_Config $config
+     * @return Zend_Config_Writer
+     */
+    public function setConfig(Zend_Config $config)
+    {
+        $this->_config = $config;
+
+        return $this;
+    }
+
+    /**
+     * Set options via an array
+     *
+     * @param  array $options
+     * @return Zend_Config_Writer
+     */
+    public function setOptions(array $options)
+    {
+        foreach ($options as $key => $value) {
+            if (in_array(strtolower($key), $this->_skipOptions)) {
+                continue;
+            }
+
+            $method = 'set' . ucfirst($key);
+            if (method_exists($this, $method)) {
+                $this->$method($value);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Write a Zend_Config object to it's target
+     *
+     * @return void
+     */
+    abstract public function write();
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php b/lib/zend/Zend/Config/Writer/Array.php
similarity index 51%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php
rename to lib/zend/Zend/Config/Writer/Array.php
index 6ea614a9d22..50c260e0cf0 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php
+++ b/lib/zend/Zend/Config/Writer/Array.php
@@ -13,38 +13,43 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
+ * @see Zend_Config_Writer
  */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php';
+require_once 'Zend/Config/Writer/FileAbstract.php';
 
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_TearDownCallResponse
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
+class Zend_Config_Writer_Array extends Zend_Config_Writer_FileAbstract
 {
     /**
-     * returns the session id
+     * Render a Zend_Config into a PHP Array config string.
+     *
+     * @since 1.10
      * @return string
      */
-    public function getSessionId()
+    public function render()
     {
-        if (isset($this->return->sessionId)) {
-            return $this->return->sessionId;
+        $data        = $this->_config->toArray();
+        $sectionName = $this->_config->getSectionName();
+
+        if (is_string($sectionName)) {
+            $data = array($sectionName => $data);
         }
-        return null;
+
+        $arrayString = "<?php\n"
+                     . "return " . var_export($data, true) . ";\n";
+
+        return $arrayString;
     }
 }
diff --git a/lib/zend/Zend/Config/Writer/FileAbstract.php b/lib/zend/Zend/Config/Writer/FileAbstract.php
new file mode 100644
index 00000000000..a1da83b96bf
--- /dev/null
+++ b/lib/zend/Zend/Config/Writer/FileAbstract.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Config
+ * @package    Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once "Zend/Config/Writer.php";
+
+/**
+ * Abstract File Writer
+ *
+ * @category   Zend
+ * @package    Zend_package
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer
+{
+    /**
+     * Filename to write to
+     *
+     * @var string
+     */
+    protected $_filename = null;
+
+    /**
+     * Wether to exclusively lock the file or not
+     *
+     * @var boolean
+     */
+    protected $_exclusiveLock = false;
+
+    /**
+     * Set the target filename
+     *
+     * @param  string $filename
+     * @return Zend_Config_Writer_Array
+     */
+    public function setFilename($filename)
+    {
+        $this->_filename = $filename;
+
+        return $this;
+    }
+
+    /**
+     * Set wether to exclusively lock the file or not
+     *
+     * @param  boolean     $exclusiveLock
+     * @return Zend_Config_Writer_Array
+     */
+    public function setExclusiveLock($exclusiveLock)
+    {
+        $this->_exclusiveLock = $exclusiveLock;
+
+        return $this;
+    }
+
+    /**
+     * Write configuration to file.
+     *
+     * @param string $filename
+     * @param Zend_Config $config
+     * @param bool $exclusiveLock
+     * @return void
+     */
+    public function write($filename = null, Zend_Config $config = null, $exclusiveLock = null)
+    {
+        if ($filename !== null) {
+            $this->setFilename($filename);
+        }
+
+        if ($config !== null) {
+            $this->setConfig($config);
+        }
+
+        if ($exclusiveLock !== null) {
+            $this->setExclusiveLock($exclusiveLock);
+        }
+
+        if ($this->_filename === null) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('No filename was set');
+        }
+
+        if ($this->_config === null) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('No config was set');
+        }
+
+        $configString = $this->render();
+
+        $flags = 0;
+
+        if ($this->_exclusiveLock) {
+            $flags |= LOCK_EX;
+        }
+
+        $result = @file_put_contents($this->_filename, $configString, $flags);
+
+        if ($result === false) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Could not write to file "' . $this->_filename . '"');
+        }
+    }
+
+    /**
+     * Render a Zend_Config into a config file string.
+     *
+     * @since 1.10
+     * @todo For 2.0 this should be redone into an abstract method.
+     * @return string
+     */
+    public function render()
+    {
+        return "";
+    }
+}
diff --git a/lib/zend/Zend/Config/Writer/Ini.php b/lib/zend/Zend/Config/Writer/Ini.php
new file mode 100644
index 00000000000..15344a5b740
--- /dev/null
+++ b/lib/zend/Zend/Config/Writer/Ini.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Config_Writer
+ */
+require_once 'Zend/Config/Writer/FileAbstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config_Writer_Ini extends Zend_Config_Writer_FileAbstract
+{
+    /**
+     * String that separates nesting levels of configuration data identifiers
+     *
+     * @var string
+     */
+    protected $_nestSeparator = '.';
+
+    /**
+     * If true the ini string is rendered in the global namespace without sections.
+     *
+     * @var bool
+     */
+    protected $_renderWithoutSections = false;
+
+    /**
+     * Set the nest separator
+     *
+     * @param  string $filename
+     * @return Zend_Config_Writer_Ini
+     */
+    public function setNestSeparator($separator)
+    {
+        $this->_nestSeparator = $separator;
+
+        return $this;
+    }
+
+    /**
+     * Set if rendering should occour without sections or not.
+     *
+     * If set to true, the INI file is rendered without sections completely
+     * into the global namespace of the INI file.
+     *
+     * @param  bool $withoutSections
+     * @return Zend_Config_Writer_Ini
+     */
+    public function setRenderWithoutSections($withoutSections=true)
+    {
+        $this->_renderWithoutSections = (bool)$withoutSections;
+        return $this;
+    }
+
+    /**
+     * Render a Zend_Config into a INI config string.
+     *
+     * @since 1.10
+     * @return string
+     */
+    public function render()
+    {
+        $iniString   = '';
+        $extends     = $this->_config->getExtends();
+        $sectionName = $this->_config->getSectionName();
+
+        if($this->_renderWithoutSections == true) {
+            $iniString .= $this->_addBranch($this->_config);
+        } else if (is_string($sectionName)) {
+            $iniString .= '[' . $sectionName . ']' . "\n"
+                       .  $this->_addBranch($this->_config)
+                       .  "\n";
+        } else {
+            $config = $this->_sortRootElements($this->_config);
+            foreach ($config as $sectionName => $data) {
+                if (!($data instanceof Zend_Config)) {
+                    $iniString .= $sectionName
+                               .  ' = '
+                               .  $this->_prepareValue($data)
+                               .  "\n";
+                } else {
+                    if (isset($extends[$sectionName])) {
+                        $sectionName .= ' : ' . $extends[$sectionName];
+                    }
+
+                    $iniString .= '[' . $sectionName . ']' . "\n"
+                               .  $this->_addBranch($data)
+                               .  "\n";
+                }
+            }
+        }
+
+        return $iniString;
+    }
+
+    /**
+     * Add a branch to an INI string recursively
+     *
+     * @param  Zend_Config $config
+     * @return void
+     */
+    protected function _addBranch(Zend_Config $config, $parents = array())
+    {
+        $iniString = '';
+
+        foreach ($config as $key => $value) {
+            $group = array_merge($parents, array($key));
+
+            if ($value instanceof Zend_Config) {
+                $iniString .= $this->_addBranch($value, $group);
+            } else {
+                $iniString .= implode($this->_nestSeparator, $group)
+                           .  ' = '
+                           .  $this->_prepareValue($value)
+                           .  "\n";
+            }
+        }
+
+        return $iniString;
+    }
+
+    /**
+     * Prepare a value for INI
+     *
+     * @param  mixed $value
+     * @return string
+     */
+    protected function _prepareValue($value)
+    {
+        if (is_integer($value) || is_float($value)) {
+            return $value;
+        } elseif (is_bool($value)) {
+            return ($value ? 'true' : 'false');
+        } elseif (strpos($value, '"') === false) {
+            return '"' . $value .  '"';
+        } else {
+            /** @see Zend_Config_Exception */
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Value can not contain double quotes "');
+        }
+    }
+
+    /**
+     * Root elements that are not assigned to any section needs to be
+     * on the top of config.
+     *
+     * @see    http://framework.zend.com/issues/browse/ZF-6289
+     * @param  Zend_Config
+     * @return Zend_Config
+     */
+    protected function _sortRootElements(Zend_Config $config)
+    {
+        $configArray = $config->toArray();
+        $sections = array();
+
+        // remove sections from config array
+        foreach ($configArray as $key => $value) {
+            if (is_array($value)) {
+                $sections[$key] = $value;
+                unset($configArray[$key]);
+            }
+        }
+
+        // readd sections to the end
+        foreach ($sections as $key => $value) {
+            $configArray[$key] = $value;
+        }
+
+        return new Zend_Config($configArray);
+    }
+}
diff --git a/lib/zend/Zend/Config/Writer/Json.php b/lib/zend/Zend/Config/Writer/Json.php
new file mode 100755
index 00000000000..25da4a9038c
--- /dev/null
+++ b/lib/zend/Zend/Config/Writer/Json.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Config_Writer
+ */
+require_once 'Zend/Config/Writer/FileAbstract.php';
+
+/**
+ * @see Zend_Config_Json
+ */
+require_once 'Zend/Config/Json.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config_Writer_Json extends Zend_Config_Writer_FileAbstract
+{
+    /**
+     * If we need to pretty-print JSON data
+     *
+     * @var boolean
+     */
+    protected $_prettyPrint = false;
+
+    /**
+     * Get prettyPrint flag
+     *
+     * @return the prettyPrint flag
+     */
+    public function prettyPrint()
+    {
+        return $this->_prettyPrint;
+    }
+
+    /**
+     * Set prettyPrint flag
+     *
+     * @param  bool $prettyPrint PrettyPrint flag
+     * @return Zend_Config_Writer_Json
+     */
+    public function setPrettyPrint($flag)
+    {
+        $this->_prettyPrint = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Render a Zend_Config into a JSON config string.
+     *
+     * @since 1.10
+     * @return string
+     */
+    public function render()
+    {
+        $data        = $this->_config->toArray();
+        $sectionName = $this->_config->getSectionName();
+        $extends     = $this->_config->getExtends();
+
+        if (is_string($sectionName)) {
+            $data = array($sectionName => $data);
+        }
+
+        foreach ($extends as $section => $parentSection) {
+            $data[$section][Zend_Config_Json::EXTENDS_NAME] = $parentSection;
+        }
+
+        // Ensure that each "extends" section actually exists
+        foreach ($data as $section => $sectionData) {
+            if (is_array($sectionData) && isset($sectionData[Zend_Config_Json::EXTENDS_NAME])) {
+                $sectionExtends = $sectionData[Zend_Config_Json::EXTENDS_NAME];
+                if (!isset($data[$sectionExtends])) {
+                    // Remove "extends" declaration if section does not exist
+                    unset($data[$section][Zend_Config_Json::EXTENDS_NAME]);
+                }
+            }
+        }
+
+        $out = Zend_Json::encode($data);
+        if ($this->prettyPrint()) {
+             $out = Zend_Json::prettyPrint($out);
+        }
+        return $out;
+    }
+}
diff --git a/lib/zend/Zend/Config/Writer/Xml.php b/lib/zend/Zend/Config/Writer/Xml.php
new file mode 100644
index 00000000000..c73564b2190
--- /dev/null
+++ b/lib/zend/Zend/Config/Writer/Xml.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Config_Writer
+ */
+require_once 'Zend/Config/Writer/FileAbstract.php';
+
+/**
+ * @see Zend_Config_Xml
+ */
+require_once 'Zend/Config/Xml.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config_Writer_Xml extends Zend_Config_Writer_FileAbstract
+{
+    /**
+     * Render a Zend_Config into a XML config string.
+     *
+     * @since 1.10
+     * @return string
+     */
+    public function render()
+    {
+        $xml         = new SimpleXMLElement('<zend-config xmlns:zf="' . Zend_Config_Xml::XML_NAMESPACE . '"/>');
+        $extends     = $this->_config->getExtends();
+        $sectionName = $this->_config->getSectionName();
+
+        if (is_string($sectionName)) {
+            $child = $xml->addChild($sectionName);
+
+            $this->_addBranch($this->_config, $child, $xml);
+        } else {
+            foreach ($this->_config as $sectionName => $data) {
+                if (!($data instanceof Zend_Config)) {
+                    $xml->addChild($sectionName, (string) $data);
+                } else {
+                    $child = $xml->addChild($sectionName);
+
+                    if (isset($extends[$sectionName])) {
+                        $child->addAttribute('zf:extends', $extends[$sectionName], Zend_Config_Xml::XML_NAMESPACE);
+                    }
+
+                    $this->_addBranch($data, $child, $xml);
+                }
+            }
+        }
+
+        $dom = dom_import_simplexml($xml)->ownerDocument;
+        $dom->formatOutput = true;
+
+        $xmlString = $dom->saveXML();
+
+        return $xmlString;
+    }
+
+    /**
+     * Add a branch to an XML object recursively
+     *
+     * @param  Zend_Config      $config
+     * @param  SimpleXMLElement $xml
+     * @param  SimpleXMLElement $parent
+     * @return void
+     */
+    protected function _addBranch(Zend_Config $config, SimpleXMLElement $xml, SimpleXMLElement $parent)
+    {
+        $branchType = null;
+
+        foreach ($config as $key => $value) {
+            if ($branchType === null) {
+                if (is_numeric($key)) {
+                    $branchType = 'numeric';
+                    $branchName = $xml->getName();
+                    $xml        = $parent;
+
+                    unset($parent->{$branchName});
+                } else {
+                    $branchType = 'string';
+                }
+            } else if ($branchType !== (is_numeric($key) ? 'numeric' : 'string')) {
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception('Mixing of string and numeric keys is not allowed');
+            }
+
+            if ($branchType === 'numeric') {
+                if ($value instanceof Zend_Config) {
+                    $child = $parent->addChild($branchName);
+
+                    $this->_addBranch($value, $child, $parent);
+                } else {
+                    $parent->addChild($branchName, (string) $value);
+                }
+            } else {
+                if ($value instanceof Zend_Config) {
+                    $child = $xml->addChild($key);
+
+                    $this->_addBranch($value, $child, $xml);
+                } else {
+                    $xml->addChild($key, (string) $value);
+                }
+            }
+        }
+    }
+}
diff --git a/lib/zend/Zend/Config/Writer/Yaml.php b/lib/zend/Zend/Config/Writer/Yaml.php
new file mode 100755
index 00000000000..4d2b1fed442
--- /dev/null
+++ b/lib/zend/Zend/Config/Writer/Yaml.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Config_Writer
+ */
+require_once 'Zend/Config/Writer/FileAbstract.php';
+
+/**
+ * @see Zend_Config_Yaml
+ */
+require_once 'Zend/Config/Yaml.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Config
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config_Writer_Yaml extends Zend_Config_Writer_FileAbstract
+{
+    /**
+     * What to call when we need to decode some YAML?
+     *
+     * @var callable
+     */
+    protected $_yamlEncoder = array('Zend_Config_Writer_Yaml', 'encode');
+
+    /**
+     * Get callback for decoding YAML
+     *
+     * @return callable
+     */
+    public function getYamlEncoder()
+    {
+        return $this->_yamlEncoder;
+    }
+
+    /**
+     * Set callback for decoding YAML
+     *
+     * @param  callable $yamlEncoder the decoder to set
+     * @return Zend_Config_Yaml
+     */
+    public function setYamlEncoder($yamlEncoder)
+    {
+        if (!is_callable($yamlEncoder)) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Invalid parameter to setYamlEncoder - must be callable');
+        }
+
+        $this->_yamlEncoder = $yamlEncoder;
+        return $this;
+    }
+
+    /**
+     * Render a Zend_Config into a YAML config string.
+     *
+     * @since 1.10
+     * @return string
+     */
+    public function render()
+    {
+        $data        = $this->_config->toArray();
+        $sectionName = $this->_config->getSectionName();
+        $extends     = $this->_config->getExtends();
+
+        if (is_string($sectionName)) {
+            $data = array($sectionName => $data);
+        }
+
+        foreach ($extends as $section => $parentSection) {
+            $data[$section][Zend_Config_Yaml::EXTENDS_NAME] = $parentSection;
+        }
+
+        // Ensure that each "extends" section actually exists
+        foreach ($data as $section => $sectionData) {
+            if (is_array($sectionData) && isset($sectionData[Zend_Config_Yaml::EXTENDS_NAME])) {
+                $sectionExtends = $sectionData[Zend_Config_Yaml::EXTENDS_NAME];
+                if (!isset($data[$sectionExtends])) {
+                    // Remove "extends" declaration if section does not exist
+                    unset($data[$section][Zend_Config_Yaml::EXTENDS_NAME]);
+                }
+            }
+        }
+
+        return call_user_func($this->getYamlEncoder(), $data);
+    }
+
+    /**
+     * Very dumb YAML encoder
+     *
+     * Until we have Zend_Yaml...
+     *
+     * @param array $data YAML data
+     * @return string
+     */
+    public static function encode($data)
+    {
+        return self::_encodeYaml(0, $data);
+    }
+
+    /**
+     * Service function for encoding YAML
+     *
+     * @param int $indent Current indent level
+     * @param array $data Data to encode
+     * @return string
+     */
+    protected static function _encodeYaml($indent, $data)
+    {
+        reset($data);
+        $result = "";
+        $numeric = is_numeric(key($data));
+
+        foreach($data as $key => $value) {
+            if(is_array($value)) {
+                $encoded = "\n".self::_encodeYaml($indent+1, $value);
+            } else {
+                $encoded = (string)$value."\n";
+            }
+            $result .= str_repeat("  ", $indent).($numeric?"- ":"$key: ").$encoded;
+        }
+        return $result;
+    }
+}
diff --git a/lib/zend/Zend/Config/Xml.php b/lib/zend/Zend/Config/Xml.php
new file mode 100644
index 00000000000..4425a8b7059
--- /dev/null
+++ b/lib/zend/Zend/Config/Xml.php
@@ -0,0 +1,314 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version   $Id$
+ */
+
+/**
+ * @see Zend_Config
+ */
+require_once 'Zend/Config.php';
+
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
+/** @see Zend_Xml_Exception */
+require_once 'Zend/Xml/Exception.php';
+
+/**
+ * XML Adapter for Zend_Config
+ *
+ * @category  Zend
+ * @package   Zend_Config
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config_Xml extends Zend_Config
+{
+    /**
+     * XML namespace for ZF-related tags and attributes
+     */
+    const XML_NAMESPACE = 'http://framework.zend.com/xml/zend-config-xml/1.0/';
+
+    /**
+     * Whether to skip extends or not
+     *
+     * @var boolean
+     */
+    protected $_skipExtends = false;
+
+    /**
+     * Loads the section $section from the config file (or string $xml for
+     * access facilitated by nested object properties.
+     *
+     * Sections are defined in the XML as children of the root element.
+     *
+     * In order to extend another section, a section defines the "extends"
+     * attribute having a value of the section name from which the extending
+     * section inherits values.
+     *
+     * Note that the keys in $section will override any keys of the same
+     * name in the sections that have been included via "extends".
+     * 
+     * The $options parameter may be provided as either a boolean or an array.
+     * If provided as a boolean, this sets the $allowModifications option of
+     * Zend_Config. If provided as an array, there are two configuration
+     * directives that may be set. For example:
+     *
+     * $options = array(
+     *     'allowModifications' => false,
+     *     'skipExtends'        => false
+     *      );
+     *
+     * @param  string        $xml     XML file or string to process
+     * @param  mixed         $section Section to process
+     * @param  array|boolean $options 
+     * @throws Zend_Config_Exception When xml is not set or cannot be loaded
+     * @throws Zend_Config_Exception When section $sectionName cannot be found in $xml
+     */
+    public function __construct($xml, $section = null, $options = false)
+    {
+        if (empty($xml)) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Filename is not set');
+        }
+
+        $allowModifications = false;
+        if (is_bool($options)) {
+            $allowModifications = $options;
+        } elseif (is_array($options)) {
+            if (isset($options['allowModifications'])) {
+                $allowModifications = (bool) $options['allowModifications'];
+            }
+            if (isset($options['skipExtends'])) {
+                $this->_skipExtends = (bool) $options['skipExtends'];
+            }
+        }
+
+        set_error_handler(array($this, '_loadFileErrorHandler')); // Warnings and errors are suppressed
+        if (strstr($xml, '<?xml')) {
+            $config = Zend_Xml_Security::scan($xml);
+        } else {
+            try {
+                if (!$config = Zend_Xml_Security::scanFile($xml)) {
+                    require_once 'Zend/Config/Exception.php';
+                    throw new Zend_Config_Exception(
+                        "Error failed to load $xml file"
+                    );
+                }
+            } catch (Zend_Xml_Exception $e) {
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception(
+                    $e->getMessage()
+                );
+            }
+        }
+
+        restore_error_handler();
+        // Check if there was a error while loading file
+        if ($this->_loadFileErrorStr !== null) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception($this->_loadFileErrorStr);
+        }
+
+        if ($section === null) {
+            $dataArray = array();
+            foreach ($config as $sectionName => $sectionData) {
+                $dataArray[$sectionName] = $this->_processExtends($config, $sectionName);
+            }
+
+            parent::__construct($dataArray, $allowModifications);
+        } else if (is_array($section)) {
+            $dataArray = array();
+            foreach ($section as $sectionName) {
+                if (!isset($config->$sectionName)) {
+                    require_once 'Zend/Config/Exception.php';
+                    throw new Zend_Config_Exception("Section '$sectionName' cannot be found in $xml");
+                }
+
+                $dataArray = array_merge($this->_processExtends($config, $sectionName), $dataArray);
+            }
+
+            parent::__construct($dataArray, $allowModifications);
+        } else {
+            if (!isset($config->$section)) {
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception("Section '$section' cannot be found in $xml");
+            }
+
+            $dataArray = $this->_processExtends($config, $section);
+            if (!is_array($dataArray)) {
+                // Section in the XML file contains just one top level string
+                $dataArray = array($section => $dataArray);
+            }
+
+            parent::__construct($dataArray, $allowModifications);
+        }
+
+        $this->_loadedSection = $section;
+    }
+
+    /**
+     * Helper function to process each element in the section and handle
+     * the "extends" inheritance attribute.
+     *
+     * @param  SimpleXMLElement $element XML Element to process
+     * @param  string           $section Section to process
+     * @param  array            $config  Configuration which was parsed yet
+     * @throws Zend_Config_Exception When $section cannot be found
+     * @return array
+     */
+    protected function _processExtends(SimpleXMLElement $element, $section, array $config = array())
+    {
+        if (!isset($element->$section)) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception("Section '$section' cannot be found");
+        }
+
+        $thisSection  = $element->$section;
+        $nsAttributes = $thisSection->attributes(self::XML_NAMESPACE);
+
+        if (isset($thisSection['extends']) || isset($nsAttributes['extends'])) {
+            $extendedSection = (string) (isset($nsAttributes['extends']) ? $nsAttributes['extends'] : $thisSection['extends']);
+            $this->_assertValidExtend($section, $extendedSection);
+
+            if (!$this->_skipExtends) {
+                $config = $this->_processExtends($element, $extendedSection, $config);
+            }
+        }
+
+        $config = $this->_arrayMergeRecursive($config, $this->_toArray($thisSection));
+
+        return $config;
+    }
+
+    /**
+     * Returns a string or an associative and possibly multidimensional array from
+     * a SimpleXMLElement.
+     *
+     * @param  SimpleXMLElement $xmlObject Convert a SimpleXMLElement into an array
+     * @return array|string
+     */
+    protected function _toArray(SimpleXMLElement $xmlObject)
+    {
+        $config       = array();
+        $nsAttributes = $xmlObject->attributes(self::XML_NAMESPACE);
+
+        // Search for parent node values
+        if (count($xmlObject->attributes()) > 0) {
+            foreach ($xmlObject->attributes() as $key => $value) {
+                if ($key === 'extends') {
+                    continue;
+                }
+
+                $value = (string) $value;
+
+                if (array_key_exists($key, $config)) {
+                    if (!is_array($config[$key])) {
+                        $config[$key] = array($config[$key]);
+                    }
+
+                    $config[$key][] = $value;
+                } else {
+                    $config[$key] = $value;
+                }
+            }
+        }
+
+        // Search for local 'const' nodes and replace them
+        if (count($xmlObject->children(self::XML_NAMESPACE)) > 0) {
+            if (count($xmlObject->children()) > 0) {
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception("A node with a 'const' childnode may not have any other children");
+            }
+
+            $dom                 = dom_import_simplexml($xmlObject);
+            $namespaceChildNodes = array();
+
+            // We have to store them in an array, as replacing nodes will
+            // confuse the DOMNodeList later
+            foreach ($dom->childNodes as $node) {
+                if ($node instanceof DOMElement && $node->namespaceURI === self::XML_NAMESPACE) {
+                    $namespaceChildNodes[] = $node;
+                }
+            }
+
+            foreach ($namespaceChildNodes as $node) {
+                switch ($node->localName) {
+                    case 'const':
+                        if (!$node->hasAttributeNS(self::XML_NAMESPACE, 'name')) {
+                            require_once 'Zend/Config/Exception.php';
+                            throw new Zend_Config_Exception("Misssing 'name' attribute in 'const' node");
+                        }
+
+                        $constantName = $node->getAttributeNS(self::XML_NAMESPACE, 'name');
+
+                        if (!defined($constantName)) {
+                            require_once 'Zend/Config/Exception.php';
+                            throw new Zend_Config_Exception("Constant with name '$constantName' was not defined");
+                        }
+
+                        $constantValue = constant($constantName);
+
+                        $dom->replaceChild($dom->ownerDocument->createTextNode($constantValue), $node);
+                        break;
+
+                    default:
+                        require_once 'Zend/Config/Exception.php';
+                        throw new Zend_Config_Exception("Unknown node with name '$node->localName' found");
+                }
+            }
+
+            return (string) simplexml_import_dom($dom);
+        }
+
+        // Search for children
+        if (count($xmlObject->children()) > 0) {
+            foreach ($xmlObject->children() as $key => $value) {
+                if (count($value->children()) > 0 || count($value->children(self::XML_NAMESPACE)) > 0) {
+                    $value = $this->_toArray($value);
+                } else if (count($value->attributes()) > 0) {
+                    $attributes = $value->attributes();
+                    if (isset($attributes['value'])) {
+                        $value = (string) $attributes['value'];
+                    } else {
+                        $value = $this->_toArray($value);
+                    }
+                } else {
+                    $value = (string) $value;
+                }
+
+                if (array_key_exists($key, $config)) {
+                    if (!is_array($config[$key]) || !array_key_exists(0, $config[$key])) {
+                        $config[$key] = array($config[$key]);
+                    }
+
+                    $config[$key][] = $value;
+                } else {
+                    $config[$key] = $value;
+                }
+            }
+        } else if (!isset($xmlObject['extends']) && !isset($nsAttributes['extends']) && (count($config) === 0)) {
+            // Object has no children nor attributes and doesn't use the extends
+            // attribute: it's a string
+            $config = (string) $xmlObject;
+        }
+
+        return $config;
+    }
+}
diff --git a/lib/zend/Zend/Config/Yaml.php b/lib/zend/Zend/Config/Yaml.php
new file mode 100755
index 00000000000..0d107033eb8
--- /dev/null
+++ b/lib/zend/Zend/Config/Yaml.php
@@ -0,0 +1,415 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Config
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version   $Id$
+ */
+
+/**
+ * @see Zend_Config
+ */
+require_once 'Zend/Config.php';
+
+/**
+ * YAML Adapter for Zend_Config
+ *
+ * @category  Zend
+ * @package   Zend_Config
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Config_Yaml extends Zend_Config
+{
+    /**
+     * Attribute name that indicates what section a config extends from
+     */
+    const EXTENDS_NAME = "_extends";
+
+    /**
+     * Whether to skip extends or not
+     *
+     * @var boolean
+     */
+    protected $_skipExtends = false;
+
+    /**
+     * What to call when we need to decode some YAML?
+     *
+     * @var callable
+     */
+    protected $_yamlDecoder = array(__CLASS__, 'decode');
+
+    /**
+     * Whether or not to ignore constants in parsed YAML
+     * @var bool
+     */
+    protected static $_ignoreConstants = false;
+
+    /**
+     * Indicate whether parser should ignore constants or not
+     *
+     * @param  bool $flag
+     * @return void
+     */
+    public static function setIgnoreConstants($flag)
+    {
+        self::$_ignoreConstants = (bool) $flag;
+    }
+
+    /**
+     * Whether parser should ignore constants or not
+     *
+     * @return bool
+     */
+    public static function ignoreConstants()
+    {
+        return self::$_ignoreConstants;
+    }
+
+    /**
+     * Get callback for decoding YAML
+     *
+     * @return callable
+     */
+    public function getYamlDecoder()
+    {
+        return $this->_yamlDecoder;
+    }
+
+    /**
+     * Set callback for decoding YAML
+     *
+     * @param  callable $yamlDecoder the decoder to set
+     * @return Zend_Config_Yaml
+     */
+    public function setYamlDecoder($yamlDecoder)
+    {
+        if (!is_callable($yamlDecoder)) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Invalid parameter to setYamlDecoder() - must be callable');
+        }
+
+        $this->_yamlDecoder = $yamlDecoder;
+        return $this;
+    }
+
+    /**
+     * Loads the section $section from the config file encoded as YAML
+     *
+     * Sections are defined as properties of the main object
+     *
+     * In order to extend another section, a section defines the "_extends"
+     * property having a value of the section name from which the extending
+     * section inherits values.
+     *
+     * Note that the keys in $section will override any keys of the same
+     * name in the sections that have been included via "_extends".
+     *
+     * Options may include:
+     * - allow_modifications: whether or not the config object is mutable
+     * - skip_extends: whether or not to skip processing of parent configuration
+     * - yaml_decoder: a callback to use to decode the Yaml source
+     *
+     * @param  string        $yaml     YAML file to process
+     * @param  mixed         $section  Section to process
+     * @param  array|boolean $options
+     */
+    public function __construct($yaml, $section = null, $options = false)
+    {
+        if (empty($yaml)) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception('Filename is not set');
+        }
+
+        $ignoreConstants    = $staticIgnoreConstants = self::ignoreConstants();
+        $allowModifications = false;
+        if (is_bool($options)) {
+            $allowModifications = $options;
+        } elseif (is_array($options)) {
+            foreach ($options as $key => $value) {
+                switch (strtolower($key)) {
+                    case 'allow_modifications':
+                    case 'allowmodifications':
+                        $allowModifications = (bool) $value;
+                        break;
+                    case 'skip_extends':
+                    case 'skipextends':
+                        $this->_skipExtends = (bool) $value;
+                        break;
+                    case 'ignore_constants':
+                    case 'ignoreconstants':
+                        $ignoreConstants = (bool) $value;
+                        break;
+                    case 'yaml_decoder':
+                    case 'yamldecoder':
+                        $this->setYamlDecoder($value);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        // Suppress warnings and errors while loading file
+        set_error_handler(array($this, '_loadFileErrorHandler'));
+        $yaml = file_get_contents($yaml);
+        restore_error_handler();
+
+        // Check if there was a error while loading file
+        if ($this->_loadFileErrorStr !== null) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception($this->_loadFileErrorStr);
+        }
+
+        // Override static value for ignore_constants if provided in $options
+        self::setIgnoreConstants($ignoreConstants);
+
+        // Parse YAML
+        $config = call_user_func($this->getYamlDecoder(), $yaml);
+
+        // Reset original static state of ignore_constants
+        self::setIgnoreConstants($staticIgnoreConstants);
+
+        if (null === $config) {
+            // decode failed
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception("Error parsing YAML data");
+        }
+
+        if (null === $section) {
+            $dataArray = array();
+            foreach ($config as $sectionName => $sectionData) {
+                $dataArray[$sectionName] = $this->_processExtends($config, $sectionName);
+            }
+            parent::__construct($dataArray, $allowModifications);
+        } elseif (is_array($section)) {
+            $dataArray = array();
+            foreach ($section as $sectionName) {
+                if (!isset($config[$sectionName])) {
+                    require_once 'Zend/Config/Exception.php';
+                    throw new Zend_Config_Exception(sprintf(
+                        'Section "%s" cannot be found', 
+                        implode(' ', (array)$section)
+                    ));
+                }
+
+                $dataArray = array_merge($this->_processExtends($config, $sectionName), $dataArray);
+            }
+            parent::__construct($dataArray, $allowModifications);
+        } else {
+            if (!isset($config[$section])) {
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception(sprintf(
+                    'Section "%s" cannot be found', 
+                    implode(' ', (array)$section)
+                ));
+            }
+
+            $dataArray = $this->_processExtends($config, $section);
+            if (!is_array($dataArray)) {
+                // Section in the yaml data contains just one top level string
+                $dataArray = array($section => $dataArray);
+            }
+            parent::__construct($dataArray, $allowModifications);
+        }
+
+        $this->_loadedSection = $section;
+    }
+
+    /**
+     * Helper function to process each element in the section and handle
+     * the "_extends" inheritance attribute.
+     *
+     * @param  array            $data Data array to process
+     * @param  string           $section Section to process
+     * @param  array            $config  Configuration which was parsed yet
+     * @return array
+     * @throws Zend_Config_Exception When $section cannot be found
+     */
+    protected function _processExtends(array $data, $section, array $config = array())
+    {
+        if (!isset($data[$section])) {
+            require_once 'Zend/Config/Exception.php';
+            throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section));
+        }
+
+        $thisSection  = $data[$section];
+
+        if (is_array($thisSection) && isset($thisSection[self::EXTENDS_NAME])) {
+            $this->_assertValidExtend($section, $thisSection[self::EXTENDS_NAME]);
+
+            if (!$this->_skipExtends) {
+                $config = $this->_processExtends($data, $thisSection[self::EXTENDS_NAME], $config);
+            }
+            unset($thisSection[self::EXTENDS_NAME]);
+        }
+
+        $config = $this->_arrayMergeRecursive($config, $thisSection);
+
+        return $config;
+    }
+
+    /**
+     * Very dumb YAML parser
+     *
+     * Until we have Zend_Yaml...
+     *
+     * @param  string $yaml YAML source
+     * @return array Decoded data
+     */
+    public static function decode($yaml)
+    {
+        $lines = explode("\n", $yaml);
+        reset($lines);
+        return self::_decodeYaml(0, $lines);
+    }
+
+    /**
+     * Service function to decode YAML
+     *
+     * @param  int $currentIndent Current indent level
+     * @param  array $lines  YAML lines
+     * @return array|string
+     */
+    protected static function _decodeYaml($currentIndent, &$lines)
+    {
+        $config   = array();
+        $inIndent = false;
+        while (list($n, $line) = each($lines)) {
+            $lineno = $n + 1;
+
+            $line = rtrim(preg_replace("/#.*$/", "", $line));
+            if (strlen($line) == 0) {
+                continue;
+            }
+
+            $indent = strspn($line, " ");
+
+            // line without the spaces
+            $line = trim($line);
+            if (strlen($line) == 0) {
+                continue;
+            }
+
+            if ($indent < $currentIndent) {
+                // this level is done
+                prev($lines);
+                return $config;
+            }
+
+            if (!$inIndent) {
+                $currentIndent = $indent;
+                $inIndent      = true;
+            }
+
+            if (preg_match("/(?!-)([\w\-]+):\s*(.*)/", $line, $m)) {
+                // key: value
+                if (strlen($m[2])) {
+                    // simple key: value
+                    $value = preg_replace("/#.*$/", "", $m[2]);
+                    $value = self::_parseValue($value);
+                } else {
+                    // key: and then values on new lines
+                    $value = self::_decodeYaml($currentIndent + 1, $lines);
+                    if (is_array($value) && !count($value)) {
+                        $value = "";
+                    }
+                }
+                $config[$m[1]] = $value;
+            } elseif ($line[0] == "-") {
+                // item in the list:
+                // - FOO
+                if (strlen($line) > 2) {
+                    $value = substr($line, 2);
+
+                    $config[] = self::_parseValue($value);
+                } else {
+                    $config[] = self::_decodeYaml($currentIndent + 1, $lines);
+                }
+            } else {
+                require_once 'Zend/Config/Exception.php';
+                throw new Zend_Config_Exception(sprintf(
+                    'Error parsing YAML at line %d - unsupported syntax: "%s"',
+                    $lineno, $line
+                ));
+            }
+        }
+        return $config;
+    }
+
+    /**
+     * Parse values
+     *
+     * @param string $value
+     * @return string
+     */
+    protected static function _parseValue($value)
+    {
+        $value = trim($value);
+
+        // remove quotes from string.
+        if ('"' == $value['0']) {
+            if ('"' == $value[count($value) -1]) {
+                $value = substr($value, 1, -1);
+            }
+        } elseif ('\'' == $value['0'] && '\'' == $value[count($value) -1]) {
+            $value = strtr($value, array("''" => "'", "'" => ''));
+        }
+
+        // Check for booleans and constants
+        if (preg_match('/^(t(rue)?|on|y(es)?)$/i', $value)) {
+            $value = true;
+        } elseif (preg_match('/^(f(alse)?|off|n(o)?)$/i', $value)) {
+            $value = false;
+        } elseif (strcasecmp($value, 'null') === 0) {
+            $value = null;
+        } elseif (!self::$_ignoreConstants) {
+            // test for constants
+            $value = self::_replaceConstants($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Replace any constants referenced in a string with their values
+     *
+     * @param  string $value
+     * @return string
+     */
+    protected static function _replaceConstants($value)
+    {
+        foreach (self::_getConstants() as $constant) {
+            if (strstr($value, $constant)) {
+                $value = str_replace($constant, constant($constant), $value);
+            }
+        }
+        return $value;
+    }
+
+    /**
+     * Get (reverse) sorted list of defined constant names
+     *
+     * @return array
+     */
+    protected static function _getConstants()
+    {
+        $constants = array_keys(get_defined_constants());
+        rsort($constants, SORT_STRING);
+        return $constants;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action.php b/lib/zend/Zend/Controller/Action.php
new file mode 100644
index 00000000000..9508e747119
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action.php
@@ -0,0 +1,798 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_HelperBroker
+ */
+require_once 'Zend/Controller/Action/HelperBroker.php';
+
+/**
+ * @see Zend_Controller_Action_Interface
+ */
+require_once 'Zend/Controller/Action/Interface.php';
+
+/**
+ * @see Zend_Controller_Front
+ */
+require_once 'Zend/Controller/Front.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Controller_Action implements Zend_Controller_Action_Interface
+{
+    /**
+     * @var array of existing class methods
+     */
+    protected $_classMethods;
+
+    /**
+     * Word delimiters (used for normalizing view script paths)
+     * @var array
+     */
+    protected $_delimiters;
+
+    /**
+     * Array of arguments provided to the constructor, minus the
+     * {@link $_request Request object}.
+     * @var array
+     */
+    protected $_invokeArgs = array();
+
+    /**
+     * Front controller instance
+     * @var Zend_Controller_Front
+     */
+    protected $_frontController;
+
+    /**
+     * Zend_Controller_Request_Abstract object wrapping the request environment
+     * @var Zend_Controller_Request_Abstract
+     */
+    protected $_request = null;
+
+    /**
+     * Zend_Controller_Response_Abstract object wrapping the response
+     * @var Zend_Controller_Response_Abstract
+     */
+    protected $_response = null;
+
+    /**
+     * View script suffix; defaults to 'phtml'
+     * @see {render()}
+     * @var string
+     */
+    public $viewSuffix = 'phtml';
+
+    /**
+     * View object
+     * @var Zend_View_Interface
+     */
+    public $view;
+
+    /**
+     * Helper Broker to assist in routing help requests to the proper object
+     *
+     * @var Zend_Controller_Action_HelperBroker
+     */
+    protected $_helper = null;
+
+    /**
+     * Class constructor
+     *
+     * The request and response objects should be registered with the
+     * controller, as should be any additional optional arguments; these will be
+     * available via {@link getRequest()}, {@link getResponse()}, and
+     * {@link getInvokeArgs()}, respectively.
+     *
+     * When overriding the constructor, please consider this usage as a best
+     * practice and ensure that each is registered appropriately; the easiest
+     * way to do so is to simply call parent::__construct($request, $response,
+     * $invokeArgs).
+     *
+     * After the request, response, and invokeArgs are set, the
+     * {@link $_helper helper broker} is initialized.
+     *
+     * Finally, {@link init()} is called as the final action of
+     * instantiation, and may be safely overridden to perform initialization
+     * tasks; as a general rule, override {@link init()} instead of the
+     * constructor to customize an action controller's instantiation.
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @param Zend_Controller_Response_Abstract $response
+     * @param array $invokeArgs Any additional invocation arguments
+     * @return void
+     */
+    public function __construct(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response, array $invokeArgs = array())
+    {
+        $this->setRequest($request)
+             ->setResponse($response)
+             ->_setInvokeArgs($invokeArgs);
+        $this->_helper = new Zend_Controller_Action_HelperBroker($this);
+        $this->init();
+    }
+
+    /**
+     * Initialize object
+     *
+     * Called from {@link __construct()} as final step of object instantiation.
+     *
+     * @return void
+     */
+    public function init()
+    {
+    }
+
+    /**
+     * Initialize View object
+     *
+     * Initializes {@link $view} if not otherwise a Zend_View_Interface.
+     *
+     * If {@link $view} is not otherwise set, instantiates a new Zend_View
+     * object, using the 'views' subdirectory at the same level as the
+     * controller directory for the current module as the base directory.
+     * It uses this to set the following:
+     * - script path = views/scripts/
+     * - helper path = views/helpers/
+     * - filter path = views/filters/
+     *
+     * @return Zend_View_Interface
+     * @throws Zend_Controller_Exception if base view directory does not exist
+     */
+    public function initView()
+    {
+        if (!$this->getInvokeArg('noViewRenderer') && $this->_helper->hasHelper('viewRenderer')) {
+            return $this->view;
+        }
+
+        require_once 'Zend/View/Interface.php';
+        if (isset($this->view) && ($this->view instanceof Zend_View_Interface)) {
+            return $this->view;
+        }
+
+        $request = $this->getRequest();
+        $module  = $request->getModuleName();
+        $dirs    = $this->getFrontController()->getControllerDirectory();
+        if (empty($module) || !isset($dirs[$module])) {
+            $module = $this->getFrontController()->getDispatcher()->getDefaultModule();
+        }
+        $baseDir = dirname($dirs[$module]) . DIRECTORY_SEPARATOR . 'views';
+        if (!file_exists($baseDir) || !is_dir($baseDir)) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Missing base view directory ("' . $baseDir . '")');
+        }
+
+        require_once 'Zend/View.php';
+        $this->view = new Zend_View(array('basePath' => $baseDir));
+
+        return $this->view;
+    }
+
+    /**
+     * Render a view
+     *
+     * Renders a view. By default, views are found in the view script path as
+     * <controller>/<action>.phtml. You may change the script suffix by
+     * resetting {@link $viewSuffix}. You may omit the controller directory
+     * prefix by specifying boolean true for $noController.
+     *
+     * By default, the rendered contents are appended to the response. You may
+     * specify the named body content segment to set by specifying a $name.
+     *
+     * @see Zend_Controller_Response_Abstract::appendBody()
+     * @param  string|null $action Defaults to action registered in request object
+     * @param  string|null $name Response object named path segment to use; defaults to null
+     * @param  bool $noController  Defaults to false; i.e. use controller name as subdir in which to search for view script
+     * @return void
+     */
+    public function render($action = null, $name = null, $noController = false)
+    {
+        if (!$this->getInvokeArg('noViewRenderer') && $this->_helper->hasHelper('viewRenderer')) {
+            return $this->_helper->viewRenderer->render($action, $name, $noController);
+        }
+
+        $view   = $this->initView();
+        $script = $this->getViewScript($action, $noController);
+
+        $this->getResponse()->appendBody(
+            $view->render($script),
+            $name
+        );
+    }
+
+    /**
+     * Render a given view script
+     *
+     * Similar to {@link render()}, this method renders a view script. Unlike render(),
+     * however, it does not autodetermine the view script via {@link getViewScript()},
+     * but instead renders the script passed to it. Use this if you know the
+     * exact view script name and path you wish to use, or if using paths that do not
+     * conform to the spec defined with getViewScript().
+     *
+     * By default, the rendered contents are appended to the response. You may
+     * specify the named body content segment to set by specifying a $name.
+     *
+     * @param  string $script
+     * @param  string $name
+     * @return void
+     */
+    public function renderScript($script, $name = null)
+    {
+        if (!$this->getInvokeArg('noViewRenderer') && $this->_helper->hasHelper('viewRenderer')) {
+            return $this->_helper->viewRenderer->renderScript($script, $name);
+        }
+
+        $view = $this->initView();
+        $this->getResponse()->appendBody(
+            $view->render($script),
+            $name
+        );
+    }
+
+    /**
+     * Construct view script path
+     *
+     * Used by render() to determine the path to the view script.
+     *
+     * @param  string $action Defaults to action registered in request object
+     * @param  bool $noController  Defaults to false; i.e. use controller name as subdir in which to search for view script
+     * @return string
+     * @throws Zend_Controller_Exception with bad $action
+     */
+    public function getViewScript($action = null, $noController = null)
+    {
+        if (!$this->getInvokeArg('noViewRenderer') && $this->_helper->hasHelper('viewRenderer')) {
+            $viewRenderer = $this->_helper->getHelper('viewRenderer');
+            if (null !== $noController) {
+                $viewRenderer->setNoController($noController);
+            }
+            return $viewRenderer->getViewScript($action);
+        }
+
+        $request = $this->getRequest();
+        if (null === $action) {
+            $action = $request->getActionName();
+        } elseif (!is_string($action)) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Invalid action specifier for view render');
+        }
+
+        if (null === $this->_delimiters) {
+            $dispatcher = Zend_Controller_Front::getInstance()->getDispatcher();
+            $wordDelimiters = $dispatcher->getWordDelimiter();
+            $pathDelimiters = $dispatcher->getPathDelimiter();
+            $this->_delimiters = array_unique(array_merge($wordDelimiters, (array) $pathDelimiters));
+        }
+
+        $action = str_replace($this->_delimiters, '-', $action);
+        $script = $action . '.' . $this->viewSuffix;
+
+        if (!$noController) {
+            $controller = $request->getControllerName();
+            $controller = str_replace($this->_delimiters, '-', $controller);
+            $script = $controller . DIRECTORY_SEPARATOR . $script;
+        }
+
+        return $script;
+    }
+
+    /**
+     * Return the Request object
+     *
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function getRequest()
+    {
+        return $this->_request;
+    }
+
+    /**
+     * Set the Request object
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @return Zend_Controller_Action
+     */
+    public function setRequest(Zend_Controller_Request_Abstract $request)
+    {
+        $this->_request = $request;
+        return $this;
+    }
+
+    /**
+     * Return the Response object
+     *
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Set the Response object
+     *
+     * @param Zend_Controller_Response_Abstract $response
+     * @return Zend_Controller_Action
+     */
+    public function setResponse(Zend_Controller_Response_Abstract $response)
+    {
+        $this->_response = $response;
+        return $this;
+    }
+
+    /**
+     * Set invocation arguments
+     *
+     * @param array $args
+     * @return Zend_Controller_Action
+     */
+    protected function _setInvokeArgs(array $args = array())
+    {
+        $this->_invokeArgs = $args;
+        return $this;
+    }
+
+    /**
+     * Return the array of constructor arguments (minus the Request object)
+     *
+     * @return array
+     */
+    public function getInvokeArgs()
+    {
+        return $this->_invokeArgs;
+    }
+
+    /**
+     * Return a single invocation argument
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function getInvokeArg($key)
+    {
+        if (isset($this->_invokeArgs[$key])) {
+            return $this->_invokeArgs[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a helper by name
+     *
+     * @param  string $helperName
+     * @return Zend_Controller_Action_Helper_Abstract
+     */
+    public function getHelper($helperName)
+    {
+        return $this->_helper->{$helperName};
+    }
+
+    /**
+     * Get a clone of a helper by name
+     *
+     * @param  string $helperName
+     * @return Zend_Controller_Action_Helper_Abstract
+     */
+    public function getHelperCopy($helperName)
+    {
+        return clone $this->_helper->{$helperName};
+    }
+
+    /**
+     * Set the front controller instance
+     *
+     * @param Zend_Controller_Front $front
+     * @return Zend_Controller_Action
+     */
+    public function setFrontController(Zend_Controller_Front $front)
+    {
+        $this->_frontController = $front;
+        return $this;
+    }
+
+    /**
+     * Retrieve Front Controller
+     *
+     * @return Zend_Controller_Front
+     */
+    public function getFrontController()
+    {
+        // Used cache version if found
+        if (null !== $this->_frontController) {
+            return $this->_frontController;
+        }
+
+        // Grab singleton instance, if class has been loaded
+        if (class_exists('Zend_Controller_Front')) {
+            $this->_frontController = Zend_Controller_Front::getInstance();
+            return $this->_frontController;
+        }
+
+        // Throw exception in all other cases
+        require_once 'Zend/Controller/Exception.php';
+        throw new Zend_Controller_Exception('Front controller class has not been loaded');
+    }
+
+    /**
+     * Pre-dispatch routines
+     *
+     * Called before action method. If using class with
+     * {@link Zend_Controller_Front}, it may modify the
+     * {@link $_request Request object} and reset its dispatched flag in order
+     * to skip processing the current action.
+     *
+     * @return void
+     */
+    public function preDispatch()
+    {
+    }
+
+    /**
+     * Post-dispatch routines
+     *
+     * Called after action method execution. If using class with
+     * {@link Zend_Controller_Front}, it may modify the
+     * {@link $_request Request object} and reset its dispatched flag in order
+     * to process an additional action.
+     *
+     * Common usages for postDispatch() include rendering content in a sitewide
+     * template, link url correction, setting headers, etc.
+     *
+     * @return void
+     */
+    public function postDispatch()
+    {
+    }
+
+    /**
+     * Proxy for undefined methods.  Default behavior is to throw an
+     * exception on undefined methods, however this function can be
+     * overridden to implement magic (dynamic) actions, or provide run-time
+     * dispatching.
+     *
+     * @param  string $methodName
+     * @param  array $args
+     * @return void
+     * @throws Zend_Controller_Action_Exception
+     */
+    public function __call($methodName, $args)
+    {
+        require_once 'Zend/Controller/Action/Exception.php';
+        if ('Action' == substr($methodName, -6)) {
+            $action = substr($methodName, 0, strlen($methodName) - 6);
+            throw new Zend_Controller_Action_Exception(sprintf('Action "%s" does not exist and was not trapped in __call()', $action), 404);
+        }
+
+        throw new Zend_Controller_Action_Exception(sprintf('Method "%s" does not exist and was not trapped in __call()', $methodName), 500);
+    }
+
+    /**
+     * Dispatch the requested action
+     *
+     * @param string $action Method name of action
+     * @return void
+     */
+    public function dispatch($action)
+    {
+        // Notify helpers of action preDispatch state
+        $this->_helper->notifyPreDispatch();
+
+        $this->preDispatch();
+        if ($this->getRequest()->isDispatched()) {
+            if (null === $this->_classMethods) {
+                $this->_classMethods = get_class_methods($this);
+            }
+
+            // If pre-dispatch hooks introduced a redirect then stop dispatch
+            // @see ZF-7496
+            if (!($this->getResponse()->isRedirect())) {
+                // preDispatch() didn't change the action, so we can continue
+                if ($this->getInvokeArg('useCaseSensitiveActions') || in_array($action, $this->_classMethods)) {
+                    if ($this->getInvokeArg('useCaseSensitiveActions')) {
+                        trigger_error('Using case sensitive actions without word separators is deprecated; please do not rely on this "feature"');
+                    }
+                    $this->$action();
+                } else {
+                    $this->__call($action, array());
+                }
+            }
+            $this->postDispatch();
+        }
+
+        // whats actually important here is that this action controller is
+        // shutting down, regardless of dispatching; notify the helpers of this
+        // state
+        $this->_helper->notifyPostDispatch();
+    }
+
+    /**
+     * Call the action specified in the request object, and return a response
+     *
+     * Not used in the Action Controller implementation, but left for usage in
+     * Page Controller implementations. Dispatches a method based on the
+     * request.
+     *
+     * Returns a Zend_Controller_Response_Abstract object, instantiating one
+     * prior to execution if none exists in the controller.
+     *
+     * {@link preDispatch()} is called prior to the action,
+     * {@link postDispatch()} is called following it.
+     *
+     * @param null|Zend_Controller_Request_Abstract $request Optional request
+     * object to use
+     * @param null|Zend_Controller_Response_Abstract $response Optional response
+     * object to use
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function run(Zend_Controller_Request_Abstract $request = null, Zend_Controller_Response_Abstract $response = null)
+    {
+        if (null !== $request) {
+            $this->setRequest($request);
+        } else {
+            $request = $this->getRequest();
+        }
+
+        if (null !== $response) {
+            $this->setResponse($response);
+        }
+
+        $action = $request->getActionName();
+        if (empty($action)) {
+            $action = 'index';
+        }
+        $action = $action . 'Action';
+
+        $request->setDispatched(true);
+        $this->dispatch($action);
+
+        return $this->getResponse();
+    }
+
+    /**
+     * Gets a parameter from the {@link $_request Request object}.  If the
+     * parameter does not exist, NULL will be returned.
+     *
+     * If the parameter does not exist and $default is set, then
+     * $default will be returned instead of NULL.
+     *
+     * @param string $paramName
+     * @param mixed $default
+     * @return mixed
+     */
+    protected function _getParam($paramName, $default = null)
+    {
+        return $this->getParam($paramName, $default);
+    }
+
+    /**
+     * Gets a parameter from the {@link $_request Request object}.  If the
+     * parameter does not exist, NULL will be returned.
+     *
+     * If the parameter does not exist and $default is set, then
+     * $default will be returned instead of NULL.
+     *
+     * @param string $paramName
+     * @param mixed $default
+     * @return mixed
+     */
+    public function getParam($paramName, $default = null)
+    {
+        $value = $this->getRequest()->getParam($paramName);
+         if ((null === $value || '' === $value) && (null !== $default)) {
+            $value = $default;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Set a parameter in the {@link $_request Request object}.
+     *
+     * @param string $paramName
+     * @param mixed $value
+     * @return Zend_Controller_Action
+     * @deprecated Deprecated as of Zend Framework 1.7. Use
+     *             setParam() instead.
+     */
+    protected function _setParam($paramName, $value)
+    {
+        return $this->setParam($paramName, $value);
+    }
+
+    /**
+     * Set a parameter in the {@link $_request Request object}.
+     *
+     * @param string $paramName
+     * @param mixed $value
+     * @return Zend_Controller_Action
+     */
+    public function setParam($paramName, $value)
+    {
+        $this->getRequest()->setParam($paramName, $value);
+
+        return $this;
+    }
+
+    /**
+     * Determine whether a given parameter exists in the
+     * {@link $_request Request object}.
+     *
+     * @param string $paramName
+     * @return boolean
+     * @deprecated Deprecated as of Zend Framework 1.7. Use
+     *             hasParam() instead.
+     */
+    protected function _hasParam($paramName)
+    {
+        return $this->hasParam($paramName);
+    }
+
+    /**
+     * Determine whether a given parameter exists in the
+     * {@link $_request Request object}.
+     *
+     * @param string $paramName
+     * @return boolean
+     */
+    public function hasParam($paramName)
+    {
+        return null !== $this->getRequest()->getParam($paramName);
+    }
+
+    /**
+     * Return all parameters in the {@link $_request Request object}
+     * as an associative array.
+     *
+     * @return array
+     * @deprecated Deprecated as of Zend Framework 1.7. Use
+     *             getAllParams() instead.
+     */
+    protected function _getAllParams()
+    {
+        return $this->getAllParams();
+    }
+
+    /**
+     * Return all parameters in the {@link $_request Request object}
+     * as an associative array.
+     *
+     * @return array
+     */
+    public function getAllParams()
+    {
+        return $this->getRequest()->getParams();
+    }
+
+
+    /**
+     * Forward to another controller/action.
+     *
+     * It is important to supply the unformatted names, i.e. "article"
+     * rather than "ArticleController".  The dispatcher will do the
+     * appropriate formatting when the request is received.
+     *
+     * If only an action name is provided, forwards to that action in this
+     * controller.
+     *
+     * If an action and controller are specified, forwards to that action and
+     * controller in this module.
+     *
+     * Specifying an action, controller, and module is the most specific way to
+     * forward.
+     *
+     * A fourth argument, $params, will be used to set the request parameters.
+     * If either the controller or module are unnecessary for forwarding,
+     * simply pass null values for them before specifying the parameters.
+     *
+     * @param string $action
+     * @param string $controller
+     * @param string $module
+     * @param array $params
+     * @return void
+     * @deprecated Deprecated as of Zend Framework 1.7. Use
+     *             forward() instead.
+     */
+    final protected function _forward($action, $controller = null, $module = null, array $params = null)
+    {
+        $this->forward($action, $controller, $module, $params);
+    }
+
+    /**
+     * Forward to another controller/action.
+     *
+     * It is important to supply the unformatted names, i.e. "article"
+     * rather than "ArticleController".  The dispatcher will do the
+     * appropriate formatting when the request is received.
+     *
+     * If only an action name is provided, forwards to that action in this
+     * controller.
+     *
+     * If an action and controller are specified, forwards to that action and
+     * controller in this module.
+     *
+     * Specifying an action, controller, and module is the most specific way to
+     * forward.
+     *
+     * A fourth argument, $params, will be used to set the request parameters.
+     * If either the controller or module are unnecessary for forwarding,
+     * simply pass null values for them before specifying the parameters.
+     *
+     * @param string $action
+     * @param string $controller
+     * @param string $module
+     * @param array $params
+     * @return void
+     */
+    final public function forward($action, $controller = null, $module = null, array $params = null)
+    {
+        $request = $this->getRequest();
+
+        if (null !== $params) {
+            $request->setParams($params);
+        }
+
+        if (null !== $controller) {
+            $request->setControllerName($controller);
+
+            // Module should only be reset if controller has been specified
+            if (null !== $module) {
+                $request->setModuleName($module);
+            }
+        }
+
+        $request->setActionName($action)
+                ->setDispatched(false);
+    }
+
+    /**
+     * Redirect to another URL
+     *
+     * Proxies to {@link Zend_Controller_Action_Helper_Redirector::gotoUrl()}.
+     *
+     * @param string $url
+     * @param array $options Options to be used when redirecting
+     * @return void
+     * @deprecated Deprecated as of Zend Framework 1.7. Use
+     *             redirect() instead.
+     */
+    protected function _redirect($url, array $options = array())
+    {
+        $this->redirect($url, $options);
+    }
+
+    /**
+     * Redirect to another URL
+     *
+     * Proxies to {@link Zend_Controller_Action_Helper_Redirector::gotoUrl()}.
+     *
+     * @param string $url
+     * @param array $options Options to be used when redirecting
+     * @return void
+     */
+    public function redirect($url, array $options = array())
+    {
+        $this->_helper->redirector->gotoUrl($url, $options);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Exception.php b/lib/zend/Zend/Controller/Action/Exception.php
new file mode 100644
index 00000000000..4cd9ce2a74b
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Exception.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Controller_Exception
+ */
+require_once 'Zend/Controller/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Exception extends Zend_Controller_Exception
+{}
diff --git a/lib/zend/Zend/Controller/Action/Helper/Abstract.php b/lib/zend/Zend/Controller/Action/Helper/Abstract.php
new file mode 100644
index 00000000000..ed039b8ead6
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/Abstract.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action
+ */
+require_once 'Zend/Controller/Action.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * $_actionController
+     *
+     * @var Zend_Controller_Action $_actionController
+     */
+    protected $_actionController = null;
+
+    /**
+     * @var mixed $_frontController
+     */
+    protected $_frontController = null;
+
+    /**
+     * setActionController()
+     *
+     * @param  Zend_Controller_Action $actionController
+     * @return Zend_Controller_ActionHelper_Abstract Provides a fluent interface
+     */
+    public function setActionController(Zend_Controller_Action $actionController = null)
+    {
+        $this->_actionController = $actionController;
+        return $this;
+    }
+
+    /**
+     * Retrieve current action controller
+     *
+     * @return Zend_Controller_Action
+     */
+    public function getActionController()
+    {
+        return $this->_actionController;
+    }
+
+    /**
+     * Retrieve front controller instance
+     *
+     * @return Zend_Controller_Front
+     */
+    public function getFrontController()
+    {
+        return Zend_Controller_Front::getInstance();
+    }
+
+    /**
+     * Hook into action controller initialization
+     *
+     * @return void
+     */
+    public function init()
+    {
+    }
+
+    /**
+     * Hook into action controller preDispatch() workflow
+     *
+     * @return void
+     */
+    public function preDispatch()
+    {
+    }
+
+    /**
+     * Hook into action controller postDispatch() workflow
+     *
+     * @return void
+     */
+    public function postDispatch()
+    {
+    }
+
+    /**
+     * getRequest() -
+     *
+     * @return Zend_Controller_Request_Abstract $request
+     */
+    public function getRequest()
+    {
+        $controller = $this->getActionController();
+        if (null === $controller) {
+            $controller = $this->getFrontController();
+        }
+
+        return $controller->getRequest();
+    }
+
+    /**
+     * getResponse() -
+     *
+     * @return Zend_Controller_Response_Abstract $response
+     */
+    public function getResponse()
+    {
+        $controller = $this->getActionController();
+        if (null === $controller) {
+            $controller = $this->getFrontController();
+        }
+
+        return $controller->getResponse();
+    }
+
+    /**
+     * getName()
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        $fullClassName = get_class($this);
+        if (strpos($fullClassName, '_') !== false) {
+            $helperName = strrchr($fullClassName, '_');
+            return ltrim($helperName, '_');
+        } elseif (strpos($fullClassName, '\\') !== false) {
+            $helperName = strrchr($fullClassName, '\\');
+            return ltrim($helperName, '\\');
+        } else {
+            return $fullClassName;
+        }
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/ActionStack.php b/lib/zend/Zend/Controller/Action/Helper/ActionStack.php
new file mode 100644
index 00000000000..e22e8b8e7e4
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/ActionStack.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * Add to action stack
+ *
+ * @uses       Zend_Controller_Action_Helper_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * @var Zend_Controller_Plugin_ActionStack
+     */
+    protected $_actionStack;
+
+    /**
+     * Constructor
+     *
+     * Register action stack plugin
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $front = Zend_Controller_Front::getInstance();
+        if (!$front->hasPlugin('Zend_Controller_Plugin_ActionStack')) {
+            /**
+             * @see Zend_Controller_Plugin_ActionStack
+             */
+            require_once 'Zend/Controller/Plugin/ActionStack.php';
+            $this->_actionStack = new Zend_Controller_Plugin_ActionStack();
+            $front->registerPlugin($this->_actionStack, 97);
+        } else {
+            $this->_actionStack = $front->getPlugin('Zend_Controller_Plugin_ActionStack');
+        }
+    }
+
+    /**
+     * Push onto the stack
+     *
+     * @param  Zend_Controller_Request_Abstract $next
+     * @return Zend_Controller_Action_Helper_ActionStack Provides a fluent interface
+     */
+    public function pushStack(Zend_Controller_Request_Abstract $next)
+    {
+        $this->_actionStack->pushStack($next);
+        return $this;
+    }
+
+    /**
+     * Push a new action onto the stack
+     *
+     * @param  string $action
+     * @param  string $controller
+     * @param  string $module
+     * @param  array  $params
+     * @throws Zend_Controller_Action_Exception
+     * @return Zend_Controller_Action_Helper_ActionStack
+     */
+    public function actionToStack($action, $controller = null, $module = null, array $params = array())
+    {
+        if ($action instanceof Zend_Controller_Request_Abstract) {
+            return $this->pushStack($action);
+        } elseif (!is_string($action)) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('ActionStack requires either a request object or minimally a string action');
+        }
+
+        $request = $this->getRequest();
+
+        if ($request instanceof Zend_Controller_Request_Abstract === false){
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('Request object not set yet');
+        }
+
+        $controller = (null === $controller) ? $request->getControllerName() : $controller;
+        $module = (null === $module) ? $request->getModuleName() : $module;
+
+        /**
+         * @see Zend_Controller_Request_Simple
+         */
+        require_once 'Zend/Controller/Request/Simple.php';
+        $newRequest = new Zend_Controller_Request_Simple($action, $controller, $module, $params);
+
+        return $this->pushStack($newRequest);
+    }
+
+    /**
+     * Perform helper when called as $this->_helper->actionStack() from an action controller
+     *
+     * Proxies to {@link simple()}
+     *
+     * @param  string $action
+     * @param  string $controller
+     * @param  string $module
+     * @param  array $params
+     * @return boolean
+     */
+    public function direct($action, $controller = null, $module = null, array $params = array())
+    {
+        return $this->actionToStack($action, $controller, $module, $params);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/AjaxContext.php b/lib/zend/Zend/Controller/Action/Helper/AjaxContext.php
new file mode 100644
index 00000000000..dd4ca426d67
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/AjaxContext.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_ContextSwitch
+ */
+require_once 'Zend/Controller/Action/Helper/ContextSwitch.php';
+
+/**
+ * Simplify AJAX context switching based on requested format
+ *
+ * @uses       Zend_Controller_Action_Helper_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_Helper_ContextSwitch
+{
+    /**
+     * Controller property to utilize for context switching
+     * @var string
+     */
+    protected $_contextKey = 'ajaxable';
+
+    /**
+     * Constructor
+     *
+     * Add HTML context
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->addContext('html', array('suffix' => 'ajax'));
+    }
+
+    /**
+     * Initialize AJAX context switching
+     *
+     * Checks for XHR requests; if detected, attempts to perform context switch.
+     *
+     * @param  string $format
+     * @return void
+     */
+    public function initContext($format = null)
+    {
+        $this->_currentContext = null;
+
+        $request = $this->getRequest();
+        if (!method_exists($request, 'isXmlHttpRequest') ||
+            !$this->getRequest()->isXmlHttpRequest())
+        {
+            return;
+        }
+
+        return parent::initContext($format);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/AutoComplete/Abstract.php b/lib/zend/Zend/Controller/Action/Helper/AutoComplete/Abstract.php
new file mode 100644
index 00000000000..707545434b2
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/AutoComplete/Abstract.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * Create and send autocompletion lists
+ *
+ * @uses       Zend_Controller_Action_Helper_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * Suppress exit when sendJson() called
+     *
+     * @var boolean
+     */
+    public $suppressExit = false;
+
+    /**
+     * Validate autocompletion data
+     *
+     * @param  mixed $data
+     * @return boolean
+     */
+    abstract public function validateData($data);
+
+    /**
+     * Prepare autocompletion data
+     *
+     * @param  mixed   $data
+     * @param  boolean $keepLayouts
+     * @return mixed
+     */
+    abstract public function prepareAutoCompletion($data, $keepLayouts = false);
+
+    /**
+     * Disable layouts and view renderer
+     *
+     * @return Zend_Controller_Action_Helper_AutoComplete_Abstract Provides a fluent interface
+     */
+    public function disableLayouts()
+    {
+        /**
+         * @see Zend_Layout
+         */
+        require_once 'Zend/Layout.php';
+        if (null !== ($layout = Zend_Layout::getMvcInstance())) {
+            $layout->disableLayout();
+        }
+
+        Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true);
+
+        return $this;
+    }
+
+    /**
+     * Encode data to JSON
+     *
+     * @param  mixed $data
+     * @param  bool  $keepLayouts
+     * @throws Zend_Controller_Action_Exception
+     * @return string
+     */
+    public function encodeJson($data, $keepLayouts = false)
+    {
+        if ($this->validateData($data)) {
+            return Zend_Controller_Action_HelperBroker::getStaticHelper('Json')->encodeJson($data, $keepLayouts);
+        }
+
+        /**
+         * @see Zend_Controller_Action_Exception
+         */
+        require_once 'Zend/Controller/Action/Exception.php';
+        throw new Zend_Controller_Action_Exception('Invalid data passed for autocompletion');
+    }
+
+    /**
+     * Send autocompletion data
+     *
+     * Calls prepareAutoCompletion, populates response body with this
+     * information, and sends response.
+     *
+     * @param  mixed $data
+     * @param  bool  $keepLayouts
+     * @return string|void
+     */
+    public function sendAutoCompletion($data, $keepLayouts = false)
+    {
+        $data = $this->prepareAutoCompletion($data, $keepLayouts);
+
+        $response = $this->getResponse();
+        $response->setBody($data);
+
+        if (!$this->suppressExit) {
+            $response->sendResponse();
+            exit;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Strategy pattern: allow calling helper as broker method
+     *
+     * Prepares autocompletion data and, if $sendNow is true, immediately sends
+     * response.
+     *
+     * @param  mixed $data
+     * @param  bool  $sendNow
+     * @param  bool  $keepLayouts
+     * @return string|void
+     */
+    public function direct($data, $sendNow = true, $keepLayouts = false)
+    {
+        if ($sendNow) {
+            return $this->sendAutoCompletion($data, $keepLayouts);
+        }
+
+        return $this->prepareAutoCompletion($data, $keepLayouts);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/AutoCompleteDojo.php b/lib/zend/Zend/Controller/Action/Helper/AutoCompleteDojo.php
new file mode 100644
index 00000000000..9027f0f8e62
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/AutoCompleteDojo.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_AutoComplete_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php';
+
+/**
+ * Create and send Dojo-compatible autocompletion lists
+ *
+ * @uses       Zend_Controller_Action_Helper_AutoComplete_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Action_Helper_AutoComplete_Abstract
+{
+    /**
+     * Validate data for autocompletion
+     *
+     * Stub; unused
+     *
+     * @param  mixed $data
+     * @return boolean
+     */
+    public function validateData($data)
+    {
+        return true;
+    }
+
+    /**
+     * Prepare data for autocompletion
+     *
+     * @param  mixed   $data
+     * @param  boolean $keepLayouts
+     * @return string
+     */
+    public function prepareAutoCompletion($data, $keepLayouts = false)
+    {
+        if (!$data instanceof Zend_Dojo_Data) {
+            require_once 'Zend/Dojo/Data.php';
+            $items = array();
+            foreach ($data as $key => $value) {
+                $items[] = array('label' => $value, 'name' => $value);
+            }
+            $data = new Zend_Dojo_Data('name', $items);
+        }
+
+        if (!$keepLayouts) {
+            require_once 'Zend/Controller/Action/HelperBroker.php';
+            Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true);
+
+            require_once 'Zend/Layout.php';
+            $layout = Zend_Layout::getMvcInstance();
+            if ($layout instanceof Zend_Layout) {
+                $layout->disableLayout();
+            }
+        }
+
+        $response = Zend_Controller_Front::getInstance()->getResponse();
+        $response->setHeader('Content-Type', 'application/json');
+
+        return $data->toJson();
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php b/lib/zend/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php
new file mode 100644
index 00000000000..098aed8b10c
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_AutoComplete_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php';
+
+/**
+ * Create and send Scriptaculous-compatible autocompletion lists
+ *
+ * @uses       Zend_Controller_Action_Helper_AutoComplete_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Controller_Action_Helper_AutoComplete_Abstract
+{
+    /**
+     * Validate data for autocompletion
+     *
+     * @param  mixed $data
+     * @return bool
+     */
+    public function validateData($data)
+    {
+        if (!is_array($data) && !is_scalar($data)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Prepare data for autocompletion
+     *
+     * @param  mixed   $data
+     * @param  boolean $keepLayouts
+     * @throws Zend_Controller_Action_Exception
+     * @return string
+     */
+    public function prepareAutoCompletion($data, $keepLayouts = false)
+    {
+        if (!$this->validateData($data)) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('Invalid data passed for autocompletion');
+        }
+
+        $data = (array) $data;
+        $data = '<ul><li>' . implode('</li><li>', $data) . '</li></ul>';
+
+        if (!$keepLayouts) {
+            $this->disableLayouts();
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/Cache.php b/lib/zend/Zend/Controller/Action/Helper/Cache.php
new file mode 100644
index 00000000000..61c089ff591
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/Cache.php
@@ -0,0 +1,289 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * @see Zend_Controller_Action_Exception
+ */
+require_once 'Zend/Controller/Action/Exception.php';
+
+/**
+ * @see Zend_Cache_Manager
+ */
+require_once 'Zend/Cache/Manager.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_Cache
+    extends Zend_Controller_Action_Helper_Abstract
+{
+
+    /**
+     * Local Cache Manager object used by Helper
+     *
+     * @var Zend_Cache_Manager
+     */
+    protected $_manager = null;
+
+    /**
+     * Indexed map of Actions to attempt Page caching on by Controller
+     *
+     * @var array
+     */
+    protected $_caching = array();
+
+    /**
+     * Indexed map of Tags by Controller and Action
+     *
+     * @var array
+     */
+    protected $_tags = array();
+
+    /**
+     * Indexed map of Extensions by Controller and Action
+     *
+     * @var array
+     */
+    protected $_extensions = array();
+
+    /**
+     * Track output buffering condition
+     */
+    protected $_obStarted = false;
+
+    /**
+     * Tell the helper which actions are cacheable and under which
+     * tags (if applicable) they should be recorded with
+     *
+     * @param array $actions
+     * @param array $tags
+     * @return void
+     */
+    public function direct(array $actions, array $tags = array(), $extension = null)
+    {
+        $controller = $this->getRequest()->getControllerName();
+        $actions = array_unique($actions);
+        if (!isset($this->_caching[$controller])) {
+            $this->_caching[$controller] = array();
+        }
+        if (!empty($tags)) {
+            $tags = array_unique($tags);
+            if (!isset($this->_tags[$controller])) {
+                $this->_tags[$controller] = array();
+            }
+        }
+        foreach ($actions as $action) {
+            $this->_caching[$controller][] = $action;
+            if (!empty($tags)) {
+                $this->_tags[$controller][$action] = array();
+                foreach ($tags as $tag) {
+                    $this->_tags[$controller][$action][] = $tag;
+                }
+            }
+        }
+        if ($extension) {
+            if (!isset($this->_extensions[$controller])) {
+                $this->_extensions[$controller] = array();
+            }
+            foreach ($actions as $action) {
+                $this->_extensions[$controller][$action] = $extension;
+            }
+        }
+    }
+
+    /**
+     * Remove a specific page cache static file based on its
+     * relative URL from the application's public directory.
+     * The file extension is not required here; usually matches
+     * the original REQUEST_URI that was cached.
+     *
+     * @param string $relativeUrl
+     * @param bool $recursive
+     * @return mixed
+     */
+    public function removePage($relativeUrl, $recursive = false)
+    {
+        $cache = $this->getCache(Zend_Cache_Manager::PAGECACHE);
+        $encodedCacheId = $this->_encodeCacheId($relativeUrl);
+
+        if ($recursive) {
+            $backend = $cache->getBackend();
+            if (($backend instanceof Zend_Cache_Backend)
+                && method_exists($backend, 'removeRecursively')
+            ) {
+                $result = $backend->removeRecursively($encodedCacheId);
+                if (is_null($result) ) {
+                    $result = $backend->removeRecursively($relativeUrl);
+                }
+                return $result;
+            }
+        }
+
+        $result = $cache->remove($encodedCacheId);
+        if (is_null($result) ) {
+            $result = $cache->remove($relativeUrl);
+        }
+        return $result;
+    }
+
+    /**
+     * Remove a specific page cache static file based on its
+     * relative URL from the application's public directory.
+     * The file extension is not required here; usually matches
+     * the original REQUEST_URI that was cached.
+     *
+     * @param array $tags
+     * @return mixed
+     */
+    public function removePagesTagged(array $tags)
+    {
+        return $this->getCache(Zend_Cache_Manager::PAGECACHE)
+            ->clean(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, $tags);
+    }
+
+    /**
+     * Commence page caching for any cacheable actions
+     *
+     * @return void
+     */
+    public function preDispatch()
+    {
+        $controller = $this->getRequest()->getControllerName();
+        $action = $this->getRequest()->getActionName();
+        $stats = ob_get_status(true);
+        foreach ($stats as $status) {
+            if ($status['name'] == 'Zend_Cache_Frontend_Page::_flush'
+            || $status['name'] == 'Zend_Cache_Frontend_Capture::_flush') {
+                $obStarted = true;
+            }
+        }
+        if (!isset($obStarted) && isset($this->_caching[$controller]) &&
+        in_array($action, $this->_caching[$controller])) {
+            $reqUri = $this->getRequest()->getRequestUri();
+            $tags = array();
+            if (isset($this->_tags[$controller][$action])
+            && !empty($this->_tags[$controller][$action])) {
+                $tags = array_unique($this->_tags[$controller][$action]);
+            }
+            $extension = null;
+            if (isset($this->_extensions[$controller][$action])) {
+                $extension = $this->_extensions[$controller][$action];
+            }
+            $this->getCache(Zend_Cache_Manager::PAGECACHE)
+                ->start($this->_encodeCacheId($reqUri), $tags, $extension);
+        }
+    }
+
+    /**
+     * Encode a Cache ID as hexadecimal. This is a workaround because Backend ID validation
+     * is trapped in the Frontend classes. Will try to get this reversed for ZF 2.0
+     * because it's a major annoyance to have IDs so restricted!
+     *
+     * @return string
+     * @param string $requestUri
+     */
+    protected function _encodeCacheId($requestUri)
+    {
+        return bin2hex($requestUri);
+    }
+
+    /**
+     * Set an instance of the Cache Manager for this helper
+     *
+     * @param Zend_Cache_Manager $manager
+     * @return void
+     */
+    public function setManager(Zend_Cache_Manager $manager)
+    {
+        $this->_manager = $manager;
+        return $this;
+    }
+
+    /**
+     * Get the Cache Manager instance or instantiate the object if not
+     * exists. Attempts to load from bootstrap if available.
+     *
+     * @return Zend_Cache_Manager
+     */
+    public function getManager()
+    {
+        if ($this->_manager !== null) {
+            return $this->_manager;
+        }
+        $front = Zend_Controller_Front::getInstance();
+        if ($front->getParam('bootstrap')
+        && $front->getParam('bootstrap')->getResource('CacheManager')) {
+            return $front->getParam('bootstrap')
+                ->getResource('CacheManager');
+        }
+        $this->_manager = new Zend_Cache_Manager;
+        return $this->_manager;
+    }
+
+    /**
+     * Return a list of actions for the current Controller marked for
+     * caching
+     *
+     * @return array
+     */
+    public function getCacheableActions()
+    {
+        return $this->_caching;
+    }
+
+    /**
+     * Return a list of tags set for all cacheable actions
+     *
+     * @return array
+     */
+    public function getCacheableTags()
+    {
+        return $this->_tags;
+    }
+
+    /**
+     * Proxy non-matched methods back to Zend_Cache_Manager where
+     * appropriate
+     *
+     * @param string $method
+     * @param array $args
+     * @return mixed
+     */
+    public function __call($method, $args)
+    {
+        if (method_exists($this->getManager(), $method)) {
+            return call_user_func_array(
+                array($this->getManager(), $method), $args
+            );
+        }
+        throw new Zend_Controller_Action_Exception('Method does not exist:'
+            . $method);
+    }
+
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/ContextSwitch.php b/lib/zend/Zend/Controller/Action/Helper/ContextSwitch.php
new file mode 100644
index 00000000000..fe9114bc6eb
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/ContextSwitch.php
@@ -0,0 +1,1394 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * Simplify context switching based on requested format
+ *
+ * @uses       Zend_Controller_Action_Helper_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * Trigger type constants
+     */
+    const TRIGGER_INIT = 'TRIGGER_INIT';
+    const TRIGGER_POST = 'TRIGGER_POST';
+
+    /**
+     * Supported contexts
+     * @var array
+     */
+    protected $_contexts = array();
+
+    /**
+     * JSON auto-serialization flag
+     * @var boolean
+     */
+    protected $_autoJsonSerialization = true;
+
+    /**
+     * Controller property key to utilize for context switching
+     * @var string
+     */
+    protected $_contextKey = 'contexts';
+
+    /**
+     * Request parameter containing requested context
+     * @var string
+     */
+    protected $_contextParam = 'format';
+
+    /**
+     * Current context
+     * @var string
+     */
+    protected $_currentContext;
+
+    /**
+     * Default context (xml)
+     * @var string
+     */
+    protected $_defaultContext = 'xml';
+
+    /**
+     * Whether or not to disable layouts when switching contexts
+     * @var boolean
+     */
+    protected $_disableLayout = true;
+
+    /**
+     * Methods that require special configuration
+     * @var array
+     */
+    protected $_specialConfig = array(
+        'setSuffix',
+        'setHeaders',
+        'setCallbacks',
+    );
+
+    /**
+     * Methods that are not configurable via setOptions and setConfig
+     * @var array
+     */
+    protected $_unconfigurable = array(
+        'setOptions',
+        'setConfig',
+        'setHeader',
+        'setCallback',
+        'setContext',
+        'setActionContext',
+        'setActionContexts',
+    );
+
+    /**
+     * @var Zend_Controller_Action_Helper_ViewRenderer
+     */
+    protected $_viewRenderer;
+
+    /**
+     * Original view suffix prior to detecting context switch
+     * @var string
+     */
+    protected $_viewSuffixOrig;
+
+    /**
+     * Constructor
+     *
+     * @param  array|Zend_Config $options
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $this->setConfig($options);
+        } elseif (is_array($options)) {
+            $this->setOptions($options);
+        }
+
+        if (empty($this->_contexts)) {
+            $this->addContexts(array(
+                'json' => array(
+                    'suffix'    => 'json',
+                    'headers'   => array('Content-Type' => 'application/json'),
+                    'callbacks' => array(
+                        'init' => 'initJsonContext',
+                        'post' => 'postJsonContext'
+                    )
+                ),
+                'xml'  => array(
+                    'suffix'    => 'xml',
+                    'headers'   => array('Content-Type' => 'application/xml'),
+                )
+            ));
+        }
+
+        $this->init();
+    }
+
+    /**
+     * Initialize at start of action controller
+     *
+     * Reset the view script suffix to the original state, or store the
+     * original state.
+     *
+     * @return void
+     */
+    public function init()
+    {
+        if (null === $this->_viewSuffixOrig) {
+            $this->_viewSuffixOrig = $this->_getViewRenderer()->getViewSuffix();
+        } else {
+            $this->_getViewRenderer()->setViewSuffix($this->_viewSuffixOrig);
+        }
+    }
+
+    /**
+     * Configure object from array of options
+     *
+     * @param  array $options
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setOptions(array $options)
+    {
+        if (isset($options['contexts'])) {
+            $this->setContexts($options['contexts']);
+            unset($options['contexts']);
+        }
+
+        foreach ($options as $key => $value) {
+            $method = 'set' . ucfirst($key);
+            if (in_array($method, $this->_unconfigurable)) {
+                continue;
+            }
+
+            if (in_array($method, $this->_specialConfig)) {
+                $method = '_' . $method;
+            }
+
+            if (method_exists($this, $method)) {
+                $this->$method($value);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Set object state from config object
+     *
+     * @param  Zend_Config $config
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setConfig(Zend_Config $config)
+    {
+        return $this->setOptions($config->toArray());
+    }
+
+    /**
+     * Strategy pattern: return object
+     *
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function direct()
+    {
+        return $this;
+    }
+
+    /**
+     * Initialize context detection and switching
+     *
+     * @param  mixed $format
+     * @throws Zend_Controller_Action_Exception
+     * @return void
+     */
+    public function initContext($format = null)
+    {
+        $this->_currentContext = null;
+
+        $controller = $this->getActionController();
+        $request    = $this->getRequest();
+        $action     = $request->getActionName();
+
+        // Return if no context switching enabled, or no context switching
+        // enabled for this action
+        $contexts = $this->getActionContexts($action);
+        if (empty($contexts)) {
+            return;
+        }
+
+        // Return if no context parameter provided
+        if (!$context = $request->getParam($this->getContextParam())) {
+            if ($format === null) {
+                return;
+            }
+            $context = $format;
+            $format  = null;
+        }
+
+        // Check if context allowed by action controller
+        if (!$this->hasActionContext($action, $context)) {
+            return;
+        }
+
+        // Return if invalid context parameter provided and no format or invalid
+        // format provided
+        if (!$this->hasContext($context)) {
+            if (empty($format) || !$this->hasContext($format)) {
+
+                return;
+            }
+        }
+
+        // Use provided format if passed
+        if (!empty($format) && $this->hasContext($format)) {
+            $context = $format;
+        }
+
+        $suffix = $this->getSuffix($context);
+
+        $this->_getViewRenderer()->setViewSuffix($suffix);
+
+        $headers = $this->getHeaders($context);
+        if (!empty($headers)) {
+            $response = $this->getResponse();
+            foreach ($headers as $header => $content) {
+                $response->setHeader($header, $content);
+            }
+        }
+
+        if ($this->getAutoDisableLayout()) {
+            /**
+             * @see Zend_Layout
+             */
+            require_once 'Zend/Layout.php';
+            $layout = Zend_Layout::getMvcInstance();
+            if (null !== $layout) {
+                $layout->disableLayout();
+            }
+        }
+
+        if (null !== ($callback = $this->getCallback($context, self::TRIGGER_INIT))) {
+            if (is_string($callback) && method_exists($this, $callback)) {
+                $this->$callback();
+            } elseif (is_string($callback) && function_exists($callback)) {
+                $callback();
+            } elseif (is_array($callback)) {
+                call_user_func($callback);
+            } else {
+                /**
+                 * @see Zend_Controller_Action_Exception
+                 */
+                require_once 'Zend/Controller/Action/Exception.php';
+                throw new Zend_Controller_Action_Exception(sprintf('Invalid context callback registered for context "%s"', $context));
+            }
+        }
+
+        $this->_currentContext = $context;
+    }
+
+    /**
+     * JSON context extra initialization
+     *
+     * Turns off viewRenderer auto-rendering
+     *
+     * @return void
+     */
+    public function initJsonContext()
+    {
+        if (!$this->getAutoJsonSerialization()) {
+            return;
+        }
+
+        $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
+        $view = $viewRenderer->view;
+        if ($view instanceof Zend_View_Interface) {
+            $viewRenderer->setNoRender(true);
+        }
+    }
+
+    /**
+     * Should JSON contexts auto-serialize?
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setAutoJsonSerialization($flag)
+    {
+        $this->_autoJsonSerialization = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Get JSON context auto-serialization flag
+     *
+     * @return boolean
+     */
+    public function getAutoJsonSerialization()
+    {
+        return $this->_autoJsonSerialization;
+    }
+
+    /**
+     * Set suffix from array
+     *
+     * @param  array $spec
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    protected function _setSuffix(array $spec)
+    {
+        foreach ($spec as $context => $suffixInfo) {
+            if (!is_string($context)) {
+                $context = null;
+            }
+
+            if (is_string($suffixInfo)) {
+                $this->setSuffix($context, $suffixInfo);
+                continue;
+            } elseif (is_array($suffixInfo)) {
+                if (isset($suffixInfo['suffix'])) {
+                    $suffix                    = $suffixInfo['suffix'];
+                    $prependViewRendererSuffix = true;
+
+                    if ((null === $context) && isset($suffixInfo['context'])) {
+                        $context = $suffixInfo['context'];
+                    }
+
+                    if (isset($suffixInfo['prependViewRendererSuffix'])) {
+                        $prependViewRendererSuffix = $suffixInfo['prependViewRendererSuffix'];
+                    }
+
+                    $this->setSuffix($context, $suffix, $prependViewRendererSuffix);
+                    continue;
+                }
+
+                $count = count($suffixInfo);
+                switch (true) {
+                    case (($count < 2) && (null === $context)):
+                        /**
+                         * @see Zend_Controller_Action_Exception
+                         */
+                        require_once 'Zend/Controller/Action/Exception.php';
+                        throw new Zend_Controller_Action_Exception('Invalid suffix information provided in config');
+                    case ($count < 2):
+                        $suffix = array_shift($suffixInfo);
+                        $this->setSuffix($context, $suffix);
+                        break;
+                    case (($count < 3) && (null === $context)):
+                        $context = array_shift($suffixInfo);
+                        $suffix  = array_shift($suffixInfo);
+                        $this->setSuffix($context, $suffix);
+                        break;
+                    case (($count == 3) && (null === $context)):
+                        $context = array_shift($suffixInfo);
+                        $suffix  = array_shift($suffixInfo);
+                        $prependViewRendererSuffix = array_shift($suffixInfo);
+                        $this->setSuffix($context, $suffix, $prependViewRendererSuffix);
+                        break;
+                    case ($count >= 2):
+                        $suffix  = array_shift($suffixInfo);
+                        $prependViewRendererSuffix = array_shift($suffixInfo);
+                        $this->setSuffix($context, $suffix, $prependViewRendererSuffix);
+                        break;
+                }
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Customize view script suffix to use when switching context.
+     *
+     * Passing an empty suffix value to the setters disables the view script
+     * suffix change.
+     *
+     * @param  string  $context                   Context type for which to set suffix
+     * @param  string  $suffix                    Suffix to use
+     * @param  boolean $prependViewRendererSuffix Whether or not to prepend the new suffix to the viewrenderer suffix
+     * @throws Zend_Controller_Action_Exception
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setSuffix($context, $suffix, $prependViewRendererSuffix = true)
+    {
+        if (!isset($this->_contexts[$context])) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception(sprintf('Cannot set suffix; invalid context type "%s"', $context));
+        }
+
+        if (empty($suffix)) {
+            $suffix = '';
+        }
+
+        if (is_array($suffix)) {
+            if (isset($suffix['prependViewRendererSuffix'])) {
+                $prependViewRendererSuffix = $suffix['prependViewRendererSuffix'];
+            }
+            if (isset($suffix['suffix'])) {
+                $suffix = $suffix['suffix'];
+            } else {
+                $suffix = '';
+            }
+        }
+
+        $suffix = (string) $suffix;
+
+        if ($prependViewRendererSuffix) {
+            if (empty($suffix)) {
+                $suffix = $this->_getViewRenderer()->getViewSuffix();
+            } else {
+                $suffix .= '.' . $this->_getViewRenderer()->getViewSuffix();
+            }
+        }
+
+        $this->_contexts[$context]['suffix'] = $suffix;
+        return $this;
+    }
+
+    /**
+     * Retrieve suffix for given context type
+     *
+     * @param  string $type Context type
+     * @throws Zend_Controller_Action_Exception
+     * @return string
+     */
+    public function getSuffix($type)
+    {
+        if (!isset($this->_contexts[$type])) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception(sprintf('Cannot retrieve suffix; invalid context type "%s"', $type));
+        }
+
+        return $this->_contexts[$type]['suffix'];
+    }
+
+    /**
+     * Does the given context exist?
+     *
+     * @param  string  $context
+     * @param  boolean $throwException
+     * @throws Zend_Controller_Action_Exception if context does not exist and throwException is true
+     * @return bool
+     */
+    public function hasContext($context, $throwException = false)
+    {
+        if (is_string($context)) {
+            if (isset($this->_contexts[$context])) {
+                return true;
+            }
+        } elseif (is_array($context)) {
+            $error = false;
+            foreach ($context as $test) {
+                if (!isset($this->_contexts[$test])) {
+                    $error = (string) $test;
+                    break;
+                }
+            }
+            if (false === $error) {
+                return true;
+            }
+            $context = $error;
+        } elseif (true === $context) {
+            return true;
+        }
+
+        if ($throwException) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception(sprintf('Context "%s" does not exist', $context));
+        }
+
+        return false;
+    }
+
+    /**
+     * Add header to context
+     *
+     * @param  string $context
+     * @param  string $header
+     * @param  string $content
+     * @throws Zend_Controller_Action_Exception
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function addHeader($context, $header, $content)
+    {
+        $context = (string) $context;
+        $this->hasContext($context, true);
+
+        $header  = (string) $header;
+        $content = (string) $content;
+
+        if (isset($this->_contexts[$context]['headers'][$header])) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception(sprintf('Cannot add "%s" header to context "%s": already exists', $header, $context));
+        }
+
+        $this->_contexts[$context]['headers'][$header] = $content;
+        return $this;
+    }
+
+    /**
+     * Customize response header to use when switching context
+     *
+     * Passing an empty header value to the setters disables the response
+     * header.
+     *
+     * @param  string $type   Context type for which to set suffix
+     * @param  string $header Header to set
+     * @param  string $content Header content
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setHeader($context, $header, $content)
+    {
+        $this->hasContext($context, true);
+        $context = (string) $context;
+        $header  = (string) $header;
+        $content = (string) $content;
+
+        $this->_contexts[$context]['headers'][$header] = $content;
+        return $this;
+    }
+
+    /**
+     * Add multiple headers at once for a given context
+     *
+     * @param  string $context
+     * @param  array  $headers
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function addHeaders($context, array $headers)
+    {
+        foreach ($headers as $header => $content) {
+            $this->addHeader($context, $header, $content);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set headers from context => headers pairs
+     *
+     * @param  array $options
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    protected function _setHeaders(array $options)
+    {
+        foreach ($options as $context => $headers) {
+            if (!is_array($headers)) {
+                continue;
+            }
+            $this->setHeaders($context, $headers);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set multiple headers at once for a given context
+     *
+     * @param  string $context
+     * @param  array  $headers
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setHeaders($context, array $headers)
+    {
+        $this->clearHeaders($context);
+        foreach ($headers as $header => $content) {
+            $this->setHeader($context, $header, $content);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve context header
+     *
+     * Returns the value of a given header for a given context type
+     *
+     * @param  string $context
+     * @param  string $header
+     * @return string|null
+     */
+    public function getHeader($context, $header)
+    {
+        $this->hasContext($context, true);
+        $context = (string) $context;
+        $header  = (string) $header;
+        if (isset($this->_contexts[$context]['headers'][$header])) {
+            return $this->_contexts[$context]['headers'][$header];
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieve context headers
+     *
+     * Returns all headers for a context as key/value pairs
+     *
+     * @param  string $context
+     * @return array
+     */
+    public function getHeaders($context)
+    {
+        $this->hasContext($context, true);
+        $context = (string) $context;
+        return $this->_contexts[$context]['headers'];
+    }
+
+    /**
+     * Remove a single header from a context
+     *
+     * @param  string $context
+     * @param  string $header
+     * @return boolean
+     */
+    public function removeHeader($context, $header)
+    {
+        $this->hasContext($context, true);
+        $context = (string) $context;
+        $header  = (string) $header;
+        if (isset($this->_contexts[$context]['headers'][$header])) {
+            unset($this->_contexts[$context]['headers'][$header]);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Clear all headers for a given context
+     *
+     * @param  string $context
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function clearHeaders($context)
+    {
+        $this->hasContext($context, true);
+        $context = (string) $context;
+        $this->_contexts[$context]['headers'] = array();
+        return $this;
+    }
+
+    /**
+     * Validate trigger and return in normalized form
+     *
+     * @param  string $trigger
+     * @throws Zend_Controller_Action_Exception
+     * @return string
+     */
+    protected function _validateTrigger($trigger)
+    {
+        $trigger = strtoupper($trigger);
+        if ('TRIGGER_' !== substr($trigger, 0, 8)) {
+            $trigger = 'TRIGGER_' . $trigger;
+        }
+
+        if (!in_array($trigger, array(self::TRIGGER_INIT, self::TRIGGER_POST))) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception(sprintf('Invalid trigger "%s"', $trigger));
+        }
+
+        return $trigger;
+    }
+
+    /**
+     * Set a callback for a given context and trigger
+     *
+     * @param  string       $context
+     * @param  string       $trigger
+     * @param  string|array $callback
+     * @throws Zend_Controller_Action_Exception
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setCallback($context, $trigger, $callback)
+    {
+        $this->hasContext($context, true);
+        $trigger = $this->_validateTrigger($trigger);
+
+        if (!is_string($callback)) {
+            if (!is_array($callback) || (2 != count($callback))) {
+                /**
+                 * @see Zend_Controller_Action_Exception
+                 */
+                require_once 'Zend/Controller/Action/Exception.php';
+                throw new Zend_Controller_Action_Exception('Invalid callback specified');
+            }
+        }
+
+        $this->_contexts[$context]['callbacks'][$trigger] = $callback;
+        return $this;
+    }
+
+    /**
+     * Set callbacks from array of context => callbacks pairs
+     *
+     * @param  array $options
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    protected function _setCallbacks(array $options)
+    {
+        foreach ($options as $context => $callbacks) {
+            if (!is_array($callbacks)) {
+                continue;
+            }
+
+            $this->setCallbacks($context, $callbacks);
+        }
+        return $this;
+    }
+
+    /**
+     * Set callbacks for a given context
+     *
+     * Callbacks should be in trigger/callback pairs.
+     *
+     * @param  string $context
+     * @param  array  $callbacks
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setCallbacks($context, array $callbacks)
+    {
+        $this->hasContext($context, true);
+        $context = (string) $context;
+        if (!isset($this->_contexts[$context]['callbacks'])) {
+            $this->_contexts[$context]['callbacks'] = array();
+        }
+
+        foreach ($callbacks as $trigger => $callback) {
+            $this->setCallback($context, $trigger, $callback);
+        }
+        return $this;
+    }
+
+    /**
+     * Get a single callback for a given context and trigger
+     *
+     * @param  string $context
+     * @param  string $trigger
+     * @return string|array|null
+     */
+    public function getCallback($context, $trigger)
+    {
+        $this->hasContext($context, true);
+        $trigger = $this->_validateTrigger($trigger);
+        if (isset($this->_contexts[$context]['callbacks'][$trigger])) {
+            return $this->_contexts[$context]['callbacks'][$trigger];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all callbacks for a given context
+     *
+     * @param  string $context
+     * @return array
+     */
+    public function getCallbacks($context)
+    {
+        $this->hasContext($context, true);
+        return $this->_contexts[$context]['callbacks'];
+    }
+
+    /**
+     * Clear a callback for a given context and trigger
+     *
+     * @param  string $context
+     * @param  string $trigger
+     * @return boolean
+     */
+    public function removeCallback($context, $trigger)
+    {
+        $this->hasContext($context, true);
+        $trigger = $this->_validateTrigger($trigger);
+        if (isset($this->_contexts[$context]['callbacks'][$trigger])) {
+            unset($this->_contexts[$context]['callbacks'][$trigger]);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Clear all callbacks for a given context
+     *
+     * @param  string $context
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function clearCallbacks($context)
+    {
+        $this->hasContext($context, true);
+        $this->_contexts[$context]['callbacks'] = array();
+        return $this;
+    }
+
+    /**
+     * Set name of parameter to use when determining context format
+     *
+     * @param  string $name
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setContextParam($name)
+    {
+        $this->_contextParam = (string) $name;
+        return $this;
+    }
+
+    /**
+     * Return context format request parameter name
+     *
+     * @return string
+     */
+    public function getContextParam()
+    {
+        return $this->_contextParam;
+    }
+
+    /**
+     * Indicate default context to use when no context format provided
+     *
+     * @param  string $type
+     * @throws Zend_Controller_Action_Exception
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setDefaultContext($type)
+    {
+        if (!isset($this->_contexts[$type])) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception(sprintf('Cannot set default context; invalid context type "%s"', $type));
+        }
+
+        $this->_defaultContext = $type;
+        return $this;
+    }
+
+    /**
+     * Return default context
+     *
+     * @return string
+     */
+    public function getDefaultContext()
+    {
+        return $this->_defaultContext;
+    }
+
+    /**
+     * Set flag indicating if layout should be disabled
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setAutoDisableLayout($flag)
+    {
+        $this->_disableLayout = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Retrieve auto layout disable flag
+     *
+     * @return boolean
+     */
+    public function getAutoDisableLayout()
+    {
+        return $this->_disableLayout;
+    }
+
+    /**
+     * Add new context
+     *
+     * @param  string $context Context type
+     * @param  array  $spec    Context specification
+     * @throws Zend_Controller_Action_Exception
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function addContext($context, array $spec)
+    {
+        if ($this->hasContext($context)) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception(sprintf('Cannot add context "%s"; already exists', $context));
+        }
+        $context = (string) $context;
+
+        $this->_contexts[$context] = array();
+
+        $this->setSuffix($context,    (isset($spec['suffix'])    ? $spec['suffix']    : ''))
+             ->setHeaders($context,   (isset($spec['headers'])   ? $spec['headers']   : array()))
+             ->setCallbacks($context, (isset($spec['callbacks']) ? $spec['callbacks'] : array()));
+        return $this;
+    }
+
+    /**
+     * Overwrite existing context
+     *
+     * @param  string $context Context type
+     * @param  array  $spec    Context specification
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setContext($context, array $spec)
+    {
+        $this->removeContext($context);
+        return $this->addContext($context, $spec);
+    }
+
+    /**
+     * Add multiple contexts
+     *
+     * @param  array $contexts
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function addContexts(array $contexts)
+    {
+        foreach ($contexts as $context => $spec) {
+            $this->addContext($context, $spec);
+        }
+        return $this;
+    }
+
+    /**
+     * Set multiple contexts, after first removing all
+     *
+     * @param  array $contexts
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setContexts(array $contexts)
+    {
+        $this->clearContexts();
+        foreach ($contexts as $context => $spec) {
+            $this->addContext($context, $spec);
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve context specification
+     *
+     * @param  string $context
+     * @return array|null
+     */
+    public function getContext($context)
+    {
+        if ($this->hasContext($context)) {
+            return $this->_contexts[(string) $context];
+        }
+        return null;
+    }
+
+    /**
+     * Retrieve context definitions
+     *
+     * @return array
+     */
+    public function getContexts()
+    {
+        return $this->_contexts;
+    }
+
+    /**
+     * Remove a context
+     *
+     * @param  string $context
+     * @return boolean
+     */
+    public function removeContext($context)
+    {
+        if ($this->hasContext($context)) {
+            unset($this->_contexts[(string) $context]);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Remove all contexts
+     *
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function clearContexts()
+    {
+        $this->_contexts = array();
+        return $this;
+    }
+
+    /**
+     * Return current context, if any
+     *
+     * @return null|string
+     */
+    public function getCurrentContext()
+    {
+        return $this->_currentContext;
+    }
+
+    /**
+     * Post dispatch processing
+     *
+     * Execute postDispatch callback for current context, if available
+     *
+     * @throws Zend_Controller_Action_Exception
+     * @return void
+     */
+    public function postDispatch()
+    {
+        $context = $this->getCurrentContext();
+        if (null !== $context) {
+            if (null !== ($callback = $this->getCallback($context, self::TRIGGER_POST))) {
+                if (is_string($callback) && method_exists($this, $callback)) {
+                    $this->$callback();
+                } elseif (is_string($callback) && function_exists($callback)) {
+                    $callback();
+                } elseif (is_array($callback)) {
+                    call_user_func($callback);
+                } else {
+                    /**
+                     * @see Zend_Controller_Action_Exception
+                     */
+                    require_once 'Zend/Controller/Action/Exception.php';
+                    throw new Zend_Controller_Action_Exception(sprintf('Invalid postDispatch context callback registered for context "%s"', $context));
+                }
+            }
+        }
+    }
+
+    /**
+     * JSON post processing
+     *
+     * JSON serialize view variables to response body
+     *
+     * @return void
+     */
+    public function postJsonContext()
+    {
+        if (!$this->getAutoJsonSerialization()) {
+            return;
+        }
+
+        $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
+        $view = $viewRenderer->view;
+        if ($view instanceof Zend_View_Interface) {
+            /**
+             * @see Zend_Json
+             */
+            if(method_exists($view, 'getVars')) {
+                require_once 'Zend/Json.php';
+                $vars = Zend_Json::encode($view->getVars());
+                $this->getResponse()->setBody($vars);
+            } else {
+                require_once 'Zend/Controller/Action/Exception.php';
+                throw new Zend_Controller_Action_Exception('View does not implement the getVars() method needed to encode the view into JSON');
+            }
+        }
+    }
+
+    /**
+     * Add one or more contexts to an action
+     *
+     * @param  string       $action
+     * @param  string|array $context
+     * @return Zend_Controller_Action_Helper_ContextSwitch|void Provides a fluent interface
+     */
+    public function addActionContext($action, $context)
+    {
+        $this->hasContext($context, true);
+        $controller = $this->getActionController();
+        if (null === $controller) {
+            return;
+        }
+        $action     = (string) $action;
+        $contextKey = $this->_contextKey;
+
+        if (!isset($controller->$contextKey)) {
+            $controller->$contextKey = array();
+        }
+
+        if (true === $context) {
+            $contexts = $this->getContexts();
+            $controller->{$contextKey}[$action] = array_keys($contexts);
+            return $this;
+        }
+
+        $context = (array) $context;
+        if (!isset($controller->{$contextKey}[$action])) {
+            $controller->{$contextKey}[$action] = $context;
+        } else {
+            $controller->{$contextKey}[$action] = array_merge(
+                $controller->{$contextKey}[$action],
+                $context
+            );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set a context as available for a given controller action
+     *
+     * @param  string       $action
+     * @param  string|array $context
+     * @return Zend_Controller_Action_Helper_ContextSwitch|void Provides a fluent interface
+     */
+    public function setActionContext($action, $context)
+    {
+        $this->hasContext($context, true);
+        $controller = $this->getActionController();
+        if (null === $controller) {
+            return;
+        }
+        $action     = (string) $action;
+        $contextKey = $this->_contextKey;
+
+        if (!isset($controller->$contextKey)) {
+            $controller->$contextKey = array();
+        }
+
+        if (true === $context) {
+            $contexts = $this->getContexts();
+            $controller->{$contextKey}[$action] = array_keys($contexts);
+        } else {
+            $controller->{$contextKey}[$action] = (array) $context;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add multiple action/context pairs at once
+     *
+     * @param  array $contexts
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function addActionContexts(array $contexts)
+    {
+        foreach ($contexts as $action => $context) {
+            $this->addActionContext($action, $context);
+        }
+        return $this;
+    }
+
+    /**
+     * Overwrite and set multiple action contexts at once
+     *
+     * @param  array $contexts
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function setActionContexts(array $contexts)
+    {
+        foreach ($contexts as $action => $context) {
+            $this->setActionContext($action, $context);
+        }
+        return $this;
+    }
+
+    /**
+     * Does a particular controller action have the given context(s)?
+     *
+     * @param  string       $action
+     * @param  string|array $context
+     * @throws Zend_Controller_Action_Exception
+     * @return boolean
+     */
+    public function hasActionContext($action, $context)
+    {
+        $this->hasContext($context, true);
+        $controller = $this->getActionController();
+        if (null === $controller) {
+            return false;
+        }
+        $action     = (string) $action;
+        $contextKey = $this->_contextKey;
+
+        if (!isset($controller->{$contextKey})) {
+            return false;
+        }
+
+        $allContexts = $controller->{$contextKey};
+
+        if (!is_array($allContexts)) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception("Invalid contexts found for controller");
+        }
+
+        if (!isset($allContexts[$action])) {
+            return false;
+        }
+
+        if (true === $allContexts[$action]) {
+            return true;
+        }
+
+        $contexts = $allContexts[$action];
+
+        if (!is_array($contexts)) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception(sprintf("Invalid contexts found for action '%s'", $action));
+        }
+
+        if (is_string($context) && in_array($context, $contexts)) {
+            return true;
+        } elseif (is_array($context)) {
+            $found = true;
+            foreach ($context as $test) {
+                if (!in_array($test, $contexts)) {
+                    $found = false;
+                    break;
+                }
+            }
+            return $found;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get contexts for a given action or all actions in the controller
+     *
+     * @param  string $action
+     * @return array
+     */
+    public function getActionContexts($action = null)
+    {
+        $controller = $this->getActionController();
+        if (null === $controller) {
+            return array();
+        }
+        $contextKey = $this->_contextKey;
+
+        if (!isset($controller->$contextKey)) {
+            return array();
+        }
+
+        if (null !== $action) {
+            $action = (string) $action;
+            if (isset($controller->{$contextKey}[$action])) {
+                return $controller->{$contextKey}[$action];
+            } else {
+                return array();
+            }
+        }
+
+        return $controller->$contextKey;
+    }
+
+    /**
+     * Remove one or more contexts for a given controller action
+     *
+     * @param  string       $action
+     * @param  string|array $context
+     * @return boolean
+     */
+    public function removeActionContext($action, $context)
+    {
+        if ($this->hasActionContext($action, $context)) {
+            $controller     = $this->getActionController();
+            $contextKey     = $this->_contextKey;
+            $action         = (string) $action;
+            $contexts       = $controller->$contextKey;
+            $actionContexts = $contexts[$action];
+            $contexts       = (array) $context;
+            foreach ($contexts as $context) {
+                $index = array_search($context, $actionContexts);
+                if (false !== $index) {
+                    unset($controller->{$contextKey}[$action][$index]);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Clear all contexts for a given controller action or all actions
+     *
+     * @param  string $action
+     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     */
+    public function clearActionContexts($action = null)
+    {
+        $controller = $this->getActionController();
+        $contextKey = $this->_contextKey;
+
+        if (!isset($controller->$contextKey) || empty($controller->$contextKey)) {
+            return $this;
+        }
+
+        if (null === $action) {
+            $controller->$contextKey = array();
+            return $this;
+        }
+
+        $action = (string) $action;
+        if (isset($controller->{$contextKey}[$action])) {
+            unset($controller->{$contextKey}[$action]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve ViewRenderer
+     *
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    protected function _getViewRenderer()
+    {
+        if (null === $this->_viewRenderer) {
+            $this->_viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
+        }
+
+        return $this->_viewRenderer;
+    }
+}
+
diff --git a/lib/zend/Zend/Controller/Action/Helper/FlashMessenger.php b/lib/zend/Zend/Controller/Action/Helper/FlashMessenger.php
new file mode 100644
index 00000000000..57fe9ecdeeb
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/FlashMessenger.php
@@ -0,0 +1,313 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Session
+ */
+require_once 'Zend/Session.php';
+
+/**
+ * @see Zend_Controller_Action_Helper_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * Flash Messenger - implement session-based messages
+ *
+ * @uses       Zend_Controller_Action_Helper_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Action_Helper_Abstract implements IteratorAggregate, Countable
+{
+    /**
+     * $_messages - Messages from previous request
+     *
+     * @var array
+     */
+    static protected $_messages = array();
+
+    /**
+     * $_session - Zend_Session storage object
+     *
+     * @var Zend_Session
+     */
+    static protected $_session = null;
+
+    /**
+     * $_messageAdded - Wether a message has been previously added
+     *
+     * @var boolean
+     */
+    static protected $_messageAdded = false;
+
+    /**
+     * $_namespace - Instance namespace, default is 'default'
+     *
+     * @var string
+     */
+    protected $_namespace = 'default';
+
+    /**
+     * __construct() - Instance constructor, needed to get iterators, etc
+     *
+     * @param  string $namespace
+     * @return void
+     */
+    public function __construct()
+    {
+        if (!self::$_session instanceof Zend_Session_Namespace) {
+            self::$_session = new Zend_Session_Namespace($this->getName());
+            foreach (self::$_session as $namespace => $messages) {
+                self::$_messages[$namespace] = $messages;
+                unset(self::$_session->{$namespace});
+            }
+        }
+    }
+
+    /**
+     * postDispatch() - runs after action is dispatched, in this
+     * case, it is resetting the namespace in case we have forwarded to a different
+     * action, Flashmessage will be 'clean' (default namespace)
+     *
+     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
+     */
+    public function postDispatch()
+    {
+        $this->resetNamespace();
+        return $this;
+    }
+
+    /**
+     * setNamespace() - change the namespace messages are added to, useful for
+     * per action controller messaging between requests
+     *
+     * @param  string $namespace
+     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
+     */
+    public function setNamespace($namespace = 'default')
+    {
+        $this->_namespace = $namespace;
+        return $this;
+    }
+    
+    /**
+     * getNamespace() - return the current namepsace
+     * 
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->_namespace;
+    }
+
+    /**
+     * resetNamespace() - reset the namespace to the default
+     *
+     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
+     */
+    public function resetNamespace()
+    {
+        $this->setNamespace();
+        return $this;
+    }
+
+    /**
+     * addMessage() - Add a message to flash message
+     *
+     * @param  string $message
+     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
+     */
+    public function addMessage($message, $namespace = null)
+    {
+        if (!is_string($namespace) || $namespace == '') {
+            $namespace = $this->getNamespace();
+        }
+        
+        if (self::$_messageAdded === false) {
+            self::$_session->setExpirationHops(1, null, true);
+        }
+
+        if (!is_array(self::$_session->{$namespace})) {
+            self::$_session->{$namespace} = array();
+        }
+
+        self::$_session->{$namespace}[] = $message;
+        self::$_messageAdded = true;
+
+        return $this;
+    }
+
+    /**
+     * hasMessages() - Wether a specific namespace has messages
+     *
+     * @return boolean
+     */
+    public function hasMessages($namespace = null)
+    {
+        if (!is_string($namespace) || $namespace == '') {
+            $namespace = $this->getNamespace();
+        }
+        
+        return isset(self::$_messages[$namespace]);
+    }
+
+    /**
+     * getMessages() - Get messages from a specific namespace
+     *
+     * @return array
+     */
+    public function getMessages($namespace = null)
+    {
+        if (!is_string($namespace) || $namespace == '') {
+            $namespace = $this->getNamespace();
+        }
+        
+        if ($this->hasMessages($namespace)) {
+            return self::$_messages[$namespace];
+        }
+
+        return array();
+    }
+
+    /**
+     * Clear all messages from the previous request & current namespace
+     *
+     * @return boolean True if messages were cleared, false if none existed
+     */
+    public function clearMessages($namespace = null)
+    {
+        if (!is_string($namespace) || $namespace == '') {
+            $namespace = $this->getNamespace();
+        }
+        
+        if ($this->hasMessages($namespace)) {
+            unset(self::$_messages[$namespace]);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * hasCurrentMessages() - check to see if messages have been added to current
+     * namespace within this request
+     *
+     * @return boolean
+     */
+    public function hasCurrentMessages($namespace = null)
+    {
+        if (!is_string($namespace) || $namespace == '') {
+            $namespace = $this->getNamespace();
+        }
+        
+        return isset(self::$_session->{$namespace});
+    }
+
+    /**
+     * getCurrentMessages() - get messages that have been added to the current
+     * namespace within this request
+     *
+     * @return array
+     */
+    public function getCurrentMessages($namespace = null)
+    {
+        if (!is_string($namespace) || $namespace == '') {
+            $namespace = $this->getNamespace();
+        }
+        
+        if ($this->hasCurrentMessages($namespace)) {
+            return self::$_session->{$namespace};
+        }
+
+        return array();
+    }
+
+    /**
+     * clear messages from the current request & current namespace
+     *
+     * @return boolean
+     */
+    public function clearCurrentMessages($namespace = null)
+    {
+        if (!is_string($namespace) || $namespace == '') {
+            $namespace = $this->getNamespace();
+        }
+        
+        if ($this->hasCurrentMessages($namespace)) {
+            unset(self::$_session->{$namespace});
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * getIterator() - complete the IteratorAggregate interface, for iterating
+     *
+     * @return ArrayObject
+     */
+    public function getIterator($namespace = null)
+    {
+        if (!is_string($namespace) || $namespace == '') {
+            $namespace = $this->getNamespace();
+        }
+        
+        if ($this->hasMessages($namespace)) {
+            return new ArrayObject($this->getMessages($namespace));
+        }
+
+        return new ArrayObject();
+    }
+
+    /**
+     * count() - Complete the countable interface
+     *
+     * @return int
+     */
+    public function count($namespace = null)
+    {
+        if (!is_string($namespace) || $namespace == '') {
+            $namespace = $this->getNamespace();
+        }
+        
+        if ($this->hasMessages($namespace)) {
+            return count($this->getMessages($namespace));
+        }
+
+        return 0;
+    }
+
+    /**
+     * Strategy pattern: proxy to addMessage()
+     *
+     * @param  string $message
+     * @return void
+     */
+    public function direct($message, $namespace=NULL)
+    {
+        return $this->addMessage($message, $namespace);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/Json.php b/lib/zend/Zend/Controller/Action/Helper/Json.php
new file mode 100644
index 00000000000..86a8b113c17
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/Json.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * Simplify AJAX context switching based on requested format
+ *
+ * @uses       Zend_Controller_Action_Helper_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * Suppress exit when sendJson() called
+     * @var boolean
+     */
+    public $suppressExit = false;
+
+    /**
+     * Create JSON response
+     *
+     * Encodes and returns data to JSON. Content-Type header set to
+     * 'application/json', and disables layouts and viewRenderer (if being
+     * used).
+     *
+     * @param  mixed   $data
+     * @param  boolean $keepLayouts
+     * @param  boolean|array $keepLayouts
+     * @param  boolean $encodeData Provided data is already JSON
+     * NOTE:   if boolean, establish $keepLayouts to true|false
+     *         if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false
+     *         if $keepLayouts and parmas for Zend_Json::encode are required
+     *         then, the array can contains a 'keepLayout'=>true|false and/or 'encodeData'=>true|false
+     *         that will not be passed to Zend_Json::encode method but will be passed
+     *         to Zend_View_Helper_Json
+     * @throws Zend_Controller_Action_Helper_Json
+     * @return string
+     */
+    public function encodeJson($data, $keepLayouts = false, $encodeData = true)
+    {
+        /**
+         * @see Zend_View_Helper_Json
+         */
+        require_once 'Zend/View/Helper/Json.php';
+        $jsonHelper = new Zend_View_Helper_Json();
+        $data = $jsonHelper->json($data, $keepLayouts, $encodeData);
+
+        if (!$keepLayouts) {
+            /**
+             * @see Zend_Controller_Action_HelperBroker
+             */
+            require_once 'Zend/Controller/Action/HelperBroker.php';
+            Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Encode JSON response and immediately send
+     *
+     * @param  mixed   $data
+     * @param  boolean|array $keepLayouts
+     * @param  $encodeData Encode $data as JSON?
+     * NOTE:   if boolean, establish $keepLayouts to true|false
+     *         if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false
+     *         if $keepLayouts and parmas for Zend_Json::encode are required
+     *         then, the array can contains a 'keepLayout'=>true|false and/or 'encodeData'=>true|false
+     *         that will not be passed to Zend_Json::encode method but will be passed
+     *         to Zend_View_Helper_Json
+     * @return string|void
+     */
+    public function sendJson($data, $keepLayouts = false, $encodeData = true)
+    {
+        $data = $this->encodeJson($data, $keepLayouts, $encodeData);
+        $response = $this->getResponse();
+        $response->setBody($data);
+
+        if (!$this->suppressExit) {
+            $response->sendResponse();
+            exit;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Strategy pattern: call helper as helper broker method
+     *
+     * Allows encoding JSON. If $sendNow is true, immediately sends JSON
+     * response.
+     *
+     * @param  mixed   $data
+     * @param  boolean $sendNow
+     * @param  boolean $keepLayouts
+     * @param  boolean $encodeData Encode $data as JSON?
+     * @return string|void
+     */
+    public function direct($data, $sendNow = true, $keepLayouts = false, $encodeData = true)
+    {
+        if ($sendNow) {
+            return $this->sendJson($data, $keepLayouts, $encodeData);
+        }
+        return $this->encodeJson($data, $keepLayouts, $encodeData);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/Redirector.php b/lib/zend/Zend/Controller/Action/Helper/Redirector.php
new file mode 100644
index 00000000000..8c81646224d
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/Redirector.php
@@ -0,0 +1,534 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * HTTP status code for redirects
+     * @var int
+     */
+    protected $_code = 302;
+
+    /**
+     * Whether or not calls to _redirect() should exit script execution
+     * @var boolean
+     */
+    protected $_exit = true;
+
+    /**
+     * Whether or not _redirect() should attempt to prepend the base URL to the
+     * passed URL (if it's a relative URL)
+     * @var boolean
+     */
+    protected $_prependBase = true;
+
+    /**
+     * Url to which to redirect
+     * @var string
+     */
+    protected $_redirectUrl = null;
+
+    /**
+     * Whether or not to use an absolute URI when redirecting
+     * @var boolean
+     */
+    protected $_useAbsoluteUri = false;
+
+    /**
+     * Whether or not to close the session before exiting
+     * @var boolean
+     */
+    protected $_closeSessionOnExit = true;
+
+    /**
+     * Retrieve HTTP status code to emit on {@link _redirect()} call
+     *
+     * @return int
+     */
+    public function getCode()
+    {
+        return $this->_code;
+    }
+
+    /**
+     * Validate HTTP status redirect code
+     *
+     * @param  int $code
+     * @throws Zend_Controller_Action_Exception on invalid HTTP status code
+     * @return true
+     */
+    protected function _checkCode($code)
+    {
+        $code = (int)$code;
+        if ((300 > $code) || (307 < $code) || (304 == $code) || (306 == $code)) {
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('Invalid redirect HTTP status code (' . $code  . ')');
+        }
+
+        return true;
+    }
+
+    /**
+     * Set HTTP status code for {@link _redirect()} behaviour
+     *
+     * @param  int $code
+     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
+     */
+    public function setCode($code)
+    {
+        $this->_checkCode($code);
+        $this->_code = $code;
+        return $this;
+    }
+
+    /**
+     * Retrieve flag for whether or not {@link _redirect()} will exit when finished.
+     *
+     * @return boolean
+     */
+    public function getExit()
+    {
+        return $this->_exit;
+    }
+
+    /**
+     * Set exit flag for {@link _redirect()} behaviour
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
+     */
+    public function setExit($flag)
+    {
+        $this->_exit = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Retrieve flag for whether or not {@link _redirect()} will prepend the
+     * base URL on relative URLs
+     *
+     * @return boolean
+     */
+    public function getPrependBase()
+    {
+        return $this->_prependBase;
+    }
+
+    /**
+     * Set 'prepend base' flag for {@link _redirect()} behaviour
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
+     */
+    public function setPrependBase($flag)
+    {
+        $this->_prependBase = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Retrieve flag for whether or not {@link redirectAndExit()} shall close the session before
+     * exiting.
+     *
+     * @return boolean
+     */
+    public function getCloseSessionOnExit()
+    {
+        return $this->_closeSessionOnExit;
+    }
+
+    /**
+     * Set flag for whether or not {@link redirectAndExit()} shall close the session before exiting.
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
+     */
+    public function setCloseSessionOnExit($flag)
+    {
+        $this->_closeSessionOnExit = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Return use absolute URI flag
+     *
+     * @return boolean
+     */
+    public function getUseAbsoluteUri()
+    {
+        return $this->_useAbsoluteUri;
+    }
+
+    /**
+     * Set use absolute URI flag
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
+     */
+    public function setUseAbsoluteUri($flag = true)
+    {
+        $this->_useAbsoluteUri = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Set redirect in response object
+     *
+     * @return void
+     */
+    protected function _redirect($url)
+    {
+        if ($this->getUseAbsoluteUri() && !preg_match('#^(https?|ftp)://#', $url)) {
+            $host  = (isset($_SERVER['HTTP_HOST'])?$_SERVER['HTTP_HOST']:'');
+            $proto = (isset($_SERVER['HTTPS'])&&$_SERVER['HTTPS']!=="off") ? 'https' : 'http';
+            $port  = (isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:80);
+            $uri   = $proto . '://' . $host;
+            if ((('http' == $proto) && (80 != $port)) || (('https' == $proto) && (443 != $port))) {
+                // do not append if HTTP_HOST already contains port
+                if (strrchr($host, ':') === false) {
+                    $uri .= ':' . $port;
+                }
+            }
+            $url = $uri . '/' . ltrim($url, '/');
+        }
+        $this->_redirectUrl = $url;
+        $this->getResponse()->setRedirect($url, $this->getCode());
+    }
+
+    /**
+     * Retrieve currently set URL for redirect
+     *
+     * @return string
+     */
+    public function getRedirectUrl()
+    {
+        return $this->_redirectUrl;
+    }
+
+    /**
+     * Determine if the baseUrl should be prepended, and prepend if necessary
+     *
+     * @param  string $url
+     * @return string
+     */
+    protected function _prependBase($url)
+    {
+        if ($this->getPrependBase()) {
+            $request = $this->getRequest();
+            if ($request instanceof Zend_Controller_Request_Http) {
+                $base = rtrim($request->getBaseUrl(), '/');
+                if (!empty($base) && ('/' != $base)) {
+                    $url = $base . '/' . ltrim($url, '/');
+                } else {
+                    $url = '/' . ltrim($url, '/');
+                }
+            }
+        }
+
+        return $url;
+    }
+
+    /**
+     * Set a redirect URL of the form /module/controller/action/params
+     *
+     * @param  string $action
+     * @param  string $controller
+     * @param  string $module
+     * @param  array  $params
+     * @return void
+     */
+    public function setGotoSimple($action, $controller = null, $module = null, array $params = array())
+    {
+        $dispatcher = $this->getFrontController()->getDispatcher();
+        $request    = $this->getRequest();
+        $curModule  = $request->getModuleName();
+        $useDefaultController = false;
+
+        if (null === $controller && null !== $module) {
+            $useDefaultController = true;
+        }
+
+        if (null === $module) {
+            $module = $curModule;
+        }
+
+        if ($module == $dispatcher->getDefaultModule()) {
+            $module = '';
+        }
+
+        if (null === $controller && !$useDefaultController) {
+            $controller = $request->getControllerName();
+            if (empty($controller)) {
+                $controller = $dispatcher->getDefaultControllerName();
+            }
+        }
+
+        $params[$request->getModuleKey()]     = $module;
+        $params[$request->getControllerKey()] = $controller;
+        $params[$request->getActionKey()]     = $action;
+
+        $router = $this->getFrontController()->getRouter();
+        $url    = $router->assemble($params, 'default', true);
+
+        $this->_redirect($url);
+    }
+
+    /**
+     * Build a URL based on a route
+     *
+     * @param  array   $urlOptions
+     * @param  string  $name Route name
+     * @param  boolean $reset
+     * @param  boolean $encode
+     * @return void
+     */
+    public function setGotoRoute(array $urlOptions = array(), $name = null, $reset = false, $encode = true)
+    {
+        $router = $this->getFrontController()->getRouter();
+        $url    = $router->assemble($urlOptions, $name, $reset, $encode);
+
+        $this->_redirect($url);
+    }
+
+    /**
+     * Set a redirect URL string
+     *
+     * By default, emits a 302 HTTP status header, prepends base URL as defined
+     * in request object if url is relative, and halts script execution by
+     * calling exit().
+     *
+     * $options is an optional associative array that can be used to control
+     * redirect behaviour. The available option keys are:
+     * - exit: boolean flag indicating whether or not to halt script execution when done
+     * - prependBase: boolean flag indicating whether or not to prepend the base URL when a relative URL is provided
+     * - code: integer HTTP status code to use with redirect. Should be between 300 and 307.
+     *
+     * _redirect() sets the Location header in the response object. If you set
+     * the exit flag to false, you can override this header later in code
+     * execution.
+     *
+     * If the exit flag is true (true by default), _redirect() will write and
+     * close the current session, if any.
+     *
+     * @param  string $url
+     * @param  array  $options
+     * @return void
+     */
+    public function setGotoUrl($url, array $options = array())
+    {
+        // prevent header injections
+        $url = str_replace(array("\n", "\r"), '', $url);
+
+        if (null !== $options) {
+            if (isset($options['exit'])) {
+                $this->setExit(($options['exit']) ? true : false);
+            }
+            if (isset($options['prependBase'])) {
+                $this->setPrependBase(($options['prependBase']) ? true : false);
+            }
+            if (isset($options['code'])) {
+                $this->setCode($options['code']);
+            }
+        }
+
+        // If relative URL, decide if we should prepend base URL
+        if (!preg_match('|^[a-z]+://|', $url)) {
+            $url = $this->_prependBase($url);
+        }
+
+        $this->_redirect($url);
+    }
+
+    /**
+     * Perform a redirect to an action/controller/module with params
+     *
+     * @param  string $action
+     * @param  string $controller
+     * @param  string $module
+     * @param  array  $params
+     * @return void
+     */
+    public function gotoSimple($action, $controller = null, $module = null, array $params = array())
+    {
+        $this->setGotoSimple($action, $controller, $module, $params);
+
+        if ($this->getExit()) {
+            $this->redirectAndExit();
+        }
+    }
+
+    /**
+     * Perform a redirect to an action/controller/module with params, forcing an immdiate exit
+     *
+     * @param  mixed $action
+     * @param  mixed $controller
+     * @param  mixed $module
+     * @param  array $params
+     * @return void
+     */
+    public function gotoSimpleAndExit($action, $controller = null, $module = null, array $params = array())
+    {
+        $this->setGotoSimple($action, $controller, $module, $params);
+        $this->redirectAndExit();
+    }
+
+    /**
+     * Redirect to a route-based URL
+     *
+     * Uses route's assemble method to build the URL; route is specified by $name;
+     * default route is used if none provided.
+     *
+     * @param  array   $urlOptions Array of key/value pairs used to assemble URL
+     * @param  string  $name
+     * @param  boolean $reset
+     * @param  boolean $encode
+     * @return void
+     */
+    public function gotoRoute(array $urlOptions = array(), $name = null, $reset = false, $encode = true)
+    {
+        $this->setGotoRoute($urlOptions, $name, $reset, $encode);
+
+        if ($this->getExit()) {
+            $this->redirectAndExit();
+        }
+    }
+
+    /**
+     * Redirect to a route-based URL, and immediately exit
+     *
+     * Uses route's assemble method to build the URL; route is specified by $name;
+     * default route is used if none provided.
+     *
+     * @param  array   $urlOptions Array of key/value pairs used to assemble URL
+     * @param  string  $name
+     * @param  boolean $reset
+     * @return void
+     */
+    public function gotoRouteAndExit(array $urlOptions = array(), $name = null, $reset = false)
+    {
+        $this->setGotoRoute($urlOptions, $name, $reset);
+        $this->redirectAndExit();
+    }
+
+    /**
+     * Perform a redirect to a url
+     *
+     * @param  string $url
+     * @param  array  $options
+     * @return void
+     */
+    public function gotoUrl($url, array $options = array())
+    {
+        $this->setGotoUrl($url, $options);
+
+        if ($this->getExit()) {
+            $this->redirectAndExit();
+        }
+    }
+
+    /**
+     * Set a URL string for a redirect, perform redirect, and immediately exit
+     *
+     * @param  string $url
+     * @param  array  $options
+     * @return void
+     */
+    public function gotoUrlAndExit($url, array $options = array())
+    {
+        $this->setGotoUrl($url, $options);
+        $this->redirectAndExit();
+    }
+
+    /**
+     * exit(): Perform exit for redirector
+     *
+     * @return void
+     */
+    public function redirectAndExit()
+    {
+        if ($this->getCloseSessionOnExit()) {
+            // Close session, if started
+            if (class_exists('Zend_Session', false) && Zend_Session::isStarted()) {
+                Zend_Session::writeClose();
+            } elseif (isset($_SESSION)) {
+                session_write_close();
+            }
+        }
+
+        $this->getResponse()->sendHeaders();
+        exit();
+    }
+
+    /**
+     * direct(): Perform helper when called as
+     * $this->_helper->redirector($action, $controller, $module, $params)
+     *
+     * @param  string $action
+     * @param  string $controller
+     * @param  string $module
+     * @param  array  $params
+     * @return void
+     */
+    public function direct($action, $controller = null, $module = null, array $params = array())
+    {
+        $this->gotoSimple($action, $controller, $module, $params);
+    }
+
+    /**
+     * Overloading
+     *
+     * Overloading for old 'goto', 'setGoto', and 'gotoAndExit' methods
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return mixed
+     * @throws Zend_Controller_Action_Exception for invalid methods
+     */
+    public function __call($method, $args)
+    {
+        $method = strtolower($method);
+        if ('goto' == $method) {
+            return call_user_func_array(array($this, 'gotoSimple'), $args);
+        }
+        if ('setgoto' == $method) {
+            return call_user_func_array(array($this, 'setGotoSimple'), $args);
+        }
+        if ('gotoandexit' == $method) {
+            return call_user_func_array(array($this, 'gotoSimpleAndExit'), $args);
+        }
+
+        require_once 'Zend/Controller/Action/Exception.php';
+        throw new Zend_Controller_Action_Exception(sprintf('Invalid method "%s" called on redirector', $method));
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/Url.php b/lib/zend/Zend/Controller/Action/Helper/Url.php
new file mode 100644
index 00000000000..7b8c69ac12a
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/Url.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * Helper for creating URLs for redirects and other tasks
+ *
+ * @uses       Zend_Controller_Action_Helper_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * Create URL based on default route
+     *
+     * @param  string $action
+     * @param  string $controller
+     * @param  string $module
+     * @param  array  $params
+     * @return string
+     */
+    public function simple($action, $controller = null, $module = null, array $params = null)
+    {
+        $request = $this->getRequest();
+
+        if (null === $controller) {
+            $controller = $request->getControllerName();
+        }
+
+        if (null === $module) {
+            $module = $request->getModuleName();
+        }
+
+        $url = $controller . '/' . $action;
+        if ($module != $this->getFrontController()->getDispatcher()->getDefaultModule()) {
+            $url = $module . '/' . $url;
+        }
+
+        if ('' !== ($baseUrl = $this->getFrontController()->getBaseUrl())) {
+            $url = $baseUrl . '/' . $url;
+        }
+
+        if (null !== $params) {
+            $paramPairs = array();
+            foreach ($params as $key => $value) {
+                $paramPairs[] = urlencode($key) . '/' . urlencode($value);
+            }
+            $paramString = implode('/', $paramPairs);
+            $url .= '/' . $paramString;
+        }
+
+        $url = '/' . ltrim($url, '/');
+
+        return $url;
+    }
+
+    /**
+     * Assembles a URL based on a given route
+     *
+     * This method will typically be used for more complex operations, as it
+     * ties into the route objects registered with the router.
+     *
+     * @param  array   $urlOptions Options passed to the assemble method of the Route object.
+     * @param  mixed   $name       The name of a Route to use. If null it will use the current Route
+     * @param  boolean $reset
+     * @param  boolean $encode
+     * @return string Url for the link href attribute.
+     */
+    public function url($urlOptions = array(), $name = null, $reset = false, $encode = true)
+    {
+        $router = $this->getFrontController()->getRouter();
+        return $router->assemble($urlOptions, $name, $reset, $encode);
+    }
+
+    /**
+     * Perform helper when called as $this->_helper->url() from an action controller
+     *
+     * Proxies to {@link simple()}
+     *
+     * @param  string $action
+     * @param  string $controller
+     * @param  string $module
+     * @param  array  $params
+     * @return string
+     */
+    public function direct($action, $controller = null, $module = null, array $params = null)
+    {
+        return $this->simple($action, $controller, $module, $params);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/Helper/ViewRenderer.php b/lib/zend/Zend/Controller/Action/Helper/ViewRenderer.php
new file mode 100644
index 00000000000..a66c12a4665
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Helper/ViewRenderer.php
@@ -0,0 +1,1004 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_Helper_Abstract
+ */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * @see Zend_View
+ */
+require_once 'Zend/View.php';
+
+/**
+ * View script integration
+ *
+ * Zend_Controller_Action_Helper_ViewRenderer provides transparent view
+ * integration for action controllers. It allows you to create a view object
+ * once, and populate it throughout all actions. Several global options may be
+ * set:
+ *
+ * - noController: if set true, render() will not look for view scripts in
+ *   subdirectories named after the controller
+ * - viewSuffix: what view script filename suffix to use
+ *
+ * The helper autoinitializes the action controller view preDispatch(). It
+ * determines the path to the class file, and then determines the view base
+ * directory from there. It also uses the module name as a class prefix for
+ * helpers and views such that if your module name is 'Search', it will set the
+ * helper class prefix to 'Search_View_Helper' and the filter class prefix to ;
+ * 'Search_View_Filter'.
+ *
+ * Usage:
+ * <code>
+ * // In your bootstrap:
+ * Zend_Controller_Action_HelperBroker::addHelper(new Zend_Controller_Action_Helper_ViewRenderer());
+ *
+ * // In your action controller methods:
+ * $viewHelper = $this->_helper->getHelper('view');
+ *
+ * // Don't use controller subdirectories
+ * $viewHelper->setNoController(true);
+ *
+ * // Specify a different script to render:
+ * $this->_helper->viewRenderer('form');
+ *
+ * </code>
+ *
+ * @uses       Zend_Controller_Action_Helper_Abstract
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action_Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * @var Zend_View_Interface
+     */
+    public $view;
+
+    /**
+     * Word delimiters
+     * @var array
+     */
+    protected $_delimiters;
+
+    /**
+     * @var Zend_Filter_Inflector
+     */
+    protected $_inflector;
+
+    /**
+     * Inflector target
+     * @var string
+     */
+    protected $_inflectorTarget = '';
+
+    /**
+     * Current module directory
+     * @var string
+     */
+    protected $_moduleDir = '';
+
+    /**
+     * Whether or not to autorender using controller name as subdirectory;
+     * global setting (not reset at next invocation)
+     * @var boolean
+     */
+    protected $_neverController = false;
+
+    /**
+     * Whether or not to autorender postDispatch; global setting (not reset at
+     * next invocation)
+     * @var boolean
+     */
+    protected $_neverRender     = false;
+
+    /**
+     * Whether or not to use a controller name as a subdirectory when rendering
+     * @var boolean
+     */
+    protected $_noController    = false;
+
+    /**
+     * Whether or not to autorender postDispatch; per controller/action setting (reset
+     * at next invocation)
+     * @var boolean
+     */
+    protected $_noRender        = false;
+
+    /**
+     * Characters representing path delimiters in the controller
+     * @var string|array
+     */
+    protected $_pathDelimiters;
+
+    /**
+     * Which named segment of the response to utilize
+     * @var string
+     */
+    protected $_responseSegment = null;
+
+    /**
+     * Which action view script to render
+     * @var string
+     */
+    protected $_scriptAction    = null;
+
+    /**
+     * View object basePath
+     * @var string
+     */
+    protected $_viewBasePathSpec = ':moduleDir/views';
+
+    /**
+     * View script path specification string
+     * @var string
+     */
+    protected $_viewScriptPathSpec = ':controller/:action.:suffix';
+
+    /**
+     * View script path specification string, minus controller segment
+     * @var string
+     */
+    protected $_viewScriptPathNoControllerSpec = ':action.:suffix';
+
+    /**
+     * View script suffix
+     * @var string
+     */
+    protected $_viewSuffix      = 'phtml';
+
+    /**
+     * Constructor
+     *
+     * Optionally set view object and options.
+     *
+     * @param  Zend_View_Interface $view
+     * @param  array               $options
+     * @return void
+     */
+    public function __construct(Zend_View_Interface $view = null, array $options = array())
+    {
+        if (null !== $view) {
+            $this->setView($view);
+        }
+
+        if (!empty($options)) {
+            $this->_setOptions($options);
+        }
+    }
+
+    /**
+     * Clone - also make sure the view is cloned.
+     *
+     * @return void
+     */
+    public function __clone()
+    {
+        if (isset($this->view) && $this->view instanceof Zend_View_Interface) {
+            $this->view = clone $this->view;
+
+        }
+    }
+
+    /**
+     * Set the view object
+     *
+     * @param  Zend_View_Interface $view
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setView(Zend_View_Interface $view)
+    {
+        $this->view = $view;
+        return $this;
+    }
+
+    /**
+     * Get current module name
+     *
+     * @return string
+     */
+    public function getModule()
+    {
+        $request = $this->getRequest();
+        $module  = $request->getModuleName();
+        if (null === $module) {
+            $module = $this->getFrontController()->getDispatcher()->getDefaultModule();
+        }
+
+        return $module;
+    }
+
+    /**
+     * Get module directory
+     *
+     * @throws Zend_Controller_Action_Exception
+     * @return string
+     */
+    public function getModuleDirectory()
+    {
+        $module    = $this->getModule();
+        $moduleDir = $this->getFrontController()->getControllerDirectory($module);
+        if ((null === $moduleDir) || is_array($moduleDir)) {
+            /**
+             * @see Zend_Controller_Action_Exception
+             */
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('ViewRenderer cannot locate module directory for module "' . $module . '"');
+        }
+        $this->_moduleDir = dirname($moduleDir);
+        return $this->_moduleDir;
+    }
+
+    /**
+     * Get inflector
+     *
+     * @return Zend_Filter_Inflector
+     */
+    public function getInflector()
+    {
+        if (null === $this->_inflector) {
+            /**
+             * @see Zend_Filter_Inflector
+             */
+            require_once 'Zend/Filter/Inflector.php';
+            /**
+             * @see Zend_Filter_PregReplace
+             */
+            require_once 'Zend/Filter/PregReplace.php';
+            /**
+             * @see Zend_Filter_Word_UnderscoreToSeparator
+             */
+            require_once 'Zend/Filter/Word/UnderscoreToSeparator.php';
+            $this->_inflector = new Zend_Filter_Inflector();
+            $this->_inflector->setStaticRuleReference('moduleDir', $this->_moduleDir) // moduleDir must be specified before the less specific 'module'
+                 ->addRules(array(
+                     ':module'     => array('Word_CamelCaseToDash', 'StringToLower'),
+                     ':controller' => array('Word_CamelCaseToDash', new Zend_Filter_Word_UnderscoreToSeparator('/'), 'StringToLower', new Zend_Filter_PregReplace('/\./', '-')),
+                     ':action'     => array('Word_CamelCaseToDash', new Zend_Filter_PregReplace('#[^a-z0-9' . preg_quote('/', '#') . ']+#i', '-'), 'StringToLower'),
+                 ))
+                 ->setStaticRuleReference('suffix', $this->_viewSuffix)
+                 ->setTargetReference($this->_inflectorTarget);
+        }
+
+        // Ensure that module directory is current
+        $this->getModuleDirectory();
+
+        return $this->_inflector;
+    }
+
+    /**
+     * Set inflector
+     *
+     * @param  Zend_Filter_Inflector $inflector
+     * @param  boolean               $reference Whether the moduleDir, target, and suffix should be set as references to ViewRenderer properties
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setInflector(Zend_Filter_Inflector $inflector, $reference = false)
+    {
+        $this->_inflector = $inflector;
+        if ($reference) {
+            $this->_inflector->setStaticRuleReference('suffix', $this->_viewSuffix)
+                 ->setStaticRuleReference('moduleDir', $this->_moduleDir)
+                 ->setTargetReference($this->_inflectorTarget);
+        }
+        return $this;
+    }
+
+    /**
+     * Set inflector target
+     *
+     * @param  string $target
+     * @return void
+     */
+    protected function _setInflectorTarget($target)
+    {
+        $this->_inflectorTarget = (string) $target;
+    }
+
+    /**
+     * Set internal module directory representation
+     *
+     * @param  string $dir
+     * @return void
+     */
+    protected function _setModuleDir($dir)
+    {
+        $this->_moduleDir = (string) $dir;
+    }
+
+    /**
+     * Get internal module directory representation
+     *
+     * @return string
+     */
+    protected function _getModuleDir()
+    {
+        return $this->_moduleDir;
+    }
+
+    /**
+     * Generate a class prefix for helper and filter classes
+     *
+     * @return string
+     */
+    protected function _generateDefaultPrefix()
+    {
+        $default = 'Zend_View';
+        if (null === $this->_actionController) {
+            return $default;
+        }
+
+        $class = get_class($this->_actionController);
+
+        if (!strstr($class, '_')) {
+            return $default;
+        }
+
+        $module = $this->getModule();
+        if ('default' == $module) {
+            return $default;
+        }
+
+        $prefix = substr($class, 0, strpos($class, '_')) . '_View';
+
+        return $prefix;
+    }
+
+    /**
+     * Retrieve base path based on location of current action controller
+     *
+     * @return string
+     */
+    protected function _getBasePath()
+    {
+        if (null === $this->_actionController) {
+            return './views';
+        }
+
+        $inflector = $this->getInflector();
+        $this->_setInflectorTarget($this->getViewBasePathSpec());
+
+        $dispatcher = $this->getFrontController()->getDispatcher();
+        $request = $this->getRequest();
+
+        $parts = array(
+            'module'     => (($moduleName = $request->getModuleName()) != '') ? $dispatcher->formatModuleName($moduleName) : $moduleName,
+            'controller' => $request->getControllerName(),
+            'action'     => $dispatcher->formatActionName($request->getActionName())
+            );
+
+        $path = $inflector->filter($parts);
+        return $path;
+    }
+
+    /**
+     * Set options
+     *
+     * @param  array $options
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    protected function _setOptions(array $options)
+    {
+        foreach ($options as $key => $value)
+        {
+            switch ($key) {
+                case 'neverRender':
+                case 'neverController':
+                case 'noController':
+                case 'noRender':
+                    $property = '_' . $key;
+                    $this->{$property} = ($value) ? true : false;
+                    break;
+                case 'responseSegment':
+                case 'scriptAction':
+                case 'viewBasePathSpec':
+                case 'viewScriptPathSpec':
+                case 'viewScriptPathNoControllerSpec':
+                case 'viewSuffix':
+                    $property = '_' . $key;
+                    $this->{$property} = (string) $value;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Initialize the view object
+     *
+     * $options may contain the following keys:
+     * - neverRender - flag dis/enabling postDispatch() autorender (affects all subsequent calls)
+     * - noController - flag indicating whether or not to look for view scripts in subdirectories named after the controller
+     * - noRender - flag indicating whether or not to autorender postDispatch()
+     * - responseSegment - which named response segment to render a view script to
+     * - scriptAction - what action script to render
+     * - viewBasePathSpec - specification to use for determining view base path
+     * - viewScriptPathSpec - specification to use for determining view script paths
+     * - viewScriptPathNoControllerSpec - specification to use for determining view script paths when noController flag is set
+     * - viewSuffix - what view script filename suffix to use
+     *
+     * @param  string $path
+     * @param  string $prefix
+     * @param  array  $options
+     * @throws Zend_Controller_Action_Exception
+     * @return void
+     */
+    public function initView($path = null, $prefix = null, array $options = array())
+    {
+        if (null === $this->view) {
+            $this->setView(new Zend_View());
+        }
+
+        // Reset some flags every time
+        $options['noController'] = (isset($options['noController'])) ? $options['noController'] : false;
+        $options['noRender']     = (isset($options['noRender'])) ? $options['noRender'] : false;
+        $this->_scriptAction     = null;
+        $this->_responseSegment  = null;
+
+        // Set options first; may be used to determine other initializations
+        $this->_setOptions($options);
+
+        // Get base view path
+        if (empty($path)) {
+            $path = $this->_getBasePath();
+            if (empty($path)) {
+                /**
+                 * @see Zend_Controller_Action_Exception
+                 */
+                require_once 'Zend/Controller/Action/Exception.php';
+                throw new Zend_Controller_Action_Exception('ViewRenderer initialization failed: retrieved view base path is empty');
+            }
+        }
+
+        if (null === $prefix) {
+            $prefix = $this->_generateDefaultPrefix();
+        }
+
+        // Determine if this path has already been registered
+        $currentPaths = $this->view->getScriptPaths();
+        $path         = str_replace(array('/', '\\'), '/', $path);
+        $pathExists   = false;
+        foreach ($currentPaths as $tmpPath) {
+            $tmpPath = str_replace(array('/', '\\'), '/', $tmpPath);
+            if (strstr($tmpPath, $path)) {
+                $pathExists = true;
+                break;
+            }
+        }
+        if (!$pathExists) {
+            $this->view->addBasePath($path, $prefix);
+        }
+
+        // Register view with action controller (unless already registered)
+        if ((null !== $this->_actionController) && (null === $this->_actionController->view)) {
+            $this->_actionController->view       = $this->view;
+            $this->_actionController->viewSuffix = $this->_viewSuffix;
+        }
+    }
+
+    /**
+     * init - initialize view
+     *
+     * @return void
+     */
+    public function init()
+    {
+        if ($this->getFrontController()->getParam('noViewRenderer')) {
+            return;
+        }
+
+        $this->initView();
+    }
+
+    /**
+     * Set view basePath specification
+     *
+     * Specification can contain one or more of the following:
+     * - :moduleDir - current module directory
+     * - :controller - name of current controller in the request
+     * - :action - name of current action in the request
+     * - :module - name of current module in the request
+     *
+     * @param  string $path
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setViewBasePathSpec($path)
+    {
+        $this->_viewBasePathSpec = (string) $path;
+        return $this;
+    }
+
+    /**
+     * Retrieve the current view basePath specification string
+     *
+     * @return string
+     */
+    public function getViewBasePathSpec()
+    {
+        return $this->_viewBasePathSpec;
+    }
+
+    /**
+     * Set view script path specification
+     *
+     * Specification can contain one or more of the following:
+     * - :moduleDir - current module directory
+     * - :controller - name of current controller in the request
+     * - :action - name of current action in the request
+     * - :module - name of current module in the request
+     *
+     * @param  string $path
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setViewScriptPathSpec($path)
+    {
+        $this->_viewScriptPathSpec = (string) $path;
+        return $this;
+    }
+
+    /**
+     * Retrieve the current view script path specification string
+     *
+     * @return string
+     */
+    public function getViewScriptPathSpec()
+    {
+        return $this->_viewScriptPathSpec;
+    }
+
+    /**
+     * Set view script path specification (no controller variant)
+     *
+     * Specification can contain one or more of the following:
+     * - :moduleDir - current module directory
+     * - :controller - name of current controller in the request
+     * - :action - name of current action in the request
+     * - :module - name of current module in the request
+     *
+     * :controller will likely be ignored in this variant.
+     *
+     * @param  string $path
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setViewScriptPathNoControllerSpec($path)
+    {
+        $this->_viewScriptPathNoControllerSpec = (string) $path;
+        return $this;
+    }
+
+    /**
+     * Retrieve the current view script path specification string (no controller variant)
+     *
+     * @return string
+     */
+    public function getViewScriptPathNoControllerSpec()
+    {
+        return $this->_viewScriptPathNoControllerSpec;
+    }
+
+    /**
+     * Get a view script based on an action and/or other variables
+     *
+     * Uses values found in current request if no values passed in $vars.
+     *
+     * If {@link $_noController} is set, uses {@link $_viewScriptPathNoControllerSpec};
+     * otherwise, uses {@link $_viewScriptPathSpec}.
+     *
+     * @param  string $action
+     * @param  array  $vars
+     * @return string
+     */
+    public function getViewScript($action = null, array $vars = array())
+    {
+        $request = $this->getRequest();
+        if ((null === $action) && (!isset($vars['action']))) {
+            $action = $this->getScriptAction();
+            if (null === $action) {
+                $action = $request->getActionName();
+            }
+            $vars['action'] = $action;
+        } elseif (null !== $action) {
+            $vars['action'] = $action;
+        }
+        
+        $replacePattern = array('/[^a-z0-9]+$/i', '/^[^a-z0-9]+/i');
+        $vars['action'] = preg_replace($replacePattern, '', $vars['action']);
+
+        $inflector = $this->getInflector();
+        if ($this->getNoController() || $this->getNeverController()) {
+            $this->_setInflectorTarget($this->getViewScriptPathNoControllerSpec());
+        } else {
+            $this->_setInflectorTarget($this->getViewScriptPathSpec());
+        }
+        return $this->_translateSpec($vars);
+    }
+
+    /**
+     * Set the neverRender flag (i.e., globally dis/enable autorendering)
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setNeverRender($flag = true)
+    {
+        $this->_neverRender = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Retrieve neverRender flag value
+     *
+     * @return boolean
+     */
+    public function getNeverRender()
+    {
+        return $this->_neverRender;
+    }
+
+    /**
+     * Set the noRender flag (i.e., whether or not to autorender)
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setNoRender($flag = true)
+    {
+        $this->_noRender = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Retrieve noRender flag value
+     *
+     * @return boolean
+     */
+    public function getNoRender()
+    {
+        return $this->_noRender;
+    }
+
+    /**
+     * Set the view script to use
+     *
+     * @param  string $name
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setScriptAction($name)
+    {
+        $this->_scriptAction = (string) $name;
+        return $this;
+    }
+
+    /**
+     * Retrieve view script name
+     *
+     * @return string
+     */
+    public function getScriptAction()
+    {
+        return $this->_scriptAction;
+    }
+
+    /**
+     * Set the response segment name
+     *
+     * @param  string $name
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setResponseSegment($name)
+    {
+        if (null === $name) {
+            $this->_responseSegment = null;
+        } else {
+            $this->_responseSegment = (string) $name;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve named response segment name
+     *
+     * @return string
+     */
+    public function getResponseSegment()
+    {
+        return $this->_responseSegment;
+    }
+
+    /**
+     * Set the noController flag (i.e., whether or not to render into controller subdirectories)
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setNoController($flag = true)
+    {
+        $this->_noController = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Retrieve noController flag value
+     *
+     * @return boolean
+     */
+    public function getNoController()
+    {
+        return $this->_noController;
+    }
+
+    /**
+     * Set the neverController flag (i.e., whether or not to render into controller subdirectories)
+     *
+     * @param  boolean $flag
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setNeverController($flag = true)
+    {
+        $this->_neverController = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Retrieve neverController flag value
+     *
+     * @return boolean
+     */
+    public function getNeverController()
+    {
+        return $this->_neverController;
+    }
+
+    /**
+     * Set view script suffix
+     *
+     * @param  string $suffix
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setViewSuffix($suffix)
+    {
+        $this->_viewSuffix = (string) $suffix;
+        return $this;
+    }
+
+    /**
+     * Get view script suffix
+     *
+     * @return string
+     */
+    public function getViewSuffix()
+    {
+        return $this->_viewSuffix;
+    }
+
+    /**
+     * Set options for rendering a view script
+     *
+     * @param  string  $action       View script to render
+     * @param  string  $name         Response named segment to render to
+     * @param  boolean $noController Whether or not to render within a subdirectory named after the controller
+     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     */
+    public function setRender($action = null, $name = null, $noController = null)
+    {
+        if (null !== $action) {
+            $this->setScriptAction($action);
+        }
+
+        if (null !== $name) {
+            $this->setResponseSegment($name);
+        }
+
+        if (null !== $noController) {
+            $this->setNoController($noController);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Inflect based on provided vars
+     *
+     * Allowed variables are:
+     * - :moduleDir - current module directory
+     * - :module - current module name
+     * - :controller - current controller name
+     * - :action - current action name
+     * - :suffix - view script file suffix
+     *
+     * @param  array $vars
+     * @return string
+     */
+    protected function _translateSpec(array $vars = array())
+    {
+        $inflector  = $this->getInflector();
+        $request    = $this->getRequest();
+        $dispatcher = $this->getFrontController()->getDispatcher();
+
+        // Format module name
+        $module = $dispatcher->formatModuleName($request->getModuleName());
+
+        // Format controller name
+        require_once 'Zend/Filter/Word/CamelCaseToDash.php';
+        $filter     = new Zend_Filter_Word_CamelCaseToDash();
+        $controller = $filter->filter($request->getControllerName());
+        $controller = $dispatcher->formatControllerName($controller);
+        if ('Controller' == substr($controller, -10)) {
+            $controller = substr($controller, 0, -10);
+        }
+
+        // Format action name
+        $action = $dispatcher->formatActionName($request->getActionName());
+
+        $params     = compact('module', 'controller', 'action');
+        foreach ($vars as $key => $value) {
+            switch ($key) {
+                case 'module':
+                case 'controller':
+                case 'action':
+                case 'moduleDir':
+                case 'suffix':
+                    $params[$key] = (string) $value;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        if (isset($params['suffix'])) {
+            $origSuffix = $this->getViewSuffix();
+            $this->setViewSuffix($params['suffix']);
+        }
+        if (isset($params['moduleDir'])) {
+            $origModuleDir = $this->_getModuleDir();
+            $this->_setModuleDir($params['moduleDir']);
+        }
+
+        $filtered = $inflector->filter($params);
+
+        if (isset($params['suffix'])) {
+            $this->setViewSuffix($origSuffix);
+        }
+        if (isset($params['moduleDir'])) {
+            $this->_setModuleDir($origModuleDir);
+        }
+
+        return $filtered;
+    }
+
+    /**
+     * Render a view script (optionally to a named response segment)
+     *
+     * Sets the noRender flag to true when called.
+     *
+     * @param  string $script
+     * @param  string $name
+     * @return void
+     */
+    public function renderScript($script, $name = null)
+    {
+        if (null === $name) {
+            $name = $this->getResponseSegment();
+        }
+
+        $this->getResponse()->appendBody(
+            $this->view->render($script),
+            $name
+        );
+
+        $this->setNoRender();
+    }
+
+    /**
+     * Render a view based on path specifications
+     *
+     * Renders a view based on the view script path specifications.
+     *
+     * @param  string  $action
+     * @param  string  $name
+     * @param  boolean $noController
+     * @return void
+     */
+    public function render($action = null, $name = null, $noController = null)
+    {
+        $this->setRender($action, $name, $noController);
+        $path = $this->getViewScript();
+        $this->renderScript($path, $name);
+    }
+
+    /**
+     * Render a script based on specification variables
+     *
+     * Pass an action, and one or more specification variables (view script suffix)
+     * to determine the view script path, and render that script.
+     *
+     * @param  string $action
+     * @param  array  $vars
+     * @param  string $name
+     * @return void
+     */
+    public function renderBySpec($action = null, array $vars = array(), $name = null)
+    {
+        if (null !== $name) {
+            $this->setResponseSegment($name);
+        }
+
+        $path = $this->getViewScript($action, $vars);
+
+        $this->renderScript($path);
+    }
+
+    /**
+     * postDispatch - auto render a view
+     *
+     * Only autorenders if:
+     * - _noRender is false
+     * - action controller is present
+     * - request has not been re-dispatched (i.e., _forward() has not been called)
+     * - response is not a redirect
+     *
+     * @return void
+     */
+    public function postDispatch()
+    {
+        if ($this->_shouldRender()) {
+            $this->render();
+        }
+    }
+
+    /**
+     * Should the ViewRenderer render a view script?
+     *
+     * @return boolean
+     */
+    protected function _shouldRender()
+    {
+        return (!$this->getFrontController()->getParam('noViewRenderer')
+            && !$this->_neverRender
+            && !$this->_noRender
+            && (null !== $this->_actionController)
+            && $this->getRequest()->isDispatched()
+            && !$this->getResponse()->isRedirect()
+        );
+    }
+
+    /**
+     * Use this helper as a method; proxies to setRender()
+     *
+     * @param  string  $action
+     * @param  string  $name
+     * @param  boolean $noController
+     * @return void
+     */
+    public function direct($action = null, $name = null, $noController = null)
+    {
+        $this->setRender($action, $name, $noController);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/HelperBroker.php b/lib/zend/Zend/Controller/Action/HelperBroker.php
new file mode 100644
index 00000000000..f911c7035e6
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/HelperBroker.php
@@ -0,0 +1,381 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Action_HelperBroker_PriorityStack
+ */
+require_once 'Zend/Controller/Action/HelperBroker/PriorityStack.php';
+
+/**
+ * @see Zend_Loader
+ */
+require_once 'Zend/Loader.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_HelperBroker
+{
+    /**
+     * $_actionController - ActionController reference
+     *
+     * @var Zend_Controller_Action
+     */
+    protected $_actionController;
+
+    /**
+     * @var Zend_Loader_PluginLoader_Interface
+     */
+    protected static $_pluginLoader;
+
+    /**
+     * $_helpers - Helper array
+     *
+     * @var Zend_Controller_Action_HelperBroker_PriorityStack
+     */
+    protected static $_stack = null;
+
+    /**
+     * Set PluginLoader for use with broker
+     *
+     * @param  Zend_Loader_PluginLoader_Interface $loader
+     * @return void
+     */
+    public static function setPluginLoader($loader)
+    {
+        if ((null !== $loader) && (!$loader instanceof Zend_Loader_PluginLoader_Interface)) {
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('Invalid plugin loader provided to HelperBroker');
+        }
+        self::$_pluginLoader = $loader;
+    }
+
+    /**
+     * Retrieve PluginLoader
+     *
+     * @return Zend_Loader_PluginLoader
+     */
+    public static function getPluginLoader()
+    {
+        if (null === self::$_pluginLoader) {
+            require_once 'Zend/Loader/PluginLoader.php';
+            self::$_pluginLoader = new Zend_Loader_PluginLoader(array(
+                'Zend_Controller_Action_Helper' => 'Zend/Controller/Action/Helper/',
+            ));
+        }
+        return self::$_pluginLoader;
+    }
+
+    /**
+     * addPrefix() - Add repository of helpers by prefix
+     *
+     * @param string $prefix
+     */
+    static public function addPrefix($prefix)
+    {
+        $prefix = rtrim($prefix, '_');
+        $path   = str_replace('_', DIRECTORY_SEPARATOR, $prefix);
+        self::getPluginLoader()->addPrefixPath($prefix, $path);
+    }
+
+    /**
+     * addPath() - Add path to repositories where Action_Helpers could be found.
+     *
+     * @param string $path
+     * @param string $prefix Optional; defaults to 'Zend_Controller_Action_Helper'
+     * @return void
+     */
+    static public function addPath($path, $prefix = 'Zend_Controller_Action_Helper')
+    {
+        self::getPluginLoader()->addPrefixPath($prefix, $path);
+    }
+
+    /**
+     * addHelper() - Add helper objects
+     *
+     * @param Zend_Controller_Action_Helper_Abstract $helper
+     * @return void
+     */
+    static public function addHelper(Zend_Controller_Action_Helper_Abstract $helper)
+    {
+        self::getStack()->push($helper);
+        return;
+    }
+
+    /**
+     * resetHelpers()
+     *
+     * @return void
+     */
+    static public function resetHelpers()
+    {
+        self::$_stack = null;
+        return;
+    }
+
+    /**
+     * Retrieve or initialize a helper statically
+     *
+     * Retrieves a helper object statically, loading on-demand if the helper
+     * does not already exist in the stack. Always returns a helper, unless
+     * the helper class cannot be found.
+     *
+     * @param  string $name
+     * @return Zend_Controller_Action_Helper_Abstract
+     */
+    public static function getStaticHelper($name)
+    {
+        $name  = self::_normalizeHelperName($name);
+        $stack = self::getStack();
+
+        if (!isset($stack->{$name})) {
+            self::_loadHelper($name);
+        }
+
+        return $stack->{$name};
+    }
+
+    /**
+     * getExistingHelper() - get helper by name
+     *
+     * Static method to retrieve helper object. Only retrieves helpers already
+     * initialized with the broker (either via addHelper() or on-demand loading
+     * via getHelper()).
+     *
+     * Throws an exception if the referenced helper does not exist in the
+     * stack; use {@link hasHelper()} to check if the helper is registered
+     * prior to retrieving it.
+     *
+     * @param  string $name
+     * @return Zend_Controller_Action_Helper_Abstract
+     * @throws Zend_Controller_Action_Exception
+     */
+    public static function getExistingHelper($name)
+    {
+        $name  = self::_normalizeHelperName($name);
+        $stack = self::getStack();
+
+        if (!isset($stack->{$name})) {
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('Action helper "' . $name . '" has not been registered with the helper broker');
+        }
+
+        return $stack->{$name};
+    }
+
+    /**
+     * Return all registered helpers as helper => object pairs
+     *
+     * @return array
+     */
+    public static function getExistingHelpers()
+    {
+        return self::getStack()->getHelpersByName();
+    }
+
+    /**
+     * Is a particular helper loaded in the broker?
+     *
+     * @param  string $name
+     * @return boolean
+     */
+    public static function hasHelper($name)
+    {
+        $name = self::_normalizeHelperName($name);
+        return isset(self::getStack()->{$name});
+    }
+
+    /**
+     * Remove a particular helper from the broker
+     *
+     * @param  string $name
+     * @return boolean
+     */
+    public static function removeHelper($name)
+    {
+        $name = self::_normalizeHelperName($name);
+        $stack = self::getStack();
+        if (isset($stack->{$name})) {
+            unset($stack->{$name});
+        }
+
+        return false;
+    }
+
+    /**
+     * Lazy load the priority stack and return it
+     *
+     * @return Zend_Controller_Action_HelperBroker_PriorityStack
+     */
+    public static function getStack()
+    {
+        if (self::$_stack == null) {
+            self::$_stack = new Zend_Controller_Action_HelperBroker_PriorityStack();
+        }
+
+        return self::$_stack;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param Zend_Controller_Action $actionController
+     * @return void
+     */
+    public function __construct(Zend_Controller_Action $actionController)
+    {
+        $this->_actionController = $actionController;
+        foreach (self::getStack() as $helper) {
+            $helper->setActionController($actionController);
+            $helper->init();
+        }
+    }
+
+    /**
+     * notifyPreDispatch() - called by action controller dispatch method
+     *
+     * @return void
+     */
+    public function notifyPreDispatch()
+    {
+        foreach (self::getStack() as $helper) {
+            $helper->preDispatch();
+        }
+    }
+
+    /**
+     * notifyPostDispatch() - called by action controller dispatch method
+     *
+     * @return void
+     */
+    public function notifyPostDispatch()
+    {
+        foreach (self::getStack() as $helper) {
+            $helper->postDispatch();
+        }
+    }
+
+    /**
+     * getHelper() - get helper by name
+     *
+     * @param  string $name
+     * @return Zend_Controller_Action_Helper_Abstract
+     */
+    public function getHelper($name)
+    {
+        $name  = self::_normalizeHelperName($name);
+        $stack = self::getStack();
+
+        if (!isset($stack->{$name})) {
+            self::_loadHelper($name);
+        }
+
+        $helper = $stack->{$name};
+
+        $initialize = false;
+        if (null === ($actionController = $helper->getActionController())) {
+            $initialize = true;
+        } elseif ($actionController !== $this->_actionController) {
+            $initialize = true;
+        }
+
+        if ($initialize) {
+            $helper->setActionController($this->_actionController)
+                   ->init();
+        }
+
+        return $helper;
+    }
+
+    /**
+     * Method overloading
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return mixed
+     * @throws Zend_Controller_Action_Exception if helper does not have a direct() method
+     */
+    public function __call($method, $args)
+    {
+        $helper = $this->getHelper($method);
+        if (!method_exists($helper, 'direct')) {
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('Helper "' . $method . '" does not support overloading via direct()');
+        }
+        return call_user_func_array(array($helper, 'direct'), $args);
+    }
+
+    /**
+     * Retrieve helper by name as object property
+     *
+     * @param  string $name
+     * @return Zend_Controller_Action_Helper_Abstract
+     */
+    public function __get($name)
+    {
+        return $this->getHelper($name);
+    }
+
+    /**
+     * Normalize helper name for lookups
+     *
+     * @param  string $name
+     * @return string
+     */
+    protected static function _normalizeHelperName($name)
+    {
+        if (strpos($name, '_') !== false) {
+            $name = str_replace(' ', '', ucwords(str_replace('_', ' ', $name)));
+        }
+
+        return ucfirst($name);
+    }
+
+    /**
+     * Load a helper
+     *
+     * @param  string $name
+     * @return void
+     */
+    protected static function _loadHelper($name)
+    {
+        try {
+            $class = self::getPluginLoader()->load($name);
+        } catch (Zend_Loader_PluginLoader_Exception $e) {
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('Action Helper by name ' . $name . ' not found', 0, $e);
+        }
+
+        $helper = new $class();
+
+        if (!$helper instanceof Zend_Controller_Action_Helper_Abstract) {
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('Helper name ' . $name . ' -> class ' . $class . ' is not of type Zend_Controller_Action_Helper_Abstract');
+        }
+
+        self::getStack()->push($helper);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Action/HelperBroker/PriorityStack.php b/lib/zend/Zend/Controller/Action/HelperBroker/PriorityStack.php
new file mode 100644
index 00000000000..d510b74ee58
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/HelperBroker/PriorityStack.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggregate, ArrayAccess, Countable
+{
+
+    protected $_helpersByPriority = array();
+    protected $_helpersByNameRef  = array();
+    protected $_nextDefaultPriority = 1;
+
+    /**
+     * Magic property overloading for returning helper by name
+     *
+     * @param string $helperName    The helper name
+     * @return Zend_Controller_Action_Helper_Abstract
+     */
+    public function __get($helperName)
+    {
+        if (!array_key_exists($helperName, $this->_helpersByNameRef)) {
+            return false;
+        }
+
+        return $this->_helpersByNameRef[$helperName];
+    }
+
+    /**
+     * Magic property overloading for returning if helper is set by name
+     *
+     * @param string $helperName    The helper name
+     * @return Zend_Controller_Action_Helper_Abstract
+     */
+    public function __isset($helperName)
+    {
+        return array_key_exists($helperName, $this->_helpersByNameRef);
+    }
+
+    /**
+     * Magic property overloading for unsetting if helper is exists by name
+     *
+     * @param string $helperName    The helper name
+     * @return Zend_Controller_Action_Helper_Abstract
+     */
+    public function __unset($helperName)
+    {
+        return $this->offsetUnset($helperName);
+    }
+
+    /**
+     * push helper onto the stack
+     *
+     * @param Zend_Controller_Action_Helper_Abstract $helper
+     * @return Zend_Controller_Action_HelperBroker_PriorityStack
+     */
+    public function push(Zend_Controller_Action_Helper_Abstract $helper)
+    {
+        $this->offsetSet($this->getNextFreeHigherPriority(), $helper);
+        return $this;
+    }
+
+    /**
+     * Return something iterable
+     *
+     * @return array
+     */
+    public function getIterator()
+    {
+        return new ArrayObject($this->_helpersByPriority);
+    }
+
+    /**
+     * offsetExists()
+     *
+     * @param int|string $priorityOrHelperName
+     * @return Zend_Controller_Action_HelperBroker_PriorityStack
+     */
+    public function offsetExists($priorityOrHelperName)
+    {
+        if (is_string($priorityOrHelperName)) {
+            return array_key_exists($priorityOrHelperName, $this->_helpersByNameRef);
+        } else {
+            return array_key_exists($priorityOrHelperName, $this->_helpersByPriority);
+        }
+    }
+
+    /**
+     * offsetGet()
+     *
+     * @param int|string $priorityOrHelperName
+     * @return Zend_Controller_Action_HelperBroker_PriorityStack
+     */
+    public function offsetGet($priorityOrHelperName)
+    {
+        if (!$this->offsetExists($priorityOrHelperName)) {
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('A helper with priority ' . $priorityOrHelperName . ' does not exist.');
+        }
+
+        if (is_string($priorityOrHelperName)) {
+            return $this->_helpersByNameRef[$priorityOrHelperName];
+        } else {
+            return $this->_helpersByPriority[$priorityOrHelperName];
+        }
+    }
+
+    /**
+     * offsetSet()
+     *
+     * @param int $priority
+     * @param Zend_Controller_Action_Helper_Abstract $helper
+     * @return Zend_Controller_Action_HelperBroker_PriorityStack
+     */
+    public function offsetSet($priority, $helper)
+    {
+        $priority = (int) $priority;
+
+        if (!$helper instanceof Zend_Controller_Action_Helper_Abstract) {
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('$helper must extend Zend_Controller_Action_Helper_Abstract.');
+        }
+
+        if (array_key_exists($helper->getName(), $this->_helpersByNameRef)) {
+            // remove any object with the same name to retain BC compailitbility
+            // @todo At ZF 2.0 time throw an exception here.
+            $this->offsetUnset($helper->getName());
+        }
+
+        if (array_key_exists($priority, $this->_helpersByPriority)) {
+            $priority = $this->getNextFreeHigherPriority($priority);  // ensures LIFO
+            trigger_error("A helper with the same priority already exists, reassigning to $priority", E_USER_WARNING);
+        }
+
+        $this->_helpersByPriority[$priority] = $helper;
+        $this->_helpersByNameRef[$helper->getName()] = $helper;
+
+        if ($priority == ($nextFreeDefault = $this->getNextFreeHigherPriority($this->_nextDefaultPriority))) {
+            $this->_nextDefaultPriority = $nextFreeDefault;
+        }
+
+        krsort($this->_helpersByPriority);  // always make sure priority and LIFO are both enforced
+        return $this;
+    }
+
+    /**
+     * offsetUnset()
+     *
+     * @param int|string $priorityOrHelperName Priority integer or the helper name
+     * @return Zend_Controller_Action_HelperBroker_PriorityStack
+     */
+    public function offsetUnset($priorityOrHelperName)
+    {
+        if (!$this->offsetExists($priorityOrHelperName)) {
+            require_once 'Zend/Controller/Action/Exception.php';
+            throw new Zend_Controller_Action_Exception('A helper with priority or name ' . $priorityOrHelperName . ' does not exist.');
+        }
+
+        if (is_string($priorityOrHelperName)) {
+            $helperName = $priorityOrHelperName;
+            $helper = $this->_helpersByNameRef[$helperName];
+            $priority = array_search($helper, $this->_helpersByPriority, true);
+        } else {
+            $priority = $priorityOrHelperName;
+            $helperName = $this->_helpersByPriority[$priorityOrHelperName]->getName();
+        }
+
+        unset($this->_helpersByNameRef[$helperName]);
+        unset($this->_helpersByPriority[$priority]);
+        return $this;
+    }
+
+    /**
+     * return the count of helpers
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->_helpersByPriority);
+    }
+
+    /**
+     * Find the next free higher priority.  If an index is given, it will
+     * find the next free highest priority after it.
+     *
+     * @param int $indexPriority OPTIONAL
+     * @return int
+     */
+    public function getNextFreeHigherPriority($indexPriority = null)
+    {
+        if ($indexPriority == null) {
+            $indexPriority = $this->_nextDefaultPriority;
+        }
+
+        $priorities = array_keys($this->_helpersByPriority);
+
+        while (in_array($indexPriority, $priorities)) {
+            $indexPriority++;
+        }
+
+        return $indexPriority;
+    }
+
+    /**
+     * Find the next free lower priority.  If an index is given, it will
+     * find the next free lower priority before it.
+     *
+     * @param int $indexPriority
+     * @return int
+     */
+    public function getNextFreeLowerPriority($indexPriority = null)
+    {
+        if ($indexPriority == null) {
+            $indexPriority = $this->_nextDefaultPriority;
+        }
+
+        $priorities = array_keys($this->_helpersByPriority);
+
+        while (in_array($indexPriority, $priorities)) {
+            $indexPriority--;
+        }
+
+        return $indexPriority;
+    }
+
+    /**
+     * return the highest priority
+     *
+     * @return int
+     */
+    public function getHighestPriority()
+    {
+        return max(array_keys($this->_helpersByPriority));
+    }
+
+    /**
+     * return the lowest priority
+     *
+     * @return int
+     */
+    public function getLowestPriority()
+    {
+        return min(array_keys($this->_helpersByPriority));
+    }
+
+    /**
+     * return the helpers referenced by name
+     *
+     * @return array
+     */
+    public function getHelpersByName()
+    {
+        return $this->_helpersByNameRef;
+    }
+
+}
diff --git a/lib/zend/Zend/Controller/Action/Interface.php b/lib/zend/Zend/Controller/Action/Interface.php
new file mode 100644
index 00000000000..db354637a10
--- /dev/null
+++ b/lib/zend/Zend/Controller/Action/Interface.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Controller_Action_Interface
+{
+    /**
+     * Class constructor
+     *
+     * The request and response objects should be registered with the
+     * controller, as should be any additional optional arguments; these will be
+     * available via {@link getRequest()}, {@link getResponse()}, and
+     * {@link getInvokeArgs()}, respectively.
+     *
+     * When overriding the constructor, please consider this usage as a best
+     * practice and ensure that each is registered appropriately; the easiest
+     * way to do so is to simply call parent::__construct($request, $response,
+     * $invokeArgs).
+     *
+     * After the request, response, and invokeArgs are set, the
+     * {@link $_helper helper broker} is initialized.
+     *
+     * Finally, {@link init()} is called as the final action of
+     * instantiation, and may be safely overridden to perform initialization
+     * tasks; as a general rule, override {@link init()} instead of the
+     * constructor to customize an action controller's instantiation.
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @param Zend_Controller_Response_Abstract $response
+     * @param array $invokeArgs Any additional invocation arguments
+     * @return void
+     */
+    public function __construct(Zend_Controller_Request_Abstract $request,
+                                Zend_Controller_Response_Abstract $response,
+                                array $invokeArgs = array());
+
+    /**
+     * Dispatch the requested action
+     *
+     * @param string $action Method name of action
+     * @return void
+     */
+    public function dispatch($action);
+}
diff --git a/lib/zend/Zend/Controller/Dispatcher/Abstract.php b/lib/zend/Zend/Controller/Dispatcher/Abstract.php
new file mode 100644
index 00000000000..2bfe1be2be5
--- /dev/null
+++ b/lib/zend/Zend/Controller/Dispatcher/Abstract.php
@@ -0,0 +1,440 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Dispatcher
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Controller_Dispatcher_Interface */
+require_once 'Zend/Controller/Dispatcher/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Dispatcher
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Controller_Dispatcher_Abstract implements Zend_Controller_Dispatcher_Interface
+{
+    /**
+     * Default action
+     * @var string
+     */
+    protected $_defaultAction = 'index';
+
+    /**
+     * Default controller
+     * @var string
+     */
+    protected $_defaultController = 'index';
+
+    /**
+     * Default module
+     * @var string
+     */
+    protected $_defaultModule = 'default';
+
+    /**
+     * Front Controller instance
+     * @var Zend_Controller_Front
+     */
+    protected $_frontController;
+
+    /**
+     * Array of invocation parameters to use when instantiating action
+     * controllers
+     * @var array
+     */
+    protected $_invokeParams = array();
+
+    /**
+     * Path delimiter character
+     * @var string
+     */
+    protected $_pathDelimiter = '_';
+
+    /**
+     * Response object to pass to action controllers, if any
+     * @var Zend_Controller_Response_Abstract|null
+     */
+    protected $_response = null;
+
+    /**
+     * Word delimiter characters
+     * @var array
+     */
+    protected $_wordDelimiter = array('-', '.');
+
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct(array $params = array())
+    {
+        $this->setParams($params);
+    }
+
+    /**
+     * Formats a string into a controller name.  This is used to take a raw
+     * controller name, such as one stored inside a Zend_Controller_Request_Abstract
+     * object, and reformat it to a proper class name that a class extending
+     * Zend_Controller_Action would use.
+     *
+     * @param string $unformatted
+     * @return string
+     */
+    public function formatControllerName($unformatted)
+    {
+        return ucfirst($this->_formatName($unformatted)) . 'Controller';
+    }
+
+    /**
+     * Formats a string into an action name.  This is used to take a raw
+     * action name, such as one that would be stored inside a Zend_Controller_Request_Abstract
+     * object, and reformat into a proper method name that would be found
+     * inside a class extending Zend_Controller_Action.
+     *
+     * @param string $unformatted
+     * @return string
+     */
+    public function formatActionName($unformatted)
+    {
+        $formatted = $this->_formatName($unformatted, true);
+        return strtolower(substr($formatted, 0, 1)) . substr($formatted, 1) . 'Action';
+    }
+
+    /**
+     * Verify delimiter
+     *
+     * Verify a delimiter to use in controllers or actions. May be a single
+     * string or an array of strings.
+     *
+     * @param string|array $spec
+     * @return array
+     * @throws Zend_Controller_Dispatcher_Exception with invalid delimiters
+     */
+    public function _verifyDelimiter($spec)
+    {
+        if (is_string($spec)) {
+            return (array) $spec;
+        } elseif (is_array($spec)) {
+            $allStrings = true;
+            foreach ($spec as $delim) {
+                if (!is_string($delim)) {
+                    $allStrings = false;
+                    break;
+                }
+            }
+
+            if (!$allStrings) {
+                require_once 'Zend/Controller/Dispatcher/Exception.php';
+                throw new Zend_Controller_Dispatcher_Exception('Word delimiter array must contain only strings');
+            }
+
+            return $spec;
+        }
+
+        require_once 'Zend/Controller/Dispatcher/Exception.php';
+        throw new Zend_Controller_Dispatcher_Exception('Invalid word delimiter');
+    }
+
+    /**
+     * Retrieve the word delimiter character(s) used in
+     * controller or action names
+     *
+     * @return array
+     */
+    public function getWordDelimiter()
+    {
+        return $this->_wordDelimiter;
+    }
+
+    /**
+     * Set word delimiter
+     *
+     * Set the word delimiter to use in controllers and actions. May be a
+     * single string or an array of strings.
+     *
+     * @param string|array $spec
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function setWordDelimiter($spec)
+    {
+        $spec = $this->_verifyDelimiter($spec);
+        $this->_wordDelimiter = $spec;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the path delimiter character(s) used in
+     * controller names
+     *
+     * @return array
+     */
+    public function getPathDelimiter()
+    {
+        return $this->_pathDelimiter;
+    }
+
+    /**
+     * Set path delimiter
+     *
+     * Set the path delimiter to use in controllers. May be a single string or
+     * an array of strings.
+     *
+     * @param string $spec
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function setPathDelimiter($spec)
+    {
+        if (!is_string($spec)) {
+            require_once 'Zend/Controller/Dispatcher/Exception.php';
+            throw new Zend_Controller_Dispatcher_Exception('Invalid path delimiter');
+        }
+        $this->_pathDelimiter = $spec;
+
+        return $this;
+    }
+
+    /**
+     * Formats a string from a URI into a PHP-friendly name.
+     *
+     * By default, replaces words separated by the word separator character(s)
+     * with camelCaps. If $isAction is false, it also preserves replaces words
+     * separated by the path separation character with an underscore, making
+     * the following word Title cased. All non-alphanumeric characters are
+     * removed.
+     *
+     * @param string $unformatted
+     * @param boolean $isAction Defaults to false
+     * @return string
+     */
+    protected function _formatName($unformatted, $isAction = false)
+    {
+        // preserve directories
+        if (!$isAction) {
+            $segments = explode($this->getPathDelimiter(), $unformatted);
+        } else {
+            $segments = (array) $unformatted;
+        }
+
+        foreach ($segments as $key => $segment) {
+            $segment        = str_replace($this->getWordDelimiter(), ' ', strtolower($segment));
+            $segment        = preg_replace('/[^a-z0-9 ]/', '', $segment);
+            $segments[$key] = str_replace(' ', '', ucwords($segment));
+        }
+
+        return implode('_', $segments);
+    }
+
+    /**
+     * Retrieve front controller instance
+     *
+     * @return Zend_Controller_Front
+     */
+    public function getFrontController()
+    {
+        if (null === $this->_frontController) {
+            require_once 'Zend/Controller/Front.php';
+            $this->_frontController = Zend_Controller_Front::getInstance();
+        }
+
+        return $this->_frontController;
+    }
+
+    /**
+     * Set front controller instance
+     *
+     * @param Zend_Controller_Front $controller
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function setFrontController(Zend_Controller_Front $controller)
+    {
+        $this->_frontController = $controller;
+        return $this;
+    }
+
+    /**
+     * Add or modify a parameter to use when instantiating an action controller
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function setParam($name, $value)
+    {
+        $name = (string) $name;
+        $this->_invokeParams[$name] = $value;
+        return $this;
+    }
+
+    /**
+     * Set parameters to pass to action controller constructors
+     *
+     * @param array $params
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function setParams(array $params)
+    {
+        $this->_invokeParams = array_merge($this->_invokeParams, $params);
+        return $this;
+    }
+
+    /**
+     * Retrieve a single parameter from the controller parameter stack
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function getParam($name)
+    {
+        if(isset($this->_invokeParams[$name])) {
+            return $this->_invokeParams[$name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieve action controller instantiation parameters
+     *
+     * @return array
+     */
+    public function getParams()
+    {
+        return $this->_invokeParams;
+    }
+
+    /**
+     * Clear the controller parameter stack
+     *
+     * By default, clears all parameters. If a parameter name is given, clears
+     * only that parameter; if an array of parameter names is provided, clears
+     * each.
+     *
+     * @param null|string|array single key or array of keys for params to clear
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function clearParams($name = null)
+    {
+        if (null === $name) {
+            $this->_invokeParams = array();
+        } elseif (is_string($name) && isset($this->_invokeParams[$name])) {
+            unset($this->_invokeParams[$name]);
+        } elseif (is_array($name)) {
+            foreach ($name as $key) {
+                if (is_string($key) && isset($this->_invokeParams[$key])) {
+                    unset($this->_invokeParams[$key]);
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set response object to pass to action controllers
+     *
+     * @param Zend_Controller_Response_Abstract|null $response
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function setResponse(Zend_Controller_Response_Abstract $response = null)
+    {
+        $this->_response = $response;
+        return $this;
+    }
+
+    /**
+     * Return the registered response object
+     *
+     * @return Zend_Controller_Response_Abstract|null
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Set the default controller (minus any formatting)
+     *
+     * @param string $controller
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function setDefaultControllerName($controller)
+    {
+        $this->_defaultController = (string) $controller;
+        return $this;
+    }
+
+    /**
+     * Retrieve the default controller name (minus formatting)
+     *
+     * @return string
+     */
+    public function getDefaultControllerName()
+    {
+        return $this->_defaultController;
+    }
+
+    /**
+     * Set the default action (minus any formatting)
+     *
+     * @param string $action
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function setDefaultAction($action)
+    {
+        $this->_defaultAction = (string) $action;
+        return $this;
+    }
+
+    /**
+     * Retrieve the default action name (minus formatting)
+     *
+     * @return string
+     */
+    public function getDefaultAction()
+    {
+        return $this->_defaultAction;
+    }
+
+    /**
+     * Set the default module
+     *
+     * @param string $module
+     * @return Zend_Controller_Dispatcher_Abstract
+     */
+    public function setDefaultModule($module)
+    {
+        $this->_defaultModule = (string) $module;
+        return $this;
+    }
+
+    /**
+     * Retrieve the default module
+     *
+     * @return string
+     */
+    public function getDefaultModule()
+    {
+        return $this->_defaultModule;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Dispatcher/Exception.php b/lib/zend/Zend/Controller/Dispatcher/Exception.php
new file mode 100644
index 00000000000..42404449663
--- /dev/null
+++ b/lib/zend/Zend/Controller/Dispatcher/Exception.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Dispatcher
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** Zend_Controller_Exception */
+require_once 'Zend/Controller/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Dispatcher
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Dispatcher_Exception extends Zend_Controller_Exception
+{}
+
diff --git a/lib/zend/Zend/Controller/Dispatcher/Interface.php b/lib/zend/Zend/Controller/Dispatcher/Interface.php
new file mode 100644
index 00000000000..bdc977cf655
--- /dev/null
+++ b/lib/zend/Zend/Controller/Dispatcher/Interface.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Dispatcher
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Zend_Controller_Request_Abstract
+ */
+require_once 'Zend/Controller/Request/Abstract.php';
+
+/**
+ * Zend_Controller_Response_Abstract
+ */
+require_once 'Zend/Controller/Response/Abstract.php';
+
+/**
+ * @package    Zend_Controller
+ * @subpackage Dispatcher
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Controller_Dispatcher_Interface
+{
+    /**
+     * Formats a string into a controller name.  This is used to take a raw
+     * controller name, such as one that would be packaged inside a request
+     * object, and reformat it to a proper class name that a class extending
+     * Zend_Controller_Action would use.
+     *
+     * @param string $unformatted
+     * @return string
+     */
+    public function formatControllerName($unformatted);
+
+    /**
+     * Formats a string into a module name.  This is used to take a raw
+     * module name, such as one that would be packaged inside a request
+     * object, and reformat it to a proper directory/class name that a class extending
+     * Zend_Controller_Action would use.
+     *
+     * @param string $unformatted
+     * @return string
+     */
+    public function formatModuleName($unformatted);
+
+    /**
+     * Formats a string into an action name.  This is used to take a raw
+     * action name, such as one that would be packaged inside a request
+     * object, and reformat into a proper method name that would be found
+     * inside a class extending Zend_Controller_Action.
+     *
+     * @param string $unformatted
+     * @return string
+     */
+    public function formatActionName($unformatted);
+
+    /**
+     * Returns TRUE if an action can be dispatched, or FALSE otherwise.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return boolean
+     */
+    public function isDispatchable(Zend_Controller_Request_Abstract $request);
+
+    /**
+     * Add or modify a parameter with which to instantiate an Action Controller
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return Zend_Controller_Dispatcher_Interface
+     */
+    public function setParam($name, $value);
+
+    /**
+     * Set an array of a parameters to pass to the Action Controller constructor
+     *
+     * @param array $params
+     * @return Zend_Controller_Dispatcher_Interface
+     */
+    public function setParams(array $params);
+
+    /**
+     * Retrieve a single parameter from the controller parameter stack
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function getParam($name);
+
+    /**
+     * Retrieve the parameters to pass to the Action Controller constructor
+     *
+     * @return array
+     */
+    public function getParams();
+
+    /**
+     * Clear the controller parameter stack
+     *
+     * By default, clears all parameters. If a parameter name is given, clears
+     * only that parameter; if an array of parameter names is provided, clears
+     * each.
+     *
+     * @param null|string|array single key or array of keys for params to clear
+     * @return Zend_Controller_Dispatcher_Interface
+     */
+    public function clearParams($name = null);
+
+    /**
+     * Set the response object to use, if any
+     *
+     * @param Zend_Controller_Response_Abstract|null $response
+     * @return void
+     */
+    public function setResponse(Zend_Controller_Response_Abstract $response = null);
+
+    /**
+     * Retrieve the response object, if any
+     *
+     * @return Zend_Controller_Response_Abstract|null
+     */
+    public function getResponse();
+
+    /**
+     * Add a controller directory to the controller directory stack
+     *
+     * @param string $path
+     * @param string $args
+     * @return Zend_Controller_Dispatcher_Interface
+     */
+    public function addControllerDirectory($path, $args = null);
+
+    /**
+     * Set the directory where controller files are stored
+     *
+     * Specify a string or an array; if an array is specified, all paths will be
+     * added.
+     *
+     * @param string|array $dir
+     * @return Zend_Controller_Dispatcher_Interface
+     */
+    public function setControllerDirectory($path);
+
+    /**
+     * Return the currently set directory(ies) for controller file lookup
+     *
+     * @return array
+     */
+    public function getControllerDirectory();
+
+    /**
+     * Dispatches a request object to a controller/action.  If the action
+     * requests a forward to another action, a new request will be returned.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @param  Zend_Controller_Response_Abstract $response
+     * @return void
+     */
+    public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response);
+
+    /**
+     * Whether or not a given module is valid
+     *
+     * @param string $module
+     * @return boolean
+     */
+    public function isValidModule($module);
+
+    /**
+     * Retrieve the default module name
+     *
+     * @return string
+     */
+    public function getDefaultModule();
+
+    /**
+     * Retrieve the default controller name
+     *
+     * @return string
+     */
+    public function getDefaultControllerName();
+
+    /**
+     * Retrieve the default action
+     *
+     * @return string
+     */
+    public function getDefaultAction();
+}
diff --git a/lib/zend/Zend/Controller/Dispatcher/Standard.php b/lib/zend/Zend/Controller/Dispatcher/Standard.php
new file mode 100644
index 00000000000..492056e42a5
--- /dev/null
+++ b/lib/zend/Zend/Controller/Dispatcher/Standard.php
@@ -0,0 +1,512 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Dispatcher
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Loader */
+require_once 'Zend/Loader.php';
+
+/** Zend_Controller_Dispatcher_Abstract */
+require_once 'Zend/Controller/Dispatcher/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Dispatcher
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abstract
+{
+    /**
+     * Current dispatchable directory
+     * @var string
+     */
+    protected $_curDirectory;
+
+    /**
+     * Current module (formatted)
+     * @var string
+     */
+    protected $_curModule;
+
+    /**
+     * Controller directory(ies)
+     * @var array
+     */
+    protected $_controllerDirectory = array();
+
+    /**
+     * Constructor: Set current module to default value
+     *
+     * @param  array $params
+     * @return void
+     */
+    public function __construct(array $params = array())
+    {
+        parent::__construct($params);
+        $this->_curModule = $this->getDefaultModule();
+    }
+
+    /**
+     * Add a single path to the controller directory stack
+     *
+     * @param string $path
+     * @param string $module
+     * @return Zend_Controller_Dispatcher_Standard
+     */
+    public function addControllerDirectory($path, $module = null)
+    {
+        if (null === $module) {
+            $module = $this->_defaultModule;
+        }
+
+        $module = (string) $module;
+        $path   = rtrim((string) $path, '/\\');
+
+        $this->_controllerDirectory[$module] = $path;
+        return $this;
+    }
+
+    /**
+     * Set controller directory
+     *
+     * @param array|string $directory
+     * @return Zend_Controller_Dispatcher_Standard
+     */
+    public function setControllerDirectory($directory, $module = null)
+    {
+        $this->_controllerDirectory = array();
+
+        if (is_string($directory)) {
+            $this->addControllerDirectory($directory, $module);
+        } elseif (is_array($directory)) {
+            foreach ((array) $directory as $module => $path) {
+                $this->addControllerDirectory($path, $module);
+            }
+        } else {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Controller directory spec must be either a string or an array');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the currently set directories for Zend_Controller_Action class
+     * lookup
+     *
+     * If a module is specified, returns just that directory.
+     *
+     * @param  string $module Module name
+     * @return array|string Returns array of all directories by default, single
+     * module directory if module argument provided
+     */
+    public function getControllerDirectory($module = null)
+    {
+        if (null === $module) {
+            return $this->_controllerDirectory;
+        }
+
+        $module = (string) $module;
+        if (array_key_exists($module, $this->_controllerDirectory)) {
+            return $this->_controllerDirectory[$module];
+        }
+
+        return null;
+    }
+
+    /**
+     * Remove a controller directory by module name
+     *
+     * @param  string $module
+     * @return bool
+     */
+    public function removeControllerDirectory($module)
+    {
+        $module = (string) $module;
+        if (array_key_exists($module, $this->_controllerDirectory)) {
+            unset($this->_controllerDirectory[$module]);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Format the module name.
+     *
+     * @param string $unformatted
+     * @return string
+     */
+    public function formatModuleName($unformatted)
+    {
+        if (($this->_defaultModule == $unformatted) && !$this->getParam('prefixDefaultModule')) {
+            return $unformatted;
+        }
+
+        return ucfirst($this->_formatName($unformatted));
+    }
+
+    /**
+     * Format action class name
+     *
+     * @param string $moduleName Name of the current module
+     * @param string $className Name of the action class
+     * @return string Formatted class name
+     */
+    public function formatClassName($moduleName, $className)
+    {
+        return $this->formatModuleName($moduleName) . '_' . $className;
+    }
+
+    /**
+     * Convert a class name to a filename
+     *
+     * @param string $class
+     * @return string
+     */
+    public function classToFilename($class)
+    {
+        return str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+    }
+
+    /**
+     * Returns TRUE if the Zend_Controller_Request_Abstract object can be
+     * dispatched to a controller.
+     *
+     * Use this method wisely. By default, the dispatcher will fall back to the
+     * default controller (either in the module specified or the global default)
+     * if a given controller does not exist. This method returning false does
+     * not necessarily indicate the dispatcher will not still dispatch the call.
+     *
+     * @param Zend_Controller_Request_Abstract $action
+     * @return boolean
+     */
+    public function isDispatchable(Zend_Controller_Request_Abstract $request)
+    {
+        $className = $this->getControllerClass($request);
+        if (!$className) {
+            return false;
+        }
+
+        $finalClass  = $className;
+        if (($this->_defaultModule != $this->_curModule)
+            || $this->getParam('prefixDefaultModule'))
+        {
+            $finalClass = $this->formatClassName($this->_curModule, $className);
+        }
+        if (class_exists($finalClass, false)) {
+            return true;
+        }
+
+        $fileSpec    = $this->classToFilename($className);
+        $dispatchDir = $this->getDispatchDirectory();
+        $test        = $dispatchDir . DIRECTORY_SEPARATOR . $fileSpec;
+        return Zend_Loader::isReadable($test);
+    }
+
+    /**
+     * Dispatch to a controller/action
+     *
+     * By default, if a controller is not dispatchable, dispatch() will throw
+     * an exception. If you wish to use the default controller instead, set the
+     * param 'useDefaultControllerAlways' via {@link setParam()}.
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @param Zend_Controller_Response_Abstract $response
+     * @return void
+     * @throws Zend_Controller_Dispatcher_Exception
+     */
+    public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response)
+    {
+        $this->setResponse($response);
+
+        /**
+         * Get controller class
+         */
+        if (!$this->isDispatchable($request)) {
+            $controller = $request->getControllerName();
+            if (!$this->getParam('useDefaultControllerAlways') && !empty($controller)) {
+                require_once 'Zend/Controller/Dispatcher/Exception.php';
+                throw new Zend_Controller_Dispatcher_Exception('Invalid controller specified (' . $request->getControllerName() . ')');
+            }
+
+            $className = $this->getDefaultControllerClass($request);
+        } else {
+            $className = $this->getControllerClass($request);
+            if (!$className) {
+                $className = $this->getDefaultControllerClass($request);
+            }
+        }
+
+        /**
+         * If we're in a module or prefixDefaultModule is on, we must add the module name
+         * prefix to the contents of $className, as getControllerClass does not do that automatically.
+         * We must keep a separate variable because modules are not strictly PSR-0: We need the no-module-prefix
+         * class name to do the class->file mapping, but the full class name to insantiate the controller
+         */
+        $moduleClassName = $className;
+        if (($this->_defaultModule != $this->_curModule)
+            || $this->getParam('prefixDefaultModule'))
+        {
+            $moduleClassName = $this->formatClassName($this->_curModule, $className);
+        }
+
+        /**
+         * Load the controller class file
+         */
+        $className = $this->loadClass($className);
+
+        /**
+         * Instantiate controller with request, response, and invocation
+         * arguments; throw exception if it's not an action controller
+         */
+        $controller = new $moduleClassName($request, $this->getResponse(), $this->getParams());
+        if (!($controller instanceof Zend_Controller_Action_Interface) &&
+            !($controller instanceof Zend_Controller_Action)) {
+            require_once 'Zend/Controller/Dispatcher/Exception.php';
+            throw new Zend_Controller_Dispatcher_Exception(
+                'Controller "' . $moduleClassName . '" is not an instance of Zend_Controller_Action_Interface'
+            );
+        }
+
+        /**
+         * Retrieve the action name
+         */
+        $action = $this->getActionMethod($request);
+
+        /**
+         * Dispatch the method call
+         */
+        $request->setDispatched(true);
+
+        // by default, buffer output
+        $disableOb = $this->getParam('disableOutputBuffering');
+        $obLevel   = ob_get_level();
+        if (empty($disableOb)) {
+            ob_start();
+        }
+
+        try {
+            $controller->dispatch($action);
+        } catch (Exception $e) {
+            // Clean output buffer on error
+            $curObLevel = ob_get_level();
+            if ($curObLevel > $obLevel) {
+                do {
+                    ob_get_clean();
+                    $curObLevel = ob_get_level();
+                } while ($curObLevel > $obLevel);
+            }
+            throw $e;
+        }
+
+        if (empty($disableOb)) {
+            $content = ob_get_clean();
+            $response->appendBody($content);
+        }
+
+        // Destroy the page controller instance and reflection objects
+        $controller = null;
+    }
+
+    /**
+     * Load a controller class
+     *
+     * Attempts to load the controller class file from
+     * {@link getControllerDirectory()}.  If the controller belongs to a
+     * module, looks for the module prefix to the controller class.
+     *
+     * @param string $className
+     * @return string Class name loaded
+     * @throws Zend_Controller_Dispatcher_Exception if class not loaded
+     */
+    public function loadClass($className)
+    {
+        $finalClass  = $className;
+        if (($this->_defaultModule != $this->_curModule)
+            || $this->getParam('prefixDefaultModule'))
+        {
+            $finalClass = $this->formatClassName($this->_curModule, $className);
+        }
+        if (class_exists($finalClass, false)) {
+            return $finalClass;
+        }
+
+        $dispatchDir = $this->getDispatchDirectory();
+        $loadFile    = $dispatchDir . DIRECTORY_SEPARATOR . $this->classToFilename($className);
+
+        if (Zend_Loader::isReadable($loadFile)) {
+            include_once $loadFile;
+        } else {
+            require_once 'Zend/Controller/Dispatcher/Exception.php';
+            throw new Zend_Controller_Dispatcher_Exception('Cannot load controller class "' . $className . '" from file "' . $loadFile . "'");
+        }
+
+        if (!class_exists($finalClass, false)) {
+            require_once 'Zend/Controller/Dispatcher/Exception.php';
+            throw new Zend_Controller_Dispatcher_Exception('Invalid controller class ("' . $finalClass . '")');
+        }
+
+        return $finalClass;
+    }
+
+    /**
+     * Get controller class name
+     *
+     * Try request first; if not found, try pulling from request parameter;
+     * if still not found, fallback to default
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @return string|false Returns class name on success
+     */
+    public function getControllerClass(Zend_Controller_Request_Abstract $request)
+    {
+        $controllerName = $request->getControllerName();
+        if (empty($controllerName)) {
+            if (!$this->getParam('useDefaultControllerAlways')) {
+                return false;
+            }
+            $controllerName = $this->getDefaultControllerName();
+            $request->setControllerName($controllerName);
+        }
+
+        $className = $this->formatControllerName($controllerName);
+
+        $controllerDirs      = $this->getControllerDirectory();
+        $module = $request->getModuleName();
+        if ($this->isValidModule($module)) {
+            $this->_curModule    = $module;
+            $this->_curDirectory = $controllerDirs[$module];
+        } elseif ($this->isValidModule($this->_defaultModule)) {
+            $request->setModuleName($this->_defaultModule);
+            $this->_curModule    = $this->_defaultModule;
+            $this->_curDirectory = $controllerDirs[$this->_defaultModule];
+        } else {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('No default module defined for this application');
+        }
+
+        return $className;
+    }
+
+    /**
+     * Determine if a given module is valid
+     *
+     * @param  string $module
+     * @return bool
+     */
+    public function isValidModule($module)
+    {
+        if (!is_string($module)) {
+            return false;
+        }
+
+        $module        = strtolower($module);
+        $controllerDir = $this->getControllerDirectory();
+        foreach (array_keys($controllerDir) as $moduleName) {
+            if ($module == strtolower($moduleName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieve default controller class
+     *
+     * Determines whether the default controller to use lies within the
+     * requested module, or if the global default should be used.
+     *
+     * By default, will only use the module default unless that controller does
+     * not exist; if this is the case, it falls back to the default controller
+     * in the default module.
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @return string
+     */
+    public function getDefaultControllerClass(Zend_Controller_Request_Abstract $request)
+    {
+        $controller = $this->getDefaultControllerName();
+        $default    = $this->formatControllerName($controller);
+        $request->setControllerName($controller)
+                ->setActionName(null);
+
+        $module              = $request->getModuleName();
+        $controllerDirs      = $this->getControllerDirectory();
+        $this->_curModule    = $this->_defaultModule;
+        $this->_curDirectory = $controllerDirs[$this->_defaultModule];
+        if ($this->isValidModule($module)) {
+            $found = false;
+            if (class_exists($default, false)) {
+                $found = true;
+            } else {
+                $moduleDir = $controllerDirs[$module];
+                $fileSpec  = $moduleDir . DIRECTORY_SEPARATOR . $this->classToFilename($default);
+                if (Zend_Loader::isReadable($fileSpec)) {
+                    $found = true;
+                    $this->_curDirectory = $moduleDir;
+                }
+            }
+            if ($found) {
+                $request->setModuleName($module);
+                $this->_curModule    = $this->formatModuleName($module);
+            }
+        } else {
+            $request->setModuleName($this->_defaultModule);
+        }
+
+        return $default;
+    }
+
+    /**
+     * Return the value of the currently selected dispatch directory (as set by
+     * {@link getController()})
+     *
+     * @return string
+     */
+    public function getDispatchDirectory()
+    {
+        return $this->_curDirectory;
+    }
+
+    /**
+     * Determine the action name
+     *
+     * First attempt to retrieve from request; then from request params
+     * using action key; default to default action
+     *
+     * Returns formatted action name
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @return string
+     */
+    public function getActionMethod(Zend_Controller_Request_Abstract $request)
+    {
+        $action = $request->getActionName();
+        if (empty($action)) {
+            $action = $this->getDefaultAction();
+            $request->setActionName($action);
+        }
+
+        return $this->formatActionName($action);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Exception.php b/lib/zend/Zend/Controller/Exception.php
new file mode 100644
index 00000000000..b36853c425c
--- /dev/null
+++ b/lib/zend/Zend/Controller/Exception.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** Zend_Exception */
+require_once 'Zend/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Exception extends Zend_Exception
+{}
+
diff --git a/lib/zend/Zend/Controller/Front.php b/lib/zend/Zend/Controller/Front.php
new file mode 100644
index 00000000000..3ca4c78b1d4
--- /dev/null
+++ b/lib/zend/Zend/Controller/Front.php
@@ -0,0 +1,994 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** Zend_Loader */
+require_once 'Zend/Loader.php';
+
+/** Zend_Controller_Action_HelperBroker */
+require_once 'Zend/Controller/Action/HelperBroker.php';
+
+/** Zend_Controller_Plugin_Broker */
+require_once 'Zend/Controller/Plugin/Broker.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Front
+{
+    /**
+     * Base URL
+     * @var string
+     */
+    protected $_baseUrl = null;
+
+    /**
+     * Directory|ies where controllers are stored
+     *
+     * @var string|array
+     */
+    protected $_controllerDir = null;
+
+    /**
+     * Instance of Zend_Controller_Dispatcher_Interface
+     * @var Zend_Controller_Dispatcher_Interface
+     */
+    protected $_dispatcher = null;
+
+    /**
+     * Singleton instance
+     *
+     * Marked only as protected to allow extension of the class. To extend,
+     * simply override {@link getInstance()}.
+     *
+     * @var Zend_Controller_Front
+     */
+    protected static $_instance = null;
+
+    /**
+     * Array of invocation parameters to use when instantiating action
+     * controllers
+     * @var array
+     */
+    protected $_invokeParams = array();
+
+    /**
+     * Subdirectory within a module containing controllers; defaults to 'controllers'
+     * @var string
+     */
+    protected $_moduleControllerDirectoryName = 'controllers';
+
+    /**
+     * Instance of Zend_Controller_Plugin_Broker
+     * @var Zend_Controller_Plugin_Broker
+     */
+    protected $_plugins = null;
+
+    /**
+     * Instance of Zend_Controller_Request_Abstract
+     * @var Zend_Controller_Request_Abstract
+     */
+    protected $_request = null;
+
+    /**
+     * Instance of Zend_Controller_Response_Abstract
+     * @var Zend_Controller_Response_Abstract
+     */
+    protected $_response = null;
+
+    /**
+     * Whether or not to return the response prior to rendering output while in
+     * {@link dispatch()}; default is to send headers and render output.
+     * @var boolean
+     */
+    protected $_returnResponse = false;
+
+    /**
+     * Instance of Zend_Controller_Router_Interface
+     * @var Zend_Controller_Router_Interface
+     */
+    protected $_router = null;
+
+    /**
+     * Whether or not exceptions encountered in {@link dispatch()} should be
+     * thrown or trapped in the response object
+     * @var boolean
+     */
+    protected $_throwExceptions = false;
+
+    /**
+     * Constructor
+     *
+     * Instantiate using {@link getInstance()}; front controller is a singleton
+     * object.
+     *
+     * Instantiates the plugin broker.
+     *
+     * @return void
+     */
+    protected function __construct()
+    {
+        $this->_plugins = new Zend_Controller_Plugin_Broker();
+    }
+
+    /**
+     * Enforce singleton; disallow cloning
+     *
+     * @return void
+     */
+    private function __clone()
+    {
+    }
+
+    /**
+     * Singleton instance
+     *
+     * @return Zend_Controller_Front
+     */
+    public static function getInstance()
+    {
+        if (null === self::$_instance) {
+            self::$_instance = new self();
+        }
+
+        return self::$_instance;
+    }
+
+    /**
+     * Resets all object properties of the singleton instance
+     *
+     * Primarily used for testing; could be used to chain front controllers.
+     *
+     * Also resets action helper broker, clearing all registered helpers.
+     *
+     * @return void
+     */
+    public function resetInstance()
+    {
+        $reflection = new ReflectionObject($this);
+        foreach ($reflection->getProperties() as $property) {
+            $name = $property->getName();
+            switch ($name) {
+                case '_instance':
+                    break;
+                case '_controllerDir':
+                case '_invokeParams':
+                    $this->{$name} = array();
+                    break;
+                case '_plugins':
+                    $this->{$name} = new Zend_Controller_Plugin_Broker();
+                    break;
+                case '_throwExceptions':
+                case '_returnResponse':
+                    $this->{$name} = false;
+                    break;
+                case '_moduleControllerDirectoryName':
+                    $this->{$name} = 'controllers';
+                    break;
+                default:
+                    $this->{$name} = null;
+                    break;
+            }
+        }
+        Zend_Controller_Action_HelperBroker::resetHelpers();
+    }
+
+    /**
+     * Convenience feature, calls setControllerDirectory()->setRouter()->dispatch()
+     *
+     * In PHP 5.1.x, a call to a static method never populates $this -- so run()
+     * may actually be called after setting up your front controller.
+     *
+     * @param string|array $controllerDirectory Path to Zend_Controller_Action
+     * controller classes or array of such paths
+     * @return void
+     * @throws Zend_Controller_Exception if called from an object instance
+     */
+    public static function run($controllerDirectory)
+    {
+        self::getInstance()
+            ->setControllerDirectory($controllerDirectory)
+            ->dispatch();
+    }
+
+    /**
+     * Add a controller directory to the controller directory stack
+     *
+     * If $args is presented and is a string, uses it for the array key mapping
+     * to the directory specified.
+     *
+     * @param string $directory
+     * @param string $module Optional argument; module with which to associate directory. If none provided, assumes 'default'
+     * @return Zend_Controller_Front
+     * @throws Zend_Controller_Exception if directory not found or readable
+     */
+    public function addControllerDirectory($directory, $module = null)
+    {
+        $this->getDispatcher()->addControllerDirectory($directory, $module);
+        return $this;
+    }
+
+    /**
+     * Set controller directory
+     *
+     * Stores controller directory(ies) in dispatcher. May be an array of
+     * directories or a string containing a single directory.
+     *
+     * @param string|array $directory Path to Zend_Controller_Action controller
+     * classes or array of such paths
+     * @param  string $module Optional module name to use with string $directory
+     * @return Zend_Controller_Front
+     */
+    public function setControllerDirectory($directory, $module = null)
+    {
+        $this->getDispatcher()->setControllerDirectory($directory, $module);
+        return $this;
+    }
+
+    /**
+     * Retrieve controller directory
+     *
+     * Retrieves:
+     * - Array of all controller directories if no $name passed
+     * - String path if $name passed and exists as a key in controller directory array
+     * - null if $name passed but does not exist in controller directory keys
+     *
+     * @param  string $name Default null
+     * @return array|string|null
+     */
+    public function getControllerDirectory($name = null)
+    {
+        return $this->getDispatcher()->getControllerDirectory($name);
+    }
+
+    /**
+     * Remove a controller directory by module name
+     *
+     * @param  string $module
+     * @return bool
+     */
+    public function removeControllerDirectory($module)
+    {
+        return $this->getDispatcher()->removeControllerDirectory($module);
+    }
+
+    /**
+     * Specify a directory as containing modules
+     *
+     * Iterates through the directory, adding any subdirectories as modules;
+     * the subdirectory within each module named after {@link $_moduleControllerDirectoryName}
+     * will be used as the controller directory path.
+     *
+     * @param  string $path
+     * @return Zend_Controller_Front
+     */
+    public function addModuleDirectory($path)
+    {
+        try{
+            $dir = new DirectoryIterator($path);
+        } catch(Exception $e) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception("Directory $path not readable", 0, $e);
+        }
+        foreach ($dir as $file) {
+            if ($file->isDot() || !$file->isDir()) {
+                continue;
+            }
+
+            $module    = $file->getFilename();
+
+            // Don't use SCCS directories as modules
+            if (preg_match('/^[^a-z]/i', $module) || ('CVS' == $module)) {
+                continue;
+            }
+
+            $moduleDir = $file->getPathname() . DIRECTORY_SEPARATOR . $this->getModuleControllerDirectoryName();
+            $this->addControllerDirectory($moduleDir, $module);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the path to a module directory (but not the controllers directory within)
+     *
+     * @param  string $module
+     * @return string|null
+     */
+    public function getModuleDirectory($module = null)
+    {
+        if (null === $module) {
+            $request = $this->getRequest();
+            if (null !== $request) {
+                $module = $this->getRequest()->getModuleName();
+            }
+            if (empty($module)) {
+                $module = $this->getDispatcher()->getDefaultModule();
+            }
+        }
+
+        $controllerDir = $this->getControllerDirectory($module);
+
+        if ((null === $controllerDir) || !is_string($controllerDir)) {
+            return null;
+        }
+
+        return dirname($controllerDir);
+    }
+
+    /**
+     * Set the directory name within a module containing controllers
+     *
+     * @param  string $name
+     * @return Zend_Controller_Front
+     */
+    public function setModuleControllerDirectoryName($name = 'controllers')
+    {
+        $this->_moduleControllerDirectoryName = (string) $name;
+
+        return $this;
+    }
+
+    /**
+     * Return the directory name within a module containing controllers
+     *
+     * @return string
+     */
+    public function getModuleControllerDirectoryName()
+    {
+        return $this->_moduleControllerDirectoryName;
+    }
+
+    /**
+     * Set the default controller (unformatted string)
+     *
+     * @param string $controller
+     * @return Zend_Controller_Front
+     */
+    public function setDefaultControllerName($controller)
+    {
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->setDefaultControllerName($controller);
+        return $this;
+    }
+
+    /**
+     * Retrieve the default controller (unformatted string)
+     *
+     * @return string
+     */
+    public function getDefaultControllerName()
+    {
+        return $this->getDispatcher()->getDefaultControllerName();
+    }
+
+    /**
+     * Set the default action (unformatted string)
+     *
+     * @param string $action
+     * @return Zend_Controller_Front
+     */
+    public function setDefaultAction($action)
+    {
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->setDefaultAction($action);
+        return $this;
+    }
+
+    /**
+     * Retrieve the default action (unformatted string)
+     *
+     * @return string
+     */
+    public function getDefaultAction()
+    {
+        return $this->getDispatcher()->getDefaultAction();
+    }
+
+    /**
+     * Set the default module name
+     *
+     * @param string $module
+     * @return Zend_Controller_Front
+     */
+    public function setDefaultModule($module)
+    {
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->setDefaultModule($module);
+        return $this;
+    }
+
+    /**
+     * Retrieve the default module
+     *
+     * @return string
+     */
+    public function getDefaultModule()
+    {
+        return $this->getDispatcher()->getDefaultModule();
+    }
+
+    /**
+     * Set request class/object
+     *
+     * Set the request object.  The request holds the request environment.
+     *
+     * If a class name is provided, it will instantiate it
+     *
+     * @param string|Zend_Controller_Request_Abstract $request
+     * @throws Zend_Controller_Exception if invalid request class
+     * @return Zend_Controller_Front
+     */
+    public function setRequest($request)
+    {
+        if (is_string($request)) {
+            if (!class_exists($request)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($request);
+            }
+            $request = new $request();
+        }
+        if (!$request instanceof Zend_Controller_Request_Abstract) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Invalid request class');
+        }
+
+        $this->_request = $request;
+
+        return $this;
+    }
+
+    /**
+     * Return the request object.
+     *
+     * @return null|Zend_Controller_Request_Abstract
+     */
+    public function getRequest()
+    {
+        return $this->_request;
+    }
+
+    /**
+     * Set router class/object
+     *
+     * Set the router object.  The router is responsible for mapping
+     * the request to a controller and action.
+     *
+     * If a class name is provided, instantiates router with any parameters
+     * registered via {@link setParam()} or {@link setParams()}.
+     *
+     * @param string|Zend_Controller_Router_Interface $router
+     * @throws Zend_Controller_Exception if invalid router class
+     * @return Zend_Controller_Front
+     */
+    public function setRouter($router)
+    {
+        if (is_string($router)) {
+            if (!class_exists($router)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($router);
+            }
+            $router = new $router();
+        }
+
+        if (!$router instanceof Zend_Controller_Router_Interface) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Invalid router class');
+        }
+
+        $router->setFrontController($this);
+        $this->_router = $router;
+
+        return $this;
+    }
+
+    /**
+     * Return the router object.
+     *
+     * Instantiates a Zend_Controller_Router_Rewrite object if no router currently set.
+     *
+     * @return Zend_Controller_Router_Interface
+     */
+    public function getRouter()
+    {
+        if (null == $this->_router) {
+            require_once 'Zend/Controller/Router/Rewrite.php';
+            $this->setRouter(new Zend_Controller_Router_Rewrite());
+        }
+
+        return $this->_router;
+    }
+
+    /**
+     * Set the base URL used for requests
+     *
+     * Use to set the base URL segment of the REQUEST_URI to use when
+     * determining PATH_INFO, etc. Examples:
+     * - /admin
+     * - /myapp
+     * - /subdir/index.php
+     *
+     * Note that the URL should not include the full URI. Do not use:
+     * - http://example.com/admin
+     * - http://example.com/myapp
+     * - http://example.com/subdir/index.php
+     *
+     * If a null value is passed, this can be used as well for autodiscovery (default).
+     *
+     * @param string $base
+     * @return Zend_Controller_Front
+     * @throws Zend_Controller_Exception for non-string $base
+     */
+    public function setBaseUrl($base = null)
+    {
+        if (!is_string($base) && (null !== $base)) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Rewrite base must be a string');
+        }
+
+        $this->_baseUrl = $base;
+
+        if ((null !== ($request = $this->getRequest())) && (method_exists($request, 'setBaseUrl'))) {
+            $request->setBaseUrl($base);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the currently set base URL
+     *
+     * @return string
+     */
+    public function getBaseUrl()
+    {
+        $request = $this->getRequest();
+        if ((null !== $request) && method_exists($request, 'getBaseUrl')) {
+            return $request->getBaseUrl();
+        }
+
+        return $this->_baseUrl;
+    }
+
+    /**
+     * Set the dispatcher object.  The dispatcher is responsible for
+     * taking a Zend_Controller_Dispatcher_Token object, instantiating the controller, and
+     * call the action method of the controller.
+     *
+     * @param Zend_Controller_Dispatcher_Interface $dispatcher
+     * @return Zend_Controller_Front
+     */
+    public function setDispatcher(Zend_Controller_Dispatcher_Interface $dispatcher)
+    {
+        $this->_dispatcher = $dispatcher;
+        return $this;
+    }
+
+    /**
+     * Return the dispatcher object.
+     *
+     * @return Zend_Controller_Dispatcher_Interface
+     */
+    public function getDispatcher()
+    {
+        /**
+         * Instantiate the default dispatcher if one was not set.
+         */
+        if (!$this->_dispatcher instanceof Zend_Controller_Dispatcher_Interface) {
+            require_once 'Zend/Controller/Dispatcher/Standard.php';
+            $this->_dispatcher = new Zend_Controller_Dispatcher_Standard();
+        }
+        return $this->_dispatcher;
+    }
+
+    /**
+     * Set response class/object
+     *
+     * Set the response object.  The response is a container for action
+     * responses and headers. Usage is optional.
+     *
+     * If a class name is provided, instantiates a response object.
+     *
+     * @param string|Zend_Controller_Response_Abstract $response
+     * @throws Zend_Controller_Exception if invalid response class
+     * @return Zend_Controller_Front
+     */
+    public function setResponse($response)
+    {
+        if (is_string($response)) {
+            if (!class_exists($response)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($response);
+            }
+            $response = new $response();
+        }
+        if (!$response instanceof Zend_Controller_Response_Abstract) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Invalid response class');
+        }
+
+        $this->_response = $response;
+
+        return $this;
+    }
+
+    /**
+     * Return the response object.
+     *
+     * @return null|Zend_Controller_Response_Abstract
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Add or modify a parameter to use when instantiating an action controller
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return Zend_Controller_Front
+     */
+    public function setParam($name, $value)
+    {
+        $name = (string) $name;
+        $this->_invokeParams[$name] = $value;
+        return $this;
+    }
+
+    /**
+     * Set parameters to pass to action controller constructors
+     *
+     * @param array $params
+     * @return Zend_Controller_Front
+     */
+    public function setParams(array $params)
+    {
+        $this->_invokeParams = array_merge($this->_invokeParams, $params);
+        return $this;
+    }
+
+    /**
+     * Retrieve a single parameter from the controller parameter stack
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function getParam($name)
+    {
+        if(isset($this->_invokeParams[$name])) {
+            return $this->_invokeParams[$name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieve action controller instantiation parameters
+     *
+     * @return array
+     */
+    public function getParams()
+    {
+        return $this->_invokeParams;
+    }
+
+    /**
+     * Clear the controller parameter stack
+     *
+     * By default, clears all parameters. If a parameter name is given, clears
+     * only that parameter; if an array of parameter names is provided, clears
+     * each.
+     *
+     * @param null|string|array single key or array of keys for params to clear
+     * @return Zend_Controller_Front
+     */
+    public function clearParams($name = null)
+    {
+        if (null === $name) {
+            $this->_invokeParams = array();
+        } elseif (is_string($name) && isset($this->_invokeParams[$name])) {
+            unset($this->_invokeParams[$name]);
+        } elseif (is_array($name)) {
+            foreach ($name as $key) {
+                if (is_string($key) && isset($this->_invokeParams[$key])) {
+                    unset($this->_invokeParams[$key]);
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Register a plugin.
+     *
+     * @param  Zend_Controller_Plugin_Abstract $plugin
+     * @param  int $stackIndex Optional; stack index for plugin
+     * @return Zend_Controller_Front
+     */
+    public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIndex = null)
+    {
+        $this->_plugins->registerPlugin($plugin, $stackIndex);
+        return $this;
+    }
+
+    /**
+     * Unregister a plugin.
+     *
+     * @param  string|Zend_Controller_Plugin_Abstract $plugin Plugin class or object to unregister
+     * @return Zend_Controller_Front
+     */
+    public function unregisterPlugin($plugin)
+    {
+        $this->_plugins->unregisterPlugin($plugin);
+        return $this;
+    }
+
+    /**
+     * Is a particular plugin registered?
+     *
+     * @param  string $class
+     * @return bool
+     */
+    public function hasPlugin($class)
+    {
+        return $this->_plugins->hasPlugin($class);
+    }
+
+    /**
+     * Retrieve a plugin or plugins by class
+     *
+     * @param  string $class
+     * @return false|Zend_Controller_Plugin_Abstract|array
+     */
+    public function getPlugin($class)
+    {
+        return $this->_plugins->getPlugin($class);
+    }
+
+    /**
+     * Retrieve all plugins
+     *
+     * @return array
+     */
+    public function getPlugins()
+    {
+        return $this->_plugins->getPlugins();
+    }
+
+    /**
+     * Set the throwExceptions flag and retrieve current status
+     *
+     * Set whether exceptions encounted in the dispatch loop should be thrown
+     * or caught and trapped in the response object.
+     *
+     * Default behaviour is to trap them in the response object; call this
+     * method to have them thrown.
+     *
+     * Passing no value will return the current value of the flag; passing a
+     * boolean true or false value will set the flag and return the current
+     * object instance.
+     *
+     * @param boolean $flag Defaults to null (return flag state)
+     * @return boolean|Zend_Controller_Front Used as a setter, returns object; as a getter, returns boolean
+     */
+    public function throwExceptions($flag = null)
+    {
+        if ($flag !== null) {
+            $this->_throwExceptions = (bool) $flag;
+            return $this;
+        }
+
+        return $this->_throwExceptions;
+    }
+
+    /**
+     * Set whether {@link dispatch()} should return the response without first
+     * rendering output. By default, output is rendered and dispatch() returns
+     * nothing.
+     *
+     * @param boolean $flag
+     * @return boolean|Zend_Controller_Front Used as a setter, returns object; as a getter, returns boolean
+     */
+    public function returnResponse($flag = null)
+    {
+        if (true === $flag) {
+            $this->_returnResponse = true;
+            return $this;
+        } elseif (false === $flag) {
+            $this->_returnResponse = false;
+            return $this;
+        }
+
+        return $this->_returnResponse;
+    }
+
+    /**
+     * Dispatch an HTTP request to a controller/action.
+     *
+     * @param Zend_Controller_Request_Abstract|null $request
+     * @param Zend_Controller_Response_Abstract|null $response
+     * @return void|Zend_Controller_Response_Abstract Returns response object if returnResponse() is true
+     */
+    public function dispatch(Zend_Controller_Request_Abstract $request = null, Zend_Controller_Response_Abstract $response = null)
+    {
+        if (!$this->getParam('noErrorHandler') && !$this->_plugins->hasPlugin('Zend_Controller_Plugin_ErrorHandler')) {
+            // Register with stack index of 100
+            require_once 'Zend/Controller/Plugin/ErrorHandler.php';
+            $this->_plugins->registerPlugin(new Zend_Controller_Plugin_ErrorHandler(), 100);
+        }
+
+        if (!$this->getParam('noViewRenderer') && !Zend_Controller_Action_HelperBroker::hasHelper('viewRenderer')) {
+            require_once 'Zend/Controller/Action/Helper/ViewRenderer.php';
+            Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-80, new Zend_Controller_Action_Helper_ViewRenderer());
+        }
+
+        /**
+         * Instantiate default request object (HTTP version) if none provided
+         */
+        if (null !== $request) {
+            $this->setRequest($request);
+        } elseif ((null === $request) && (null === ($request = $this->getRequest()))) {
+            require_once 'Zend/Controller/Request/Http.php';
+            $request = new Zend_Controller_Request_Http();
+            $this->setRequest($request);
+        }
+
+        /**
+         * Set base URL of request object, if available
+         */
+        if (is_callable(array($this->_request, 'setBaseUrl'))) {
+            if (null !== $this->_baseUrl) {
+                $this->_request->setBaseUrl($this->_baseUrl);
+            }
+        }
+
+        /**
+         * Instantiate default response object (HTTP version) if none provided
+         */
+        if (null !== $response) {
+            $this->setResponse($response);
+        } elseif ((null === $this->_response) && (null === ($this->_response = $this->getResponse()))) {
+            require_once 'Zend/Controller/Response/Http.php';
+            $response = new Zend_Controller_Response_Http();
+            $this->setResponse($response);
+        }
+
+        /**
+         * Register request and response objects with plugin broker
+         */
+        $this->_plugins
+             ->setRequest($this->_request)
+             ->setResponse($this->_response);
+
+        /**
+         * Initialize router
+         */
+        $router = $this->getRouter();
+        $router->setParams($this->getParams());
+
+        /**
+         * Initialize dispatcher
+         */
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->setParams($this->getParams())
+                   ->setResponse($this->_response);
+
+        // Begin dispatch
+        try {
+            /**
+             * Route request to controller/action, if a router is provided
+             */
+
+            /**
+            * Notify plugins of router startup
+            */
+            $this->_plugins->routeStartup($this->_request);
+
+            try {
+                $router->route($this->_request);
+            }  catch (Exception $e) {
+                if ($this->throwExceptions()) {
+                    throw $e;
+                }
+
+                $this->_response->setException($e);
+            }
+
+            /**
+            * Notify plugins of router completion
+            */
+            $this->_plugins->routeShutdown($this->_request);
+
+            /**
+             * Notify plugins of dispatch loop startup
+             */
+            $this->_plugins->dispatchLoopStartup($this->_request);
+
+            /**
+             *  Attempt to dispatch the controller/action. If the $this->_request
+             *  indicates that it needs to be dispatched, move to the next
+             *  action in the request.
+             */
+            do {
+                $this->_request->setDispatched(true);
+
+                /**
+                 * Notify plugins of dispatch startup
+                 */
+                $this->_plugins->preDispatch($this->_request);
+
+                /**
+                 * Skip requested action if preDispatch() has reset it
+                 */
+                if (!$this->_request->isDispatched()) {
+                    continue;
+                }
+
+                /**
+                 * Dispatch request
+                 */
+                try {
+                    $dispatcher->dispatch($this->_request, $this->_response);
+                } catch (Exception $e) {
+                    if ($this->throwExceptions()) {
+                        throw $e;
+                    }
+                    $this->_response->setException($e);
+                }
+
+                /**
+                 * Notify plugins of dispatch completion
+                 */
+                $this->_plugins->postDispatch($this->_request);
+            } while (!$this->_request->isDispatched());
+        } catch (Exception $e) {
+            if ($this->throwExceptions()) {
+                throw $e;
+            }
+
+            $this->_response->setException($e);
+        }
+
+        /**
+         * Notify plugins of dispatch loop completion
+         */
+        try {
+            $this->_plugins->dispatchLoopShutdown();
+        } catch (Exception $e) {
+            if ($this->throwExceptions()) {
+                throw $e;
+            }
+
+            $this->_response->setException($e);
+        }
+
+        if ($this->returnResponse()) {
+            return $this->_response;
+        }
+
+        $this->_response->sendResponse();
+    }
+}
diff --git a/lib/zend/Zend/Controller/Plugin/Abstract.php b/lib/zend/Zend/Controller/Plugin/Abstract.php
new file mode 100644
index 00000000000..7e590b7eef0
--- /dev/null
+++ b/lib/zend/Zend/Controller/Plugin/Abstract.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Controller_Plugin_Abstract
+{
+    /**
+     * @var Zend_Controller_Request_Abstract
+     */
+    protected $_request;
+
+    /**
+     * @var Zend_Controller_Response_Abstract
+     */
+    protected $_response;
+
+    /**
+     * Set request object
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @return Zend_Controller_Plugin_Abstract
+     */
+    public function setRequest(Zend_Controller_Request_Abstract $request)
+    {
+        $this->_request = $request;
+        return $this;
+    }
+
+    /**
+     * Get request object
+     *
+     * @return Zend_Controller_Request_Abstract $request
+     */
+    public function getRequest()
+    {
+        return $this->_request;
+    }
+
+    /**
+     * Set response object
+     *
+     * @param Zend_Controller_Response_Abstract $response
+     * @return Zend_Controller_Plugin_Abstract
+     */
+    public function setResponse(Zend_Controller_Response_Abstract $response)
+    {
+        $this->_response = $response;
+        return $this;
+    }
+
+    /**
+     * Get response object
+     *
+     * @return Zend_Controller_Response_Abstract $response
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Called before Zend_Controller_Front begins evaluating the
+     * request against its routes.
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function routeStartup(Zend_Controller_Request_Abstract $request)
+    {}
+
+    /**
+     * Called after Zend_Controller_Router exits.
+     *
+     * Called after Zend_Controller_Front exits from the router.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function routeShutdown(Zend_Controller_Request_Abstract $request)
+    {}
+
+    /**
+     * Called before Zend_Controller_Front enters its dispatch loop.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function dispatchLoopStartup(Zend_Controller_Request_Abstract $request)
+    {}
+
+    /**
+     * Called before an action is dispatched by Zend_Controller_Dispatcher.
+     *
+     * This callback allows for proxy or filter behavior.  By altering the
+     * request and resetting its dispatched flag (via
+     * {@link Zend_Controller_Request_Abstract::setDispatched() setDispatched(false)}),
+     * the current action may be skipped.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function preDispatch(Zend_Controller_Request_Abstract $request)
+    {}
+
+    /**
+     * Called after an action is dispatched by Zend_Controller_Dispatcher.
+     *
+     * This callback allows for proxy or filter behavior. By altering the
+     * request and resetting its dispatched flag (via
+     * {@link Zend_Controller_Request_Abstract::setDispatched() setDispatched(false)}),
+     * a new action may be specified for dispatching.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function postDispatch(Zend_Controller_Request_Abstract $request)
+    {}
+
+    /**
+     * Called before Zend_Controller_Front exits its dispatch loop.
+     *
+     * @return void
+     */
+    public function dispatchLoopShutdown()
+    {}
+}
diff --git a/lib/zend/Zend/Controller/Plugin/ActionStack.php b/lib/zend/Zend/Controller/Plugin/ActionStack.php
new file mode 100644
index 00000000000..12c62de1127
--- /dev/null
+++ b/lib/zend/Zend/Controller/Plugin/ActionStack.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Plugin_Abstract */
+require_once 'Zend/Controller/Plugin/Abstract.php';
+
+/** Zend_Registry */
+require_once 'Zend/Registry.php';
+
+/**
+ * Manage a stack of actions
+ *
+ * @uses       Zend_Controller_Plugin_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
+{
+    /** @var Zend_Registry */
+    protected $_registry;
+
+    /**
+     * Registry key under which actions are stored
+     * @var string
+     */
+    protected $_registryKey = 'Zend_Controller_Plugin_ActionStack';
+
+    /**
+     * Valid keys for stack items
+     * @var array
+     */
+    protected $_validKeys = array(
+        'module',
+        'controller',
+        'action',
+        'params'
+    );
+
+    /**
+     * Flag to determine whether request parameters are cleared between actions, or whether new parameters
+     * are added to existing request parameters.
+     *
+     * @var Bool
+     */
+    protected $_clearRequestParams = false;
+
+    /**
+     * Constructor
+     *
+     * @param  Zend_Registry $registry
+     * @param  string $key
+     * @return void
+     */
+    public function __construct(Zend_Registry $registry = null, $key = null)
+    {
+        if (null === $registry) {
+            $registry = Zend_Registry::getInstance();
+        }
+        $this->setRegistry($registry);
+
+        if (null !== $key) {
+            $this->setRegistryKey($key);
+        } else {
+            $key = $this->getRegistryKey();
+        }
+
+        $registry[$key] = array();
+    }
+
+    /**
+     * Set registry object
+     *
+     * @param  Zend_Registry $registry
+     * @return Zend_Controller_Plugin_ActionStack
+     */
+    public function setRegistry(Zend_Registry $registry)
+    {
+        $this->_registry = $registry;
+        return $this;
+    }
+
+    /**
+     * Retrieve registry object
+     *
+     * @return Zend_Registry
+     */
+    public function getRegistry()
+    {
+        return $this->_registry;
+    }
+
+    /**
+     * Retrieve registry key
+     *
+     * @return string
+     */
+    public function getRegistryKey()
+    {
+        return $this->_registryKey;
+    }
+
+    /**
+     * Set registry key
+     *
+     * @param  string $key
+     * @return Zend_Controller_Plugin_ActionStack
+     */
+    public function setRegistryKey($key)
+    {
+        $this->_registryKey = (string) $key;
+        return $this;
+    }
+
+    /**
+     *  Set clearRequestParams flag
+     *
+     *  @param  bool $clearRequestParams
+     *  @return Zend_Controller_Plugin_ActionStack
+     */
+    public function setClearRequestParams($clearRequestParams)
+    {
+        $this->_clearRequestParams = (bool) $clearRequestParams;
+        return $this;
+    }
+
+    /**
+     * Retrieve clearRequestParams flag
+     *
+     * @return bool
+     */
+    public function getClearRequestParams()
+    {
+        return $this->_clearRequestParams;
+    }
+
+    /**
+     * Retrieve action stack
+     *
+     * @return array
+     */
+    public function getStack()
+    {
+        $registry = $this->getRegistry();
+        $stack    = $registry[$this->getRegistryKey()];
+        return $stack;
+    }
+
+    /**
+     * Save stack to registry
+     *
+     * @param  array $stack
+     * @return Zend_Controller_Plugin_ActionStack
+     */
+    protected function _saveStack(array $stack)
+    {
+        $registry = $this->getRegistry();
+        $registry[$this->getRegistryKey()] = $stack;
+        return $this;
+    }
+
+    /**
+     * Push an item onto the stack
+     *
+     * @param  Zend_Controller_Request_Abstract $next
+     * @return Zend_Controller_Plugin_ActionStack
+     */
+    public function pushStack(Zend_Controller_Request_Abstract $next)
+    {
+        $stack = $this->getStack();
+        array_push($stack, $next);
+        return $this->_saveStack($stack);
+    }
+
+    /**
+     * Pop an item off the action stack
+     *
+     * @return false|Zend_Controller_Request_Abstract
+     */
+    public function popStack()
+    {
+        $stack = $this->getStack();
+        if (0 == count($stack)) {
+            return false;
+        }
+
+        $next = array_pop($stack);
+        $this->_saveStack($stack);
+
+        if (!$next instanceof Zend_Controller_Request_Abstract) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('ArrayStack should only contain request objects');
+        }
+        $action = $next->getActionName();
+        if (empty($action)) {
+            return $this->popStack($stack);
+        }
+
+        $request    = $this->getRequest();
+        $controller = $next->getControllerName();
+        if (empty($controller)) {
+            $next->setControllerName($request->getControllerName());
+        }
+
+        $module = $next->getModuleName();
+        if (empty($module)) {
+            $next->setModuleName($request->getModuleName());
+        }
+
+        return $next;
+    }
+
+    /**
+     * postDispatch() plugin hook -- check for actions in stack, and dispatch if any found
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function postDispatch(Zend_Controller_Request_Abstract $request)
+    {
+        // Don't move on to next request if this is already an attempt to
+        // forward
+        if (!$request->isDispatched()) {
+            return;
+        }
+
+        $this->setRequest($request);
+        $stack = $this->getStack();
+        if (empty($stack)) {
+            return;
+        }
+        $next = $this->popStack();
+        if (!$next) {
+            return;
+        }
+
+        $this->forward($next);
+    }
+
+    /**
+     * Forward request with next action
+     *
+     * @param  array $next
+     * @return void
+     */
+    public function forward(Zend_Controller_Request_Abstract $next)
+    {
+        $request = $this->getRequest();
+        if ($this->getClearRequestParams()) {
+            $request->clearParams();
+        }
+
+        $request->setModuleName($next->getModuleName())
+                ->setControllerName($next->getControllerName())
+                ->setActionName($next->getActionName())
+                ->setParams($next->getParams())
+                ->setDispatched(false);
+    }
+}
diff --git a/lib/zend/Zend/Controller/Plugin/Broker.php b/lib/zend/Zend/Controller/Plugin/Broker.php
new file mode 100644
index 00000000000..1214583eb30
--- /dev/null
+++ b/lib/zend/Zend/Controller/Plugin/Broker.php
@@ -0,0 +1,365 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Controller_Plugin_Abstract */
+require_once 'Zend/Controller/Plugin/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract
+{
+
+    /**
+     * Array of instance of objects extending Zend_Controller_Plugin_Abstract
+     *
+     * @var array
+     */
+    protected $_plugins = array();
+
+
+    /**
+     * Register a plugin.
+     *
+     * @param  Zend_Controller_Plugin_Abstract $plugin
+     * @param  int $stackIndex
+     * @return Zend_Controller_Plugin_Broker
+     */
+    public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIndex = null)
+    {
+        if (false !== array_search($plugin, $this->_plugins, true)) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Plugin already registered');
+        }
+
+        $stackIndex = (int) $stackIndex;
+
+        if ($stackIndex) {
+            if (isset($this->_plugins[$stackIndex])) {
+                require_once 'Zend/Controller/Exception.php';
+                throw new Zend_Controller_Exception('Plugin with stackIndex "' . $stackIndex . '" already registered');
+            }
+            $this->_plugins[$stackIndex] = $plugin;
+        } else {
+            $stackIndex = count($this->_plugins);
+            while (isset($this->_plugins[$stackIndex])) {
+                ++$stackIndex;
+            }
+            $this->_plugins[$stackIndex] = $plugin;
+        }
+
+        $request = $this->getRequest();
+        if ($request) {
+            $this->_plugins[$stackIndex]->setRequest($request);
+        }
+        $response = $this->getResponse();
+        if ($response) {
+            $this->_plugins[$stackIndex]->setResponse($response);
+        }
+
+        ksort($this->_plugins);
+
+        return $this;
+    }
+
+    /**
+     * Unregister a plugin.
+     *
+     * @param string|Zend_Controller_Plugin_Abstract $plugin Plugin object or class name
+     * @return Zend_Controller_Plugin_Broker
+     */
+    public function unregisterPlugin($plugin)
+    {
+        if ($plugin instanceof Zend_Controller_Plugin_Abstract) {
+            // Given a plugin object, find it in the array
+            $key = array_search($plugin, $this->_plugins, true);
+            if (false === $key) {
+                require_once 'Zend/Controller/Exception.php';
+                throw new Zend_Controller_Exception('Plugin never registered.');
+            }
+            unset($this->_plugins[$key]);
+        } elseif (is_string($plugin)) {
+            // Given a plugin class, find all plugins of that class and unset them
+            foreach ($this->_plugins as $key => $_plugin) {
+                $type = get_class($_plugin);
+                if ($plugin == $type) {
+                    unset($this->_plugins[$key]);
+                }
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Is a plugin of a particular class registered?
+     *
+     * @param  string $class
+     * @return bool
+     */
+    public function hasPlugin($class)
+    {
+        foreach ($this->_plugins as $plugin) {
+            $type = get_class($plugin);
+            if ($class == $type) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieve a plugin or plugins by class
+     *
+     * @param  string $class Class name of plugin(s) desired
+     * @return false|Zend_Controller_Plugin_Abstract|array Returns false if none found, plugin if only one found, and array of plugins if multiple plugins of same class found
+     */
+    public function getPlugin($class)
+    {
+        $found = array();
+        foreach ($this->_plugins as $plugin) {
+            $type = get_class($plugin);
+            if ($class == $type) {
+                $found[] = $plugin;
+            }
+        }
+
+        switch (count($found)) {
+            case 0:
+                return false;
+            case 1:
+                return $found[0];
+            default:
+                return $found;
+        }
+    }
+
+    /**
+     * Retrieve all plugins
+     *
+     * @return array
+     */
+    public function getPlugins()
+    {
+        return $this->_plugins;
+    }
+
+    /**
+     * Set request object, and register with each plugin
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @return Zend_Controller_Plugin_Broker
+     */
+    public function setRequest(Zend_Controller_Request_Abstract $request)
+    {
+        $this->_request = $request;
+
+        foreach ($this->_plugins as $plugin) {
+            $plugin->setRequest($request);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get request object
+     *
+     * @return Zend_Controller_Request_Abstract $request
+     */
+    public function getRequest()
+    {
+        return $this->_request;
+    }
+
+    /**
+     * Set response object
+     *
+     * @param Zend_Controller_Response_Abstract $response
+     * @return Zend_Controller_Plugin_Broker
+     */
+    public function setResponse(Zend_Controller_Response_Abstract $response)
+    {
+        $this->_response = $response;
+
+        foreach ($this->_plugins as $plugin) {
+            $plugin->setResponse($response);
+        }
+
+
+        return $this;
+    }
+
+    /**
+     * Get response object
+     *
+     * @return Zend_Controller_Response_Abstract $response
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+
+
+    /**
+     * Called before Zend_Controller_Front begins evaluating the
+     * request against its routes.
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function routeStartup(Zend_Controller_Request_Abstract $request)
+    {
+        foreach ($this->_plugins as $plugin) {
+            try {
+                $plugin->routeStartup($request);
+            } catch (Exception $e) {
+                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
+                    throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e);
+                } else {
+                    $this->getResponse()->setException($e);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Called before Zend_Controller_Front exits its iterations over
+     * the route set.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function routeShutdown(Zend_Controller_Request_Abstract $request)
+    {
+        foreach ($this->_plugins as $plugin) {
+            try {
+                $plugin->routeShutdown($request);
+            } catch (Exception $e) {
+                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
+                    throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e);
+                } else {
+                    $this->getResponse()->setException($e);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Called before Zend_Controller_Front enters its dispatch loop.
+     *
+     * During the dispatch loop, Zend_Controller_Front keeps a
+     * Zend_Controller_Request_Abstract object, and uses
+     * Zend_Controller_Dispatcher to dispatch the
+     * Zend_Controller_Request_Abstract object to controllers/actions.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function dispatchLoopStartup(Zend_Controller_Request_Abstract $request)
+    {
+        foreach ($this->_plugins as $plugin) {
+            try {
+                $plugin->dispatchLoopStartup($request);
+            } catch (Exception $e) {
+                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
+                    throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e);
+                } else {
+                    $this->getResponse()->setException($e);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Called before an action is dispatched by Zend_Controller_Dispatcher.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function preDispatch(Zend_Controller_Request_Abstract $request)
+    {
+        foreach ($this->_plugins as $plugin) {
+            try {
+                $plugin->preDispatch($request);
+            } catch (Exception $e) {
+                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
+                    throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e);
+                } else {
+                    $this->getResponse()->setException($e);
+					// skip rendering of normal dispatch give the error handler a try
+					$this->getRequest()->setDispatched(false);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Called after an action is dispatched by Zend_Controller_Dispatcher.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function postDispatch(Zend_Controller_Request_Abstract $request)
+    {
+        foreach ($this->_plugins as $plugin) {
+            try {
+                $plugin->postDispatch($request);
+            } catch (Exception $e) {
+                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
+                    throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e);
+                } else {
+                    $this->getResponse()->setException($e);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Called before Zend_Controller_Front exits its dispatch loop.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function dispatchLoopShutdown()
+    {
+       foreach ($this->_plugins as $plugin) {
+           try {
+                $plugin->dispatchLoopShutdown();
+            } catch (Exception $e) {
+                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
+                    throw new Zend_Controller_Exception($e->getMessage() . $e->getTraceAsString(), $e->getCode(), $e);
+                } else {
+                    $this->getResponse()->setException($e);
+                }
+            }
+       }
+    }
+}
diff --git a/lib/zend/Zend/Controller/Plugin/ErrorHandler.php b/lib/zend/Zend/Controller/Plugin/ErrorHandler.php
new file mode 100644
index 00000000000..42da1633c64
--- /dev/null
+++ b/lib/zend/Zend/Controller/Plugin/ErrorHandler.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Plugin_Abstract */
+require_once 'Zend/Controller/Plugin/Abstract.php';
+
+/**
+ * Handle exceptions that bubble up based on missing controllers, actions, or
+ * application errors, and forward to an error handler.
+ *
+ * @uses       Zend_Controller_Plugin_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Controller_Plugin_ErrorHandler extends Zend_Controller_Plugin_Abstract
+{
+    /**
+     * Const - No controller exception; controller does not exist
+     */
+    const EXCEPTION_NO_CONTROLLER = 'EXCEPTION_NO_CONTROLLER';
+
+    /**
+     * Const - No action exception; controller exists, but action does not
+     */
+    const EXCEPTION_NO_ACTION = 'EXCEPTION_NO_ACTION';
+
+    /**
+     * Const - No route exception; no routing was possible
+     */
+    const EXCEPTION_NO_ROUTE = 'EXCEPTION_NO_ROUTE';
+
+    /**
+     * Const - Other Exception; exceptions thrown by application controllers
+     */
+    const EXCEPTION_OTHER = 'EXCEPTION_OTHER';
+
+    /**
+     * Module to use for errors; defaults to default module in dispatcher
+     * @var string
+     */
+    protected $_errorModule;
+
+    /**
+     * Controller to use for errors; defaults to 'error'
+     * @var string
+     */
+    protected $_errorController = 'error';
+
+    /**
+     * Action to use for errors; defaults to 'error'
+     * @var string
+     */
+    protected $_errorAction = 'error';
+
+    /**
+     * Flag; are we already inside the error handler loop?
+     * @var bool
+     */
+    protected $_isInsideErrorHandlerLoop = false;
+
+    /**
+     * Exception count logged at first invocation of plugin
+     * @var int
+     */
+    protected $_exceptionCountAtFirstEncounter = 0;
+
+    /**
+     * Constructor
+     *
+     * Options may include:
+     * - module
+     * - controller
+     * - action
+     *
+     * @param  Array $options
+     * @return void
+     */
+    public function __construct(Array $options = array())
+    {
+        $this->setErrorHandler($options);
+    }
+
+    /**
+     * setErrorHandler() - setup the error handling options
+     *
+     * @param  array $options
+     * @return Zend_Controller_Plugin_ErrorHandler
+     */
+    public function setErrorHandler(Array $options = array())
+    {
+        if (isset($options['module'])) {
+            $this->setErrorHandlerModule($options['module']);
+        }
+        if (isset($options['controller'])) {
+            $this->setErrorHandlerController($options['controller']);
+        }
+        if (isset($options['action'])) {
+            $this->setErrorHandlerAction($options['action']);
+        }
+        return $this;
+    }
+
+    /**
+     * Set the module name for the error handler
+     *
+     * @param  string $module
+     * @return Zend_Controller_Plugin_ErrorHandler
+     */
+    public function setErrorHandlerModule($module)
+    {
+        $this->_errorModule = (string) $module;
+        return $this;
+    }
+
+    /**
+     * Retrieve the current error handler module
+     *
+     * @return string
+     */
+    public function getErrorHandlerModule()
+    {
+        if (null === $this->_errorModule) {
+            $this->_errorModule = Zend_Controller_Front::getInstance()->getDispatcher()->getDefaultModule();
+        }
+        return $this->_errorModule;
+    }
+
+    /**
+     * Set the controller name for the error handler
+     *
+     * @param  string $controller
+     * @return Zend_Controller_Plugin_ErrorHandler
+     */
+    public function setErrorHandlerController($controller)
+    {
+        $this->_errorController = (string) $controller;
+        return $this;
+    }
+
+    /**
+     * Retrieve the current error handler controller
+     *
+     * @return string
+     */
+    public function getErrorHandlerController()
+    {
+        return $this->_errorController;
+    }
+
+    /**
+     * Set the action name for the error handler
+     *
+     * @param  string $action
+     * @return Zend_Controller_Plugin_ErrorHandler
+     */
+    public function setErrorHandlerAction($action)
+    {
+        $this->_errorAction = (string) $action;
+        return $this;
+    }
+
+    /**
+     * Retrieve the current error handler action
+     *
+     * @return string
+     */
+    public function getErrorHandlerAction()
+    {
+        return $this->_errorAction;
+    }
+
+    /**
+     * Route shutdown hook -- Ccheck for router exceptions
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     */
+    public function routeShutdown(Zend_Controller_Request_Abstract $request)
+    {
+        $this->_handleError($request);
+    }
+
+    /**
+     * Pre dispatch hook -- check for exceptions and dispatch error handler if
+     * necessary
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     */
+    public function preDispatch(Zend_Controller_Request_Abstract $request)
+    {
+        $this->_handleError($request);
+    }
+	
+    /**
+     * Post dispatch hook -- check for exceptions and dispatch error handler if
+     * necessary
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     */
+    public function postDispatch(Zend_Controller_Request_Abstract $request)
+    {
+        $this->_handleError($request);
+    }
+
+    /**
+     * Handle errors and exceptions
+     *
+     * If the 'noErrorHandler' front controller flag has been set,
+     * returns early.
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    protected function _handleError(Zend_Controller_Request_Abstract $request)
+    {
+        $frontController = Zend_Controller_Front::getInstance();
+        if ($frontController->getParam('noErrorHandler')) {
+            return;
+        }
+
+        $response = $this->getResponse();
+
+        if ($this->_isInsideErrorHandlerLoop) {
+            $exceptions = $response->getException();
+            if (count($exceptions) > $this->_exceptionCountAtFirstEncounter) {
+                // Exception thrown by error handler; tell the front controller to throw it
+                $frontController->throwExceptions(true);
+                throw array_pop($exceptions);
+            }
+        }
+
+        // check for an exception AND allow the error handler controller the option to forward
+        if (($response->isException()) && (!$this->_isInsideErrorHandlerLoop)) {
+            $this->_isInsideErrorHandlerLoop = true;
+
+            // Get exception information
+            $error            = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
+            $exceptions       = $response->getException();
+            $exception        = $exceptions[0];
+            $exceptionType    = get_class($exception);
+            $error->exception = $exception;
+            switch ($exceptionType) {
+                case 'Zend_Controller_Router_Exception':
+                    if (404 == $exception->getCode()) {
+                        $error->type = self::EXCEPTION_NO_ROUTE;
+                    } else {
+                        $error->type = self::EXCEPTION_OTHER;
+                    }
+                    break;
+                case 'Zend_Controller_Dispatcher_Exception':
+                    $error->type = self::EXCEPTION_NO_CONTROLLER;
+                    break;
+                case 'Zend_Controller_Action_Exception':
+                    if (404 == $exception->getCode()) {
+                        $error->type = self::EXCEPTION_NO_ACTION;
+                    } else {
+                        $error->type = self::EXCEPTION_OTHER;
+                    }
+                    break;
+                default:
+                    $error->type = self::EXCEPTION_OTHER;
+                    break;
+            }
+
+            // Keep a copy of the original request
+            $error->request = clone $request;
+
+            // get a count of the number of exceptions encountered
+            $this->_exceptionCountAtFirstEncounter = count($exceptions);
+
+            // Forward to the error handler
+            $request->setParam('error_handler', $error)
+                    ->setModuleName($this->getErrorHandlerModule())
+                    ->setControllerName($this->getErrorHandlerController())
+                    ->setActionName($this->getErrorHandlerAction())
+                    ->setDispatched(false);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Controller/Plugin/PutHandler.php b/lib/zend/Zend/Controller/Plugin/PutHandler.php
new file mode 100644
index 00000000000..3b5f57b9102
--- /dev/null
+++ b/lib/zend/Zend/Controller/Plugin/PutHandler.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Plugin
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Plugin_Abstract
+ */
+require_once 'Zend/Controller/Plugin/Abstract.php';
+
+/**
+ * @see Zend_Controller_Request_Http
+ */
+require_once 'Zend/Controller/Request/Http.php';
+
+/**
+ * Plugin to digest PUT request body and make params available just like POST
+ *
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Plugin
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Plugin_PutHandler extends Zend_Controller_Plugin_Abstract
+{
+    /**
+     * Before dispatching, digest PUT request body and set params
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     */
+    public function preDispatch(Zend_Controller_Request_Abstract $request)
+    {
+        if (!$request instanceof Zend_Controller_Request_Http) {
+            return;
+        }
+
+        if ($this->_request->isPut()) {
+            $putParams = array();
+            parse_str($this->_request->getRawBody(), $putParams);
+            $request->setParams($putParams);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Controller/Request/Abstract.php b/lib/zend/Zend/Controller/Request/Abstract.php
new file mode 100644
index 00000000000..d57238f46be
--- /dev/null
+++ b/lib/zend/Zend/Controller/Request/Abstract.php
@@ -0,0 +1,356 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Controller_Request_Abstract
+{
+    /**
+     * Has the action been dispatched?
+     * @var boolean
+     */
+    protected $_dispatched = false;
+
+    /**
+     * Module
+     * @var string
+     */
+    protected $_module;
+
+    /**
+     * Module key for retrieving module from params
+     * @var string
+     */
+    protected $_moduleKey = 'module';
+
+    /**
+     * Controller
+     * @var string
+     */
+    protected $_controller;
+
+    /**
+     * Controller key for retrieving controller from params
+     * @var string
+     */
+    protected $_controllerKey = 'controller';
+
+    /**
+     * Action
+     * @var string
+     */
+    protected $_action;
+
+    /**
+     * Action key for retrieving action from params
+     * @var string
+     */
+    protected $_actionKey = 'action';
+
+    /**
+     * Request parameters
+     * @var array
+     */
+    protected $_params = array();
+
+    /**
+     * Retrieve the module name
+     *
+     * @return string
+     */
+    public function getModuleName()
+    {
+        if (null === $this->_module) {
+            $this->_module = $this->getParam($this->getModuleKey());
+        }
+
+        return $this->_module;
+    }
+
+    /**
+     * Set the module name to use
+     *
+     * @param string $value
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function setModuleName($value)
+    {
+        $this->_module = $value;
+        return $this;
+    }
+
+    /**
+     * Retrieve the controller name
+     *
+     * @return string
+     */
+    public function getControllerName()
+    {
+        if (null === $this->_controller) {
+            $this->_controller = $this->getParam($this->getControllerKey());
+        }
+
+        return $this->_controller;
+    }
+
+    /**
+     * Set the controller name to use
+     *
+     * @param string $value
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function setControllerName($value)
+    {
+        $this->_controller = $value;
+        return $this;
+    }
+
+    /**
+     * Retrieve the action name
+     *
+     * @return string
+     */
+    public function getActionName()
+    {
+        if (null === $this->_action) {
+            $this->_action = $this->getParam($this->getActionKey());
+        }
+
+        return $this->_action;
+    }
+
+    /**
+     * Set the action name
+     *
+     * @param string $value
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function setActionName($value)
+    {
+        $this->_action = $value;
+        /**
+         * @see ZF-3465
+         */
+        if (null === $value) {
+            $this->setParam($this->getActionKey(), $value);
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve the module key
+     *
+     * @return string
+     */
+    public function getModuleKey()
+    {
+        return $this->_moduleKey;
+    }
+
+    /**
+     * Set the module key
+     *
+     * @param string $key
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function setModuleKey($key)
+    {
+        $this->_moduleKey = (string) $key;
+        return $this;
+    }
+
+    /**
+     * Retrieve the controller key
+     *
+     * @return string
+     */
+    public function getControllerKey()
+    {
+        return $this->_controllerKey;
+    }
+
+    /**
+     * Set the controller key
+     *
+     * @param string $key
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function setControllerKey($key)
+    {
+        $this->_controllerKey = (string) $key;
+        return $this;
+    }
+
+    /**
+     * Retrieve the action key
+     *
+     * @return string
+     */
+    public function getActionKey()
+    {
+        return $this->_actionKey;
+    }
+
+    /**
+     * Set the action key
+     *
+     * @param string $key
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function setActionKey($key)
+    {
+        $this->_actionKey = (string) $key;
+        return $this;
+    }
+
+    /**
+     * Get an action parameter
+     *
+     * @param string $key
+     * @param mixed $default Default value to use if key not found
+     * @return mixed
+     */
+    public function getParam($key, $default = null)
+    {
+        $key = (string) $key;
+        if (isset($this->_params[$key])) {
+            return $this->_params[$key];
+        }
+
+        return $default;
+    }
+
+    /**
+     * Retrieve only user params (i.e, any param specific to the object and not the environment)
+     *
+     * @return array
+     */
+    public function getUserParams()
+    {
+        return $this->_params;
+    }
+
+    /**
+     * Retrieve a single user param (i.e, a param specific to the object and not the environment)
+     *
+     * @param string $key
+     * @param string $default Default value to use if key not found
+     * @return mixed
+     */
+    public function getUserParam($key, $default = null)
+    {
+        if (isset($this->_params[$key])) {
+            return $this->_params[$key];
+        }
+
+        return $default;
+    }
+
+    /**
+     * Set an action parameter
+     *
+     * A $value of null will unset the $key if it exists
+     *
+     * @param string $key
+     * @param mixed $value
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function setParam($key, $value)
+    {
+        $key = (string) $key;
+
+        if ((null === $value) && isset($this->_params[$key])) {
+            unset($this->_params[$key]);
+        } elseif (null !== $value) {
+            $this->_params[$key] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get all action parameters
+     *
+     * @return array
+     */
+     public function getParams()
+     {
+         return $this->_params;
+     }
+
+    /**
+     * Set action parameters en masse; does not overwrite
+     *
+     * Null values will unset the associated key.
+     *
+     * @param array $array
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function setParams(array $array)
+    {
+        $this->_params = $this->_params + (array) $array;
+
+        foreach ($array as $key => $value) {
+            if (null === $value) {
+                unset($this->_params[$key]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Unset all user parameters
+     *
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function clearParams()
+    {
+        $this->_params = array();
+        return $this;
+    }
+
+    /**
+     * Set flag indicating whether or not request has been dispatched
+     *
+     * @param boolean $flag
+     * @return Zend_Controller_Request_Abstract
+     */
+    public function setDispatched($flag = true)
+    {
+        $this->_dispatched = $flag ? true : false;
+        return $this;
+    }
+
+    /**
+     * Determine if the request has been dispatched
+     *
+     * @return boolean
+     */
+    public function isDispatched()
+    {
+        return $this->_dispatched;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Request/Apache404.php b/lib/zend/Zend/Controller/Request/Apache404.php
new file mode 100644
index 00000000000..3c4dd7ac487
--- /dev/null
+++ b/lib/zend/Zend/Controller/Request/Apache404.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Controller_Request_Http */
+require_once 'Zend/Controller/Request/Http.php';
+
+/** Zend_Uri */
+require_once 'Zend/Uri.php';
+
+/**
+ * Zend_Controller_Request_Apache404
+ *
+ * HTTP request object for use with Zend_Controller family. Extends basic HTTP
+ * request object to allow for two edge cases when using Apache:
+ * - Using Apache's 404 handler instead of mod_rewrite to direct requests
+ * - Using the PT flag in rewrite rules
+ *
+ * In each case, the URL to check against is found in REDIRECT_URL, not
+ * REQUEST_URI.
+ *
+ * @uses       Zend_Controller_Request_Http
+ * @package    Zend_Controller
+ * @subpackage Request
+ */
+class Zend_Controller_Request_Apache404 extends Zend_Controller_Request_Http
+{
+    public function setRequestUri($requestUri = null)
+    {
+        $parseUriGetVars = false;
+        if ($requestUri === null) {
+            if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
+                $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
+            } elseif (isset($_SERVER['REDIRECT_URL'])) {  // Check if using mod_rewrite
+                $requestUri = $_SERVER['REDIRECT_URL'];
+                if (isset($_SERVER['REDIRECT_QUERY_STRING'])) {
+                    $parseUriGetVars = $_SERVER['REDIRECT_QUERY_STRING'];
+                }
+            } elseif (isset($_SERVER['REQUEST_URI'])) {
+                $requestUri = $_SERVER['REQUEST_URI'];
+            } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0, PHP as CGI
+                $requestUri = $_SERVER['ORIG_PATH_INFO'];
+                if (!empty($_SERVER['QUERY_STRING'])) {
+                    $requestUri .= '?' . $_SERVER['QUERY_STRING'];
+                }
+            } else {
+                return $this;
+            }
+        } elseif (!is_string($requestUri)) {
+            return $this;
+        } else {
+            if (false !== ($pos = strpos($requestUri, '?'))) {
+                $parseUriGetVars = substr($requestUri, $pos + 1);
+            }
+        }
+
+        if ($parseUriGetVars) {
+            // Set GET items, if available
+            parse_str($parseUriGetVars, $_GET);
+        }
+
+        $this->_requestUri = $requestUri;
+        return $this;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Request/Exception.php b/lib/zend/Zend/Controller/Request/Exception.php
new file mode 100644
index 00000000000..a7e3629fdab
--- /dev/null
+++ b/lib/zend/Zend/Controller/Request/Exception.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Request
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** Zend_Controller_Exception */
+require_once 'Zend/Controller/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Request
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Request_Exception extends Zend_Controller_Exception
+{}
+
diff --git a/lib/zend/Zend/Controller/Request/Http.php b/lib/zend/Zend/Controller/Request/Http.php
new file mode 100644
index 00000000000..e997774905e
--- /dev/null
+++ b/lib/zend/Zend/Controller/Request/Http.php
@@ -0,0 +1,1094 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** @see Zend_Controller_Request_Abstract */
+require_once 'Zend/Controller/Request/Abstract.php';
+
+/** @see Zend_Uri */
+require_once 'Zend/Uri.php';
+
+/**
+ * Zend_Controller_Request_Http
+ *
+ * HTTP request object for use with Zend_Controller family.
+ *
+ * @uses Zend_Controller_Request_Abstract
+ * @package Zend_Controller
+ * @subpackage Request
+ */
+class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
+{
+    /**
+     * Scheme for http
+     *
+     */
+    const SCHEME_HTTP  = 'http';
+
+    /**
+     * Scheme for https
+     *
+     */
+    const SCHEME_HTTPS = 'https';
+
+    /**
+     * Allowed parameter sources
+     * @var array
+     */
+    protected $_paramSources = array('_GET', '_POST');
+
+    /**
+     * REQUEST_URI
+     * @var string;
+     */
+    protected $_requestUri;
+
+    /**
+     * Base URL of request
+     * @var string
+     */
+    protected $_baseUrl = null;
+
+    /**
+     * Base path of request
+     * @var string
+     */
+    protected $_basePath = null;
+
+    /**
+     * PATH_INFO
+     * @var string
+     */
+    protected $_pathInfo = '';
+
+    /**
+     * Instance parameters
+     * @var array
+     */
+    protected $_params = array();
+
+    /**
+     * Raw request body
+     * @var string|false
+     */
+    protected $_rawBody;
+
+    /**
+     * Alias keys for request parameters
+     * @var array
+     */
+    protected $_aliases = array();
+
+    /**
+     * Constructor
+     *
+     * If a $uri is passed, the object will attempt to populate itself using
+     * that information.
+     *
+     * @param string|Zend_Uri $uri
+     * @return void
+     * @throws Zend_Controller_Request_Exception when invalid URI passed
+     */
+    public function __construct($uri = null)
+    {
+        if (null !== $uri) {
+            if (!$uri instanceof Zend_Uri) {
+                $uri = Zend_Uri::factory($uri);
+            }
+            if ($uri->valid()) {
+                $path  = $uri->getPath();
+                $query = $uri->getQuery();
+                if (!empty($query)) {
+                    $path .= '?' . $query;
+                }
+
+                $this->setRequestUri($path);
+            } else {
+                require_once 'Zend/Controller/Request/Exception.php';
+                throw new Zend_Controller_Request_Exception('Invalid URI provided to constructor');
+            }
+        } else {
+            $this->setRequestUri();
+        }
+    }
+
+    /**
+     * Access values contained in the superglobals as public members
+     * Order of precedence: 1. GET, 2. POST, 3. COOKIE, 4. SERVER, 5. ENV
+     *
+     * @see http://msdn.microsoft.com/en-us/library/system.web.httprequest.item.aspx
+     * @param string $key
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        switch (true) {
+            case isset($this->_params[$key]):
+                return $this->_params[$key];
+            case isset($_GET[$key]):
+                return $_GET[$key];
+            case isset($_POST[$key]):
+                return $_POST[$key];
+            case isset($_COOKIE[$key]):
+                return $_COOKIE[$key];
+            case ($key == 'REQUEST_URI'):
+                return $this->getRequestUri();
+            case ($key == 'PATH_INFO'):
+                return $this->getPathInfo();
+            case isset($_SERVER[$key]):
+                return $_SERVER[$key];
+            case isset($_ENV[$key]):
+                return $_ENV[$key];
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * Alias to __get
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function get($key)
+    {
+        return $this->__get($key);
+    }
+
+    /**
+     * Set values
+     *
+     * In order to follow {@link __get()}, which operates on a number of
+     * superglobals, setting values through overloading is not allowed and will
+     * raise an exception. Use setParam() instead.
+     *
+     * @param string $key
+     * @param mixed $value
+     * @return void
+     * @throws Zend_Controller_Request_Exception
+     */
+    public function __set($key, $value)
+    {
+        require_once 'Zend/Controller/Request/Exception.php';
+        throw new Zend_Controller_Request_Exception('Setting values in superglobals not allowed; please use setParam()');
+    }
+
+    /**
+     * Alias to __set()
+     *
+     * @param string $key
+     * @param mixed $value
+     * @return void
+     */
+    public function set($key, $value)
+    {
+        return $this->__set($key, $value);
+    }
+
+    /**
+     * Check to see if a property is set
+     *
+     * @param string $key
+     * @return boolean
+     */
+    public function __isset($key)
+    {
+        switch (true) {
+            case isset($this->_params[$key]):
+                return true;
+            case isset($_GET[$key]):
+                return true;
+            case isset($_POST[$key]):
+                return true;
+            case isset($_COOKIE[$key]):
+                return true;
+            case isset($_SERVER[$key]):
+                return true;
+            case isset($_ENV[$key]):
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Alias to __isset()
+     *
+     * @param string $key
+     * @return boolean
+     */
+    public function has($key)
+    {
+        return $this->__isset($key);
+    }
+
+    /**
+     * Set GET values
+     *
+     * @param  string|array $spec
+     * @param  null|mixed $value
+     * @return Zend_Controller_Request_Http
+     */
+    public function setQuery($spec, $value = null)
+    {
+        if ((null === $value) && !is_array($spec)) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Invalid value passed to setQuery(); must be either array of values or key/value pair');
+        }
+        if ((null === $value) && is_array($spec)) {
+            foreach ($spec as $key => $value) {
+                $this->setQuery($key, $value);
+            }
+            return $this;
+        }
+        $_GET[(string) $spec] = $value;
+        return $this;
+    }
+
+    /**
+     * Retrieve a member of the $_GET superglobal
+     *
+     * If no $key is passed, returns the entire $_GET array.
+     *
+     * @todo How to retrieve from nested arrays
+     * @param string $key
+     * @param mixed $default Default value to use if key not found
+     * @return mixed Returns null if key does not exist
+     */
+    public function getQuery($key = null, $default = null)
+    {
+        if (null === $key) {
+            return $_GET;
+        }
+
+        return (isset($_GET[$key])) ? $_GET[$key] : $default;
+    }
+
+    /**
+     * Set POST values
+     *
+     * @param  string|array $spec
+     * @param  null|mixed $value
+     * @return Zend_Controller_Request_Http
+     */
+    public function setPost($spec, $value = null)
+    {
+        if ((null === $value) && !is_array($spec)) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Invalid value passed to setPost(); must be either array of values or key/value pair');
+        }
+        if ((null === $value) && is_array($spec)) {
+            foreach ($spec as $key => $value) {
+                $this->setPost($key, $value);
+            }
+            return $this;
+        }
+        $_POST[(string) $spec] = $value;
+        return $this;
+    }
+
+    /**
+     * Retrieve a member of the $_POST superglobal
+     *
+     * If no $key is passed, returns the entire $_POST array.
+     *
+     * @todo How to retrieve from nested arrays
+     * @param string $key
+     * @param mixed $default Default value to use if key not found
+     * @return mixed Returns null if key does not exist
+     */
+    public function getPost($key = null, $default = null)
+    {
+        if (null === $key) {
+            return $_POST;
+        }
+
+        return (isset($_POST[$key])) ? $_POST[$key] : $default;
+    }
+
+    /**
+     * Retrieve a member of the $_COOKIE superglobal
+     *
+     * If no $key is passed, returns the entire $_COOKIE array.
+     *
+     * @todo How to retrieve from nested arrays
+     * @param string $key
+     * @param mixed $default Default value to use if key not found
+     * @return mixed Returns null if key does not exist
+     */
+    public function getCookie($key = null, $default = null)
+    {
+        if (null === $key) {
+            return $_COOKIE;
+        }
+
+        return (isset($_COOKIE[$key])) ? $_COOKIE[$key] : $default;
+    }
+
+    /**
+     * Retrieve a member of the $_SERVER superglobal
+     *
+     * If no $key is passed, returns the entire $_SERVER array.
+     *
+     * @param string $key
+     * @param mixed $default Default value to use if key not found
+     * @return mixed Returns null if key does not exist
+     */
+    public function getServer($key = null, $default = null)
+    {
+        if (null === $key) {
+            return $_SERVER;
+        }
+
+        return (isset($_SERVER[$key])) ? $_SERVER[$key] : $default;
+    }
+
+    /**
+     * Retrieve a member of the $_ENV superglobal
+     *
+     * If no $key is passed, returns the entire $_ENV array.
+     *
+     * @param string $key
+     * @param mixed $default Default value to use if key not found
+     * @return mixed Returns null if key does not exist
+     */
+    public function getEnv($key = null, $default = null)
+    {
+        if (null === $key) {
+            return $_ENV;
+        }
+
+        return (isset($_ENV[$key])) ? $_ENV[$key] : $default;
+    }
+
+    /**
+     * Set the REQUEST_URI on which the instance operates
+     *
+     * If no request URI is passed, uses the value in $_SERVER['REQUEST_URI'],
+     * $_SERVER['HTTP_X_REWRITE_URL'], or $_SERVER['ORIG_PATH_INFO'] + $_SERVER['QUERY_STRING'].
+     *
+     * @param string $requestUri
+     * @return Zend_Controller_Request_Http
+     */
+    public function setRequestUri($requestUri = null)
+    {
+        if ($requestUri === null) {
+            if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { 
+                // IIS with Microsoft Rewrite Module
+                $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL'];
+            } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { 
+                // IIS with ISAPI_Rewrite
+                $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
+            } elseif (
+                // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem)
+                isset($_SERVER['IIS_WasUrlRewritten'])
+                && $_SERVER['IIS_WasUrlRewritten'] == '1'
+                && isset($_SERVER['UNENCODED_URL'])
+                && $_SERVER['UNENCODED_URL'] != ''
+                ) {
+                $requestUri = $_SERVER['UNENCODED_URL'];
+            } elseif (isset($_SERVER['REQUEST_URI'])) {
+                $requestUri = $_SERVER['REQUEST_URI'];
+                // Http proxy reqs setup request uri with scheme and host [and port] + the url path, only use url path
+                $schemeAndHttpHost = $this->getScheme() . '://' . $this->getHttpHost();
+                if (strpos($requestUri, $schemeAndHttpHost) === 0) {
+                    $requestUri = substr($requestUri, strlen($schemeAndHttpHost));
+                }
+            } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0, PHP as CGI
+                $requestUri = $_SERVER['ORIG_PATH_INFO'];
+                if (!empty($_SERVER['QUERY_STRING'])) {
+                    $requestUri .= '?' . $_SERVER['QUERY_STRING'];
+                }
+            } else {
+                return $this;
+            }
+        } elseif (!is_string($requestUri)) {
+            return $this;
+        } else {
+            // Set GET items, if available
+            if (false !== ($pos = strpos($requestUri, '?'))) {
+                // Get key => value pairs and set $_GET
+                $query = substr($requestUri, $pos + 1);
+                parse_str($query, $vars);
+                $this->setQuery($vars);
+            }
+        }
+
+        $this->_requestUri = $requestUri;
+        return $this;
+    }
+
+    /**
+     * Returns the REQUEST_URI taking into account
+     * platform differences between Apache and IIS
+     *
+     * @return string
+     */
+    public function getRequestUri()
+    {
+        if (empty($this->_requestUri)) {
+            $this->setRequestUri();
+        }
+
+        return $this->_requestUri;
+    }
+
+    /**
+     * Set the base URL of the request; i.e., the segment leading to the script name
+     *
+     * E.g.:
+     * - /admin
+     * - /myapp
+     * - /subdir/index.php
+     *
+     * Do not use the full URI when providing the base. The following are
+     * examples of what not to use:
+     * - http://example.com/admin (should be just /admin)
+     * - http://example.com/subdir/index.php (should be just /subdir/index.php)
+     *
+     * If no $baseUrl is provided, attempts to determine the base URL from the
+     * environment, using SCRIPT_FILENAME, SCRIPT_NAME, PHP_SELF, and
+     * ORIG_SCRIPT_NAME in its determination.
+     *
+     * @param mixed $baseUrl
+     * @return Zend_Controller_Request_Http
+     */
+    public function setBaseUrl($baseUrl = null)
+    {
+        if ((null !== $baseUrl) && !is_string($baseUrl)) {
+            return $this;
+        }
+
+        if ($baseUrl === null) {
+            $filename = (isset($_SERVER['SCRIPT_FILENAME'])) ? basename($_SERVER['SCRIPT_FILENAME']) : '';
+
+            if (isset($_SERVER['SCRIPT_NAME']) && basename($_SERVER['SCRIPT_NAME']) === $filename) {
+                $baseUrl = $_SERVER['SCRIPT_NAME'];
+            } elseif (isset($_SERVER['PHP_SELF']) && basename($_SERVER['PHP_SELF']) === $filename) {
+                $baseUrl = $_SERVER['PHP_SELF'];
+            } elseif (isset($_SERVER['ORIG_SCRIPT_NAME']) && basename($_SERVER['ORIG_SCRIPT_NAME']) === $filename) {
+                $baseUrl = $_SERVER['ORIG_SCRIPT_NAME']; // 1and1 shared hosting compatibility
+            } else {
+                // Backtrack up the script_filename to find the portion matching
+                // php_self
+                $path    = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : '';
+                $file    = isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : '';
+                $segs    = explode('/', trim($file, '/'));
+                $segs    = array_reverse($segs);
+                $index   = 0;
+                $last    = count($segs);
+                $baseUrl = '';
+                do {
+                    $seg     = $segs[$index];
+                    $baseUrl = '/' . $seg . $baseUrl;
+                    ++$index;
+                } while (($last > $index) && (false !== ($pos = strpos($path, $baseUrl))) && (0 != $pos));
+            }
+
+            // Does the baseUrl have anything in common with the request_uri?
+            $requestUri = $this->getRequestUri();
+
+            if (0 === strpos($requestUri, $baseUrl)) {
+                // full $baseUrl matches
+                $this->_baseUrl = $baseUrl;
+                return $this;
+            }
+
+            if (0 === strpos($requestUri, dirname($baseUrl))) {
+                // directory portion of $baseUrl matches
+                $this->_baseUrl = rtrim(dirname($baseUrl), '/');
+                return $this;
+            }
+
+            $truncatedRequestUri = $requestUri;
+            if (($pos = strpos($requestUri, '?')) !== false) {
+                $truncatedRequestUri = substr($requestUri, 0, $pos);
+            }
+
+            $basename = basename($baseUrl);
+            if (empty($basename) || !strpos($truncatedRequestUri, $basename)) {
+                // no match whatsoever; set it blank
+                $this->_baseUrl = '';
+                return $this;
+            }
+
+            // If using mod_rewrite or ISAPI_Rewrite strip the script filename
+            // out of baseUrl. $pos !== 0 makes sure it is not matching a value
+            // from PATH_INFO or QUERY_STRING
+            if ((strlen($requestUri) >= strlen($baseUrl))
+                && ((false !== ($pos = strpos($requestUri, $baseUrl))) && ($pos !== 0)))
+            {
+                $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
+            }
+        }
+
+        $this->_baseUrl = rtrim($baseUrl, '/');
+        return $this;
+    }
+
+    /**
+     * Everything in REQUEST_URI before PATH_INFO
+     * <form action="<?=$baseUrl?>/news/submit" method="POST"/>
+     *
+     * @return string
+     */
+    public function getBaseUrl($raw = false)
+    {
+        if (null === $this->_baseUrl) {
+            $this->setBaseUrl();
+        }
+
+        return (($raw == false) ? urldecode($this->_baseUrl) : $this->_baseUrl);
+    }
+
+    /**
+     * Set the base path for the URL
+     *
+     * @param string|null $basePath
+     * @return Zend_Controller_Request_Http
+     */
+    public function setBasePath($basePath = null)
+    {
+        if ($basePath === null) {
+            $filename = (isset($_SERVER['SCRIPT_FILENAME']))
+                      ? basename($_SERVER['SCRIPT_FILENAME'])
+                      : '';
+
+            $baseUrl = $this->getBaseUrl();
+            if (empty($baseUrl)) {
+                $this->_basePath = '';
+                return $this;
+            }
+
+            if (basename($baseUrl) === $filename) {
+                $basePath = dirname($baseUrl);
+            } else {
+                $basePath = $baseUrl;
+            }
+        }
+
+        if (substr(PHP_OS, 0, 3) === 'WIN') {
+            $basePath = str_replace('\\', '/', $basePath);
+        }
+
+        $this->_basePath = rtrim($basePath, '/');
+        return $this;
+    }
+
+    /**
+     * Everything in REQUEST_URI before PATH_INFO not including the filename
+     * <img src="<?=$basePath?>/images/zend.png"/>
+     *
+     * @return string
+     */
+    public function getBasePath()
+    {
+        if (null === $this->_basePath) {
+            $this->setBasePath();
+        }
+
+        return $this->_basePath;
+    }
+
+    /**
+     * Set the PATH_INFO string
+     *
+     * @param string|null $pathInfo
+     * @return Zend_Controller_Request_Http
+     */
+    public function setPathInfo($pathInfo = null)
+    {
+        if ($pathInfo === null) {
+            $baseUrl = $this->getBaseUrl(); // this actually calls setBaseUrl() & setRequestUri()
+            $baseUrlRaw = $this->getBaseUrl(false);
+            $baseUrlEncoded = urlencode($baseUrlRaw);
+        
+            if (null === ($requestUri = $this->getRequestUri())) {
+                return $this;
+            }
+        
+            // Remove the query string from REQUEST_URI
+            if ($pos = strpos($requestUri, '?')) {
+                $requestUri = substr($requestUri, 0, $pos);
+            }
+            
+            if (!empty($baseUrl) || !empty($baseUrlRaw)) {
+                if (strpos($requestUri, $baseUrl) === 0) {
+                    $pathInfo = substr($requestUri, strlen($baseUrl));
+                } elseif (strpos($requestUri, $baseUrlRaw) === 0) {
+                    $pathInfo = substr($requestUri, strlen($baseUrlRaw));
+                } elseif (strpos($requestUri, $baseUrlEncoded) === 0) {
+                    $pathInfo = substr($requestUri, strlen($baseUrlEncoded));
+                } else {
+                    $pathInfo = $requestUri;
+                }
+            } else {
+                $pathInfo = $requestUri;
+            }
+        
+        }
+
+        $this->_pathInfo = (string) $pathInfo;
+        return $this;
+    }
+
+    /**
+     * Returns everything between the BaseUrl and QueryString.
+     * This value is calculated instead of reading PATH_INFO
+     * directly from $_SERVER due to cross-platform differences.
+     *
+     * @return string
+     */
+    public function getPathInfo()
+    {
+        if (empty($this->_pathInfo)) {
+            $this->setPathInfo();
+        }
+
+        return $this->_pathInfo;
+    }
+
+    /**
+     * Set allowed parameter sources
+     *
+     * Can be empty array, or contain one or more of '_GET' or '_POST'.
+     *
+     * @param  array $paramSoures
+     * @return Zend_Controller_Request_Http
+     */
+    public function setParamSources(array $paramSources = array())
+    {
+        $this->_paramSources = $paramSources;
+        return $this;
+    }
+
+    /**
+     * Get list of allowed parameter sources
+     *
+     * @return array
+     */
+    public function getParamSources()
+    {
+        return $this->_paramSources;
+    }
+
+    /**
+     * Set a userland parameter
+     *
+     * Uses $key to set a userland parameter. If $key is an alias, the actual
+     * key will be retrieved and used to set the parameter.
+     *
+     * @param mixed $key
+     * @param mixed $value
+     * @return Zend_Controller_Request_Http
+     */
+    public function setParam($key, $value)
+    {
+        $key = (null !== ($alias = $this->getAlias($key))) ? $alias : $key;
+        parent::setParam($key, $value);
+        return $this;
+    }
+
+    /**
+     * Retrieve a parameter
+     *
+     * Retrieves a parameter from the instance. Priority is in the order of
+     * userland parameters (see {@link setParam()}), $_GET, $_POST. If a
+     * parameter matching the $key is not found, null is returned.
+     *
+     * If the $key is an alias, the actual key aliased will be used.
+     *
+     * @param mixed $key
+     * @param mixed $default Default value to use if key not found
+     * @return mixed
+     */
+    public function getParam($key, $default = null)
+    {
+        $keyName = (null !== ($alias = $this->getAlias($key))) ? $alias : $key;
+
+        $paramSources = $this->getParamSources();
+        if (isset($this->_params[$keyName])) {
+            return $this->_params[$keyName];
+        } elseif (in_array('_GET', $paramSources) && (isset($_GET[$keyName]))) {
+            return $_GET[$keyName];
+        } elseif (in_array('_POST', $paramSources) && (isset($_POST[$keyName]))) {
+            return $_POST[$keyName];
+        }
+
+        return $default;
+    }
+
+    /**
+     * Retrieve an array of parameters
+     *
+     * Retrieves a merged array of parameters, with precedence of userland
+     * params (see {@link setParam()}), $_GET, $_POST (i.e., values in the
+     * userland params will take precedence over all others).
+     *
+     * @return array
+     */
+    public function getParams()
+    {
+        $return       = $this->_params;
+        $paramSources = $this->getParamSources();
+        if (in_array('_GET', $paramSources)
+            && isset($_GET)
+            && is_array($_GET)
+        ) {
+            $return += $_GET;
+        }
+        if (in_array('_POST', $paramSources)
+            && isset($_POST)
+            && is_array($_POST)
+        ) {
+            $return += $_POST;
+        }
+        return $return;
+    }
+
+    /**
+     * Set parameters
+     *
+     * Set one or more parameters. Parameters are set as userland parameters,
+     * using the keys specified in the array.
+     *
+     * @param array $params
+     * @return Zend_Controller_Request_Http
+     */
+    public function setParams(array $params)
+    {
+        foreach ($params as $key => $value) {
+            $this->setParam($key, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * Set a key alias
+     *
+     * Set an alias used for key lookups. $name specifies the alias, $target
+     * specifies the actual key to use.
+     *
+     * @param string $name
+     * @param string $target
+     * @return Zend_Controller_Request_Http
+     */
+    public function setAlias($name, $target)
+    {
+        $this->_aliases[$name] = $target;
+        return $this;
+    }
+
+    /**
+     * Retrieve an alias
+     *
+     * Retrieve the actual key represented by the alias $name.
+     *
+     * @param string $name
+     * @return string|null Returns null when no alias exists
+     */
+    public function getAlias($name)
+    {
+        if (isset($this->_aliases[$name])) {
+            return $this->_aliases[$name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieve the list of all aliases
+     *
+     * @return array
+     */
+    public function getAliases()
+    {
+        return $this->_aliases;
+    }
+
+    /**
+     * Return the method by which the request was made
+     *
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->getServer('REQUEST_METHOD');
+    }
+
+    /**
+     * Was the request made by POST?
+     *
+     * @return boolean
+     */
+    public function isPost()
+    {
+        if ('POST' == $this->getMethod()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Was the request made by GET?
+     *
+     * @return boolean
+     */
+    public function isGet()
+    {
+        if ('GET' == $this->getMethod()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Was the request made by PUT?
+     *
+     * @return boolean
+     */
+    public function isPut()
+    {
+        if ('PUT' == $this->getMethod()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Was the request made by DELETE?
+     *
+     * @return boolean
+     */
+    public function isDelete()
+    {
+        if ('DELETE' == $this->getMethod()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Was the request made by HEAD?
+     *
+     * @return boolean
+     */
+    public function isHead()
+    {
+        if ('HEAD' == $this->getMethod()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Was the request made by OPTIONS?
+     *
+     * @return boolean
+     */
+    public function isOptions()
+    {
+        if ('OPTIONS' == $this->getMethod()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Was the request made by PATCH?
+     *
+     * @return boolean
+     */
+    public function isPatch()
+    {
+        if ('PATCH' == $this->getMethod()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Is the request a Javascript XMLHttpRequest?
+     *
+     * Should work with Prototype/Script.aculo.us, possibly others.
+     *
+     * @return boolean
+     */
+    public function isXmlHttpRequest()
+    {
+        return ($this->getHeader('X_REQUESTED_WITH') == 'XMLHttpRequest');
+    }
+
+    /**
+     * Is this a Flash request?
+     *
+     * @return boolean
+     */
+    public function isFlashRequest()
+    {
+        $header = strtolower($this->getHeader('USER_AGENT'));
+        return (strstr($header, ' flash')) ? true : false;
+    }
+
+    /**
+     * Is https secure request
+     *
+     * @return boolean
+     */
+    public function isSecure()
+    {
+        return ($this->getScheme() === self::SCHEME_HTTPS);
+    }
+
+    /**
+     * Return the raw body of the request, if present
+     *
+     * @return string|false Raw body, or false if not present
+     */
+    public function getRawBody()
+    {
+        if (null === $this->_rawBody) {
+            $body = file_get_contents('php://input');
+
+            if (strlen(trim($body)) > 0) {
+                $this->_rawBody = $body;
+            } else {
+                $this->_rawBody = false;
+            }
+        }
+        return $this->_rawBody;
+    }
+
+    /**
+     * Return the value of the given HTTP header. Pass the header name as the
+     * plain, HTTP-specified header name. Ex.: Ask for 'Accept' to get the
+     * Accept header, 'Accept-Encoding' to get the Accept-Encoding header.
+     *
+     * @param string $header HTTP header name
+     * @return string|false HTTP header value, or false if not found
+     * @throws Zend_Controller_Request_Exception
+     */
+    public function getHeader($header)
+    {
+        if (empty($header)) {
+            require_once 'Zend/Controller/Request/Exception.php';
+            throw new Zend_Controller_Request_Exception('An HTTP header name is required');
+        }
+
+        // Try to get it from the $_SERVER array first
+        $temp = strtoupper(str_replace('-', '_', $header));
+        if (isset($_SERVER['HTTP_' . $temp])) {
+            return $_SERVER['HTTP_' . $temp];
+        }
+
+        /*
+         * Try to get it from the $_SERVER array on POST request or CGI environment
+         * @see https://www.ietf.org/rfc/rfc3875 (4.1.2. and 4.1.3.)
+         */
+        if (isset($_SERVER[$temp])
+            && in_array($temp, array('CONTENT_TYPE', 'CONTENT_LENGTH'))
+        ) {
+            return $_SERVER[$temp];
+        }
+
+        // This seems to be the only way to get the Authorization header on
+        // Apache
+        if (function_exists('apache_request_headers')) {
+            $headers = apache_request_headers();
+            if (isset($headers[$header])) {
+                return $headers[$header];
+            }
+            $header = strtolower($header);
+            foreach ($headers as $key => $value) {
+                if (strtolower($key) == $header) {
+                    return $value;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the request URI scheme
+     *
+     * @return string
+     */
+    public function getScheme()
+    {
+        return ($this->getServer('HTTPS') == 'on') ? self::SCHEME_HTTPS : self::SCHEME_HTTP;
+    }
+
+    /**
+     * Get the HTTP host.
+     *
+     * "Host" ":" host [ ":" port ] ; Section 3.2.2
+     * Note the HTTP Host header is not the same as the URI host.
+     * It includes the port while the URI host doesn't.
+     *
+     * @return string
+     */
+    public function getHttpHost()
+    {
+        $host = $this->getServer('HTTP_HOST');
+        if (!empty($host)) {
+            return $host;
+        }
+
+        $scheme = $this->getScheme();
+        $name   = $this->getServer('SERVER_NAME');
+        $port   = $this->getServer('SERVER_PORT');
+
+        if(null === $name) {
+            return '';
+        }
+        elseif (($scheme == self::SCHEME_HTTP && $port == 80) || ($scheme == self::SCHEME_HTTPS && $port == 443)) {
+            return $name;
+        } else {
+            return $name . ':' . $port;
+        }
+    }
+
+    /**
+     * Get the client's IP addres
+     *
+     * @param  boolean $checkProxy
+     * @return string
+     */
+    public function getClientIp($checkProxy = true)
+    {
+        if ($checkProxy && $this->getServer('HTTP_CLIENT_IP') != null) {
+            $ip = $this->getServer('HTTP_CLIENT_IP');
+        } else if ($checkProxy && $this->getServer('HTTP_X_FORWARDED_FOR') != null) {
+            $ip = $this->getServer('HTTP_X_FORWARDED_FOR');
+        } else {
+            $ip = $this->getServer('REMOTE_ADDR');
+        }
+
+        return $ip;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Request/HttpTestCase.php b/lib/zend/Zend/Controller/Request/HttpTestCase.php
new file mode 100644
index 00000000000..58b9bd3936a
--- /dev/null
+++ b/lib/zend/Zend/Controller/Request/HttpTestCase.php
@@ -0,0 +1,277 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Request_Http
+ */
+require_once 'Zend/Controller/Request/Http.php';
+
+/**
+ * Zend_Controller_Request_HttpTestCase
+ *
+ * HTTP request object for use with Zend_Controller family.
+ *
+ * @uses Zend_Controller_Request_Http
+ * @package Zend_Controller
+ * @subpackage Request
+ */
+class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
+{
+    /**
+     * Request headers
+     * @var array
+     */
+    protected $_headers = array();
+
+    /**
+     * Request method
+     * @var string
+     */
+    protected $_method = 'GET';
+
+    /**
+     * Raw POST body
+     * @var string|null
+     */
+    protected $_rawBody;
+
+    /**
+     * Valid request method types
+     * @var array
+     */
+    protected $_validMethodTypes = array(
+        'DELETE',
+        'GET',
+        'HEAD',
+        'OPTIONS',
+        'PATCH',
+        'POST',
+        'PUT',
+    );
+
+    /**
+     * Clear GET values
+     *
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function clearQuery()
+    {
+        $_GET = array();
+        return $this;
+    }
+
+    /**
+     * Clear POST values
+     *
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function clearPost()
+    {
+        $_POST = array();
+        return $this;
+    }
+
+    /**
+     * Set raw POST body
+     *
+     * @param  string $content
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function setRawBody($content)
+    {
+        $this->_rawBody = (string) $content;
+        return $this;
+    }
+
+    /**
+     * Get RAW POST body
+     *
+     * @return string|null
+     */
+    public function getRawBody()
+    {
+        return $this->_rawBody;
+    }
+
+    /**
+     * Clear raw POST body
+     *
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function clearRawBody()
+    {
+        $this->_rawBody = null;
+        return $this;
+    }
+
+    /**
+     * Set a cookie
+     *
+     * @param  string $key
+     * @param  mixed $value
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function setCookie($key, $value)
+    {
+        $_COOKIE[(string) $key] = $value;
+        return $this;
+    }
+
+    /**
+     * Set multiple cookies at once
+     *
+     * @param array $cookies
+     * @return void
+     */
+    public function setCookies(array $cookies)
+    {
+        foreach ($cookies as $key => $value) {
+            $_COOKIE[$key] = $value;
+        }
+        return $this;
+    }
+
+    /**
+     * Clear all cookies
+     *
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function clearCookies()
+    {
+        $_COOKIE = array();
+        return $this;
+    }
+
+    /**
+     * Set request method
+     *
+     * @param  string $type
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function setMethod($type)
+    {
+        $type = strtoupper(trim((string) $type));
+        if (!in_array($type, $this->_validMethodTypes)) {
+            require_once 'Zend/Controller/Exception.php';
+            throw new Zend_Controller_Exception('Invalid request method specified');
+        }
+        $this->_method = $type;
+        return $this;
+    }
+
+    /**
+     * Get request method
+     *
+     * @return string|null
+     */
+    public function getMethod()
+    {
+        return $this->_method;
+    }
+
+    /**
+     * Set a request header
+     *
+     * @param  string $key
+     * @param  string $value
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function setHeader($key, $value)
+    {
+        $key = $this->_normalizeHeaderName($key);
+        $this->_headers[$key] = (string) $value;
+        return $this;
+    }
+
+    /**
+     * Set request headers
+     *
+     * @param  array $headers
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function setHeaders(array $headers)
+    {
+        foreach ($headers as $key => $value) {
+            $this->setHeader($key, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * Get request header
+     *
+     * @param  string $header
+     * @param  mixed $default
+     * @return string|null
+     */
+    public function getHeader($header, $default = null)
+    {
+        $header = $this->_normalizeHeaderName($header);
+        if (array_key_exists($header, $this->_headers)) {
+            return $this->_headers[$header];
+        }
+        return $default;
+    }
+
+    /**
+     * Get all request headers
+     *
+     * @return array
+     */
+    public function getHeaders()
+    {
+        return $this->_headers;
+    }
+
+    /**
+     * Clear request headers
+     *
+     * @return Zend_Controller_Request_HttpTestCase
+     */
+    public function clearHeaders()
+    {
+        $this->_headers = array();
+        return $this;
+    }
+
+    /**
+     * Get REQUEST_URI
+     *
+     * @return null|string
+     */
+    public function getRequestUri()
+    {
+        return $this->_requestUri;
+    }
+
+    /**
+     * Normalize a header name for setting and retrieval
+     *
+     * @param  string $name
+     * @return string
+     */
+    protected function _normalizeHeaderName($name)
+    {
+        $name = strtoupper((string) $name);
+        $name = str_replace('-', '_', $name);
+        return $name;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Request/Simple.php b/lib/zend/Zend/Controller/Request/Simple.php
new file mode 100644
index 00000000000..74e4b0c4a10
--- /dev/null
+++ b/lib/zend/Zend/Controller/Request/Simple.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Request
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Controller_Request_Abstract */
+require_once 'Zend/Controller/Request/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Request
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Request_Simple extends Zend_Controller_Request_Abstract
+{
+
+    public function __construct($action = null, $controller = null, $module = null, array $params = array())
+    {
+        if ($action) {
+            $this->setActionName($action);
+        }
+
+        if ($controller) {
+            $this->setControllerName($controller);
+        }
+
+        if ($module) {
+            $this->setModuleName($module);
+        }
+
+        if ($params) {
+            $this->setParams($params);
+        }
+    }
+
+}
diff --git a/lib/zend/Zend/Controller/Response/Abstract.php b/lib/zend/Zend/Controller/Response/Abstract.php
new file mode 100644
index 00000000000..9fcc22693e5
--- /dev/null
+++ b/lib/zend/Zend/Controller/Response/Abstract.php
@@ -0,0 +1,796 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Zend_Controller_Response_Abstract
+ *
+ * Base class for Zend_Controller responses
+ *
+ * @package Zend_Controller
+ * @subpackage Response
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Controller_Response_Abstract
+{
+    /**
+     * Body content
+     * @var array
+     */
+    protected $_body = array();
+
+    /**
+     * Exception stack
+     * @var Exception
+     */
+    protected $_exceptions = array();
+
+    /**
+     * Array of headers. Each header is an array with keys 'name' and 'value'
+     * @var array
+     */
+    protected $_headers = array();
+
+    /**
+     * Array of raw headers. Each header is a single string, the entire header to emit
+     * @var array
+     */
+    protected $_headersRaw = array();
+
+    /**
+     * HTTP response code to use in headers
+     * @var int
+     */
+    protected $_httpResponseCode = 200;
+
+    /**
+     * Flag; is this response a redirect?
+     * @var boolean
+     */
+    protected $_isRedirect = false;
+
+    /**
+     * Whether or not to render exceptions; off by default
+     * @var boolean
+     */
+    protected $_renderExceptions = false;
+
+    /**
+     * Flag; if true, when header operations are called after headers have been
+     * sent, an exception will be raised; otherwise, processing will continue
+     * as normal. Defaults to true.
+     *
+     * @see canSendHeaders()
+     * @var boolean
+     */
+    public $headersSentThrowsException = true;
+
+    /**
+     * Normalize a header name
+     *
+     * Normalizes a header name to X-Capitalized-Names
+     *
+     * @param  string $name
+     * @return string
+     */
+    protected function _normalizeHeader($name)
+    {
+        $filtered = str_replace(array('-', '_'), ' ', (string) $name);
+        $filtered = ucwords(strtolower($filtered));
+        $filtered = str_replace(' ', '-', $filtered);
+        return $filtered;
+    }
+
+    /**
+     * Set a header
+     *
+     * If $replace is true, replaces any headers already defined with that
+     * $name.
+     *
+     * @param string $name
+     * @param string $value
+     * @param boolean $replace
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function setHeader($name, $value, $replace = false)
+    {
+        $this->canSendHeaders(true);
+        $name  = $this->_normalizeHeader($name);
+        $value = (string) $value;
+
+        if ($replace) {
+            foreach ($this->_headers as $key => $header) {
+                if ($name == $header['name']) {
+                    unset($this->_headers[$key]);
+                }
+            }
+        }
+
+        $this->_headers[] = array(
+            'name'    => $name,
+            'value'   => $value,
+            'replace' => $replace
+        );
+
+        return $this;
+    }
+
+    /**
+     * Set redirect URL
+     *
+     * Sets Location header and response code. Forces replacement of any prior
+     * redirects.
+     *
+     * @param string $url
+     * @param int $code
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function setRedirect($url, $code = 302)
+    {
+        $this->canSendHeaders(true);
+        $this->setHeader('Location', $url, true)
+             ->setHttpResponseCode($code);
+
+        return $this;
+    }
+
+    /**
+     * Is this a redirect?
+     *
+     * @return boolean
+     */
+    public function isRedirect()
+    {
+        return $this->_isRedirect;
+    }
+
+    /**
+     * Return array of headers; see {@link $_headers} for format
+     *
+     * @return array
+     */
+    public function getHeaders()
+    {
+        return $this->_headers;
+    }
+
+    /**
+     * Clear headers
+     *
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function clearHeaders()
+    {
+        $this->_headers = array();
+
+        return $this;
+    }
+
+    /**
+     * Clears the specified HTTP header
+     *
+     * @param  string $name
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function clearHeader($name)
+    {
+        if (! count($this->_headers)) {
+            return $this;
+        }
+
+        foreach ($this->_headers as $index => $header) {
+            if ($name == $header['name']) {
+                unset($this->_headers[$index]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set raw HTTP header
+     *
+     * Allows setting non key => value headers, such as status codes
+     *
+     * @param string $value
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function setRawHeader($value)
+    {
+        $this->canSendHeaders(true);
+        if ('Location' == substr($value, 0, 8)) {
+            $this->_isRedirect = true;
+        }
+        $this->_headersRaw[] = (string) $value;
+        return $this;
+    }
+
+    /**
+     * Retrieve all {@link setRawHeader() raw HTTP headers}
+     *
+     * @return array
+     */
+    public function getRawHeaders()
+    {
+        return $this->_headersRaw;
+    }
+
+    /**
+     * Clear all {@link setRawHeader() raw HTTP headers}
+     *
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function clearRawHeaders()
+    {
+        $this->_headersRaw = array();
+        return $this;
+    }
+
+    /**
+     * Clears the specified raw HTTP header
+     *
+     * @param  string $headerRaw
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function clearRawHeader($headerRaw)
+    {
+        if (! count($this->_headersRaw)) {
+            return $this;
+        }
+
+        $key = array_search($headerRaw, $this->_headersRaw);
+        if ($key !== false) {
+            unset($this->_headersRaw[$key]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Clear all headers, normal and raw
+     *
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function clearAllHeaders()
+    {
+        return $this->clearHeaders()
+                    ->clearRawHeaders();
+    }
+
+    /**
+     * Set HTTP response code to use with headers
+     *
+     * @param int $code
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function setHttpResponseCode($code)
+    {
+        if (!is_int($code) || (100 > $code) || (599 < $code)) {
+            require_once 'Zend/Controller/Response/Exception.php';
+            throw new Zend_Controller_Response_Exception('Invalid HTTP response code');
+        }
+
+        if ((300 <= $code) && (307 >= $code)) {
+            $this->_isRedirect = true;
+        } else {
+            $this->_isRedirect = false;
+        }
+
+        $this->_httpResponseCode = $code;
+        return $this;
+    }
+
+    /**
+     * Retrieve HTTP response code
+     *
+     * @return int
+     */
+    public function getHttpResponseCode()
+    {
+        return $this->_httpResponseCode;
+    }
+
+    /**
+     * Can we send headers?
+     *
+     * @param boolean $throw Whether or not to throw an exception if headers have been sent; defaults to false
+     * @return boolean
+     * @throws Zend_Controller_Response_Exception
+     */
+    public function canSendHeaders($throw = false)
+    {
+        $ok = headers_sent($file, $line);
+        if ($ok && $throw && $this->headersSentThrowsException) {
+            require_once 'Zend/Controller/Response/Exception.php';
+            throw new Zend_Controller_Response_Exception('Cannot send headers; headers already sent in ' . $file . ', line ' . $line);
+        }
+
+        return !$ok;
+    }
+
+    /**
+     * Send all headers
+     *
+     * Sends any headers specified. If an {@link setHttpResponseCode() HTTP response code}
+     * has been specified, it is sent with the first header.
+     *
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function sendHeaders()
+    {
+        // Only check if we can send headers if we have headers to send
+        if (count($this->_headersRaw) || count($this->_headers) || (200 != $this->_httpResponseCode)) {
+            $this->canSendHeaders(true);
+        } elseif (200 == $this->_httpResponseCode) {
+            // Haven't changed the response code, and we have no headers
+            return $this;
+        }
+
+        $httpCodeSent = false;
+
+        foreach ($this->_headersRaw as $header) {
+            if (!$httpCodeSent && $this->_httpResponseCode) {
+                header($header, true, $this->_httpResponseCode);
+                $httpCodeSent = true;
+            } else {
+                header($header);
+            }
+        }
+
+        foreach ($this->_headers as $header) {
+            if (!$httpCodeSent && $this->_httpResponseCode) {
+                header($header['name'] . ': ' . $header['value'], $header['replace'], $this->_httpResponseCode);
+                $httpCodeSent = true;
+            } else {
+                header($header['name'] . ': ' . $header['value'], $header['replace']);
+            }
+        }
+
+        if (!$httpCodeSent) {
+            header('HTTP/1.1 ' . $this->_httpResponseCode);
+            $httpCodeSent = true;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set body content
+     *
+     * If $name is not passed, or is not a string, resets the entire body and
+     * sets the 'default' key to $content.
+     *
+     * If $name is a string, sets the named segment in the body array to
+     * $content.
+     *
+     * @param string $content
+     * @param null|string $name
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function setBody($content, $name = null)
+    {
+        if ((null === $name) || !is_string($name)) {
+            $this->_body = array('default' => (string) $content);
+        } else {
+            $this->_body[$name] = (string) $content;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Append content to the body content
+     *
+     * @param string $content
+     * @param null|string $name
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function appendBody($content, $name = null)
+    {
+        if ((null === $name) || !is_string($name)) {
+            if (isset($this->_body['default'])) {
+                $this->_body['default'] .= (string) $content;
+            } else {
+                return $this->append('default', $content);
+            }
+        } elseif (isset($this->_body[$name])) {
+            $this->_body[$name] .= (string) $content;
+        } else {
+            return $this->append($name, $content);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Clear body array
+     *
+     * With no arguments, clears the entire body array. Given a $name, clears
+     * just that named segment; if no segment matching $name exists, returns
+     * false to indicate an error.
+     *
+     * @param  string $name Named segment to clear
+     * @return boolean
+     */
+    public function clearBody($name = null)
+    {
+        if (null !== $name) {
+            $name = (string) $name;
+            if (isset($this->_body[$name])) {
+                unset($this->_body[$name]);
+                return true;
+            }
+
+            return false;
+        }
+
+        $this->_body = array();
+        return true;
+    }
+
+    /**
+     * Return the body content
+     *
+     * If $spec is false, returns the concatenated values of the body content
+     * array. If $spec is boolean true, returns the body content array. If
+     * $spec is a string and matches a named segment, returns the contents of
+     * that segment; otherwise, returns null.
+     *
+     * @param boolean $spec
+     * @return string|array|null
+     */
+    public function getBody($spec = false)
+    {
+        if (false === $spec) {
+            ob_start();
+            $this->outputBody();
+            return ob_get_clean();
+        } elseif (true === $spec) {
+            return $this->_body;
+        } elseif (is_string($spec) && isset($this->_body[$spec])) {
+            return $this->_body[$spec];
+        }
+
+        return null;
+    }
+
+    /**
+     * Append a named body segment to the body content array
+     *
+     * If segment already exists, replaces with $content and places at end of
+     * array.
+     *
+     * @param string $name
+     * @param string $content
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function append($name, $content)
+    {
+        if (!is_string($name)) {
+            require_once 'Zend/Controller/Response/Exception.php';
+            throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")');
+        }
+
+        if (isset($this->_body[$name])) {
+            unset($this->_body[$name]);
+        }
+        $this->_body[$name] = (string) $content;
+        return $this;
+    }
+
+    /**
+     * Prepend a named body segment to the body content array
+     *
+     * If segment already exists, replaces with $content and places at top of
+     * array.
+     *
+     * @param string $name
+     * @param string $content
+     * @return void
+     */
+    public function prepend($name, $content)
+    {
+        if (!is_string($name)) {
+            require_once 'Zend/Controller/Response/Exception.php';
+            throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")');
+        }
+
+        if (isset($this->_body[$name])) {
+            unset($this->_body[$name]);
+        }
+
+        $new = array($name => (string) $content);
+        $this->_body = $new + $this->_body;
+
+        return $this;
+    }
+
+    /**
+     * Insert a named segment into the body content array
+     *
+     * @param  string $name
+     * @param  string $content
+     * @param  string $parent
+     * @param  boolean $before Whether to insert the new segment before or
+     * after the parent. Defaults to false (after)
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function insert($name, $content, $parent = null, $before = false)
+    {
+        if (!is_string($name)) {
+            require_once 'Zend/Controller/Response/Exception.php';
+            throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")');
+        }
+
+        if ((null !== $parent) && !is_string($parent)) {
+            require_once 'Zend/Controller/Response/Exception.php';
+            throw new Zend_Controller_Response_Exception('Invalid body segment parent key ("' . gettype($parent) . '")');
+        }
+
+        if (isset($this->_body[$name])) {
+            unset($this->_body[$name]);
+        }
+
+        if ((null === $parent) || !isset($this->_body[$parent])) {
+            return $this->append($name, $content);
+        }
+
+        $ins  = array($name => (string) $content);
+        $keys = array_keys($this->_body);
+        $loc  = array_search($parent, $keys);
+        if (!$before) {
+            // Increment location if not inserting before
+            ++$loc;
+        }
+
+        if (0 === $loc) {
+            // If location of key is 0, we're prepending
+            $this->_body = $ins + $this->_body;
+        } elseif ($loc >= (count($this->_body))) {
+            // If location of key is maximal, we're appending
+            $this->_body = $this->_body + $ins;
+        } else {
+            // Otherwise, insert at location specified
+            $pre  = array_slice($this->_body, 0, $loc);
+            $post = array_slice($this->_body, $loc);
+            $this->_body = $pre + $ins + $post;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Echo the body segments
+     *
+     * @return void
+     */
+    public function outputBody()
+    {
+        $body = implode('', $this->_body);
+        echo $body;
+    }
+
+    /**
+     * Register an exception with the response
+     *
+     * @param Exception $e
+     * @return Zend_Controller_Response_Abstract
+     */
+    public function setException(Exception $e)
+    {
+        $this->_exceptions[] = $e;
+        return $this;
+    }
+
+    /**
+     * Retrieve the exception stack
+     *
+     * @return array
+     */
+    public function getException()
+    {
+        return $this->_exceptions;
+    }
+
+    /**
+     * Has an exception been registered with the response?
+     *
+     * @return boolean
+     */
+    public function isException()
+    {
+        return !empty($this->_exceptions);
+    }
+
+    /**
+     * Does the response object contain an exception of a given type?
+     *
+     * @param  string $type
+     * @return boolean
+     */
+    public function hasExceptionOfType($type)
+    {
+        foreach ($this->_exceptions as $e) {
+            if ($e instanceof $type) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Does the response object contain an exception with a given message?
+     *
+     * @param  string $message
+     * @return boolean
+     */
+    public function hasExceptionOfMessage($message)
+    {
+        foreach ($this->_exceptions as $e) {
+            if ($message == $e->getMessage()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Does the response object contain an exception with a given code?
+     *
+     * @param  int $code
+     * @return boolean
+     */
+    public function hasExceptionOfCode($code)
+    {
+        $code = (int) $code;
+        foreach ($this->_exceptions as $e) {
+            if ($code == $e->getCode()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieve all exceptions of a given type
+     *
+     * @param  string $type
+     * @return false|array
+     */
+    public function getExceptionByType($type)
+    {
+        $exceptions = array();
+        foreach ($this->_exceptions as $e) {
+            if ($e instanceof $type) {
+                $exceptions[] = $e;
+            }
+        }
+
+        if (empty($exceptions)) {
+            $exceptions = false;
+        }
+
+        return $exceptions;
+    }
+
+    /**
+     * Retrieve all exceptions of a given message
+     *
+     * @param  string $message
+     * @return false|array
+     */
+    public function getExceptionByMessage($message)
+    {
+        $exceptions = array();
+        foreach ($this->_exceptions as $e) {
+            if ($message == $e->getMessage()) {
+                $exceptions[] = $e;
+            }
+        }
+
+        if (empty($exceptions)) {
+            $exceptions = false;
+        }
+
+        return $exceptions;
+    }
+
+    /**
+     * Retrieve all exceptions of a given code
+     *
+     * @param mixed $code
+     * @return void
+     */
+    public function getExceptionByCode($code)
+    {
+        $code       = (int) $code;
+        $exceptions = array();
+        foreach ($this->_exceptions as $e) {
+            if ($code == $e->getCode()) {
+                $exceptions[] = $e;
+            }
+        }
+
+        if (empty($exceptions)) {
+            $exceptions = false;
+        }
+
+        return $exceptions;
+    }
+
+    /**
+     * Whether or not to render exceptions (off by default)
+     *
+     * If called with no arguments or a null argument, returns the value of the
+     * flag; otherwise, sets it and returns the current value.
+     *
+     * @param boolean $flag Optional
+     * @return boolean
+     */
+    public function renderExceptions($flag = null)
+    {
+        if (null !== $flag) {
+            $this->_renderExceptions = $flag ? true : false;
+        }
+
+        return $this->_renderExceptions;
+    }
+
+    /**
+     * Send the response, including all headers, rendering exceptions if so
+     * requested.
+     *
+     * @return void
+     */
+    public function sendResponse()
+    {
+        $this->sendHeaders();
+
+        if ($this->isException() && $this->renderExceptions()) {
+            $exceptions = '';
+            foreach ($this->getException() as $e) {
+                $exceptions .= $e->__toString() . "\n";
+            }
+            echo $exceptions;
+            return;
+        }
+
+        $this->outputBody();
+    }
+
+    /**
+     * Magic __toString functionality
+     *
+     * Proxies to {@link sendResponse()} and returns response value as string
+     * using output buffering.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        ob_start();
+        $this->sendResponse();
+        return ob_get_clean();
+    }
+}
diff --git a/lib/zend/Zend/Controller/Response/Cli.php b/lib/zend/Zend/Controller/Response/Cli.php
new file mode 100644
index 00000000000..ed141659fa8
--- /dev/null
+++ b/lib/zend/Zend/Controller/Response/Cli.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** Zend_Controller_Response_Abstract */
+require_once 'Zend/Controller/Response/Abstract.php';
+
+
+/**
+ * Zend_Controller_Response_Cli
+ *
+ * CLI response for controllers
+ *
+ * @uses Zend_Controller_Response_Abstract
+ * @package Zend_Controller
+ * @subpackage Response
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Response_Cli extends Zend_Controller_Response_Abstract
+{
+    /**
+     * Flag; if true, when header operations are called after headers have been
+     * sent, an exception will be raised; otherwise, processing will continue
+     * as normal. Defaults to false.
+     *
+     * @see canSendHeaders()
+     * @var boolean
+     */
+    public $headersSentThrowsException = false;
+
+
+    /**
+     * Magic __toString functionality
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        if ($this->isException() && $this->renderExceptions()) {
+            $exceptions = '';
+            foreach ($this->getException() as $e) {
+                $exceptions .= $e->__toString() . "\n";
+            }
+            return $exceptions;
+        }
+
+        return $this->_body;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Response/Exception.php b/lib/zend/Zend/Controller/Response/Exception.php
new file mode 100644
index 00000000000..9829fb66bc4
--- /dev/null
+++ b/lib/zend/Zend/Controller/Response/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Request
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** Zend_Controller_Exception */
+require_once 'Zend/Controller/Exception.php';
+
+
+/**
+ * @package    Zend_Controller
+ * @subpackage Response
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Response_Exception extends Zend_Controller_Exception
+{}
+
diff --git a/lib/zend/Zend/Controller/Response/Http.php b/lib/zend/Zend/Controller/Response/Http.php
new file mode 100644
index 00000000000..a70a5bb8f58
--- /dev/null
+++ b/lib/zend/Zend/Controller/Response/Http.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** Zend_Controller_Response_Abstract */
+require_once 'Zend/Controller/Response/Abstract.php';
+
+
+/**
+ * Zend_Controller_Response_Http
+ *
+ * HTTP response for controllers
+ *
+ * @uses Zend_Controller_Response_Abstract
+ * @package Zend_Controller
+ * @subpackage Response
+ */
+class Zend_Controller_Response_Http extends Zend_Controller_Response_Abstract
+{
+}
diff --git a/lib/zend/Zend/Controller/Response/HttpTestCase.php b/lib/zend/Zend/Controller/Response/HttpTestCase.php
new file mode 100644
index 00000000000..768dbfd3115
--- /dev/null
+++ b/lib/zend/Zend/Controller/Response/HttpTestCase.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Controller_Response_Http
+ */
+require_once 'Zend/Controller/Response/Http.php';
+
+/**
+ * Zend_Controller_Response_HttpTestCase
+ *
+ * @uses Zend_Controller_Response_Http
+ * @package Zend_Controller
+ * @subpackage Response
+ */
+class Zend_Controller_Response_HttpTestCase extends Zend_Controller_Response_Http
+{
+    /**
+     * "send" headers by returning array of all headers that would be sent
+     *
+     * @return array
+     */
+    public function sendHeaders()
+    {
+        $headers = array();
+        foreach ($this->_headersRaw as $header) {
+            $headers[] = $header;
+        }
+        foreach ($this->_headers as $header) {
+            $name = $header['name'];
+            $key  = strtolower($name);
+            if (array_key_exists($name, $headers)) {
+                if ($header['replace']) {
+                    $headers[$key] = $header['name'] . ': ' . $header['value'];
+                }
+            } else {
+                $headers[$key] = $header['name'] . ': ' . $header['value'];
+            }
+        }
+        return $headers;
+    }
+
+    /**
+     * Can we send headers?
+     *
+     * @param  bool $throw
+     * @return void
+     */
+    public function canSendHeaders($throw = false)
+    {
+        return true;
+    }
+
+    /**
+     * Return the concatenated body segments
+     *
+     * @return string
+     */
+    public function outputBody()
+    {
+        $fullContent = '';
+        foreach ($this->_body as $content) {
+            $fullContent .= $content;
+        }
+        return $fullContent;
+    }
+
+    /**
+     * Get body and/or body segments
+     *
+     * @param  bool|string $spec
+     * @return string|array|null
+     */
+    public function getBody($spec = false)
+    {
+        if (false === $spec) {
+            return $this->outputBody();
+        } elseif (true === $spec) {
+            return $this->_body;
+        } elseif (is_string($spec) && isset($this->_body[$spec])) {
+            return $this->_body[$spec];
+        }
+
+        return null;
+    }
+
+    /**
+     * "send" Response
+     *
+     * Concats all response headers, and then final body (separated by two
+     * newlines)
+     *
+     * @return string
+     */
+    public function sendResponse()
+    {
+        $headers = $this->sendHeaders();
+        $content = implode("\n", $headers) . "\n\n";
+
+        if ($this->isException() && $this->renderExceptions()) {
+            $exceptions = '';
+            foreach ($this->getException() as $e) {
+                $exceptions .= $e->__toString() . "\n";
+            }
+            $content .= $exceptions;
+        } else {
+            $content .= $this->outputBody();
+        }
+
+        return $content;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Router/Abstract.php b/lib/zend/Zend/Controller/Router/Abstract.php
new file mode 100644
index 00000000000..71ed9473de5
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Abstract.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Controller_Router_Interface */
+require_once 'Zend/Controller/Router/Interface.php';
+
+/**
+ * Simple first implementation of a router, to be replaced
+ * with rules-based URI processor.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Controller_Router_Abstract implements Zend_Controller_Router_Interface
+{
+    /**
+     * URI delimiter
+     */
+    const URI_DELIMITER = '/';
+
+    /**
+     * Front controller instance
+     *
+     * @var Zend_Controller_Front
+     */
+    protected $_frontController;
+
+    /**
+     * Array of invocation parameters to use when instantiating action
+     * controllers
+     *
+     * @var array
+     */
+    protected $_invokeParams = array();
+
+    /**
+     * Constructor
+     *
+     * @param array $params
+     */
+    public function __construct(array $params = array())
+    {
+        $this->setParams($params);
+    }
+
+    /**
+     * Add or modify a parameter to use when instantiating an action controller
+     *
+     * @param string $name
+     * @param mixed  $value
+     * @return Zend_Controller_Router_Abstract
+     */
+    public function setParam($name, $value)
+    {
+        $name                       = (string)$name;
+        $this->_invokeParams[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Set parameters to pass to action controller constructors
+     *
+     * @param array $params
+     * @return Zend_Controller_Router_Abstract
+     */
+    public function setParams(array $params)
+    {
+        $this->_invokeParams = array_merge($this->_invokeParams, $params);
+
+        return $this;
+    }
+
+    /**
+     * Retrieve a single parameter from the controller parameter stack
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function getParam($name)
+    {
+        if (isset($this->_invokeParams[$name])) {
+            return $this->_invokeParams[$name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieve action controller instantiation parameters
+     *
+     * @return array
+     */
+    public function getParams()
+    {
+        return $this->_invokeParams;
+    }
+
+    /**
+     * Clear the controller parameter stack
+     *
+     * By default, clears all parameters. If a parameter name is given, clears
+     * only that parameter; if an array of parameter names is provided, clears
+     * each.
+     *
+     * @param null|string|array single key or array of keys for params to clear
+     * @return Zend_Controller_Router_Abstract
+     */
+    public function clearParams($name = null)
+    {
+        if (null === $name) {
+            $this->_invokeParams = array();
+        } elseif (is_string($name) && isset($this->_invokeParams[$name])) {
+            unset($this->_invokeParams[$name]);
+        } elseif (is_array($name)) {
+            foreach ($name as $key) {
+                if (is_string($key) && isset($this->_invokeParams[$key])) {
+                    unset($this->_invokeParams[$key]);
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve Front Controller
+     *
+     * @return Zend_Controller_Front
+     */
+    public function getFrontController()
+    {
+        // Used cache version if found
+        if (null !== $this->_frontController) {
+            return $this->_frontController;
+        }
+
+        require_once 'Zend/Controller/Front.php';
+        $this->_frontController = Zend_Controller_Front::getInstance();
+
+        return $this->_frontController;
+    }
+
+    /**
+     * Set Front Controller
+     *
+     * @param Zend_Controller_Front $controller
+     * @return Zend_Controller_Router_Interface
+     */
+    public function setFrontController(Zend_Controller_Front $controller)
+    {
+        $this->_frontController = $controller;
+
+        return $this;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Router/Exception.php b/lib/zend/Zend/Controller/Router/Exception.php
new file mode 100644
index 00000000000..2d036333060
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Exception.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Exception */
+require_once 'Zend/Controller/Exception.php';
+
+/**
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Router_Exception extends Zend_Controller_Exception
+{
+}
+
diff --git a/lib/zend/Zend/Controller/Router/Interface.php b/lib/zend/Zend/Controller/Router/Interface.php
new file mode 100644
index 00000000000..920286d94bc
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Interface.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Controller_Router_Interface
+{
+    /**
+     * Processes a request and sets its controller and action.  If
+     * no route was possible, an exception is thrown.
+     *
+     * @param  Zend_Controller_Request_Abstract
+     * @throws Zend_Controller_Router_Exception
+     * @return Zend_Controller_Request_Abstract|boolean
+     */
+    public function route(Zend_Controller_Request_Abstract $dispatcher);
+
+    /**
+     * Generates a URL path that can be used in URL creation, redirection, etc.
+     *
+     * May be passed user params to override ones from URI, Request or even defaults.
+     * If passed parameter has a value of null, it's URL variable will be reset to
+     * default.
+     *
+     * If null is passed as a route name assemble will use the current Route or 'default'
+     * if current is not yet set.
+     *
+     * Reset is used to signal that all parameters should be reset to it's defaults.
+     * Ignoring all URL specified values. User specified params still get precedence.
+     *
+     * Encode tells to url encode resulting path parts.
+     *
+     * @param  array $userParams Options passed by a user used to override parameters
+     * @param  mixed $name       The name of a Route to use
+     * @param  bool  $reset      Whether to reset to the route defaults ignoring URL params
+     * @param  bool  $encode     Tells to encode URL parts on output
+     * @throws Zend_Controller_Router_Exception
+     * @return string Resulting URL path
+     */
+    public function assemble($userParams, $name = null, $reset = false, $encode = true);
+
+    /**
+     * Retrieve Front Controller
+     *
+     * @return Zend_Controller_Front
+     */
+    public function getFrontController();
+
+    /**
+     * Set Front Controller
+     *
+     * @param Zend_Controller_Front $controller
+     * @return Zend_Controller_Router_Interface
+     */
+    public function setFrontController(Zend_Controller_Front $controller);
+
+    /**
+     * Add or modify a parameter with which to instantiate any helper objects
+     *
+     * @param string $name
+     * @param mixed  $value
+     * @return Zend_Controller_Router_Interface
+     */
+    public function setParam($name, $value);
+
+    /**
+     * Set an array of a parameters to pass to helper object constructors
+     *
+     * @param array $params
+     * @return Zend_Controller_Router_Interface
+     */
+    public function setParams(array $params);
+
+    /**
+     * Retrieve a single parameter from the controller parameter stack
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function getParam($name);
+
+    /**
+     * Retrieve the parameters to pass to helper object constructors
+     *
+     * @return array
+     */
+    public function getParams();
+
+    /**
+     * Clear the controller parameter stack
+     *
+     * By default, clears all parameters. If a parameter name is given, clears
+     * only that parameter; if an array of parameter names is provided, clears
+     * each.
+     *
+     * @param null|string|array single key or array of keys for params to clear
+     * @return Zend_Controller_Router_Interface
+     */
+    public function clearParams($name = null);
+}
diff --git a/lib/zend/Zend/Controller/Router/Rewrite.php b/lib/zend/Zend/Controller/Router/Rewrite.php
new file mode 100644
index 00000000000..07cf6154529
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Rewrite.php
@@ -0,0 +1,555 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Router_Abstract */
+require_once 'Zend/Controller/Router/Abstract.php';
+
+/** Zend_Controller_Router_Route */
+require_once 'Zend/Controller/Router/Route.php';
+
+/**
+ * Ruby routing based Router.
+ *
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @see        http://manuals.rubyonrails.com/read/chapter/65
+ */
+class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
+{
+
+    /**
+     * Whether or not to use default routes
+     *
+     * @var boolean
+     */
+    protected $_useDefaultRoutes = true;
+
+    /**
+     * Array of routes to match against
+     *
+     * @var array
+     */
+    protected $_routes = array();
+
+    /**
+     * Currently matched route
+     *
+     * @var string
+     */
+    protected $_currentRoute = null;
+
+    /**
+     * Global parameters given to all routes
+     *
+     * @var array
+     */
+    protected $_globalParams = array();
+
+    /**
+     * Separator to use with chain names
+     *
+     * @var string
+     */
+    protected $_chainNameSeparator = '-';
+
+    /**
+     * Determines if request parameters should be used as global parameters
+     * inside this router.
+     *
+     * @var boolean
+     */
+    protected $_useCurrentParamsAsGlobal = false;
+
+    /**
+     * Add default routes which are used to mimic basic router behaviour
+     *
+     * @return Zend_Controller_Router_Rewrite
+     */
+    public function addDefaultRoutes()
+    {
+        if (!$this->hasRoute('default')) {
+            $dispatcher = $this->getFrontController()->getDispatcher();
+            $request    = $this->getFrontController()->getRequest();
+
+            require_once 'Zend/Controller/Router/Route/Module.php';
+            $compat = new Zend_Controller_Router_Route_Module(array(), $dispatcher, $request);
+
+            $this->_routes = array('default' => $compat) + $this->_routes;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add route to the route chain
+     *
+     * If route contains method setRequest(), it is initialized with a request object
+     *
+     * @param  string                                 $name  Name of the route
+     * @param  Zend_Controller_Router_Route_Interface $route Instance of the route
+     * @return Zend_Controller_Router_Rewrite
+     */
+    public function addRoute($name, Zend_Controller_Router_Route_Interface $route)
+    {
+        if (method_exists($route, 'setRequest')) {
+            $route->setRequest($this->getFrontController()->getRequest());
+        }
+
+        $this->_routes[$name] = $route;
+
+        return $this;
+    }
+
+    /**
+     * Add routes to the route chain
+     *
+     * @param  array $routes Array of routes with names as keys and routes as values
+     * @return Zend_Controller_Router_Rewrite
+     */
+    public function addRoutes($routes)
+    {
+        foreach ($routes as $name => $route) {
+            $this->addRoute($name, $route);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Create routes out of Zend_Config configuration
+     *
+     * Example INI:
+     * routes.archive.route = "archive/:year/*"
+     * routes.archive.defaults.controller = archive
+     * routes.archive.defaults.action = show
+     * routes.archive.defaults.year = 2000
+     * routes.archive.reqs.year = "\d+"
+     *
+     * routes.news.type = "Zend_Controller_Router_Route_Static"
+     * routes.news.route = "news"
+     * routes.news.defaults.controller = "news"
+     * routes.news.defaults.action = "list"
+     *
+     * And finally after you have created a Zend_Config with above ini:
+     * $router = new Zend_Controller_Router_Rewrite();
+     * $router->addConfig($config, 'routes');
+     *
+     * @param  Zend_Config $config  Configuration object
+     * @param  string      $section Name of the config section containing route's definitions
+     * @throws Zend_Controller_Router_Exception
+     * @return Zend_Controller_Router_Rewrite
+     */
+    public function addConfig(Zend_Config $config, $section = null)
+    {
+        if ($section !== null) {
+            if ($config->{$section} === null) {
+                require_once 'Zend/Controller/Router/Exception.php';
+                throw new Zend_Controller_Router_Exception("No route configuration in section '{$section}'");
+            }
+
+            $config = $config->{$section};
+        }
+
+        foreach ($config as $name => $info) {
+            $route = $this->_getRouteFromConfig($info);
+
+            if ($route instanceof Zend_Controller_Router_Route_Chain) {
+                if (!isset($info->chain)) {
+                    require_once 'Zend/Controller/Router/Exception.php';
+                    throw new Zend_Controller_Router_Exception("No chain defined");
+                }
+
+                if ($info->chain instanceof Zend_Config) {
+                    $childRouteNames = $info->chain;
+                } else {
+                    $childRouteNames = explode(',', $info->chain);
+                }
+
+                foreach ($childRouteNames as $childRouteName) {
+                    $childRoute = $this->getRoute(trim($childRouteName));
+                    $route->chain($childRoute);
+                }
+
+                $this->addRoute($name, $route);
+            } elseif (isset($info->chains) && $info->chains instanceof Zend_Config) {
+                $this->_addChainRoutesFromConfig($name, $route, $info->chains);
+            } else {
+                $this->addRoute($name, $route);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get a route frm a config instance
+     *
+     * @param  Zend_Config $info
+     * @return Zend_Controller_Router_Route_Interface
+     */
+    protected function _getRouteFromConfig(Zend_Config $info)
+    {
+        $class = (isset($info->type)) ? $info->type : 'Zend_Controller_Router_Route';
+        if (!class_exists($class)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($class);
+        }
+
+        $route = call_user_func(
+            array(
+                $class,
+                'getInstance'
+            ), $info
+        );
+
+        if (isset($info->abstract) && $info->abstract && method_exists($route, 'isAbstract')) {
+            $route->isAbstract(true);
+        }
+
+        return $route;
+    }
+
+    /**
+     * Add chain routes from a config route
+     *
+     * @param  string                                 $name
+     * @param  Zend_Controller_Router_Route_Interface $route
+     * @param  Zend_Config                            $childRoutesInfo
+     * @return void
+     */
+    protected function _addChainRoutesFromConfig(
+        $name,
+        Zend_Controller_Router_Route_Interface $route,
+        Zend_Config $childRoutesInfo
+    )
+    {
+        foreach ($childRoutesInfo as $childRouteName => $childRouteInfo) {
+            if (is_string($childRouteInfo)) {
+                $childRouteName = $childRouteInfo;
+                $childRoute     = $this->getRoute($childRouteName);
+            } else {
+                $childRoute = $this->_getRouteFromConfig($childRouteInfo);
+            }
+
+            if ($route instanceof Zend_Controller_Router_Route_Chain) {
+                $chainRoute = clone $route;
+                $chainRoute->chain($childRoute);
+            } else {
+                $chainRoute = $route->chain($childRoute);
+            }
+
+            $chainName = $name . $this->_chainNameSeparator . $childRouteName;
+
+            if (isset($childRouteInfo->chains)) {
+                $this->_addChainRoutesFromConfig($chainName, $chainRoute, $childRouteInfo->chains);
+            } else {
+                $this->addRoute($chainName, $chainRoute);
+            }
+        }
+    }
+
+    /**
+     * Remove a route from the route chain
+     *
+     * @param  string $name Name of the route
+     * @throws Zend_Controller_Router_Exception
+     * @return Zend_Controller_Router_Rewrite
+     */
+    public function removeRoute($name)
+    {
+        if (!isset($this->_routes[$name])) {
+            require_once 'Zend/Controller/Router/Exception.php';
+            throw new Zend_Controller_Router_Exception("Route $name is not defined");
+        }
+
+        unset($this->_routes[$name]);
+
+        return $this;
+    }
+
+    /**
+     * Remove all standard default routes
+     *
+     * @return Zend_Controller_Router_Rewrite
+     */
+    public function removeDefaultRoutes()
+    {
+        $this->_useDefaultRoutes = false;
+
+        return $this;
+    }
+
+    /**
+     * Check if named route exists
+     *
+     * @param  string $name Name of the route
+     * @return boolean
+     */
+    public function hasRoute($name)
+    {
+        return isset($this->_routes[$name]);
+    }
+
+    /**
+     * Retrieve a named route
+     *
+     * @param string $name Name of the route
+     * @throws Zend_Controller_Router_Exception
+     * @return Zend_Controller_Router_Route_Interface Route object
+     */
+    public function getRoute($name)
+    {
+        if (!isset($this->_routes[$name])) {
+            require_once 'Zend/Controller/Router/Exception.php';
+            throw new Zend_Controller_Router_Exception("Route $name is not defined");
+        }
+
+        return $this->_routes[$name];
+    }
+
+    /**
+     * Retrieve a currently matched route
+     *
+     * @throws Zend_Controller_Router_Exception
+     * @return Zend_Controller_Router_Route_Interface Route object
+     */
+    public function getCurrentRoute()
+    {
+        if (!isset($this->_currentRoute)) {
+            require_once 'Zend/Controller/Router/Exception.php';
+            throw new Zend_Controller_Router_Exception("Current route is not defined");
+        }
+
+        return $this->getRoute($this->_currentRoute);
+    }
+
+    /**
+     * Retrieve a name of currently matched route
+     *
+     * @throws Zend_Controller_Router_Exception
+     * @return string Route name
+     */
+    public function getCurrentRouteName()
+    {
+        if (!isset($this->_currentRoute)) {
+            require_once 'Zend/Controller/Router/Exception.php';
+            throw new Zend_Controller_Router_Exception("Current route is not defined");
+        }
+
+        return $this->_currentRoute;
+    }
+
+    /**
+     * Retrieve an array of routes added to the route chain
+     *
+     * @return array All of the defined routes
+     */
+    public function getRoutes()
+    {
+        return $this->_routes;
+    }
+
+    /**
+     * Find a matching route to the current PATH_INFO and inject
+     * returning values to the Request object.
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @throws Zend_Controller_Router_Exception
+     * @return Zend_Controller_Request_Abstract Request object
+     */
+    public function route(Zend_Controller_Request_Abstract $request)
+    {
+        if (!$request instanceof Zend_Controller_Request_Http) {
+            require_once 'Zend/Controller/Router/Exception.php';
+            throw new Zend_Controller_Router_Exception(
+                'Zend_Controller_Router_Rewrite requires a Zend_Controller_Request_Http-based request object'
+            );
+        }
+
+        if ($this->_useDefaultRoutes) {
+            $this->addDefaultRoutes();
+        }
+
+        // Find the matching route
+        $routeMatched = false;
+
+        foreach (array_reverse($this->_routes, true) as $name => $route) {
+            // TODO: Should be an interface method. Hack for 1.0 BC
+            if (method_exists($route, 'isAbstract') && $route->isAbstract()) {
+                continue;
+            }
+
+            // TODO: Should be an interface method. Hack for 1.0 BC
+            if (!method_exists($route, 'getVersion') || $route->getVersion() == 1) {
+                $match = $request->getPathInfo();
+            } else {
+                $match = $request;
+            }
+
+            if ($params = $route->match($match)) {
+                $this->_setRequestParams($request, $params);
+                $this->_currentRoute = $name;
+                $routeMatched        = true;
+                break;
+            }
+        }
+
+        if (!$routeMatched) {
+            require_once 'Zend/Controller/Router/Exception.php';
+            throw new Zend_Controller_Router_Exception('No route matched the request', 404);
+        }
+
+        if ($this->_useCurrentParamsAsGlobal) {
+            $params = $request->getParams();
+            foreach ($params as $param => $value) {
+                $this->setGlobalParam($param, $value);
+            }
+        }
+
+        return $request;
+    }
+
+    /**
+     * Sets parameters for request object
+     *
+     * Module name, controller name and action name
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     * @param array                            $params
+     */
+    protected function _setRequestParams($request, $params)
+    {
+        foreach ($params as $param => $value) {
+
+            $request->setParam($param, $value);
+
+            if ($param === $request->getModuleKey()) {
+                $request->setModuleName($value);
+            }
+            if ($param === $request->getControllerKey()) {
+                $request->setControllerName($value);
+            }
+            if ($param === $request->getActionKey()) {
+                $request->setActionName($value);
+            }
+        }
+    }
+
+    /**
+     * Generates a URL path that can be used in URL creation, redirection, etc.
+     *
+     * @param  array $userParams Options passed by a user used to override parameters
+     * @param  mixed $name       The name of a Route to use
+     * @param  bool  $reset      Whether to reset to the route defaults ignoring URL params
+     * @param  bool  $encode     Tells to encode URL parts on output
+     * @throws Zend_Controller_Router_Exception
+     * @return string Resulting absolute URL path
+     */
+    public function assemble($userParams, $name = null, $reset = false, $encode = true)
+    {
+        if (!is_array($userParams)) {
+            require_once 'Zend/Controller/Router/Exception.php';
+            throw new Zend_Controller_Router_Exception('userParams must be an array');
+        }
+
+        if ($name == null) {
+            try {
+                $name = $this->getCurrentRouteName();
+            } catch (Zend_Controller_Router_Exception $e) {
+                $name = 'default';
+            }
+        }
+
+        // Use UNION (+) in order to preserve numeric keys
+        $params = $userParams + $this->_globalParams;
+
+        $route = $this->getRoute($name);
+        $url   = $route->assemble($params, $reset, $encode);
+
+        if (!preg_match('|^[a-z]+://|', $url)) {
+            $url = rtrim($this->getFrontController()->getBaseUrl(), self::URI_DELIMITER) . self::URI_DELIMITER . $url;
+        }
+
+        return $url;
+    }
+
+    /**
+     * Set a global parameter
+     *
+     * @param  string $name
+     * @param  mixed  $value
+     * @return Zend_Controller_Router_Rewrite
+     */
+    public function setGlobalParam($name, $value)
+    {
+        $this->_globalParams[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Set the separator to use with chain names
+     *
+     * @param string $separator The separator to use
+     * @return Zend_Controller_Router_Rewrite
+     */
+    public function setChainNameSeparator($separator)
+    {
+        $this->_chainNameSeparator = $separator;
+
+        return $this;
+    }
+
+    /**
+     * Get the separator to use for chain names
+     *
+     * @return string
+     */
+    public function getChainNameSeparator()
+    {
+        return $this->_chainNameSeparator;
+    }
+
+    /**
+     * Determines/returns whether to use the request parameters as global parameters.
+     *
+     * @param boolean|null $use
+     *              Null/unset when you want to retrieve the current state.
+     *              True when request parameters should be global, false otherwise
+     * @return boolean|Zend_Controller_Router_Rewrite
+     *              Returns a boolean if first param isn't set, returns an
+     *              instance of Zend_Controller_Router_Rewrite otherwise.
+     *
+     */
+    public function useRequestParametersAsGlobal($use = null)
+    {
+        if ($use === null) {
+            return $this->_useCurrentParamsAsGlobal;
+        }
+
+        $this->_useCurrentParamsAsGlobal = (bool)$use;
+
+        return $this;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Router/Route.php b/lib/zend/Zend/Controller/Router/Route.php
new file mode 100644
index 00000000000..927b97b3d34
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Route.php
@@ -0,0 +1,605 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Router_Route_Abstract */
+require_once 'Zend/Controller/Router/Route/Abstract.php';
+
+/**
+ * Route
+ *
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @see        http://manuals.rubyonrails.com/read/chapter/65
+ */
+class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
+{
+
+    /**
+     * Default translator
+     *
+     * @var Zend_Translate
+     */
+    protected static $_defaultTranslator;
+
+    /**
+     * Translator
+     *
+     * @var Zend_Translate
+     */
+    protected $_translator;
+
+    /**
+     * Default locale
+     *
+     * @var mixed
+     */
+    protected static $_defaultLocale;
+
+    /**
+     * Locale
+     *
+     * @var mixed
+     */
+    protected $_locale;
+
+    /**
+     * Wether this is a translated route or not
+     *
+     * @var boolean
+     */
+    protected $_isTranslated = false;
+
+    /**
+     * Translatable variables
+     *
+     * @var array
+     */
+    protected $_translatable = array();
+
+    protected $_urlVariable = ':';
+
+    protected $_urlDelimiter = self::URI_DELIMITER;
+
+    protected $_regexDelimiter = '#';
+
+    protected $_defaultRegex = null;
+
+    /**
+     * Holds names of all route's pattern variable names. Array index holds a position in URL.
+     *
+     * @var array
+     */
+    protected $_variables = array();
+
+    /**
+     * Holds Route patterns for all URL parts. In case of a variable it stores it's regex
+     * requirement or null. In case of a static part, it holds only it's direct value.
+     * In case of a wildcard, it stores an asterisk (*)
+     *
+     * @var array
+     */
+    protected $_parts = array();
+
+    /**
+     * Holds user submitted default values for route's variables. Name and value pairs.
+     *
+     * @var array
+     */
+    protected $_defaults = array();
+
+    /**
+     * Holds user submitted regular expression patterns for route's variables' values.
+     * Name and value pairs.
+     *
+     * @var array
+     */
+    protected $_requirements = array();
+
+    /**
+     * Associative array filled on match() that holds matched path values
+     * for given variable names.
+     *
+     * @var array
+     */
+    protected $_values = array();
+
+    /**
+     * Associative array filled on match() that holds wildcard variable
+     * names and values.
+     *
+     * @var array
+     */
+    protected $_wildcardData = array();
+
+    /**
+     * Helper var that holds a count of route pattern's static parts
+     * for validation
+     *
+     * @var int
+     */
+    protected $_staticCount = 0;
+
+    public function getVersion()
+    {
+        return 1;
+    }
+
+    /**
+     * Instantiates route based on passed Zend_Config structure
+     *
+     * @param Zend_Config $config Configuration object
+     * @return Zend_Controller_Router_Route
+     */
+    public static function getInstance(Zend_Config $config)
+    {
+        $reqs = ($config->reqs instanceof Zend_Config) ? $config->reqs->toArray() : array();
+        $defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
+
+        return new self($config->route, $defs, $reqs);
+    }
+
+    /**
+     * Prepares the route for mapping by splitting (exploding) it
+     * to a corresponding atomic parts. These parts are assigned
+     * a position which is later used for matching and preparing values.
+     *
+     * @param string         $route      Map used to match with later submitted URL path
+     * @param array          $defaults   Defaults for map variables with keys as variable names
+     * @param array          $reqs       Regular expression requirements for variables (keys as variable names)
+     * @param Zend_Translate $translator Translator to use for this instance
+     * @param mixed|null     $locale
+     */
+    public function __construct(
+        $route, $defaults = array(), $reqs = array(), Zend_Translate $translator = null, $locale = null
+    )
+    {
+        $route               = trim($route, $this->_urlDelimiter);
+        $this->_defaults     = (array)$defaults;
+        $this->_requirements = (array)$reqs;
+        $this->_translator   = $translator;
+        $this->_locale       = $locale;
+
+        if ($route !== '') {
+            foreach (explode($this->_urlDelimiter, $route) as $pos => $part) {
+                if (substr($part, 0, 1) == $this->_urlVariable && substr($part, 1, 1) != $this->_urlVariable) {
+                    $name = substr($part, 1);
+
+                    if (substr($name, 0, 1) === '@' && substr($name, 1, 1) !== '@') {
+                        $name                  = substr($name, 1);
+                        $this->_translatable[] = $name;
+                        $this->_isTranslated   = true;
+                    }
+
+                    $this->_parts[$pos]     = (isset($reqs[$name]) ? $reqs[$name] : $this->_defaultRegex);
+                    $this->_variables[$pos] = $name;
+                } else {
+                    if (substr($part, 0, 1) == $this->_urlVariable) {
+                        $part = substr($part, 1);
+                    }
+
+                    if (substr($part, 0, 1) === '@' && substr($part, 1, 1) !== '@') {
+                        $this->_isTranslated = true;
+                    }
+
+                    $this->_parts[$pos] = $part;
+
+                    if ($part !== '*') {
+                        $this->_staticCount++;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Matches a user submitted path with parts defined by a map. Assigns and
+     * returns an array of variables on a successful match.
+     *
+     * @param string  $path Path used to match against this routing map
+     * @param boolean $partial
+     * @throws Zend_Controller_Router_Exception
+     * @return array|false An array of assigned values or a false on a mismatch
+     */
+    public function match($path, $partial = false)
+    {
+        if ($this->_isTranslated) {
+            $translateMessages = $this->getTranslator()->getMessages();
+        }
+
+        $pathStaticCount = 0;
+        $values          = array();
+        $matchedPath     = '';
+
+        if (!$partial) {
+            $path = trim($path, $this->_urlDelimiter);
+        }
+
+        if ($path !== '') {
+            $path = explode($this->_urlDelimiter, $path);
+
+            foreach ($path as $pos => $pathPart) {
+                // Path is longer than a route, it's not a match
+                if (!array_key_exists($pos, $this->_parts)) {
+                    if ($partial) {
+                        break;
+                    } else {
+                        return false;
+                    }
+                }
+
+                $matchedPath .= $pathPart . $this->_urlDelimiter;
+
+                // If it's a wildcard, get the rest of URL as wildcard data and stop matching
+                if ($this->_parts[$pos] == '*') {
+                    $count = count($path);
+                    for ($i = $pos; $i < $count; $i += 2) {
+                        $var = urldecode($path[$i]);
+                        if (!isset($this->_wildcardData[$var]) && !isset($this->_defaults[$var])
+                            && !isset($values[$var])
+                        ) {
+                            $this->_wildcardData[$var] = (isset($path[$i + 1])) ? urldecode($path[$i + 1]) : null;
+                        }
+                    }
+
+                    $matchedPath = implode($this->_urlDelimiter, $path);
+                    break;
+                }
+
+                $name     = isset($this->_variables[$pos]) ? $this->_variables[$pos] : null;
+                $pathPart = urldecode($pathPart);
+
+                // Translate value if required
+                $part = $this->_parts[$pos];
+                if ($this->_isTranslated
+                    && (substr($part, 0, 1) === '@' && substr($part, 1, 1) !== '@'
+                        && $name === null)
+                    || $name !== null && in_array($name, $this->_translatable)
+                ) {
+                    if (substr($part, 0, 1) === '@') {
+                        $part = substr($part, 1);
+                    }
+
+                    if (($originalPathPart = array_search($pathPart, $translateMessages)) !== false) {
+                        $pathPart = $originalPathPart;
+                    }
+                }
+
+                if (substr($part, 0, 2) === '@@') {
+                    $part = substr($part, 1);
+                }
+
+                // If it's a static part, match directly
+                if ($name === null && $part != $pathPart) {
+                    return false;
+                }
+
+                // If it's a variable with requirement, match a regex. If not - everything matches
+                if ($part !== null
+                    && !preg_match(
+                        $this->_regexDelimiter . '^' . $part . '$' . $this->_regexDelimiter . 'iu', $pathPart
+                    )
+                ) {
+                    return false;
+                }
+
+                // If it's a variable store it's value for later
+                if ($name !== null) {
+                    $values[$name] = $pathPart;
+                } else {
+                    $pathStaticCount++;
+                }
+            }
+        }
+
+        // Check if all static mappings have been matched
+        if ($this->_staticCount != $pathStaticCount) {
+            return false;
+        }
+
+        $return = $values + $this->_wildcardData + $this->_defaults;
+
+        // Check if all map variables have been initialized
+        foreach ($this->_variables as $var) {
+            if (!array_key_exists($var, $return)) {
+                return false;
+            } elseif ($return[$var] == '' || $return[$var] === null) {
+                // Empty variable? Replace with the default value.
+                $return[$var] = $this->_defaults[$var];
+            }
+        }
+
+        $this->setMatchedPath(rtrim($matchedPath, $this->_urlDelimiter));
+
+        $this->_values = $values;
+
+        return $return;
+    }
+
+    /**
+     * Assembles user submitted parameters forming a URL path defined by this route
+     *
+     * @param  array   $data  An array of variable and value pairs used as parameters
+     * @param  boolean $reset Whether or not to set route defaults with those provided in $data
+     * @param  boolean $encode
+     * @param  boolean $partial
+     * @throws Zend_Controller_Router_Exception
+     * @return string Route path with user submitted parameters
+     */
+    public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
+    {
+        if ($this->_isTranslated) {
+            $translator = $this->getTranslator();
+
+            if (isset($data['@locale'])) {
+                $locale = $data['@locale'];
+                unset($data['@locale']);
+            } else {
+                $locale = $this->getLocale();
+            }
+        }
+
+        $url  = array();
+        $flag = false;
+
+        foreach ($this->_parts as $key => $part) {
+            $name = isset($this->_variables[$key]) ? $this->_variables[$key] : null;
+
+            $useDefault = false;
+            if (isset($name) && array_key_exists($name, $data) && $data[$name] === null) {
+                $useDefault = true;
+            }
+
+            if (isset($name)) {
+                if (isset($data[$name]) && !$useDefault) {
+                    $value = $data[$name];
+                    unset($data[$name]);
+                } elseif (!$reset && !$useDefault && isset($this->_values[$name])) {
+                    $value = $this->_values[$name];
+                } elseif (!$reset && !$useDefault && isset($this->_wildcardData[$name])) {
+                    $value = $this->_wildcardData[$name];
+                } elseif (array_key_exists($name, $this->_defaults)) {
+                    $value = $this->_defaults[$name];
+                } else {
+                    require_once 'Zend/Controller/Router/Exception.php';
+                    throw new Zend_Controller_Router_Exception($name . ' is not specified');
+                }
+
+                if ($this->_isTranslated && in_array($name, $this->_translatable)) {
+                    $url[$key] = $translator->translate($value, $locale);
+                } else {
+                    $url[$key] = $value;
+                }
+            } elseif ($part != '*') {
+                if ($this->_isTranslated && substr($part, 0, 1) === '@') {
+                    if (substr($part, 1, 1) !== '@') {
+                        $url[$key] = $translator->translate(substr($part, 1), $locale);
+                    } else {
+                        $url[$key] = substr($part, 1);
+                    }
+                } else {
+                    if (substr($part, 0, 2) === '@@') {
+                        $part = substr($part, 1);
+                    }
+
+                    $url[$key] = $part;
+                }
+            } else {
+                if (!$reset) {
+                    $data += $this->_wildcardData;
+                }
+                $defaults = $this->getDefaults();
+                foreach ($data as $var => $value) {
+                    if ($value !== null && (!isset($defaults[$var]) || $value != $defaults[$var])) {
+                        $url[$key++] = $var;
+                        $url[$key++] = $value;
+                        $flag        = true;
+                    }
+                }
+            }
+        }
+
+        $return = '';
+
+        foreach (array_reverse($url, true) as $key => $value) {
+            $defaultValue = null;
+
+            if (isset($this->_variables[$key])) {
+                $defaultValue = $this->getDefault($this->_variables[$key]);
+
+                if ($this->_isTranslated && $defaultValue !== null
+                    && isset($this->_translatable[$this->_variables[$key]])
+                ) {
+                    $defaultValue = $translator->translate($defaultValue, $locale);
+                }
+            }
+
+            if ($flag || $value !== $defaultValue || $partial) {
+                if ($encode) {
+                    $value = urlencode($value);
+                }
+                $return = $this->_urlDelimiter . $value . $return;
+                $flag   = true;
+            }
+        }
+
+        return trim($return, $this->_urlDelimiter);
+    }
+
+    /**
+     * Return a single parameter of route's defaults
+     *
+     * @param string $name Array key of the parameter
+     * @return string Previously set default
+     */
+    public function getDefault($name)
+    {
+        if (isset($this->_defaults[$name])) {
+            return $this->_defaults[$name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Return an array of defaults
+     *
+     * @return array Route defaults
+     */
+    public function getDefaults()
+    {
+        return $this->_defaults;
+    }
+
+    /**
+     * Get all variables which are used by the route
+     *
+     * @return array
+     */
+    public function getVariables()
+    {
+        return $this->_variables;
+    }
+
+    /**
+     * Set a default translator
+     *
+     * @param  Zend_Translate $translator
+     * @return void
+     */
+    public static function setDefaultTranslator(Zend_Translate $translator = null)
+    {
+        self::$_defaultTranslator = $translator;
+    }
+
+    /**
+     * Get the default translator
+     *
+     * @return Zend_Translate
+     */
+    public static function getDefaultTranslator()
+    {
+        return self::$_defaultTranslator;
+    }
+
+    /**
+     * Set a translator
+     *
+     * @param  Zend_Translate $translator
+     * @return void
+     */
+    public function setTranslator(Zend_Translate $translator)
+    {
+        $this->_translator = $translator;
+    }
+
+    /**
+     * Get the translator
+     *
+     * @throws Zend_Controller_Router_Exception When no translator can be found
+     * @return Zend_Translate
+     */
+    public function getTranslator()
+    {
+        if ($this->_translator !== null) {
+            return $this->_translator;
+        } else {
+            if (($translator = self::getDefaultTranslator()) !== null) {
+                return $translator;
+            } else {
+                try {
+                    $translator = Zend_Registry::get('Zend_Translate');
+                } catch (Zend_Exception $e) {
+                    $translator = null;
+                }
+
+                if ($translator instanceof Zend_Translate) {
+                    return $translator;
+                }
+            }
+        }
+
+        require_once 'Zend/Controller/Router/Exception.php';
+        throw new Zend_Controller_Router_Exception('Could not find a translator');
+    }
+
+    /**
+     * Set a default locale
+     *
+     * @param  mixed $locale
+     * @return void
+     */
+    public static function setDefaultLocale($locale = null)
+    {
+        self::$_defaultLocale = $locale;
+    }
+
+    /**
+     * Get the default locale
+     *
+     * @return mixed
+     */
+    public static function getDefaultLocale()
+    {
+        return self::$_defaultLocale;
+    }
+
+    /**
+     * Set a locale
+     *
+     * @param  mixed $locale
+     * @return void
+     */
+    public function setLocale($locale)
+    {
+        $this->_locale = $locale;
+    }
+
+    /**
+     * Get the locale
+     *
+     * @return mixed
+     */
+    public function getLocale()
+    {
+        if ($this->_locale !== null) {
+            return $this->_locale;
+        } else {
+            if (($locale = self::getDefaultLocale()) !== null) {
+                return $locale;
+            } else {
+                try {
+                    $locale = Zend_Registry::get('Zend_Locale');
+                } catch (Zend_Exception $e) {
+                    $locale = null;
+                }
+
+                if ($locale !== null) {
+                    return $locale;
+                }
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Router/Route/Abstract.php b/lib/zend/Zend/Controller/Router/Route/Abstract.php
new file mode 100644
index 00000000000..2f6dc84807f
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Route/Abstract.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Controller_Router_Route_Interface
+ */
+require_once 'Zend/Controller/Router/Route/Interface.php';
+
+/**
+ * Abstract Route
+ *
+ * Implements interface and provides convenience methods
+ *
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_Router_Route_Interface
+{
+    /**
+     * URI delimiter
+     */
+    const URI_DELIMITER = '/';
+
+    /**
+     * Wether this route is abstract or not
+     *
+     * @var boolean
+     */
+    protected $_isAbstract = false;
+
+    /**
+     * Path matched by this route
+     *
+     * @var string
+     */
+    protected $_matchedPath = null;
+
+    /**
+     * Get the version of the route
+     *
+     * @return integer
+     */
+    public function getVersion()
+    {
+        return 2;
+    }
+
+    /**
+     * Set partially matched path
+     *
+     * @param  string $path
+     * @return void
+     */
+    public function setMatchedPath($path)
+    {
+        $this->_matchedPath = $path;
+    }
+
+    /**
+     * Get partially matched path
+     *
+     * @return string
+     */
+    public function getMatchedPath()
+    {
+        return $this->_matchedPath;
+    }
+
+    /**
+     * Check or set wether this is an abstract route or not
+     *
+     * @param  boolean $flag
+     * @return boolean
+     */
+    public function isAbstract($flag = null)
+    {
+        if ($flag !== null) {
+            $this->_isAbstract = $flag;
+        }
+
+        return $this->_isAbstract;
+    }
+
+    /**
+     * Create a new chain
+     *
+     * @param  Zend_Controller_Router_Route_Abstract $route
+     * @param  string                                $separator
+     * @return Zend_Controller_Router_Route_Chain
+     */
+    public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/')
+    {
+        require_once 'Zend/Controller/Router/Route/Chain.php';
+
+        $chain = new Zend_Controller_Router_Route_Chain();
+        $chain->chain($this)->chain($route, $separator);
+
+        return $chain;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Router/Route/Chain.php b/lib/zend/Zend/Controller/Router/Route/Chain.php
new file mode 100644
index 00000000000..a474931ac51
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Route/Chain.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Router_Route_Abstract */
+require_once 'Zend/Controller/Router/Route/Abstract.php';
+
+/**
+ * Chain route is used for managing route chaining.
+ *
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Abstract
+{
+
+    /**
+     * Routes
+     *
+     * @var array
+     */
+    protected $_routes = array();
+
+    /**
+     * Separators
+     *
+     * @var array
+     */
+    protected $_separators = array();
+
+    /**
+     * Instantiates route based on passed Zend_Config structure
+     *
+     * @param  Zend_Config $config Configuration object
+     * @return Zend_Controller_Router_Route_Chain
+     */
+    public static function getInstance(Zend_Config $config)
+    {
+        $defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
+
+        return new self($config->route, $defs);
+    }
+
+    /**
+     * Add a route to this chain
+     *
+     * @param  Zend_Controller_Router_Route_Abstract $route
+     * @param  string                                $separator
+     * @return Zend_Controller_Router_Route_Chain
+     */
+    public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = self::URI_DELIMITER)
+    {
+        $this->_routes[]     = $route;
+        $this->_separators[] = $separator;
+
+        return $this;
+    }
+
+    /**
+     * Matches a user submitted path with a previously defined route.
+     * Assigns and returns an array of defaults on a successful match.
+     *
+     * @param  Zend_Controller_Request_Http $request Request to get the path info from
+     * @param  null                         $partial
+     * @return array|false An array of assigned values or a false on a mismatch
+     */
+    public function match($request, $partial = null)
+    {
+        $rawPath     = $request->getPathInfo();
+        $path        = trim($request->getPathInfo(), self::URI_DELIMITER);
+        $subPath     = $path;
+        $values      = array();
+        $matchedPath = null;
+
+        foreach ($this->_routes as $key => $route) {
+            if ($key > 0
+                && $matchedPath !== null
+                && $subPath !== ''
+                && $subPath !== false
+            ) {
+                $separator = substr($subPath, 0, strlen($this->_separators[$key]));
+
+                if ($separator !== $this->_separators[$key]) {
+                    $request->setPathInfo($rawPath);
+                    return false;
+                }
+
+                $subPath = substr($subPath, strlen($separator));
+            }
+            // TODO: Should be an interface method. Hack for 1.0 BC
+            if (!method_exists($route, 'getVersion') || $route->getVersion() == 1) {
+                $match = $subPath;
+            } else {
+                $request->setPathInfo($subPath);
+                $match = $request;
+            }
+
+            $res = $route->match($match, true);
+
+            if ($res === false) {
+                $request->setPathInfo($rawPath);
+                return false;
+            }
+
+            $matchedPath = $route->getMatchedPath();
+
+            if ($matchedPath !== null) {
+                $subPath   = substr($subPath, strlen($matchedPath));
+            }
+
+            $values = $res + $values;
+        }
+
+        $request->setPathInfo($path);
+
+        if ($subPath !== '' && $subPath !== false) {
+            return false;
+        }
+
+        return $values;
+    }
+
+    /**
+     * Assembles a URL path defined by this route
+     *
+     * @param  array $data An array of variable and value pairs used as parameters
+     * @param  bool  $reset
+     * @param  bool  $encode
+     * @return string Route path with user submitted parameters
+     */
+    public function assemble($data = array(), $reset = false, $encode = false)
+    {
+        $value     = '';
+        $numRoutes = count($this->_routes);
+
+        foreach ($this->_routes as $key => $route) {
+            if ($key > 0) {
+                $value .= $this->_separators[$key];
+            }
+
+            $value .= $route->assemble($data, $reset, $encode, (($numRoutes - 1) > $key));
+
+            if (method_exists($route, 'getVariables')) {
+                $variables = $route->getVariables();
+
+                foreach ($variables as $variable) {
+                    $data[$variable] = null;
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Set the request object for this and the child routes
+     *
+     * @param  Zend_Controller_Request_Abstract|null $request
+     * @return void
+     */
+    public function setRequest(Zend_Controller_Request_Abstract $request = null)
+    {
+        $this->_request = $request;
+
+        foreach ($this->_routes as $route) {
+            if (method_exists($route, 'setRequest')) {
+                $route->setRequest($request);
+            }
+        }
+    }
+
+    /**
+     * Return a single parameter of route's defaults
+     *
+     * @param  string $name Array key of the parameter
+     * @return string Previously set default
+     */
+    public function getDefault($name)
+    {
+        $default = null;
+        foreach ($this->_routes as $route) {
+            if (method_exists($route, 'getDefault')) {
+                $current = $route->getDefault($name);
+                if (null !== $current) {
+                    $default = $current;
+                }
+            }
+        }
+
+        return $default;
+    }
+
+    /**
+     * Return an array of defaults
+     *
+     * @return array Route defaults
+     */
+    public function getDefaults()
+    {
+        $defaults = array();
+        foreach ($this->_routes as $route) {
+            if (method_exists($route, 'getDefaults')) {
+                $defaults = array_merge($defaults, $route->getDefaults());
+            }
+        }
+
+        return $defaults;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Router/Route/Hostname.php b/lib/zend/Zend/Controller/Router/Route/Hostname.php
new file mode 100644
index 00000000000..2d33c61811a
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Route/Hostname.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Router_Route_Abstract */
+require_once 'Zend/Controller/Router/Route/Abstract.php';
+
+/**
+ * Hostname Route
+ *
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @see        http://manuals.rubyonrails.com/read/chapter/65
+ */
+class Zend_Controller_Router_Route_Hostname extends Zend_Controller_Router_Route_Abstract
+{
+
+    /**
+     * Host variable
+     *
+     * @var string
+     */
+    protected $_hostVariable = ':';
+
+    /**
+     * Regex delimiter
+     *
+     * @var string
+     */
+    protected $_regexDelimiter = '#';
+
+    /**
+     * Default regex string
+     *
+     * @var string|null
+     */
+    protected $_defaultRegex = null;
+
+    /**
+     * Holds names of all route's pattern variable names. Array index holds a position in host.
+     *
+     * @var array
+     */
+    protected $_variables = array();
+
+    /**
+     * Holds Route patterns for all host parts. In case of a variable it stores it's regex
+     * requirement or null. In case of a static part, it holds only it's direct value.
+     *
+     * @var array
+     */
+    protected $_parts = array();
+
+    /**
+     * Holds user submitted default values for route's variables. Name and value pairs.
+     *
+     * @var array
+     */
+    protected $_defaults = array();
+
+    /**
+     * Holds user submitted regular expression patterns for route's variables' values.
+     * Name and value pairs.
+     *
+     * @var array
+     */
+    protected $_requirements = array();
+
+    /**
+     * Default scheme
+     *
+     * @var string
+     */
+    protected $_scheme = null;
+
+    /**
+     * Associative array filled on match() that holds matched path values
+     * for given variable names.
+     *
+     * @var array
+     */
+    protected $_values = array();
+
+    /**
+     * Current request object
+     *
+     * @var Zend_Controller_Request_Abstract
+     */
+    protected $_request;
+
+    /**
+     * Helper var that holds a count of route pattern's static parts
+     * for validation
+     *
+     * @var int
+     */
+    private $_staticCount = 0;
+
+    /**
+     * Set the request object
+     *
+     * @param  Zend_Controller_Request_Abstract|null $request
+     */
+    public function setRequest(Zend_Controller_Request_Abstract $request = null)
+    {
+        $this->_request = $request;
+    }
+
+    /**
+     * Get the request object
+     *
+     * @return Zend_Controller_Request_Abstract $request
+     */
+    public function getRequest()
+    {
+        if ($this->_request === null) {
+            require_once 'Zend/Controller/Front.php';
+            $this->_request = Zend_Controller_Front::getInstance()->getRequest();
+        }
+
+        return $this->_request;
+    }
+
+    /**
+     * Instantiates route based on passed Zend_Config structure
+     *
+     * @param Zend_Config $config Configuration object
+     * @return Zend_Controller_Router_Route_Hostname
+     */
+    public static function getInstance(Zend_Config $config)
+    {
+        $reqs   = ($config->reqs instanceof Zend_Config) ? $config->reqs->toArray() : array();
+        $defs   = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
+        $scheme = (isset($config->scheme)) ? $config->scheme : null;
+
+        return new self($config->route, $defs, $reqs, $scheme);
+    }
+
+    /**
+     * Prepares the route for mapping by splitting (exploding) it
+     * to a corresponding atomic parts. These parts are assigned
+     * a position which is later used for matching and preparing values.
+     *
+     * @param string $route    Map used to match with later submitted hostname
+     * @param array  $defaults Defaults for map variables with keys as variable names
+     * @param array  $reqs     Regular expression requirements for variables (keys as variable names)
+     * @param string $scheme
+     */
+    public function __construct($route, $defaults = array(), $reqs = array(), $scheme = null)
+    {
+        $route               = trim($route, '.');
+        $this->_defaults     = (array) $defaults;
+        $this->_requirements = (array) $reqs;
+        $this->_scheme       = $scheme;
+
+        if ($route != '') {
+            foreach (explode('.', $route) as $pos => $part) {
+                if (substr($part, 0, 1) == $this->_hostVariable) {
+                    $name                   = substr($part, 1);
+                    $this->_parts[$pos]     = (isset($reqs[$name]) ? $reqs[$name] : $this->_defaultRegex);
+                    $this->_variables[$pos] = $name;
+                } else {
+                    $this->_parts[$pos] = $part;
+                    $this->_staticCount++;
+                }
+            }
+        }
+    }
+
+    /**
+     * Matches a user submitted path with parts defined by a map. Assigns and
+     * returns an array of variables on a successful match.
+     *
+     * @param Zend_Controller_Request_Http $request Request to get the host from
+     * @return array|false An array of assigned values or a false on a mismatch
+     */
+    public function match($request)
+    {
+        // Check the scheme if required
+        if ($this->_scheme !== null) {
+            $scheme = $request->getScheme();
+
+            if ($scheme !== $this->_scheme) {
+                return false;
+            }
+        }
+
+        // Get the host and remove unnecessary port information
+        $host = $request->getHttpHost();
+        if (preg_match('#:\d+$#', $host, $result) === 1) {
+            $host = substr($host, 0, -strlen($result[0]));
+        }
+
+        $hostStaticCount = 0;
+        $values          = array();
+
+        $host = trim($host, '.');
+
+        if ($host != '') {
+            $host = explode('.', $host);
+
+            foreach ($host as $pos => $hostPart) {
+                // Host is longer than a route, it's not a match
+                if (!array_key_exists($pos, $this->_parts)) {
+                    return false;
+                }
+
+                $name     = isset($this->_variables[$pos]) ? $this->_variables[$pos] : null;
+                $hostPart = urldecode($hostPart);
+
+                // If it's a static part, match directly
+                if ($name === null && $this->_parts[$pos] != $hostPart) {
+                    return false;
+                }
+
+                // If it's a variable with requirement, match a regex. If not - everything matches
+                if ($this->_parts[$pos] !== null
+                    && !preg_match(
+                        $this->_regexDelimiter . '^' . $this->_parts[$pos] . '$' . $this->_regexDelimiter . 'iu',
+                        $hostPart
+                    )
+                ) {
+                    return false;
+                }
+
+                // If it's a variable store it's value for later
+                if ($name !== null) {
+                    $values[$name] = $hostPart;
+                } else {
+                    $hostStaticCount++;
+                }
+            }
+        }
+
+        // Check if all static mappings have been matched
+        if ($this->_staticCount != $hostStaticCount) {
+            return false;
+        }
+
+        $return = $values + $this->_defaults;
+
+        // Check if all map variables have been initialized
+        foreach ($this->_variables as $var) {
+            if (!array_key_exists($var, $return)) {
+                return false;
+            }
+        }
+
+        $this->_values = $values;
+
+        return $return;
+    }
+
+    /**
+     * Assembles user submitted parameters forming a hostname defined by this route
+     *
+     * @param  array   $data  An array of variable and value pairs used as parameters
+     * @param  boolean $reset Whether or not to set route defaults with those provided in $data
+     * @param  boolean $encode
+     * @param  boolean $partial
+     * @throws Zend_Controller_Router_Exception
+     * @return string Route path with user submitted parameters
+     */
+    public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
+    {
+        $host = array();
+        $flag = false;
+
+        foreach ($this->_parts as $key => $part) {
+            $name = isset($this->_variables[$key]) ? $this->_variables[$key] : null;
+
+            $useDefault = false;
+            if (isset($name) && array_key_exists($name, $data) && $data[$name] === null) {
+                $useDefault = true;
+            }
+
+            if (isset($name)) {
+                if (isset($data[$name]) && !$useDefault) {
+                    $host[$key] = $data[$name];
+                    unset($data[$name]);
+                } elseif (!$reset && !$useDefault && isset($this->_values[$name])) {
+                    $host[$key] = $this->_values[$name];
+                } elseif (isset($this->_defaults[$name])) {
+                    $host[$key] = $this->_defaults[$name];
+                } else {
+                    require_once 'Zend/Controller/Router/Exception.php';
+                    throw new Zend_Controller_Router_Exception($name . ' is not specified');
+                }
+            } else {
+                $host[$key] = $part;
+            }
+        }
+
+        $return = '';
+
+        foreach (array_reverse($host, true) as $key => $value) {
+            if ($flag || !isset($this->_variables[$key]) || $value !== $this->getDefault($this->_variables[$key])
+                || $partial
+            ) {
+                if ($encode) {
+                    $value = urlencode($value);
+                }
+                $return = '.' . $value . $return;
+                $flag   = true;
+            }
+        }
+
+        $url = trim($return, '.');
+
+        if ($this->_scheme !== null) {
+            $scheme = $this->_scheme;
+        } else {
+            $request = $this->getRequest();
+            if ($request instanceof Zend_Controller_Request_Http) {
+                $scheme = $request->getScheme();
+            } else {
+                $scheme = 'http';
+            }
+        }
+
+        $url = $scheme . '://' . $url;
+
+        return $url;
+    }
+
+    /**
+     * Return a single parameter of route's defaults
+     *
+     * @param string $name Array key of the parameter
+     * @return string Previously set default
+     */
+    public function getDefault($name)
+    {
+        if (isset($this->_defaults[$name])) {
+            return $this->_defaults[$name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Return an array of defaults
+     *
+     * @return array Route defaults
+     */
+    public function getDefaults()
+    {
+        return $this->_defaults;
+    }
+
+    /**
+     * Get all variables which are used by the route
+     *
+     * @return array
+     */
+    public function getVariables()
+    {
+        return $this->_variables;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Router/Route/Interface.php b/lib/zend/Zend/Controller/Router/Route/Interface.php
new file mode 100644
index 00000000000..6e82990f557
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Route/Interface.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Config */
+require_once 'Zend/Config.php';
+
+/**
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Controller_Router_Route_Interface
+{
+    public function match($path);
+
+    public function assemble($data = array(), $reset = false, $encode = false);
+
+    public static function getInstance(Zend_Config $config);
+}
\ No newline at end of file
diff --git a/lib/zend/Zend/Controller/Router/Route/Module.php b/lib/zend/Zend/Controller/Router/Route/Module.php
new file mode 100644
index 00000000000..581a89b1bc4
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Route/Module.php
@@ -0,0 +1,323 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Router_Route_Abstract */
+require_once 'Zend/Controller/Router/Route/Abstract.php';
+
+/**
+ * Module Route
+ *
+ * Default route for module functionality
+ *
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @see        http://manuals.rubyonrails.com/read/chapter/65
+ */
+class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_Abstract
+{
+
+    /**
+     * Default values for the route (ie. module, controller, action, params)
+     *
+     * @var array
+     */
+    protected $_defaults;
+
+    /**
+     * Default values for the route (ie. module, controller, action, params)
+     *
+     * @var array
+     */
+    protected $_values = array();
+
+    /**
+     * @var boolean
+     */
+    protected $_moduleValid = false;
+
+    /**
+     * @var boolean
+     */
+    protected $_keysSet = false;
+
+    /**#@+
+     * Array keys to use for module, controller, and action. Should be taken out of request.
+     *
+     * @var string
+     */
+    protected $_moduleKey     = 'module';
+    protected $_controllerKey = 'controller';
+    protected $_actionKey     = 'action';
+    /**#@-*/
+
+    /**
+     * @var Zend_Controller_Dispatcher_Interface
+     */
+    protected $_dispatcher;
+
+    /**
+     * @var Zend_Controller_Request_Abstract
+     */
+    protected $_request;
+
+    /**
+     * Get the version of the route
+     *
+     * @return int
+     */
+    public function getVersion()
+    {
+        return 1;
+    }
+
+    /**
+     * Instantiates route based on passed Zend_Config structure
+     *
+     * @param Zend_Config $config
+     * @return Zend_Controller_Router_Route_Module
+     */
+    public static function getInstance(Zend_Config $config)
+    {
+        $frontController = Zend_Controller_Front::getInstance();
+
+        $defs       = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
+        $dispatcher = $frontController->getDispatcher();
+        $request    = $frontController->getRequest();
+
+        return new self($defs, $dispatcher, $request);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param array                                $defaults   Defaults for map variables with keys as variable names
+     * @param Zend_Controller_Dispatcher_Interface $dispatcher Dispatcher object
+     * @param Zend_Controller_Request_Abstract     $request    Request object
+     */
+    public function __construct(
+        array $defaults = array(),
+        Zend_Controller_Dispatcher_Interface $dispatcher = null,
+        Zend_Controller_Request_Abstract $request = null
+    )
+    {
+        $this->_defaults = $defaults;
+
+        if (isset($request)) {
+            $this->_request = $request;
+        }
+
+        if (isset($dispatcher)) {
+            $this->_dispatcher = $dispatcher;
+        }
+    }
+
+    /**
+     * Set request keys based on values in request object
+     *
+     * @return void
+     */
+    protected function _setRequestKeys()
+    {
+        if (null !== $this->_request) {
+            $this->_moduleKey     = $this->_request->getModuleKey();
+            $this->_controllerKey = $this->_request->getControllerKey();
+            $this->_actionKey     = $this->_request->getActionKey();
+        }
+
+        if (null !== $this->_dispatcher) {
+            $this->_defaults += array(
+                $this->_controllerKey => $this->_dispatcher->getDefaultControllerName(),
+                $this->_actionKey     => $this->_dispatcher->getDefaultAction(),
+                $this->_moduleKey     => $this->_dispatcher->getDefaultModule()
+            );
+        }
+
+        $this->_keysSet = true;
+    }
+
+    /**
+     * Matches a user submitted path. Assigns and returns an array of variables
+     * on a successful match.
+     *
+     * If a request object is registered, it uses its setModuleName(),
+     * setControllerName(), and setActionName() accessors to set those values.
+     * Always returns the values as an array.
+     *
+     * @param string  $path Path used to match against this routing map
+     * @param boolean $partial
+     * @return array An array of assigned values or a false on a mismatch
+     */
+    public function match($path, $partial = false)
+    {
+        $this->_setRequestKeys();
+
+        $values = array();
+        $params = array();
+
+        if (!$partial) {
+            $path = trim($path, self::URI_DELIMITER);
+        } else {
+            $matchedPath = $path;
+        }
+
+        if ($path != '') {
+            $path = explode(self::URI_DELIMITER, $path);
+
+            if ($this->_dispatcher && $this->_dispatcher->isValidModule($path[0])) {
+                $values[$this->_moduleKey] = array_shift($path);
+                $this->_moduleValid        = true;
+            }
+
+            if (count($path) && !empty($path[0])) {
+                $values[$this->_controllerKey] = array_shift($path);
+            }
+
+            if (count($path) && !empty($path[0])) {
+                $values[$this->_actionKey] = array_shift($path);
+            }
+
+            if ($numSegs = count($path)) {
+                for ($i = 0; $i < $numSegs; $i = $i + 2) {
+                    $key          = urldecode($path[$i]);
+                    $val          = isset($path[$i + 1]) ? urldecode($path[$i + 1]) : null;
+                    $params[$key] = (isset($params[$key]) ? (array_merge((array)$params[$key], array($val))) : $val);
+                }
+            }
+        }
+
+        if ($partial) {
+            $this->setMatchedPath($matchedPath);
+        }
+
+        $this->_values = $values + $params;
+
+        return $this->_values + $this->_defaults;
+    }
+
+    /**
+     * Assembles user submitted parameters forming a URL path defined by this route
+     *
+     * @param array   $data  An array of variable and value pairs used as parameters
+     * @param boolean $reset Weither to reset the current params
+     * @param boolean $encode
+     * @param boolean $partial
+     * @return string Route path with user submitted parameters
+     */
+    public function assemble($data = array(), $reset = false, $encode = true, $partial = false)
+    {
+        if (!$this->_keysSet) {
+            $this->_setRequestKeys();
+        }
+
+        $params = (!$reset) ? $this->_values : array();
+
+        foreach ($data as $key => $value) {
+            if ($value !== null) {
+                $params[$key] = $value;
+            } elseif (isset($params[$key])) {
+                unset($params[$key]);
+            }
+        }
+
+        $params += $this->_defaults;
+
+        $url = '';
+
+        if ($this->_moduleValid || array_key_exists($this->_moduleKey, $data)) {
+            if ($params[$this->_moduleKey] != $this->_defaults[$this->_moduleKey]) {
+                $module = $params[$this->_moduleKey];
+            }
+        }
+        unset($params[$this->_moduleKey]);
+
+        $controller = $params[$this->_controllerKey];
+        unset($params[$this->_controllerKey]);
+
+        $action = $params[$this->_actionKey];
+        unset($params[$this->_actionKey]);
+
+        foreach ($params as $key => $value) {
+            $key = ($encode) ? urlencode($key) : $key;
+            if (is_array($value)) {
+                foreach ($value as $arrayValue) {
+                    $arrayValue = ($encode) ? urlencode($arrayValue) : $arrayValue;
+                    $url .= self::URI_DELIMITER . $key;
+                    $url .= self::URI_DELIMITER . $arrayValue;
+                }
+            } else {
+                if ($encode) {
+                    $value = urlencode($value);
+                }
+                $url .= self::URI_DELIMITER . $key;
+                $url .= self::URI_DELIMITER . $value;
+            }
+        }
+
+        if (!empty($url) || $action !== $this->_defaults[$this->_actionKey]) {
+            if ($encode) {
+                $action = urlencode($action);
+            }
+            $url = self::URI_DELIMITER . $action . $url;
+        }
+
+        if (!empty($url) || $controller !== $this->_defaults[$this->_controllerKey]) {
+            if ($encode) {
+                $controller = urlencode($controller);
+            }
+            $url = self::URI_DELIMITER . $controller . $url;
+        }
+
+        if (isset($module)) {
+            if ($encode) {
+                $module = urlencode($module);
+            }
+            $url = self::URI_DELIMITER . $module . $url;
+        }
+
+        return ltrim($url, self::URI_DELIMITER);
+    }
+
+    /**
+     * Return a single parameter of route's defaults
+     *
+     * @param string $name Array key of the parameter
+     * @return string Previously set default
+     */
+    public function getDefault($name)
+    {
+        if (isset($this->_defaults[$name])) {
+            return $this->_defaults[$name];
+        }
+    }
+
+    /**
+     * Return an array of defaults
+     *
+     * @return array Route defaults
+     */
+    public function getDefaults()
+    {
+        return $this->_defaults;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Router/Route/Regex.php b/lib/zend/Zend/Controller/Router/Route/Regex.php
new file mode 100644
index 00000000000..e012357d7b3
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Route/Regex.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Router_Route_Abstract */
+require_once 'Zend/Controller/Router/Route/Abstract.php';
+
+/**
+ * Regex Route
+ *
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Abstract
+{
+
+    /**
+     * Regex string
+     *
+     * @var string|null
+     */
+    protected $_regex = null;
+
+    /**
+     * Default values for the route (ie. module, controller, action, params)
+     *
+     * @var array
+     */
+    protected $_defaults = array();
+
+    /**
+     * Reverse
+     *
+     * @var string|null
+     */
+    protected $_reverse = null;
+
+    /**
+     * Map
+     *
+     * @var array
+     */
+    protected $_map = array();
+
+    /**
+     * Values
+     *
+     * @var array
+     */
+    protected $_values = array();
+
+    /**
+     * Instantiates route based on passed Zend_Config structure
+     *
+     * @param Zend_Config $config Configuration object
+     * @return Zend_Controller_Router_Route_Regex
+     */
+    public static function getInstance(Zend_Config $config)
+    {
+        $defs    = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
+        $map     = ($config->map instanceof Zend_Config) ? $config->map->toArray() : array();
+        $reverse = (isset($config->reverse)) ? $config->reverse : null;
+
+        return new self($config->route, $defs, $map, $reverse);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param       $route
+     * @param array $defaults
+     * @param array $map
+     * @param null  $reverse
+     */
+    public function __construct($route, $defaults = array(), $map = array(), $reverse = null)
+    {
+        $this->_regex    = $route;
+        $this->_defaults = (array) $defaults;
+        $this->_map      = (array) $map;
+        $this->_reverse  = $reverse;
+    }
+
+    /**
+     * Get the version of the route
+     *
+     * @return int
+     */
+    public function getVersion()
+    {
+        return 1;
+    }
+
+    /**
+     * Matches a user submitted path with a previously defined route.
+     * Assigns and returns an array of defaults on a successful match.
+     *
+     * @param  string $path Path used to match against this routing map
+     * @return array|false  An array of assigned values or a false on a mismatch
+     */
+    public function match($path, $partial = false)
+    {
+        if (!$partial) {
+            $path  = trim(urldecode($path), self::URI_DELIMITER);
+            $regex = '#^' . $this->_regex . '$#i';
+        } else {
+            $regex = '#^' . $this->_regex . '#i';
+        }
+
+        $res = preg_match($regex, $path, $values);
+
+        if ($res === 0) {
+            return false;
+        }
+
+        if ($partial) {
+            $this->setMatchedPath($values[0]);
+        }
+
+        // array_filter_key()? Why isn't this in a standard PHP function set yet? :)
+        foreach ($values as $i => $value) {
+            if (!is_int($i) || $i === 0) {
+                unset($values[$i]);
+            }
+        }
+
+        $this->_values = $values;
+
+        $values   = $this->_getMappedValues($values);
+        $defaults = $this->_getMappedValues($this->_defaults, false, true);
+        $return   = $values + $defaults;
+
+        return $return;
+    }
+
+    /**
+     * Maps numerically indexed array values to it's associative mapped counterpart.
+     * Or vice versa. Uses user provided map array which consists of index => name
+     * parameter mapping. If map is not found, it returns original array.
+     *
+     * Method strips destination type of keys form source array. Ie. if source array is
+     * indexed numerically then every associative key will be stripped. Vice versa if reversed
+     * is set to true.
+     *
+     * @param  array   $values   Indexed or associative array of values to map
+     * @param  boolean $reversed False means translation of index to association. True means reverse.
+     * @param  boolean $preserve Should wrong type of keys be preserved or stripped.
+     * @return array   An array of mapped values
+     */
+    protected function _getMappedValues($values, $reversed = false, $preserve = false)
+    {
+        if (count($this->_map) == 0) {
+            return $values;
+        }
+
+        $return = array();
+
+        foreach ($values as $key => $value) {
+            if (is_int($key) && !$reversed) {
+                if (array_key_exists($key, $this->_map)) {
+                    $index = $this->_map[$key];
+                } elseif (false === ($index = array_search($key, $this->_map))) {
+                    $index = $key;
+                }
+                $return[$index] = $values[$key];
+            } elseif ($reversed) {
+                $index = $key;
+                if (!is_int($key)) {
+                    if (array_key_exists($key, $this->_map)) {
+                        $index = $this->_map[$key];
+                    } else {
+                        $index = array_search($key, $this->_map, true);
+                    }
+                }
+                if (false !== $index) {
+                    $return[$index] = $values[$key];
+                }
+            } elseif ($preserve) {
+                $return[$key] = $value;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * Assembles a URL path defined by this route
+     *
+     * @param  array   $data An array of name (or index) and value pairs used as parameters
+     * @param  boolean $reset
+     * @param  boolean $encode
+     * @param  boolean $partial
+     * @throws Zend_Controller_Router_Exception
+     * @return string Route path with user submitted parameters
+     */
+    public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
+    {
+        if ($this->_reverse === null) {
+            require_once 'Zend/Controller/Router/Exception.php';
+            throw new Zend_Controller_Router_Exception('Cannot assemble. Reversed route is not specified.');
+        }
+
+        $defaultValuesMapped = $this->_getMappedValues($this->_defaults, true, false);
+        $matchedValuesMapped = $this->_getMappedValues($this->_values, true, false);
+        $dataValuesMapped    = $this->_getMappedValues($data, true, false);
+
+        // handle resets, if so requested (By null value) to do so
+        if (($resetKeys = array_search(null, $dataValuesMapped, true)) !== false) {
+            foreach ((array)$resetKeys as $resetKey) {
+                if (isset($matchedValuesMapped[$resetKey])) {
+                    unset($matchedValuesMapped[$resetKey]);
+                    unset($dataValuesMapped[$resetKey]);
+                }
+            }
+        }
+
+        // merge all the data together, first defaults, then values matched, then supplied
+        $mergedData = $defaultValuesMapped;
+        $mergedData = $this->_arrayMergeNumericKeys($mergedData, $matchedValuesMapped);
+        $mergedData = $this->_arrayMergeNumericKeys($mergedData, $dataValuesMapped);
+
+        if ($encode) {
+            foreach ($mergedData as $key => &$value) {
+                $value = urlencode($value);
+            }
+        }
+
+        ksort($mergedData);
+
+        $return = @vsprintf($this->_reverse, $mergedData);
+
+        if ($return === false) {
+            require_once 'Zend/Controller/Router/Exception.php';
+            throw new Zend_Controller_Router_Exception('Cannot assemble. Too few arguments?');
+        }
+
+        return $return;
+    }
+
+    /**
+     * Return a single parameter of route's defaults
+     *
+     * @param string $name Array key of the parameter
+     * @return string Previously set default
+     */
+    public function getDefault($name)
+    {
+        if (isset($this->_defaults[$name])) {
+            return $this->_defaults[$name];
+        }
+    }
+
+    /**
+     * Return an array of defaults
+     *
+     * @return array Route defaults
+     */
+    public function getDefaults()
+    {
+        return $this->_defaults;
+    }
+
+    /**
+     * Get all variables which are used by the route
+     *
+     * @return array
+     */
+    public function getVariables()
+    {
+        $variables = array();
+
+        foreach ($this->_map as $key => $value) {
+            if (is_numeric($key)) {
+                $variables[] = $value;
+            } else {
+                $variables[] = $key;
+            }
+        }
+
+        return $variables;
+    }
+
+    /**
+     * _arrayMergeNumericKeys() - allows for a strict key (numeric's included) array_merge.
+     * php's array_merge() lacks the ability to merge with numeric keys.
+     *
+     * @param array $array1
+     * @param array $array2
+     * @return array
+     */
+    protected function _arrayMergeNumericKeys(Array $array1, Array $array2)
+    {
+        $returnArray = $array1;
+        foreach ($array2 as $array2Index => $array2Value) {
+            $returnArray[$array2Index] = $array2Value;
+        }
+
+        return $returnArray;
+    }
+}
diff --git a/lib/zend/Zend/Controller/Router/Route/Static.php b/lib/zend/Zend/Controller/Router/Route/Static.php
new file mode 100644
index 00000000000..4acd9f572ed
--- /dev/null
+++ b/lib/zend/Zend/Controller/Router/Route/Static.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Router_Route_Abstract */
+require_once 'Zend/Controller/Router/Route/Abstract.php';
+
+/**
+ * StaticRoute is used for managing static URIs.
+ *
+ * It's a lot faster compared to the standard Route implementation.
+ *
+ * @package    Zend_Controller
+ * @subpackage Router
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Controller_Router_Route_Static extends Zend_Controller_Router_Route_Abstract
+{
+
+    /**
+     * Route
+     *
+     * @var string|null
+     */
+    protected $_route = null;
+
+    /**
+     * Default values for the route (ie. module, controller, action, params)
+     *
+     * @var array
+     */
+    protected $_defaults = array();
+
+    /**
+     * Get the version of the route
+     *
+     * @return int
+     */
+    public function getVersion()
+    {
+        return 1;
+    }
+
+    /**
+     * Instantiates route based on passed Zend_Config structure
+     *
+     * @param Zend_Config $config Configuration object
+     * @return Zend_Controller_Router_Route_Static
+     */
+    public static function getInstance(Zend_Config $config)
+    {
+        $defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
+
+        return new self($config->route, $defs);
+    }
+
+    /**
+     * Prepares the route for mapping.
+     *
+     * @param string $route    Map used to match with later submitted URL path
+     * @param array  $defaults Defaults for map variables with keys as variable names
+     */
+    public function __construct($route, $defaults = array())
+    {
+        $this->_route    = trim($route, self::URI_DELIMITER);
+        $this->_defaults = (array) $defaults;
+    }
+
+    /**
+     * Matches a user submitted path with a previously defined route.
+     * Assigns and returns an array of defaults on a successful match.
+     *
+     * @param string $path Path used to match against this routing map
+     * @return array|false An array of assigned values or a false on a mismatch
+     */
+    public function match($path, $partial = false)
+    {
+        if ($partial) {
+            if ((empty($path) && empty($this->_route))
+                || (substr($path, 0, strlen($this->_route)) === $this->_route)
+            ) {
+                $this->setMatchedPath($this->_route);
+
+                return $this->_defaults;
+            }
+        } else {
+            if (trim($path, self::URI_DELIMITER) == $this->_route) {
+                return $this->_defaults;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Assembles a URL path defined by this route
+     *
+     * @param array $data An array of variable and value pairs used as parameters
+     * @return string Route path with user submitted parameters
+     */
+    public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
+    {
+        return $this->_route;
+    }
+
+    /**
+     * Return a single parameter of route's defaults
+     *
+     * @param string $name Array key of the parameter
+     * @return string Previously set default
+     */
+    public function getDefault($name)
+    {
+        if (isset($this->_defaults[$name])) {
+            return $this->_defaults[$name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Return an array of defaults
+     *
+     * @return array Route defaults
+     */
+    public function getDefaults()
+    {
+        return $this->_defaults;
+    }
+}
diff --git a/lib/zend/Zend/Crypt.php b/lib/zend/Zend/Crypt.php
new file mode 100644
index 00000000000..0ceeac71e33
--- /dev/null
+++ b/lib/zend/Zend/Crypt.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt
+{
+
+    const TYPE_OPENSSL = 'openssl';
+    const TYPE_HASH = 'hash';
+    const TYPE_MHASH = 'mhash';
+
+    protected static $_type = null;
+
+    /**
+     * @var array
+     */
+    protected static $_supportedAlgosOpenssl = array(
+        'md2',
+        'md4',
+        'mdc2',
+        'rmd160',
+        'sha',
+        'sha1',
+        'sha224',
+        'sha256',
+        'sha384',
+        'sha512'
+    );
+
+    /**
+     * @var array
+     */
+    protected static $_supportedAlgosMhash = array(
+        'adler32',
+        'crc32',
+        'crc32b',
+        'gost',
+        'haval128',
+        'haval160',
+        'haval192',
+        'haval256',
+        'md4',
+        'md5',
+        'ripemd160',
+        'sha1',
+        'sha256',
+        'tiger',
+        'tiger128',
+        'tiger160'
+    );
+
+    /**
+     * @param string $algorithm
+     * @param string $data
+     * @param bool $binaryOutput
+     * @return unknown
+     */
+    public static function hash($algorithm, $data, $binaryOutput = false)
+    {
+        $algorithm = strtolower($algorithm);
+        if (function_exists($algorithm)) {
+            return $algorithm($data, $binaryOutput);
+        }
+        self::_detectHashSupport($algorithm);
+        $supportedMethod = '_digest' . ucfirst(self::$_type);
+        $result = self::$supportedMethod($algorithm, $data, $binaryOutput);
+        return $result;
+    }
+
+    /**
+     * @param string $algorithm
+     * @throws Zend_Crypt_Exception
+     */
+    protected static function _detectHashSupport($algorithm)
+    {
+        if (function_exists('hash')) {
+            self::$_type = self::TYPE_HASH;
+            if (in_array($algorithm, hash_algos())) {
+               return;
+            }
+        }
+        if (function_exists('mhash')) {
+            self::$_type = self::TYPE_MHASH;
+            if (in_array($algorithm, self::$_supportedAlgosMhash)) {
+               return;
+            }
+        }
+        if (function_exists('openssl_digest')) {
+            if ($algorithm == 'ripemd160') {
+                $algorithm = 'rmd160';
+            }
+            self::$_type = self::TYPE_OPENSSL;
+            if (in_array($algorithm, self::$_supportedAlgosOpenssl)) {
+               return;
+            }
+        }
+        /**
+         * @see Zend_Crypt_Exception
+         */
+        require_once 'Zend/Crypt/Exception.php';
+        throw new Zend_Crypt_Exception('\'' . $algorithm . '\' is not supported by any available extension or native function');
+    }
+
+    /**
+     * @param string $algorithm
+     * @param string $data
+     * @param bool $binaryOutput
+     * @return string
+     */
+    protected static function _digestHash($algorithm, $data, $binaryOutput)
+    {
+        return hash($algorithm, $data, $binaryOutput);
+    }
+
+    /**
+     * @param string $algorithm
+     * @param string $data
+     * @param bool $binaryOutput
+     * @return string
+     */
+    protected static function _digestMhash($algorithm, $data, $binaryOutput)
+    {
+        $constant = constant('MHASH_' . strtoupper($algorithm));
+        $binary = mhash($constant, $data);
+        if ($binaryOutput) {
+            return $binary;
+        }
+        return bin2hex($binary);
+    }
+
+    /**
+     * @param string $algorithm
+     * @param string $data
+     * @param bool $binaryOutput
+     * @return string
+     */
+    protected static function _digestOpenssl($algorithm, $data, $binaryOutput)
+    {
+        if ($algorithm == 'ripemd160') {
+            $algorithm = 'rmd160';
+        }
+        return openssl_digest($data, $algorithm, $binaryOutput);
+    }
+
+}
diff --git a/lib/zend/Zend/Crypt/DiffieHellman.php b/lib/zend/Zend/Crypt/DiffieHellman.php
new file mode 100644
index 00000000000..b14411e172e
--- /dev/null
+++ b/lib/zend/Zend/Crypt/DiffieHellman.php
@@ -0,0 +1,388 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage DiffieHellman
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * PHP implementation of the Diffie-Hellman public key encryption algorithm.
+ * Allows two unassociated parties to establish a joint shared secret key
+ * to be used in encrypting subsequent communications.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_DiffieHellman
+{
+
+    /**
+     * Static flag to select whether to use PHP5.3's openssl extension
+     * if available.
+     *
+     * @var boolean
+     */
+    public static $useOpenssl = true;
+
+    /**
+     * Default large prime number; required by the algorithm.
+     *
+     * @var string
+     */
+    private $_prime = null;
+
+    /**
+     * The default generator number. This number must be greater than 0 but
+     * less than the prime number set.
+     *
+     * @var string
+     */
+    private $_generator = null;
+
+    /**
+     * A private number set by the local user. It's optional and will
+     * be generated if not set.
+     *
+     * @var string
+     */
+    private $_privateKey = null;
+
+    /**
+     * BigInteger support object courtesy of Zend_Crypt_Math
+     *
+     * @var Zend_Crypt_Math_BigInteger
+     */
+    private $_math = null;
+
+    /**
+     * The public key generated by this instance after calling generateKeys().
+     *
+     * @var string
+     */
+    private $_publicKey = null;
+
+    /**
+     * The shared secret key resulting from a completed Diffie Hellman
+     * exchange
+     *
+     * @var string
+     */
+    private $_secretKey = null;
+
+    /**
+     * Constants
+     */
+    const BINARY = 'binary';
+    const NUMBER = 'number';
+    const BTWOC  = 'btwoc';
+
+    /**
+     * Constructor; if set construct the object using the parameter array to
+     * set values for Prime, Generator and Private.
+     * If a Private Key is not set, one will be generated at random.
+     *
+     * @param string $prime
+     * @param string $generator
+     * @param string $privateKey
+     * @param string $privateKeyType
+     */
+    public function __construct($prime, $generator, $privateKey = null, $privateKeyType = self::NUMBER)
+    {
+        $this->setPrime($prime);
+        $this->setGenerator($generator);
+        if ($privateKey !== null) {
+            $this->setPrivateKey($privateKey, $privateKeyType);
+        }
+        $this->setBigIntegerMath();
+    }
+
+    /**
+     * Generate own public key. If a private number has not already been
+     * set, one will be generated at this stage.
+     *
+     * @return Zend_Crypt_DiffieHellman
+     */
+    public function generateKeys()
+    {
+        if (function_exists('openssl_dh_compute_key') && self::$useOpenssl !== false) {
+            $details = array();
+            $details['p'] = $this->getPrime();
+            $details['g'] = $this->getGenerator();
+            if ($this->hasPrivateKey()) {
+                $details['priv_key'] = $this->getPrivateKey();
+            }
+            $opensslKeyResource = openssl_pkey_new( array('dh' => $details) );
+            $data = openssl_pkey_get_details($opensslKeyResource);
+            $this->setPrivateKey($data['dh']['priv_key'], self::BINARY);
+            $this->setPublicKey($data['dh']['pub_key'], self::BINARY);
+        } else {
+            // Private key is lazy generated in the absence of PHP 5.3's ext/openssl
+            $publicKey = $this->_math->powmod($this->getGenerator(), $this->getPrivateKey(), $this->getPrime());
+            $this->setPublicKey($publicKey);
+        }
+        return $this;
+    }
+
+    /**
+     * Setter for the value of the public number
+     *
+     * @param string $number
+     * @param string $type
+     * @throws Zend_Crypt_DiffieHellman_Exception
+     * @return Zend_Crypt_DiffieHellman
+     */
+    public function setPublicKey($number, $type = self::NUMBER)
+    {
+        if ($type == self::BINARY) {
+            $number = $this->_math->fromBinary($number);
+        }
+        if (!preg_match("/^\d+$/", $number)) {
+            require_once('Zend/Crypt/DiffieHellman/Exception.php');
+            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number');
+        }
+        $this->_publicKey = (string) $number;
+        return $this;
+    }
+
+    /**
+     * Returns own public key for communication to the second party to this
+     * transaction.
+     *
+     * @param string $type
+     * @throws Zend_Crypt_DiffieHellman_Exception
+     * @return string
+     */
+    public function getPublicKey($type = self::NUMBER)
+    {
+        if ($this->_publicKey === null) {
+            require_once 'Zend/Crypt/DiffieHellman/Exception.php';
+            throw new Zend_Crypt_DiffieHellman_Exception('A public key has not yet been generated using a prior call to generateKeys()');
+        }
+        if ($type == self::BINARY) {
+            return $this->_math->toBinary($this->_publicKey);
+        } elseif ($type == self::BTWOC) {
+            return $this->_math->btwoc($this->_math->toBinary($this->_publicKey));
+        }
+        return $this->_publicKey;
+    }
+
+    /**
+     * Compute the shared secret key based on the public key received from the
+     * the second party to this transaction. This should agree to the secret
+     * key the second party computes on our own public key.
+     * Once in agreement, the key is known to only to both parties.
+     * By default, the function expects the public key to be in binary form
+     * which is the typical format when being transmitted.
+     *
+     * If you need the binary form of the shared secret key, call
+     * getSharedSecretKey() with the optional parameter for Binary output.
+     *
+     * @param string $publicKey
+     * @param string $type
+     * @param string $output
+     * @throws Zend_Crypt_DiffieHellman_Exception
+     * @return mixed
+     */
+    public function computeSecretKey($publicKey, $type = self::NUMBER, $output = self::NUMBER)
+    {
+        if ($type == self::BINARY) {
+            $publicKey = $this->_math->fromBinary($publicKey);
+        }
+        if (!preg_match("/^\d+$/", $publicKey)) {
+            require_once('Zend/Crypt/DiffieHellman/Exception.php');
+            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number');
+        }
+        if (function_exists('openssl_dh_compute_key') && self::$useOpenssl !== false) {
+            $this->_secretKey = openssl_dh_compute_key($publicKey, $this->getPublicKey());
+        } else {
+            $this->_secretKey = $this->_math->powmod($publicKey, $this->getPrivateKey(), $this->getPrime());
+        }
+        return $this->getSharedSecretKey($output);
+    }
+
+    /**
+     * Return the computed shared secret key from the DiffieHellman transaction
+     *
+     * @param string $type
+     * @throws Zend_Crypt_DiffieHellman_Exception
+     * @return string
+     */
+    public function getSharedSecretKey($type = self::NUMBER)
+    {
+        if (!isset($this->_secretKey)) {
+            require_once('Zend/Crypt/DiffieHellman/Exception.php');
+            throw new Zend_Crypt_DiffieHellman_Exception('A secret key has not yet been computed; call computeSecretKey()');
+        }
+        if ($type == self::BINARY) {
+            return $this->_math->toBinary($this->_secretKey);
+        } elseif ($type == self::BTWOC) {
+            return $this->_math->btwoc($this->_math->toBinary($this->_secretKey));
+        }
+        return $this->_secretKey;
+    }
+
+    /**
+     * Setter for the value of the prime number
+     *
+     * @param string $number
+     * @throws Zend_Crypt_DiffieHellman_Exception
+     * @return Zend_Crypt_DiffieHellman
+     */
+    public function setPrime($number)
+    {
+        if (!preg_match("/^\d+$/", $number) || $number < 11) {
+            require_once('Zend/Crypt/DiffieHellman/Exception.php');
+            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number or too small: should be a large natural number prime');
+        }
+        $this->_prime = (string) $number;
+        return $this;
+    }
+
+    /**
+     * Getter for the value of the prime number
+     *
+     * @throws Zend_Crypt_DiffieHellman_Exception
+     * @return string
+     */
+    public function getPrime()
+    {
+        if (!isset($this->_prime)) {
+            require_once('Zend/Crypt/DiffieHellman/Exception.php');
+            throw new Zend_Crypt_DiffieHellman_Exception('No prime number has been set');
+        }
+        return $this->_prime;
+    }
+
+    /**
+     * Setter for the value of the generator number
+     *
+     * @param string $number
+     * @throws Zend_Crypt_DiffieHellman_Exception
+     * @return Zend_Crypt_DiffieHellman
+     */
+    public function setGenerator($number)
+    {
+        if (!preg_match("/^\d+$/", $number) || $number < 2) {
+            require_once('Zend/Crypt/DiffieHellman/Exception.php');
+            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number greater than 1');
+        }
+        $this->_generator = (string) $number;
+        return $this;
+    }
+
+    /**
+     * Getter for the value of the generator number
+     *
+     * @throws Zend_Crypt_DiffieHellman_Exception
+     * @return string
+     */
+    public function getGenerator()
+    {
+        if (!isset($this->_generator)) {
+            require_once('Zend/Crypt/DiffieHellman/Exception.php');
+            throw new Zend_Crypt_DiffieHellman_Exception('No generator number has been set');
+        }
+        return $this->_generator;
+    }
+
+    /**
+     * Setter for the value of the private number
+     *
+     * @param string $number
+     * @param string $type
+     * @throws Zend_Crypt_DiffieHellman_Exception
+     * @return Zend_Crypt_DiffieHellman
+     */
+    public function setPrivateKey($number, $type = self::NUMBER)
+    {
+        if ($type == self::BINARY) {
+            $number = $this->_math->fromBinary($number);
+        }
+        if (!preg_match("/^\d+$/", $number)) {
+            require_once('Zend/Crypt/DiffieHellman/Exception.php');
+            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number');
+        }
+        $this->_privateKey = (string) $number;
+        return $this;
+    }
+
+    /**
+     * Getter for the value of the private number
+     *
+     * @param string $type
+     * @return string
+     */
+    public function getPrivateKey($type = self::NUMBER)
+    {
+        if (!$this->hasPrivateKey()) {
+            $this->setPrivateKey($this->_generatePrivateKey(), self::BINARY);
+        }
+        if ($type == self::BINARY) {
+            return $this->_math->toBinary($this->_privateKey);
+        } elseif ($type == self::BTWOC) {
+            return $this->_math->btwoc($this->_math->toBinary($this->_privateKey));
+        }
+        return $this->_privateKey;
+    }
+
+    /**
+     * Check whether a private key currently exists.
+     *
+     * @return boolean
+     */
+    public function hasPrivateKey()
+    {
+        return isset($this->_privateKey);
+    }
+
+    /**
+     * Setter to pass an extension parameter which is used to create
+     * a specific BigInteger instance for a specific extension type.
+     * Allows manual setting of the class in case of an extension
+     * problem or bug.
+     *
+     * @param string $extension
+     * @return void
+     */
+    public function setBigIntegerMath($extension = null)
+    {
+        /**
+         * @see Zend_Crypt_Math
+         */
+        require_once 'Zend/Crypt/Math.php';
+        $this->_math = new Zend_Crypt_Math($extension);
+    }
+
+    /**
+     * In the event a private number/key has not been set by the user,
+     * or generated by ext/openssl, a best attempt will be made to
+     * generate a random key. Having a random number generator installed
+     * on linux/bsd is highly recommended! The alternative is not recommended
+     * for production unless without any other option.
+     *
+     * @return string
+     */
+    protected function _generatePrivateKey()
+    {
+        $rand = $this->_math->rand($this->getGenerator(), $this->getPrime());
+        return $rand;
+    }
+
+}
diff --git a/lib/zend/Zend/Crypt/DiffieHellman/Exception.php b/lib/zend/Zend/Crypt/DiffieHellman/Exception.php
new file mode 100644
index 00000000000..9afa43d6713
--- /dev/null
+++ b/lib/zend/Zend/Crypt/DiffieHellman/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage DiffieHellman
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Exception
+ */
+require_once 'Zend/Crypt/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_DiffieHellman_Exception extends Zend_Crypt_Exception
+{
+}
diff --git a/lib/zend/Zend/Crypt/Exception.php b/lib/zend/Zend/Crypt/Exception.php
new file mode 100644
index 00000000000..790f450fe10
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Exception.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Exception extends Zend_Exception
+{
+}
diff --git a/lib/zend/Zend/Crypt/Hmac.php b/lib/zend/Zend/Crypt/Hmac.php
new file mode 100644
index 00000000000..b11eb4d7490
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Hmac.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Hmac
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt
+ */
+require_once 'Zend/Crypt.php';
+
+/**
+ * PHP implementation of the RFC 2104 Hash based Message Authentication Code
+ * algorithm.
+ *
+ * @todo  Patch for refactoring failed tests (key block sizes >80 using internal algo)
+ * @todo       Check if mhash() is a required alternative (will be PECL-only soon)
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Hmac extends Zend_Crypt
+{
+
+    /**
+     * The key to use for the hash
+     *
+     * @var string
+     */
+    protected static $_key = null;
+
+    /**
+     * pack() format to be used for current hashing method
+     *
+     * @var string
+     */
+    protected static $_packFormat = null;
+
+    /**
+     * Hashing algorithm; can be the md5/sha1 functions or any algorithm name
+     * listed in the output of PHP 5.1.2+ hash_algos().
+     *
+     * @var string
+     */
+    protected static $_hashAlgorithm = 'md5';
+
+    /**
+     * List of algorithms supported my mhash()
+     *
+     * @var array
+     */
+    protected static $_supportedMhashAlgorithms = array('adler32',' crc32', 'crc32b', 'gost',
+            'haval128', 'haval160', 'haval192', 'haval256', 'md4', 'md5', 'ripemd160',
+            'sha1', 'sha256', 'tiger', 'tiger128', 'tiger160');
+
+    /**
+     * Constants representing the output mode of the hash algorithm
+     */
+    const STRING = 'string';
+    const BINARY = 'binary';
+
+    /**
+     * Performs a HMAC computation given relevant details such as Key, Hashing
+     * algorithm, the data to compute MAC of, and an output format of String,
+     * Binary notation or BTWOC.
+     *
+     * @param string $key
+     * @param string $hash
+     * @param string $data
+     * @param string $output
+     * @throws Zend_Crypt_Hmac_Exception
+     * @return string
+     */
+    public static function compute($key, $hash, $data, $output = self::STRING)
+    {
+        // set the key
+        if (!isset($key) || empty($key)) {
+            require_once 'Zend/Crypt/Hmac/Exception.php';
+            throw new Zend_Crypt_Hmac_Exception('provided key is null or empty');
+        }
+        self::$_key = $key;
+
+        // set the hash
+        self::_setHashAlgorithm($hash);
+
+        // perform hashing and return
+        return self::_hash($data, $output);
+    }
+
+    /**
+     * Setter for the hash method.
+     *
+     * @param string $hash
+     * @throws Zend_Crypt_Hmac_Exception
+     * @return Zend_Crypt_Hmac
+     */
+    protected static function _setHashAlgorithm($hash)
+    {
+        if (!isset($hash) || empty($hash)) {
+            require_once 'Zend/Crypt/Hmac/Exception.php';
+            throw new Zend_Crypt_Hmac_Exception('provided hash string is null or empty');
+        }
+
+        $hash = strtolower($hash);
+        $hashSupported = false;
+
+        if (function_exists('hash_algos') && in_array($hash, hash_algos())) {
+            $hashSupported = true;
+        }
+
+        if ($hashSupported === false && function_exists('mhash') && in_array($hash, self::$_supportedAlgosMhash)) {
+            $hashSupported = true;
+        }
+
+        if ($hashSupported === false) {
+            require_once 'Zend/Crypt/Hmac/Exception.php';
+            throw new Zend_Crypt_Hmac_Exception('hash algorithm provided is not supported on this PHP installation; please enable the hash or mhash extensions');
+        }
+        self::$_hashAlgorithm = $hash;
+    }
+
+    /**
+     * Perform HMAC and return the keyed data
+     *
+     * @param string $data
+     * @param string $output
+     * @param bool $internal Option to not use hash() functions for testing
+     * @return string
+     */
+    protected static function _hash($data, $output = self::STRING, $internal = false)
+    {
+        if (function_exists('hash_hmac')) {
+            if ($output == self::BINARY) {
+                return hash_hmac(self::$_hashAlgorithm, $data, self::$_key, true);
+            }
+            return hash_hmac(self::$_hashAlgorithm, $data, self::$_key);
+        }
+
+        if (function_exists('mhash')) {
+            if ($output == self::BINARY) {
+                return mhash(self::_getMhashDefinition(self::$_hashAlgorithm), $data, self::$_key);
+            }
+            $bin = mhash(self::_getMhashDefinition(self::$_hashAlgorithm), $data, self::$_key);
+            return bin2hex($bin);
+        }
+    }
+
+    /**
+     * Since MHASH accepts an integer constant representing the hash algorithm
+     * we need to make a small detour to get the correct integer matching our
+     * algorithm's name.
+     *
+     * @param string $hashAlgorithm
+     * @return integer
+     */
+    protected static function _getMhashDefinition($hashAlgorithm)
+    {
+        for ($i = 0; $i <= mhash_count(); $i++)
+        {
+            $types[mhash_get_hash_name($i)] = $i;
+        }
+        return $types[strtoupper($hashAlgorithm)];
+    }
+
+}
diff --git a/lib/zend/Zend/Crypt/Hmac/Exception.php b/lib/zend/Zend/Crypt/Hmac/Exception.php
new file mode 100644
index 00000000000..36acda37e76
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Hmac/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Hmac
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Exception
+ */
+require_once 'Zend/Crypt/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Hmac_Exception extends Zend_Crypt_Exception
+{
+}
diff --git a/lib/zend/Zend/Crypt/Math.php b/lib/zend/Zend/Crypt/Math.php
new file mode 100644
index 00000000000..e6b8b5796cf
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Math.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Math
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Math_BigInteger
+ */
+require_once 'Zend/Crypt/Math/BigInteger.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Math extends Zend_Crypt_Math_BigInteger
+{
+
+    /**
+     * Generate a pseudorandom number within the given range.
+     * Will attempt to read from a systems RNG if it exists or else utilises
+     * a simple random character to maximum length process. Simplicity
+     * is a factor better left for development...
+     *
+     * @param string|int $minimum
+     * @param string|int $maximum
+     * @return string
+     */
+    public function rand($minimum, $maximum)
+    {
+        if (file_exists('/dev/urandom')) {
+            $frandom = fopen('/dev/urandom', 'r');
+            if ($frandom !== false) {
+                return fread($frandom, strlen($maximum) - 1);
+            }
+        }
+        if (strlen($maximum) < 4) {
+            return mt_rand($minimum, $maximum - 1);
+        }
+        $rand = '';
+        $i2 = strlen($maximum) - 1;
+        for ($i = 1;$i < $i2;$i++) {
+            $rand .= mt_rand(0,9);
+        }
+        $rand .= mt_rand(0,9);
+        return $rand;
+    }
+
+    /**
+     * Get the big endian two's complement of a given big integer in
+     * binary notation
+     *
+     * @param string $long
+     * @return string
+     */
+    public function btwoc($long) {
+        if (ord($long[0]) > 127) {
+            return "\x00" . $long;
+        }
+        return $long;
+    }
+
+    /**
+     * Translate a binary form into a big integer string
+     *
+     * @param string $binary
+     * @return string
+     */
+    public function fromBinary($binary) {
+        return $this->_math->binaryToInteger($binary);
+    }
+
+    /**
+     * Translate a big integer string into a binary form
+     *
+     * @param string $integer
+     * @return string
+     */
+    public function toBinary($integer)
+    {
+        return $this->_math->integerToBinary($integer);
+    }
+
+}
diff --git a/lib/zend/Zend/Crypt/Math/BigInteger.php b/lib/zend/Zend/Crypt/Math/BigInteger.php
new file mode 100644
index 00000000000..e066f608513
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Math/BigInteger.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Math
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Support for arbitrary precision mathematics in PHP.
+ *
+ * Zend_Crypt_Math_BigInteger is a wrapper across three PHP extensions: bcmath, gmp
+ * and big_int. Since each offer similar functionality, but availability of
+ * each differs across installations of PHP, this wrapper attempts to select
+ * the fastest option available and encapsulate a subset of its functionality
+ * which all extensions share in common.
+ *
+ * This class requires one of the three extensions to be available. BCMATH
+ * while the slowest, is available by default under Windows, and under Unix
+ * if PHP is compiled with the flag "--enable-bcmath". GMP requires the gmp
+ * library from http://www.swox.com/gmp/ and PHP compiled with the "--with-gmp"
+ * flag. BIG_INT support is available from a big_int PHP library available from
+ * only from PECL (a Windows port is not available).
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Math_BigInteger
+{
+
+    /**
+     * Holds an instance of one of the three arbitrary precision wrappers.
+     *
+     * @var Zend_Crypt_Math_BigInteger_Interface
+     */
+    protected $_math = null;
+
+    /**
+     * Constructor; a Factory which detects a suitable PHP extension for
+     * arbitrary precision math and instantiates the suitable wrapper
+     * object.
+     *
+     * @param string $extension
+     * @throws  Zend_Crypt_Math_BigInteger_Exception
+     */
+    public function __construct($extension = null)
+    {
+        if ($extension !== null && !in_array($extension, array('bcmath', 'gmp', 'bigint'))) {
+            require_once('Zend/Crypt/Math/BigInteger/Exception.php');
+            throw new Zend_Crypt_Math_BigInteger_Exception('Invalid extension type; please use one of bcmath, gmp or bigint');
+        }
+        $this->_loadAdapter($extension);
+    }
+
+    /**
+     * Redirect all public method calls to the wrapped extension object.
+     *
+     * @param  string $methodName
+     * @param  array  $args
+     * @return mixed
+     * @throws Zend_Crypt_Math_BigInteger_Exception
+     */
+    public function __call($methodName, $args)
+    {
+        if(!method_exists($this->_math, $methodName)) {
+            require_once 'Zend/Crypt/Math/BigInteger/Exception.php';
+            throw new Zend_Crypt_Math_BigInteger_Exception('invalid method call: ' . get_class($this->_math) . '::' . $methodName . '() does not exist');
+        }
+        return call_user_func_array(array($this->_math, $methodName), $args);
+    }
+
+    /**
+     * @param string $extension
+     * @throws  Zend_Crypt_Math_BigInteger_Exception
+     */
+    protected function _loadAdapter($extension = null)
+    {
+        if ($extension === null) {
+            if (extension_loaded('gmp')) {
+                $extension = 'gmp';
+            //} elseif (extension_loaded('big_int')) {
+            //    $extension = 'big_int';
+            } else {
+                $extension = 'bcmath';
+            }
+        }
+        if($extension == 'gmp' && extension_loaded('gmp')) {
+            require_once 'Zend/Crypt/Math/BigInteger/Gmp.php';
+            $this->_math = new Zend_Crypt_Math_BigInteger_Gmp();
+        //} elseif($extension == 'bigint' && extension_loaded('big_int')) {
+        //    require_once 'Zend/Crypt_Math/BigInteger/Bigint.php';
+        //    $this->_math = new Zend_Crypt_Math_BigInteger_Bigint();
+        } elseif ($extension == 'bcmath' && extension_loaded('bcmath')) {
+            require_once 'Zend/Crypt/Math/BigInteger/Bcmath.php';
+            $this->_math = new Zend_Crypt_Math_BigInteger_Bcmath();
+        } else {
+            require_once 'Zend/Crypt/Math/BigInteger/Exception.php';
+            throw new Zend_Crypt_Math_BigInteger_Exception($extension . ' big integer precision math support not detected');
+        }
+    }
+
+}
diff --git a/lib/zend/Zend/Crypt/Math/BigInteger/Bcmath.php b/lib/zend/Zend/Crypt/Math/BigInteger/Bcmath.php
new file mode 100644
index 00000000000..40154b6fbb0
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Math/BigInteger/Bcmath.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Math
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Math_BigInteger_Interface
+ */
+require_once 'Zend/Crypt/Math/BigInteger/Interface.php';
+
+/**
+ * Support for arbitrary precision mathematics in PHP.
+ *
+ * Zend_Crypt_Math_BigInteger_Bcmath is a wrapper across the PHP BCMath
+ * extension.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_Interface
+{
+
+    /**
+     * Initialise a big integer into an extension specific type. This is not
+     * applicable to BCMath.
+     *
+     * @param string $operand
+     * @param int $base
+     * @return string
+     */
+    public function init($operand, $base = 10)
+    {
+        return $operand;
+    }
+
+    /**
+     * Adds two arbitrary precision numbers
+     *
+     * @param string $left_operand
+     * @param string $right_operand
+     * @return string
+     */
+    public function add($left_operand, $right_operand)
+    {
+        return bcadd($left_operand, $right_operand);
+    }
+
+    /**
+     * Subtract one arbitrary precision number from another
+     *
+     * @param string $left_operand
+     * @param string $right_operand
+     * @return string
+     */
+    public function subtract($left_operand, $right_operand)
+    {
+        return bcsub($left_operand, $right_operand);
+    }
+
+    /**
+     * Compare two big integers and returns result as an integer where 0 means
+     * both are identical, 1 that left_operand is larger, or -1 that
+     * right_operand is larger.
+     *
+     * @param string $left_operand
+     * @param string $right_operand
+     * @return int
+     */
+    public function compare($left_operand, $right_operand)
+    {
+        return bccomp($left_operand, $right_operand);
+    }
+
+    /**
+     * Divide two big integers and return result or NULL if the denominator
+     * is zero.
+     *
+     * @param string $left_operand
+     * @param string $right_operand
+     * @return string|null
+     */
+    public function divide($left_operand, $right_operand)
+    {
+        return bcdiv($left_operand, $right_operand);
+    }
+
+    /**
+     * Get modulus of an arbitrary precision number
+     *
+     * @param string $left_operand
+     * @param string $modulus
+     * @return string
+     */
+    public function modulus($left_operand, $modulus)
+    {
+        return bcmod($left_operand, $modulus);
+    }
+
+    /**
+     * Multiply two arbitrary precision numbers
+     *
+     * @param string $left_operand
+     * @param string $right_operand
+     * @return string
+     */
+    public function multiply($left_operand, $right_operand)
+    {
+        return bcmul($left_operand, $right_operand);
+    }
+
+    /**
+     * Raise an arbitrary precision number to another
+     *
+     * @param string $left_operand
+     * @param string $right_operand
+     * @return string
+     */
+    public function pow($left_operand, $right_operand)
+    {
+        return bcpow($left_operand, $right_operand);
+    }
+
+    /**
+     * Raise an arbitrary precision number to another, reduced by a specified
+     * modulus
+     *
+     * @param string $left_operand
+     * @param string $right_operand
+     * @param string $modulus
+     * @return string
+     */
+    public function powmod($left_operand, $right_operand, $modulus)
+    {
+        return bcpowmod($left_operand, $right_operand, $modulus);
+    }
+
+    /**
+     * Get the square root of an arbitrary precision number
+     *
+     * @param string $operand
+     * @return string
+     */
+    public function sqrt($operand)
+    {
+        return bcsqrt($operand);
+    }
+
+    /**
+     * @param string $operand
+     * @return string
+     */
+    public function binaryToInteger($operand)
+    {
+        $result = '0';
+        while (strlen($operand)) {
+            $ord = ord(substr($operand, 0, 1));
+            $result = bcadd(bcmul($result, 256), $ord);
+            $operand = substr($operand, 1);
+        }
+        return $result;
+    }
+
+    /**
+     * @param string $operand
+     * @return string
+     */
+    public function integerToBinary($operand)
+    {
+        $cmp = bccomp($operand, 0);
+        $return = '';
+        if ($cmp == 0) {
+            return "\0";
+        }
+        while (bccomp($operand, 0) > 0) {
+            $return = chr(bcmod($operand, 256)) . $return;
+            $operand = bcdiv($operand, 256);
+        }
+        if (ord($return[0]) > 127) {
+            $return = "\0" . $return;
+        }
+        return $return;
+    }
+
+    /**public function integerToBinary($operand)
+    {
+        $return = '';
+        while(bccomp($operand, '0')) {
+            $return .= chr(bcmod($operand, '256'));
+            $operand = bcdiv($operand, '256');
+        }
+        return $return;
+    }**/ // Prior version for referenced offset
+
+    /**
+     * @param string $operand
+     * @return string
+     */
+    public function hexToDecimal($operand)
+    {
+        $return = '0';
+        while(strlen($hex)) {
+            $hex = hexdec(substr($operand, 0, 4));
+            $dec = bcadd(bcmul($return, 65536), $hex);
+            $operand = substr($operand, 4);
+        }
+        return $return;
+    }
+}
diff --git a/lib/zend/Zend/Crypt/Math/BigInteger/Exception.php b/lib/zend/Zend/Crypt/Math/BigInteger/Exception.php
new file mode 100644
index 00000000000..d5ee2e6ddf0
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Math/BigInteger/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Math
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Math_Exception
+ */
+require_once 'Zend/Crypt/Math/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Math_BigInteger_Exception extends Zend_Crypt_Math_Exception
+{
+}
diff --git a/lib/zend/Zend/Crypt/Math/BigInteger/Gmp.php b/lib/zend/Zend/Crypt/Math/BigInteger/Gmp.php
new file mode 100644
index 00000000000..4246796724d
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Math/BigInteger/Gmp.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Math
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Math_BigInteger_Interface
+ */
+require_once 'Zend/Crypt/Math/BigInteger/Interface.php';
+
+/**
+ * Support for arbitrary precision mathematics in PHP.
+ *
+ * Zend_Crypt_Math_BigInteger_Gmp is a wrapper across the PHP BCMath
+ * extension.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Interface
+{
+
+    /**
+     * Initialise a big integer into an extension specific type.
+     * @param string $operand
+     * @param int $base
+     * @return string
+     */
+    public function init($operand, $base = 10)
+    {
+        return $operand;
+    }
+
+    /**
+     * Adds two arbitrary precision numbers
+     *
+     * @param resource $left_operand
+     * @param resource $right_operand
+     * @return string
+     */
+    public function add($left_operand, $right_operand)
+    {
+        $result = gmp_add($left_operand, $right_operand);
+        return gmp_strval($result);
+    }
+
+    /**
+     * Subtract numbers
+     *
+     * @param resource $left_operand
+     * @param resource $right_operand
+     * @return string
+     */
+    public function subtract($left_operand, $right_operand)
+    {
+        $result = gmp_sub($left_operand, $right_operand);
+        return gmp_strval($result);
+    }
+
+    /**
+     * Compare two big integers and returns result as an integer where 0 means
+     * both are identical, 1 that left_operand is larger, or -1 that
+     * right_operand is larger.
+     *
+     * @param resource $left_operand
+     * @param resource $right_operand
+     * @return int
+     */
+    public function compare($left_operand, $right_operand)
+    {
+        $result = gmp_cmp($left_operand, $right_operand);
+        return gmp_strval($result);
+    }
+
+    /**
+     * Divide two big integers and return result or NULL if the denominator
+     * is zero.
+     *
+     * @param resource $left_operand
+     * @param resource $right_operand
+     * @return string|null
+     */
+    public function divide($left_operand, $right_operand)
+    {
+        $result = gmp_div($left_operand, $right_operand);
+        return gmp_strval($result);
+    }
+
+    /**
+     * Modulo operation
+     *
+     * @param resource $left_operand
+     * @param resource $modulus
+     * @internal param string $right_operand
+     * @return string
+     */
+    public function modulus($left_operand, $modulus)
+    {
+        $result = gmp_mod($left_operand, $modulus);
+        return gmp_strval($result);
+    }
+
+    /**
+     * Multiply numbers
+     *
+     * @param resource $left_operand
+     * @param resource $right_operand
+     * @return string
+     */
+    public function multiply($left_operand, $right_operand)
+    {
+        $result = gmp_mul($left_operand, $right_operand);
+        return gmp_strval($result);
+    }
+
+    /**
+     * Raise number into power
+     *
+     * @param resource $left_operand
+     * @param int      $right_operand
+     * @return string
+     */
+    public function pow($left_operand, $right_operand)
+    {
+        $result = gmp_pow($left_operand, $right_operand);
+        return gmp_strval($result);
+    }
+
+    /**
+     * Raise number into power with modulo
+     *
+     * @param resource $left_operand
+     * @param resource $right_operand
+     * @param resource $modulus
+     * @return string
+     */
+    public function powmod($left_operand, $right_operand, $modulus)
+    {
+        $result = gmp_powm($left_operand, $right_operand, $modulus);
+        return gmp_strval($result);
+    }
+
+    /**
+     * Calculate square root
+     *
+     * @param $operand
+     * @return string
+     */
+    public function sqrt($operand)
+    {
+        $result = gmp_sqrt($operand);
+        return gmp_strval($result);
+    }
+
+    /**
+     * @param string $operand
+     * @return string
+     */
+    public function binaryToInteger($operand)
+    {
+        $result = '0';
+        while (strlen($operand)) {
+            $ord = ord(substr($operand, 0, 1));
+            $result = gmp_add(gmp_mul($result, 256), $ord);
+            $operand = substr($operand, 1);
+        }
+        return gmp_strval($result);
+    }
+
+    /**
+     * @param resource $operand GMP number resource
+     * @return string
+     */
+    public function integerToBinary($operand)
+    {
+        $bigInt = gmp_strval($operand, 16);
+        if (strlen($bigInt) % 2 != 0) {
+            $bigInt = '0' . $bigInt;
+        } else if ($bigInt[0] > '7') {
+            $bigInt = '00' . $bigInt;
+        }
+        $return = pack("H*", $bigInt);
+        return $return;
+    }
+
+    /**
+     * @param string $operand
+     * @return string
+     */
+    public function hexToDecimal($operand)
+    {
+        $return = '0';
+        while(strlen($hex)) {
+            $hex = hexdec(substr($operand, 0, 4));
+            $dec = gmp_add(gmp_mul($return, 65536), $hex);
+            $operand = substr($operand, 4);
+        }
+        return $return;
+    }
+
+}
diff --git a/lib/zend/Zend/Crypt/Math/BigInteger/Interface.php b/lib/zend/Zend/Crypt/Math/BigInteger/Interface.php
new file mode 100644
index 00000000000..9fa92815e30
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Math/BigInteger/Interface.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Math
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Support for arbitrary precision mathematics in PHP.
+ *
+ * Interface for a wrapper across any PHP extension supporting arbitrary
+ * precision maths.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Crypt_Math_BigInteger_Interface
+{
+
+    public function init($operand, $base = 10);
+    public function add($left_operand, $right_operand);
+    public function subtract($left_operand, $right_operand);
+    public function compare($left_operand, $right_operand);
+    public function divide($left_operand, $right_operand);
+    public function modulus($left_operand, $modulus);
+    public function multiply($left_operand, $right_operand);
+    public function pow($left_operand, $right_operand);
+    public function powmod($left_operand, $right_operand, $modulus);
+    public function sqrt($operand);
+    public function binaryToInteger($operand);
+    public function integerToBinary($operand);
+    public function hexToDecimal($operand);
+
+}
diff --git a/lib/zend/Zend/Crypt/Math/Exception.php b/lib/zend/Zend/Crypt/Math/Exception.php
new file mode 100644
index 00000000000..297aa35ea41
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Math/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Math
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Exception
+ */
+require_once 'Zend/Crypt/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Math_Exception extends Zend_Crypt_Exception
+{
+}
diff --git a/lib/zend/Zend/Crypt/Rsa.php b/lib/zend/Zend/Crypt/Rsa.php
new file mode 100644
index 00000000000..84e6e768488
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Rsa.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Rsa
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Rsa_Key_Private
+ */
+require_once 'Zend/Crypt/Rsa/Key/Private.php';
+
+/**
+ * @see Zend_Crypt_Rsa_Key_Public
+ */
+require_once 'Zend/Crypt/Rsa/Key/Public.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Rsa
+{
+
+    const BINARY = 'binary';
+    const BASE64 = 'base64';
+
+    protected $_privateKey;
+
+    protected $_publicKey;
+
+    /**
+     * @var string
+     */
+    protected $_pemString;
+
+    protected $_pemPath;
+
+    protected $_certificateString;
+
+    protected $_certificatePath;
+
+    protected $_hashAlgorithm;
+
+    protected $_passPhrase;
+
+    /**
+     * Class constructor
+     *
+     * @param array $options
+     * @throws Zend_Crypt_Rsa_Exception
+     */
+    public function __construct(array $options = null)
+    {
+        if (!extension_loaded('openssl')) {
+            require_once 'Zend/Crypt/Rsa/Exception.php';
+            throw new Zend_Crypt_Rsa_Exception('Zend_Crypt_Rsa requires openssl extension to be loaded.');
+        }
+
+        // Set _hashAlgorithm property when we are sure, that openssl extension is loaded
+        // and OPENSSL_ALGO_SHA1 constant is available
+        $this->_hashAlgorithm = OPENSSL_ALGO_SHA1;
+
+        if (isset($options)) {
+            $this->setOptions($options);
+        }
+    }
+
+    public function setOptions(array $options)
+    {
+        if (isset($options['passPhrase'])) {
+            $this->_passPhrase = $options['passPhrase'];
+        }
+        foreach ($options as $option=>$value) {
+            switch ($option) {
+                case 'pemString':
+                    $this->setPemString($value);
+                    break;
+                case 'pemPath':
+                    $this->setPemPath($value);
+                    break;
+                case 'certificateString':
+                    $this->setCertificateString($value);
+                    break;
+                case 'certificatePath':
+                    $this->setCertificatePath($value);
+                    break;
+                case 'hashAlgorithm':
+                    $this->setHashAlgorithm($value);
+                    break;
+            }
+        }
+    }
+
+    public function getPrivateKey()
+    {
+        return $this->_privateKey;
+    }
+
+    public function getPublicKey()
+    {
+        return $this->_publicKey;
+    }
+
+    /**
+     * @param string $data
+     * @param Zend_Crypt_Rsa_Key_Private $privateKey
+     * @param string $format
+     * @return string
+     */
+    public function sign($data, Zend_Crypt_Rsa_Key_Private $privateKey = null, $format = null)
+    {
+        $signature = '';
+        if (isset($privateKey)) {
+            $opensslKeyResource = $privateKey->getOpensslKeyResource();
+        } else {
+            $opensslKeyResource = $this->_privateKey->getOpensslKeyResource();
+        }
+        $result = openssl_sign(
+            $data, $signature,
+            $opensslKeyResource,
+            $this->getHashAlgorithm()
+        );
+        if ($format == self::BASE64) {
+            return base64_encode($signature);
+        }
+        return $signature;
+    }
+
+    /**
+     * @param string $data
+     * @param string $signature
+     * @param string $format
+     * @return string
+     */
+    public function verifySignature($data, $signature, $format = null)
+    {
+        if ($format == self::BASE64) {
+            $signature = base64_decode($signature);
+        }
+        $result = openssl_verify($data, $signature,
+            $this->getPublicKey()->getOpensslKeyResource(),
+            $this->getHashAlgorithm());
+        return $result;
+    }
+
+    /**
+     * @param string $data
+     * @param Zend_Crypt_Rsa_Key $key
+     * @param string $format
+     * @return string
+     */
+    public function encrypt($data, Zend_Crypt_Rsa_Key $key, $format = null)
+    {
+        $encrypted = '';
+        $function = 'openssl_public_encrypt';
+        if ($key instanceof Zend_Crypt_Rsa_Key_Private) {
+            $function = 'openssl_private_encrypt';
+        }
+        $function($data, $encrypted, $key->getOpensslKeyResource());
+        if ($format == self::BASE64) {
+            return base64_encode($encrypted);
+        }
+        return $encrypted;
+    }
+
+    /**
+     * @param string $data
+     * @param Zend_Crypt_Rsa_Key $key
+     * @param string $format
+     * @return string
+     */
+    public function decrypt($data, Zend_Crypt_Rsa_Key $key, $format = null)
+    {
+        $decrypted = '';
+        if ($format == self::BASE64) {
+            $data = base64_decode($data);
+        }
+        $function = 'openssl_private_decrypt';
+        if ($key instanceof Zend_Crypt_Rsa_Key_Public) {
+            $function = 'openssl_public_decrypt';
+        }
+        $function($data, $decrypted, $key->getOpensslKeyResource());
+        return $decrypted;
+    }
+
+    /**
+     * @param  array $configargs
+     * 
+     * @throws Zend_Crypt_Rsa_Exception
+     * 
+     * @return ArrayObject
+     */
+    public function generateKeys(array $configargs = null)
+    {
+        $config = null;
+        $passPhrase = null;
+        if ($configargs !== null) {
+            if (isset($configargs['passPhrase'])) {
+                $passPhrase = $configargs['passPhrase'];
+                unset($configargs['passPhrase']);
+            }
+            $config = $this->_parseConfigArgs($configargs);
+        }
+        $privateKey = null;
+        $publicKey = null;
+        $resource = openssl_pkey_new($config);
+        if (!$resource) {
+            require_once 'Zend/Crypt/Rsa/Exception.php';
+            throw new Zend_Crypt_Rsa_Exception('Failed to generate a new private key');
+        }
+        // above fails on PHP 5.3
+        openssl_pkey_export($resource, $private, $passPhrase);
+        $privateKey = new Zend_Crypt_Rsa_Key_Private($private, $passPhrase);
+        $details = openssl_pkey_get_details($resource);
+        $publicKey = new Zend_Crypt_Rsa_Key_Public($details['key']);
+        $return = new ArrayObject(array(
+           'privateKey'=>$privateKey,
+           'publicKey'=>$publicKey
+        ), ArrayObject::ARRAY_AS_PROPS);
+        return $return;
+    }
+
+    /**
+     * @param string $value
+     */
+    public function setPemString($value)
+    {
+        $this->_pemString = $value;
+        try {
+            $this->_privateKey = new Zend_Crypt_Rsa_Key_Private($this->_pemString, $this->_passPhrase);
+            $this->_publicKey = $this->_privateKey->getPublicKey();
+        } catch (Zend_Crypt_Exception $e) {
+            $this->_privateKey = null;
+            $this->_publicKey = new Zend_Crypt_Rsa_Key_Public($this->_pemString);
+        }
+    }
+
+    public function setPemPath($value)
+    {
+        $this->_pemPath = $value;
+        $this->setPemString(file_get_contents($this->_pemPath));
+    }
+
+    public function setCertificateString($value)
+    {
+        $this->_certificateString = $value;
+        $this->_publicKey = new Zend_Crypt_Rsa_Key_Public($this->_certificateString, $this->_passPhrase);
+    }
+
+    public function setCertificatePath($value)
+    {
+        $this->_certificatePath = $value;
+        $this->setCertificateString(file_get_contents($this->_certificatePath));
+    }
+
+    public function setHashAlgorithm($name)
+    {
+        switch (strtolower($name)) {
+            case 'md2':
+                $this->_hashAlgorithm = OPENSSL_ALGO_MD2;
+                break;
+            case 'md4':
+                $this->_hashAlgorithm = OPENSSL_ALGO_MD4;
+                break;
+            case 'md5':
+                $this->_hashAlgorithm = OPENSSL_ALGO_MD5;
+                break;
+            case 'sha1':
+                $this->_hashAlgorithm = OPENSSL_ALGO_SHA1;
+                break;
+            case 'dss1':
+                $this->_hashAlgorithm = OPENSSL_ALGO_DSS1;
+                break;
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getPemString()
+    {
+        return $this->_pemString;
+    }
+
+    public function getPemPath()
+    {
+        return $this->_pemPath;
+    }
+
+    public function getCertificateString()
+    {
+        return $this->_certificateString;
+    }
+
+    public function getCertificatePath()
+    {
+        return $this->_certificatePath;
+    }
+
+    public function getHashAlgorithm()
+    {
+        return $this->_hashAlgorithm;
+    }
+
+    protected function _parseConfigArgs(array $config = null)
+    {
+        $configs = array();
+        if (isset($config['private_key_bits'])) {
+            $configs['private_key_bits'] = $config['private_key_bits'];
+        }
+        if (isset($config['privateKeyBits'])) {
+            $configs['private_key_bits'] = $config['privateKeyBits'];
+        }
+        if (!empty($configs)) {
+            return $configs;
+        }
+        return null;
+    }
+
+}
diff --git a/lib/zend/Zend/Crypt/Rsa/Exception.php b/lib/zend/Zend/Crypt/Rsa/Exception.php
new file mode 100644
index 00000000000..f1cf65e86ac
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Rsa/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Math
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/**
+ * @see Zend_Crypt_Exception
+ */
+require_once 'Zend/Crypt/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Rsa_Exception extends Zend_Crypt_Exception
+{
+}
diff --git a/lib/zend/Zend/Crypt/Rsa/Key.php b/lib/zend/Zend/Crypt/Rsa/Key.php
new file mode 100644
index 00000000000..fafde02f574
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Rsa/Key.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Rsa
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Rsa_Key implements Countable
+{
+    /**
+     * @var string
+     */
+    protected $_pemString = null;
+
+    /**
+     * Bits, key string and type of key
+     *
+     * @var array
+     */
+    protected $_details = array();
+
+    /**
+     * Key Resource
+     *
+     * @var resource
+     */
+    protected $_opensslKeyResource = null;
+
+    /**
+     * Retrieves key resource
+     *
+     * @return resource
+     */
+    public function getOpensslKeyResource()
+    {
+        return $this->_opensslKeyResource;
+    }
+
+    /**
+     * @return string
+     * @throws Zend_Crypt_Exception
+     */
+    public function toString()
+    {
+        if (!empty($this->_pemString)) {
+            return $this->_pemString;
+        } elseif (!empty($this->_certificateString)) {
+            return $this->_certificateString;
+        }
+        /**
+         * @see Zend_Crypt_Exception
+         */
+        require_once 'Zend/Crypt/Exception.php';
+        throw new Zend_Crypt_Exception('No public key string representation is available');
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    public function count()
+    {
+        return $this->_details['bits'];
+    }
+
+    public function getType()
+    {
+        return $this->_details['type'];
+    }
+}
diff --git a/lib/zend/Zend/Crypt/Rsa/Key/Private.php b/lib/zend/Zend/Crypt/Rsa/Key/Private.php
new file mode 100644
index 00000000000..98b2e026c24
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Rsa/Key/Private.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Rsa
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Rsa_Key
+ */
+require_once 'Zend/Crypt/Rsa/Key.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Rsa_Key_Private extends Zend_Crypt_Rsa_Key
+{
+
+    protected $_publicKey = null;
+
+    public function __construct($pemString, $passPhrase = null)
+    {
+        $this->_pemString = $pemString;
+        $this->_parse($passPhrase);
+    }
+
+    /**
+     * @param string $passPhrase
+     * @throws Zend_Crypt_Exception
+     */
+    protected function _parse($passPhrase)
+    {
+        $result = openssl_get_privatekey($this->_pemString, $passPhrase);
+        if (!$result) {
+            /**
+             * @see Zend_Crypt_Exception
+             */
+            require_once 'Zend/Crypt/Exception.php';
+            throw new Zend_Crypt_Exception('Unable to load private key');
+        }
+        $this->_opensslKeyResource = $result;
+        $this->_details = openssl_pkey_get_details($this->_opensslKeyResource);
+    }
+
+    public function getPublicKey()
+    {
+        if ($this->_publicKey === null) {
+            /**
+             * @see Zend_Crypt_Rsa_Key_Public
+             */
+            require_once 'Zend/Crypt/Rsa/Key/Public.php';
+            $this->_publicKey = new Zend_Crypt_Rsa_Key_Public($this->_details['key']);
+        }
+        return $this->_publicKey;
+    }
+
+}
diff --git a/lib/zend/Zend/Crypt/Rsa/Key/Public.php b/lib/zend/Zend/Crypt/Rsa/Key/Public.php
new file mode 100644
index 00000000000..9694342d17b
--- /dev/null
+++ b/lib/zend/Zend/Crypt/Rsa/Key/Public.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @subpackage Rsa
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Crypt_Rsa_Key
+ */
+require_once 'Zend/Crypt/Rsa/Key.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Crypt
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Crypt_Rsa_Key_Public extends Zend_Crypt_Rsa_Key
+{
+
+    protected $_certificateString = null;
+
+    public function __construct($string)
+    {
+        $this->_parse($string);
+    }
+
+    /**
+     * @param string $string
+     * @throws Zend_Crypt_Exception
+     */
+    protected function _parse($string)
+    {
+        if (preg_match("/^-----BEGIN CERTIFICATE-----/", $string)) {
+            $this->_certificateString = $string;
+        } else {
+            $this->_pemString = $string;
+        }
+        $result = openssl_get_publickey($string);
+        if (!$result) {
+            /**
+             * @see Zend_Crypt_Exception
+             */
+            require_once 'Zend/Crypt/Exception.php';
+            throw new Zend_Crypt_Exception('Unable to load public key');
+        }
+        //openssl_pkey_export($result, $public);
+        //$this->_pemString = $public;
+        $this->_opensslKeyResource = $result;
+        $this->_details = openssl_pkey_get_details($this->_opensslKeyResource);
+    }
+
+    public function getCertificate()
+    {
+        return $this->_certificateString;
+    }
+
+}
diff --git a/lib/zend/Zend/Currency.php b/lib/zend/Zend/Currency.php
new file mode 100644
index 00000000000..9abc8b19989
--- /dev/null
+++ b/lib/zend/Zend/Currency.php
@@ -0,0 +1,902 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Currency
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version   $Id$
+ */
+
+/**
+ * include needed classes
+ */
+require_once 'Zend/Locale.php';
+require_once 'Zend/Locale/Data.php';
+require_once 'Zend/Locale/Format.php';
+
+/**
+ * Class for handling currency notations
+ *
+ * @category  Zend
+ * @package   Zend_Currency
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Currency
+{
+    // Constants for defining what currency symbol should be displayed
+    const NO_SYMBOL     = 1;
+    const USE_SYMBOL    = 2;
+    const USE_SHORTNAME = 3;
+    const USE_NAME      = 4;
+
+    // Constants for defining the position of the currencysign
+    const STANDARD = 8;
+    const RIGHT    = 16;
+    const LEFT     = 32;
+
+    /**
+     * Options array
+     *
+     * The following options are available
+     * 'position'  => Position for the currency sign
+     * 'script'    => Script for the output
+     * 'format'    => Locale for numeric output
+     * 'display'   => Currency detail to show
+     * 'precision' => Precision for the currency
+     * 'name'      => Name for this currency
+     * 'currency'  => 3 lettered international abbreviation
+     * 'symbol'    => Currency symbol
+     * 'locale'    => Locale for this currency
+     * 'value'     => Money value
+     * 'service'   => Exchange service to use
+     *
+     * @var array
+     * @see Zend_Locale
+     */
+    protected $_options = array(
+        'position'  => self::STANDARD,
+        'script'    => null,
+        'format'    => null,
+        'display'   => self::NO_SYMBOL,
+        'precision' => 2,
+        'name'      => null,
+        'currency'  => null,
+        'symbol'    => null,
+        'locale'    => null,
+        'value'     => 0,
+        'service'   => null,
+        'tag'       => 'Zend_Locale'
+    );
+
+    /**
+     * Creates a currency instance. Every supressed parameter is used from the actual or the given locale.
+     *
+     * @param  string|array       $options OPTIONAL Options array or currency short name
+     *                                              when string is given
+     * @param  string|Zend_Locale $locale  OPTIONAL locale name
+     * @throws Zend_Currency_Exception When currency is invalid
+     */
+    public function __construct($options = null, $locale = null)
+    {
+        $calloptions = $options;
+        if (is_array($options) && isset($options['display'])) {
+            $this->_options['display'] = $options['display'];
+        }
+
+        if (is_array($options)) {
+            $this->setLocale($locale);
+            $this->setFormat($options);
+        } else if (Zend_Locale::isLocale($options, false, false)) {
+            $this->setLocale($options);
+            $options = $locale;
+        } else {
+            $this->setLocale($locale);
+        }
+
+        // Get currency details
+        if (!isset($this->_options['currency']) || !is_array($options)) {
+            $this->_options['currency'] = self::getShortName($options, $this->_options['locale']);
+        }
+
+        if (!isset($this->_options['name']) || !is_array($options)) {
+            $this->_options['name']     = self::getName($options, $this->_options['locale']);
+        }
+
+        if (!isset($this->_options['symbol']) || !is_array($options)) {
+            $this->_options['symbol']   = self::getSymbol($options, $this->_options['locale']);
+        }
+
+        if (($this->_options['currency'] === null) and ($this->_options['name'] === null)) {
+            require_once 'Zend/Currency/Exception.php';
+            throw new Zend_Currency_Exception("Currency '$options' not found");
+        }
+
+        // Get the format
+        if ((is_array($calloptions) && !isset($calloptions['display']))
+                || (!is_array($calloptions) && $this->_options['display'] == self::NO_SYMBOL)) {
+            if (!empty($this->_options['symbol'])) {
+                $this->_options['display'] = self::USE_SYMBOL;
+            } else if (!empty($this->_options['currency'])) {
+                $this->_options['display'] = self::USE_SHORTNAME;
+            }
+        }
+    }
+
+    /**
+     * Returns a localized currency string
+     *
+     * @param  integer|float $value   OPTIONAL Currency value
+     * @param  array         $options OPTIONAL options to set temporary
+     * @throws Zend_Currency_Exception When the value is not a number
+     * @return string
+     */
+    public function toCurrency($value = null, array $options = array())
+    {
+        if ($value === null) {
+            if (is_array($options) && isset($options['value'])) {
+                $value = $options['value'];
+            } else {
+                $value = $this->_options['value'];
+            }
+        }
+
+        if (is_array($value)) {
+            $options += $value;
+            if (isset($options['value'])) {
+                $value = $options['value'];
+            }
+        }
+
+        // Validate the passed number
+        if (!(isset($value)) or (is_numeric($value) === false)) {
+            require_once 'Zend/Currency/Exception.php';
+            throw new Zend_Currency_Exception("Value '$value' has to be numeric");
+        }
+
+        if (isset($options['currency'])) {
+            if (!isset($options['locale'])) {
+                $options['locale'] = $this->_options['locale'];
+            }
+
+            $options['currency'] = self::getShortName($options['currency'], $options['locale']);
+            $options['name']     = self::getName($options['currency'], $options['locale']);
+            $options['symbol']   = self::getSymbol($options['currency'], $options['locale']);
+        }
+
+        $options = $this->_checkOptions($options) + $this->_options;
+
+        // Format the number
+        $format = $options['format'];
+        $locale = $options['locale'];
+        if (empty($format)) {
+            $format = Zend_Locale_Data::getContent($locale, 'currencynumber');
+        } else if (Zend_Locale::isLocale($format, true, false)) {
+            $locale = $format;
+            $format = Zend_Locale_Data::getContent($format, 'currencynumber');
+        }
+
+        $original = $value;
+        $value    = Zend_Locale_Format::toNumber($value, array('locale'        => $locale,
+                                                               'number_format' => $format,
+                                                               'precision'     => $options['precision']));
+
+        if ($options['position'] !== self::STANDARD) {
+            $value = str_replace('¤', '', $value);
+            $space = '';
+            if (iconv_strpos($value, ' ') !== false) {
+                $value = str_replace(' ', '', $value);
+                $space = ' ';
+            }
+
+            if ($options['position'] == self::LEFT) {
+                $value = '¤' . $space . $value;
+            } else {
+                $value = $value . $space . '¤';
+            }
+        }
+
+        // Localize the number digits
+        if (empty($options['script']) === false) {
+            $value = Zend_Locale_Format::convertNumerals($value, 'Latn', $options['script']);
+        }
+
+        // Get the sign to be placed next to the number
+        if (is_numeric($options['display']) === false) {
+            $sign = $options['display'];
+        } else {
+            switch($options['display']) {
+                case self::USE_SYMBOL:
+                    $sign = $this->_extractPattern($options['symbol'], $original);
+                    break;
+
+                case self::USE_SHORTNAME:
+                    $sign = $options['currency'];
+                    break;
+
+                case self::USE_NAME:
+                    $sign = $options['name'];
+                    break;
+
+                default:
+                    $sign = '';
+                    $value = str_replace(' ', '', $value);
+                    break;
+            }
+        }
+
+        $value = str_replace('¤', $sign, $value);
+        return $value;
+    }
+
+    /**
+     * Internal method to extract the currency pattern
+     * when a choice is given based on the given value
+     *
+     * @param  string $pattern
+     * @param  float|integer $value
+     * @return string
+     */
+    private function _extractPattern($pattern, $value)
+    {
+        if (strpos($pattern, '|') === false) {
+            return $pattern;
+        }
+
+        $patterns = explode('|', $pattern);
+        $token    = $pattern;
+        $value    = trim(str_replace('¤', '', $value));
+        krsort($patterns);
+        foreach($patterns as $content) {
+            if (strpos($content, '<') !== false) {
+                $check = iconv_substr($content, 0, iconv_strpos($content, '<'));
+                $token = iconv_substr($content, iconv_strpos($content, '<') + 1);
+                if ($check < $value) {
+                    return $token;
+                }
+            } else {
+                $check = iconv_substr($content, 0, iconv_strpos($content, '≤'));
+                $token = iconv_substr($content, iconv_strpos($content, '≤') + 1);
+                if ($check <= $value) {
+                    return $token;
+                }
+            }
+
+        }
+
+        return $token;
+    }
+
+    /**
+     * Sets the formating options of the localized currency string
+     * If no parameter is passed, the standard setting of the
+     * actual set locale will be used
+     *
+     * @param  array $options (Optional) Options to set
+     * @return Zend_Currency
+     */
+    public function setFormat(array $options = array())
+    {
+        $this->_options = $this->_checkOptions($options) + $this->_options;
+        return $this;
+    }
+
+    /**
+     * Internal function for checking static given locale parameter
+     *
+     * @param  string             $currency (Optional) Currency name
+     * @param  string|Zend_Locale $locale   (Optional) Locale to display informations
+     * @throws Zend_Currency_Exception When locale contains no region
+     * @return string The extracted locale representation as string
+     */
+    private function _checkParams($currency = null, $locale = null)
+    {
+        // Manage the params
+        if ((empty($locale)) and (!empty($currency)) and
+            (Zend_Locale::isLocale($currency, true, false))) {
+            $locale   = $currency;
+            $currency = null;
+        }
+
+        // Validate the locale and get the country short name
+        $country = null;
+        if ((Zend_Locale::isLocale($locale, true, false)) and (strlen($locale) > 4)) {
+            $country = substr($locale, (strpos($locale, '_') + 1));
+        } else {
+            require_once 'Zend/Currency/Exception.php';
+            throw new Zend_Currency_Exception("No region found within the locale '" . (string) $locale . "'");
+        }
+
+        // Get the available currencies for this country
+        $data = Zend_Locale_Data::getContent($locale, 'currencytoregion', $country);
+        if ((empty($currency) === false) and (empty($data) === false)) {
+            $abbreviation = $currency;
+        } else {
+            $abbreviation = $data;
+        }
+
+        return array('locale' => $locale, 'currency' => $currency, 'name' => $abbreviation, 'country' => $country);
+    }
+
+    /**
+     * Returns the actual or details of other currency symbols,
+     * when no symbol is available it returns the currency shortname (f.e. FIM for Finnian Mark)
+     *
+     * @param  string             $currency (Optional) Currency name
+     * @param  string|Zend_Locale $locale   (Optional) Locale to display informations
+     * @return string
+     */
+    public function getSymbol($currency = null, $locale = null)
+    {
+        if (($currency === null) and ($locale === null)) {
+            return $this->_options['symbol'];
+        }
+
+        $params = self::_checkParams($currency, $locale);
+
+        // Get the symbol
+        $symbol = Zend_Locale_Data::getContent($params['locale'], 'currencysymbol', $params['currency']);
+        if (empty($symbol) === true) {
+            $symbol = Zend_Locale_Data::getContent($params['locale'], 'currencysymbol', $params['name']);
+        }
+
+        if (empty($symbol) === true) {
+            return null;
+        }
+
+        return $symbol;
+    }
+
+    /**
+     * Returns the actual or details of other currency shortnames
+     *
+     * @param  string             $currency OPTIONAL Currency's name
+     * @param  string|Zend_Locale $locale   OPTIONAL The locale
+     * @return string
+     */
+    public function getShortName($currency = null, $locale = null)
+    {
+        if (($currency === null) and ($locale === null)) {
+            return $this->_options['currency'];
+        }
+
+        $params = self::_checkParams($currency, $locale);
+
+        // Get the shortname
+        if (empty($params['currency']) === true) {
+            return $params['name'];
+        }
+
+        $list = Zend_Locale_Data::getContent($params['locale'], 'currencytoname', $params['currency']);
+        if (empty($list) === true) {
+            $list = Zend_Locale_Data::getContent($params['locale'], 'nametocurrency', $params['currency']);
+            if (empty($list) === false) {
+                $list = $params['currency'];
+            }
+        }
+
+        if (empty($list) === true) {
+            return null;
+        }
+
+        return $list;
+    }
+
+    /**
+     * Returns the actual or details of other currency names
+     *
+     * @param  string             $currency (Optional) Currency's short name
+     * @param  string|Zend_Locale $locale   (Optional) The locale
+     * @return string
+     */
+    public function getName($currency = null, $locale = null)
+    {
+        if (($currency === null) and ($locale === null)) {
+            return $this->_options['name'];
+        }
+
+        $params = self::_checkParams($currency, $locale);
+
+        // Get the name
+        $name = Zend_Locale_Data::getContent($params['locale'], 'nametocurrency', $params['currency']);
+        if (empty($name) === true) {
+            $name = Zend_Locale_Data::getContent($params['locale'], 'nametocurrency', $params['name']);
+        }
+
+        if (empty($name) === true) {
+            return null;
+        }
+
+        return $name;
+    }
+
+    /**
+     * Returns a list of regions where this currency is or was known
+     *
+     * @param  string $currency OPTIONAL Currency's short name
+     * @throws Zend_Currency_Exception When no currency was defined
+     * @return array List of regions
+     */
+    public function getRegionList($currency = null)
+    {
+        if ($currency === null) {
+            $currency = $this->_options['currency'];
+        }
+
+        if (empty($currency) === true) {
+            require_once 'Zend/Currency/Exception.php';
+            throw new Zend_Currency_Exception('No currency defined');
+        }
+
+        $data = Zend_Locale_Data::getContent($this->_options['locale'], 'regiontocurrency', $currency);
+
+        $result = explode(' ', $data);
+        return $result;
+    }
+
+    /**
+     * Returns a list of currencies which are used in this region
+     * a region name should be 2 charachters only (f.e. EG, DE, US)
+     * If no region is given, the actual region is used
+     *
+     * @param  string $region OPTIONAL Region to return the currencies for
+     * @return array List of currencies
+     */
+    public function getCurrencyList($region = null)
+    {
+        if (empty($region) === true) {
+            if (strlen($this->_options['locale']) > 4) {
+                $region = substr($this->_options['locale'], (strpos($this->_options['locale'], '_') + 1));
+            }
+        }
+
+        $data = Zend_Locale_Data::getContent($this->_options['locale'], 'currencytoregion', $region);
+
+        $result = explode(' ', $data);
+        return $result;
+    }
+
+    /**
+     * Returns the actual currency name
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->toCurrency();
+    }
+
+    /**
+     * Returns the currency name
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Returns the set cache
+     *
+     * @return Zend_Cache_Core The set cache
+     */
+    public static function getCache()
+    {
+        return Zend_Locale_Data::getCache();
+    }
+
+    /**
+     * Sets a cache for Zend_Currency
+     *
+     * @param  Zend_Cache_Core $cache Cache to set
+     * @return void
+     */
+    public static function setCache(Zend_Cache_Core $cache)
+    {
+        Zend_Locale_Data::setCache($cache);
+    }
+
+    /**
+     * Returns true when a cache is set
+     *
+     * @return boolean
+     */
+    public static function hasCache()
+    {
+        return Zend_Locale_Data::hasCache();
+    }
+
+    /**
+     * Removes any set cache
+     *
+     * @return void
+     */
+    public static function removeCache()
+    {
+        Zend_Locale_Data::removeCache();
+    }
+
+    /**
+     * Clears all set cache data
+     *
+     * @param string $tag Tag to clear when the default tag name is not used
+     * @return void
+     */
+    public static function clearCache($tag = null)
+    {
+        Zend_Locale_Data::clearCache($tag);
+    }
+
+    /**
+     * Sets a new locale for data retreivement
+     * Example: 'de_XX' will be set to 'de' because 'de_XX' does not exist
+     * 'xx_YY' will be set to 'root' because 'xx' does not exist
+     *
+     * @param  string|Zend_Locale $locale (Optional) Locale for parsing input
+     * @throws Zend_Currency_Exception When the given locale does not exist
+     * @return Zend_Currency Provides fluent interface
+     */
+    public function setLocale($locale = null)
+    {
+        require_once 'Zend/Locale.php';
+        try {
+            $locale = Zend_Locale::findLocale($locale);
+            if (strlen($locale) > 4) {
+                $this->_options['locale'] = $locale;
+            } else {
+                require_once 'Zend/Currency/Exception.php';
+                throw new Zend_Currency_Exception("No region found within the locale '" . (string) $locale . "'");
+            }
+        } catch (Zend_Locale_Exception $e) {
+            require_once 'Zend/Currency/Exception.php';
+            throw new Zend_Currency_Exception($e->getMessage());
+        }
+
+        // Get currency details
+        $this->_options['currency'] = $this->getShortName(null, $this->_options['locale']);
+        $this->_options['name']     = $this->getName(null, $this->_options['locale']);
+        $this->_options['symbol']   = $this->getSymbol(null, $this->_options['locale']);
+
+        return $this;
+    }
+
+    /**
+     * Returns the actual set locale
+     *
+     * @return string
+     */
+    public function getLocale()
+    {
+        return $this->_options['locale'];
+    }
+
+    /**
+     * Returns the value
+     *
+     * @return float
+     */
+    public function getValue()
+    {
+        return $this->_options['value'];
+    }
+
+    /**
+     * Adds a currency
+     *
+     * @param float|integer|Zend_Currency $value    Add this value to currency
+     * @param string|Zend_Currency        $currency The currency to add
+     * @return Zend_Currency
+     */
+    public function setValue($value, $currency = null)
+    {
+        $this->_options['value'] = $this->_exchangeCurrency($value, $currency);
+        return $this;
+    }
+
+    /**
+     * Adds a currency
+     *
+     * @param float|integer|Zend_Currency $value    Add this value to currency
+     * @param string|Zend_Currency        $currency The currency to add
+     * @return Zend_Currency
+     */
+    public function add($value, $currency = null)
+    {
+        $value = $this->_exchangeCurrency($value, $currency);
+        $this->_options['value'] += (float) $value;
+        return $this;
+    }
+
+    /**
+     * Substracts a currency
+     *
+     * @param float|integer|Zend_Currency $value    Substracts this value from currency
+     * @param string|Zend_Currency        $currency The currency to substract
+     * @return Zend_Currency
+     */
+    public function sub($value, $currency = null)
+    {
+        $value = $this->_exchangeCurrency($value, $currency);
+        $this->_options['value'] -= (float) $value;
+        return $this;
+    }
+
+    /**
+     * Divides a currency
+     *
+     * @param float|integer|Zend_Currency $value    Divides this value from currency
+     * @param string|Zend_Currency        $currency The currency to divide
+     * @return Zend_Currency
+     */
+    public function div($value, $currency = null)
+    {
+        $value = $this->_exchangeCurrency($value, $currency);
+        $this->_options['value'] /= (float) $value;
+        return $this;
+    }
+
+    /**
+     * Multiplies a currency
+     *
+     * @param float|integer|Zend_Currency $value    Multiplies this value from currency
+     * @param string|Zend_Currency        $currency The currency to multiply
+     * @return Zend_Currency
+     */
+    public function mul($value, $currency = null)
+    {
+        $value = $this->_exchangeCurrency($value, $currency);
+        $this->_options['value'] *= (float) $value;
+        return $this;
+    }
+
+    /**
+     * Calculates the modulo from a currency
+     *
+     * @param float|integer|Zend_Currency $value    Calculate modulo from this value
+     * @param string|Zend_Currency        $currency The currency to calculate the modulo
+     * @return Zend_Currency
+     */
+    public function mod($value, $currency = null)
+    {
+        $value = $this->_exchangeCurrency($value, $currency);
+        $this->_options['value'] %= (float) $value;
+        return $this;
+    }
+
+    /**
+     * Compares two currencies
+     *
+     * @param float|integer|Zend_Currency $value    Compares the currency with this value
+     * @param string|Zend_Currency        $currency The currency to compare this value from
+     * @return Zend_Currency
+     */
+    public function compare($value, $currency = null)
+    {
+        $value = $this->_exchangeCurrency($value, $currency);
+        $value = $this->_options['value'] - $value;
+        if ($value < 0) {
+            return -1;
+        } else if ($value > 0) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Returns true when the two currencies are equal
+     *
+     * @param float|integer|Zend_Currency $value    Compares the currency with this value
+     * @param string|Zend_Currency        $currency The currency to compare this value from
+     * @return boolean
+     */
+    public function equals($value, $currency = null)
+    {
+        $value = $this->_exchangeCurrency($value, $currency);
+        if ($this->_options['value'] == $value) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns true when the currency is more than the given value
+     *
+     * @param float|integer|Zend_Currency $value    Compares the currency with this value
+     * @param string|Zend_Currency        $currency The currency to compare this value from
+     * @return boolean
+     */
+    public function isMore($value, $currency = null)
+    {
+        $value = $this->_exchangeCurrency($value, $currency);
+        if ($this->_options['value'] > $value) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns true when the currency is less than the given value
+     *
+     * @param float|integer|Zend_Currency $value    Compares the currency with this value
+     * @param string|Zend_Currency        $currency The currency to compare this value from
+     * @return boolean
+     */
+    public function isLess($value, $currency = null)
+    {
+        $value = $this->_exchangeCurrency($value, $currency);
+        if ($this->_options['value'] < $value) {
+            return true;
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Internal method which calculates the exchanges currency
+     *
+     * @param float|integer|Zend_Currency $value    Compares the currency with this value
+     * @param string|Zend_Currency        $currency The currency to compare this value from
+     * @return unknown
+     */
+    protected function _exchangeCurrency($value, $currency)
+    {
+        if ($value instanceof Zend_Currency) {
+            $currency = $value->getShortName();
+            $value    = $value->getValue();
+        } else {
+            $currency = $this->getShortName($currency, $this->getLocale());
+        }
+
+        $rate = 1;
+        if ($currency !== $this->getShortName()) {
+            $service = $this->getService();
+            if (!($service instanceof Zend_Currency_CurrencyInterface)) {
+                require_once 'Zend/Currency/Exception.php';
+                throw new Zend_Currency_Exception('No exchange service applied');
+            }
+
+            $rate = $service->getRate($currency, $this->getShortName());
+        }
+
+        $value *= $rate;
+        return $value;
+    }
+
+    /**
+     * Returns the set service class
+     *
+     * @return Zend_Service
+     */
+    public function getService()
+    {
+        return $this->_options['service'];
+    }
+
+    /**
+     * Sets a new exchange service
+     *
+     * @param string|Zend_Currency_CurrencyInterface $service Service class
+     * @return Zend_Currency
+     */
+    public function setService($service)
+    {
+        if (is_string($service)) {
+            require_once 'Zend/Loader.php';
+            if (!class_exists($service)) {
+                $file = str_replace('_', DIRECTORY_SEPARATOR, $service) . '.php';
+                if (Zend_Loader::isReadable($file)) {
+                    Zend_Loader::loadClass($service);
+                }
+            }
+
+            $service = new $service;
+        }
+
+        if (!($service instanceof Zend_Currency_CurrencyInterface)) {
+            require_once 'Zend/Currency/Exception.php';
+            throw new Zend_Currency_Exception('A currency service must implement Zend_Currency_CurrencyInterface');
+        }
+
+        $this->_options['service'] = $service;
+        return $this;
+    }
+
+    /**
+     * Internal method for checking the options array
+     *
+     * @param  array $options Options to check
+     * @throws Zend_Currency_Exception On unknown position
+     * @throws Zend_Currency_Exception On unknown locale
+     * @throws Zend_Currency_Exception On unknown display
+     * @throws Zend_Currency_Exception On precision not between -1 and 30
+     * @throws Zend_Currency_Exception On problem with script conversion
+     * @throws Zend_Currency_Exception On unknown options
+     * @return array
+     */
+    protected function _checkOptions(array $options = array())
+    {
+        if (count($options) === 0) {
+            return $this->_options;
+        }
+
+        foreach ($options as $name => $value) {
+            $name = strtolower($name);
+            if ($name !== 'format') {
+                if (gettype($value) === 'string') {
+                    $value = strtolower($value);
+                }
+            }
+
+            switch($name) {
+                case 'position':
+                    if (($value !== self::STANDARD) and ($value !== self::RIGHT) and ($value !== self::LEFT)) {
+                        require_once 'Zend/Currency/Exception.php';
+                        throw new Zend_Currency_Exception("Unknown position '" . $value . "'");
+                    }
+
+                    break;
+
+                case 'format':
+                    if ((empty($value) === false) and (Zend_Locale::isLocale($value, null, false) === false)) {
+                        if (!is_string($value) || (strpos($value, '0') === false)) {
+                            require_once 'Zend/Currency/Exception.php';
+                            throw new Zend_Currency_Exception("'" .
+                                ((gettype($value) === 'object') ? get_class($value) : $value)
+                                . "' is no format token");
+                        }
+                    }
+                    break;
+
+                case 'display':
+                    if (is_numeric($value) and ($value !== self::NO_SYMBOL) and ($value !== self::USE_SYMBOL) and
+                        ($value !== self::USE_SHORTNAME) and ($value !== self::USE_NAME)) {
+                        require_once 'Zend/Currency/Exception.php';
+                        throw new Zend_Currency_Exception("Unknown display '$value'");
+                    }
+                    break;
+
+                case 'precision':
+                    if ($value === null) {
+                        $value = -1;
+                    }
+
+                    if (($value < -1) or ($value > 30)) {
+                        require_once 'Zend/Currency/Exception.php';
+                        throw new Zend_Currency_Exception("'$value' precision has to be between -1 and 30.");
+                    }
+                    break;
+
+                case 'script':
+                    try {
+                        Zend_Locale_Format::convertNumerals(0, $options['script']);
+                    } catch (Zend_Locale_Exception $e) {
+                        require_once 'Zend/Currency/Exception.php';
+                        throw new Zend_Currency_Exception($e->getMessage());
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return $options;
+    }
+}
diff --git a/lib/zend/Zend/Currency/CurrencyInterface.php b/lib/zend/Zend/Currency/CurrencyInterface.php
new file mode 100644
index 00000000000..8e828864b8c
--- /dev/null
+++ b/lib/zend/Zend/Currency/CurrencyInterface.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Currency
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version   $Id$
+ */
+
+/**
+ * Exception class for Zend_Currency
+ *
+ * @category  Zend
+ * @package   Zend_Currency
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Currency_CurrencyInterface
+{
+    /**
+     * Returns the actual exchange rate
+     *
+     * @param string $from Short Name of the base currency
+     * @param string $to   Short Name of the currency to exchange to
+     */
+    public function getRate($from, $to);
+}
diff --git a/lib/zend/Zend/Currency/Exception.php b/lib/zend/Zend/Currency/Exception.php
new file mode 100644
index 00000000000..9fa965b755e
--- /dev/null
+++ b/lib/zend/Zend/Currency/Exception.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Currency
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version   $Id$
+ */
+
+/**
+ * Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+/**
+ * Exception class for Zend_Currency
+ *
+ * @category  Zend
+ * @package   Zend_Currency
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Currency_Exception extends Zend_Exception
+{
+}
diff --git a/lib/zend/Zend/Date.php b/lib/zend/Zend/Date.php
index 17e1c520b54..48bc906f9b3 100644
--- a/lib/zend/Zend/Date.php
+++ b/lib/zend/Zend/Date.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -30,7 +30,7 @@ require_once 'Zend/Locale/Math.php';
 /**
  * @category  Zend
  * @package   Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Date extends Zend_Date_DateObject
@@ -274,6 +274,7 @@ class Zend_Date extends Zend_Date_DateObject
                             }
 
                             parent::$_cache = $value;
+                            parent::$_cacheTags = Zend_Date_DateObject::_getTagSupportForCache();
                             Zend_Locale_Data::setCache($value);
                         }
                         break;
@@ -353,7 +354,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Sets a new timestamp
      *
      * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to set
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setTimestamp($timestamp)
@@ -365,7 +366,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Adds a timestamp
      *
      * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to add
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addTimestamp($timestamp)
@@ -377,7 +378,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Subtracts a timestamp
      *
      * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to sub
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subTimestamp($timestamp)
@@ -557,7 +558,7 @@ class Zend_Date extends Zend_Date_DateObject
         $comment = false;
         $format  = '';
         $orig    = '';
-        for ($i = 0; $i < strlen($part); ++$i) {
+        for ($i = 0; isset($part[$i]); ++$i) {
             if ($part[$i] == "'") {
                 $comment = $comment ? false : true;
                 if (isset($part[$i+1]) && ($part[$i+1] == "'")) {
@@ -1062,7 +1063,7 @@ class Zend_Date extends Zend_Date_DateObject
      * @param  string|integer|array|Zend_Date  $date    Date or datepart to set
      * @param  string                          $part    OPTIONAL Part of the date to set, if null the timestamp is set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function set($date, $part = null, $locale = null)
@@ -1090,7 +1091,7 @@ class Zend_Date extends Zend_Date_DateObject
      * @param  string|integer|array|Zend_Date  $date    Date or datepart to add
      * @param  string                          $part    OPTIONAL Part of the date to add, if null the timestamp is added
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function add($date, $part = self::TIMESTAMP, $locale = null)
@@ -1113,7 +1114,7 @@ class Zend_Date extends Zend_Date_DateObject
      * @param  string|integer|array|Zend_Date  $date    Date or datepart to subtract
      * @param  string                          $part    OPTIONAL Part of the date to sub, if null the timestamp is subtracted
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function sub($date, $part = self::TIMESTAMP, $locale = null)
@@ -1200,14 +1201,14 @@ class Zend_Date extends Zend_Date_DateObject
         }
 
         preg_match('/([+-]\d{2}):{0,1}\d{2}/', $zone, $match);
-        if (!empty($match) and ($match[count($match) - 1] <= 12) and ($match[count($match) - 1] >= -12)) {
+        if (!empty($match) and ($match[count($match) - 1] <= 14) and ($match[count($match) - 1] >= -12)) {
             $zone = "Etc/GMT";
             $zone .= ($match[count($match) - 1] < 0) ? "+" : "-";
             $zone .= (int) abs($match[count($match) - 1]);
             return $zone;
         }
 
-        preg_match('/([[:alpha:]\/]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match);
+        preg_match('/([[:alpha:]\/_]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match);
         try {
             if (!empty($match) and (!is_int($match[count($match) - 1]))) {
                 $oldzone = $this->getTimezone();
@@ -2066,9 +2067,18 @@ class Zend_Date extends Zend_Date_DateObject
                 }
                 // (T)hh:mm:ss
                 preg_match('/[T,\s]{0,1}(\d{2}):(\d{2}):(\d{2})/', $tmpdate, $timematch);
+                // (T)hhmmss
                 if (empty($timematch)) {
                     preg_match('/[T,\s]{0,1}(\d{2})(\d{2})(\d{2})/', $tmpdate, $timematch);
                 }
+                // (T)hh:mm
+                if (empty($timematch)) {
+                    preg_match('/[T,\s]{0,1}(\d{2}):(\d{2})/', $tmpdate, $timematch);
+                }
+                // (T)hhmm
+                if (empty($timematch)) {
+                    preg_match('/[T,\s]{0,1}(\d{2})(\d{2})/', $tmpdate, $timematch);
+                }
                 if (empty($datematch) and empty($timematch)) {
                     require_once 'Zend/Date/Exception.php';
                     throw new Zend_Date_Exception("unsupported ISO8601 format ($date)", 0, null, $date);
@@ -2092,6 +2102,9 @@ class Zend_Date extends Zend_Date_DateObject
                     $timematch[2] = 0;
                     $timematch[3] = 0;
                 }
+                if (!isset($timematch[3])) {
+                    $timematch[3] = 0;
+                }
 
                 if (($calc == 'set') || ($calc == 'cmp')) {
                     --$datematch[2];
@@ -2106,7 +2119,10 @@ class Zend_Date extends Zend_Date_DateObject
                 break;
 
             case self::RFC_2822:
-                $result = preg_match('/^\w{3},\s(\d{1,2})\s(\w{3})\s(\d{4})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4})$/', $date, $match);
+                 $result = preg_match('/^\w{3},\s(\d{1,2})\s(\w{3})\s(\d{4})\s'
+                                    . '(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]'
+                                    . '{1}\d{4}|\w{1,20})$/', $date, $match);
+
                 if (!$result) {
                     require_once 'Zend/Date/Exception.php';
                     throw new Zend_Date_Exception("no RFC 2822 format ($date)", 0, null, $date);
@@ -2640,10 +2656,8 @@ class Zend_Date extends Zend_Date_DateObject
                                 $parsed['day'] = 0;
                             }
 
-                            if (isset($parsed['year'])) {
-                                $parsed['year'] -= 1970;
-                            } else {
-                                $parsed['year'] = 0;
+                            if (!isset($parsed['year'])) {
+                                $parsed['year'] = 1970;
                             }
                         }
 
@@ -2653,7 +2667,7 @@ class Zend_Date extends Zend_Date_DateObject
                             isset($parsed['second']) ? $parsed['second'] : 0,
                             isset($parsed['month']) ? (1 + $parsed['month']) : 1,
                             isset($parsed['day']) ? (1 + $parsed['day']) : 1,
-                            isset($parsed['year']) ? (1970 + $parsed['year']) : 1970,
+                            $parsed['year'],
                             false), $this->getUnixTimestamp(), false);
                     } catch (Zend_Locale_Exception $e) {
                         if (!is_numeric($date)) {
@@ -2834,7 +2848,7 @@ class Zend_Date extends Zend_Date_DateObject
      * @param  string|integer|array|Zend_Date  $time    Time to set
      * @param  string                          $format  OPTIONAL Timeformat for parsing input
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setTime($time, $format = null, $locale = null)
@@ -2852,7 +2866,7 @@ class Zend_Date extends Zend_Date_DateObject
      * @param  string|integer|array|Zend_Date  $time    Time to add
      * @param  string                          $format  OPTIONAL Timeformat for parsing input
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addTime($time, $format = null, $locale = null)
@@ -2870,7 +2884,7 @@ class Zend_Date extends Zend_Date_DateObject
      * @param  string|integer|array|Zend_Date  $time    Time to sub
      * @param  string                          $format  OPTIONAL Timeformat for parsing input
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid inteface
+     * @return Zend_Date Provides a fluent inteface
      * @throws Zend_Date_Exception
      */
     public function subTime($time, $format = null, $locale = null)
@@ -2996,7 +3010,7 @@ class Zend_Date extends Zend_Date_DateObject
      * @param  string|integer|array|Zend_Date  $date    Date to set
      * @param  string                          $format  OPTIONAL Date format for parsing
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setDate($date, $format = null, $locale = null)
@@ -3014,7 +3028,7 @@ class Zend_Date extends Zend_Date_DateObject
      * @param  string|integer|array|Zend_Date  $date    Date to add
      * @param  string                          $format  OPTIONAL Date format for parsing input
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addDate($date, $format = null, $locale = null)
@@ -3033,7 +3047,7 @@ class Zend_Date extends Zend_Date_DateObject
      * @param  string|integer|array|Zend_Date  $date    Date to sub
      * @param  string                          $format  OPTIONAL Date format for parsing input
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subDate($date, $format = null, $locale = null)
@@ -3084,7 +3098,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|Zend_Date  $date    ISO Date to set
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setIso($date, $locale = null)
@@ -3101,7 +3115,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|Zend_Date  $date    ISO Date to add
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addIso($date, $locale = null)
@@ -3118,7 +3132,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|Zend_Date  $date    ISO Date to sub
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subIso($date, $locale = null)
@@ -3171,7 +3185,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|Zend_Date  $date    RFC 822 to set
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setArpa($date, $locale = null)
@@ -3189,7 +3203,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|Zend_Date  $date    RFC 822 Date to add
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addArpa($date, $locale = null)
@@ -3207,7 +3221,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|Zend_Date  $date    RFC 822 Date to sub
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subArpa($date, $locale = null)
@@ -3233,12 +3247,12 @@ class Zend_Date extends Zend_Date_DateObject
         return $this->_calcvalue('cmp', $date, 'arpa', self::RFC_822, $locale);
     }
 
-
     /**
      * Check if location is supported
      *
-     * @param $location array - locations array
-     * @return $horizon float
+     * @param array $location locations array
+     * @throws Zend_Date_Exception
+     * @return float $horizon float
      */
     private function _checkLocation($location)
     {
@@ -3280,7 +3294,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Returns the time of sunrise for this date and a given location as new date object
      * For a list of cities and correct locations use the class Zend_Date_Cities
      *
-     * @param  $location array - location of sunrise
+     * @param array $location location of sunrise
      *                   ['horizon']   -> civil, nautic, astronomical, effective (default)
      *                   ['longitude'] -> longitude of location
      *                   ['latitude']  -> latitude of location
@@ -3300,7 +3314,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Returns the time of sunset for this date and a given location as new date object
      * For a list of cities and correct locations use the class Zend_Date_Cities
      *
-     * @param  $location array - location of sunset
+     * @param array $location location of sunset
      *                   ['horizon']   -> civil, nautic, astronomical, effective (default)
      *                   ['longitude'] -> longitude of location
      *                   ['latitude']  -> latitude of location
@@ -3320,7 +3334,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Returns an array with the sunset and sunrise dates for all horizon types
      * For a list of cities and correct locations use the class Zend_Date_Cities
      *
-     * @param  $location array - location of suninfo
+     * @param array $location location of suninfo
      *                   ['horizon']   -> civil, nautic, astronomical, effective (default)
      *                   ['longitude'] -> longitude of location
      *                   ['latitude']  -> latitude of location
@@ -3356,11 +3370,11 @@ class Zend_Date extends Zend_Date_DateObject
         return $suninfo;
     }
 
-
     /**
      * Check a given year for leap year.
      *
-     * @param  integer|array|Zend_Date  $year  Year to check
+     * @param  integer|array|Zend_Date $year Year to check
+     * @throws Zend_Date_Exception
      * @return boolean
      */
     public static function checkLeapYear($year)
@@ -3456,7 +3470,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string                          $calc    Calculation to make
      * @param  string|integer|array|Zend_Date  $date    Date or Part to calculate
-     * @param  string                          $part    Datepart for Calculation
+     * @param  string                          $type    Datepart for Calculation
      * @param  string|Zend_Locale              $locale  Locale for parsing input
      * @return integer|string  new date
      * @throws Zend_Date_Exception
@@ -3494,11 +3508,13 @@ class Zend_Date extends Zend_Date_DateObject
     /**
      * Internal calculation, returns the requested date type
      *
-     * @param  string                    $calc    Calculation to make
-     * @param  string|integer|Zend_Date  $value   Datevalue to calculate with, if null the actual value is taken
-     * @param  string|Zend_Locale        $locale  Locale for parsing input
-     * @return integer|Zend_Date  new date
+     * @param  string                   $calc   Calculation to make
+     * @param  string|integer|Zend_Date $value  Datevalue to calculate with, if null the actual value is taken
+     * @param  string                   $type
+     * @param  string                   $parameter
+     * @param  string|Zend_Locale       $locale Locale for parsing input
      * @throws Zend_Date_Exception
+     * @return integer|Zend_Date  new date
      */
     private function _calcvalue($calc, $value, $type, $parameter, $locale)
     {
@@ -3554,9 +3570,9 @@ class Zend_Date extends Zend_Date_DateObject
      * use set() instead.
      * Returned is the new date object
      *
-     * @param  string|integer|array|Zend_Date  $date    Year to set
+     * @param  string|integer|array|Zend_Date  $year    Year to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setYear($year, $locale = null)
@@ -3573,9 +3589,9 @@ class Zend_Date extends Zend_Date_DateObject
      * use add() instead.
      * Returned is the new date object
      *
-     * @param  string|integer|array|Zend_Date  $date    Year to add
+     * @param  string|integer|array|Zend_Date  $year    Year to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addYear($year, $locale = null)
@@ -3592,9 +3608,9 @@ class Zend_Date extends Zend_Date_DateObject
      * use sub() instead.
      * Returned is the new date object
      *
-     * @param  string|integer|array|Zend_Date  $date    Year to sub
+     * @param  string|integer|array|Zend_Date  $year    Year to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subYear($year, $locale = null)
@@ -3718,7 +3734,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $month   Month to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setMonth($month, $locale = null)
@@ -3737,7 +3753,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $month   Month to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addMonth($month, $locale = null)
@@ -3756,7 +3772,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $month   Month to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subMonth($month, $locale = null)
@@ -3785,7 +3801,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Returns the day as new date object
      * Example: 20.May.1986 -> 20.Jan.1970 00:00:00
      *
-     * @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
+     * @param Zend_Locale $locale OPTIONAL Locale for parsing input
      * @return Zend_Date
      */
     public function getDay($locale = null)
@@ -3793,13 +3809,13 @@ class Zend_Date extends Zend_Date_DateObject
         return $this->copyPart(self::DAY_SHORT, $locale);
     }
 
-
     /**
      * Returns the calculated day
      *
-     * @param $calc    string                    Type of calculation to make
-     * @param $day     string|integer|Zend_Date  Day to calculate, when null the actual day is calculated
-     * @param $locale  string|Zend_Locale        Locale for parsing input
+     * @param string      $calc   Type of calculation to make
+     * @param Zend_Date   $day    Day to calculate, when null the actual day is calculated
+     * @param Zend_Locale $locale Locale for parsing input
+     * @throws Zend_Date_Exception
      * @return Zend_Date|integer
      */
     private function _day($calc, $day, $locale)
@@ -3860,9 +3876,9 @@ class Zend_Date extends Zend_Date_DateObject
      * Returned is the new date object
      * Example: setDay('Montag', 'de_AT'); will set the monday of this week as day.
      *
-     * @param  string|integer|array|Zend_Date  $month   Day to set
+     * @param  string|integer|array|Zend_Date  $day     Day to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setDay($day, $locale = null)
@@ -3878,9 +3894,9 @@ class Zend_Date extends Zend_Date_DateObject
      * If a localized dayname is given it will be parsed with the default locale or the optional
      * set locale.
      *
-     * @param  string|integer|array|Zend_Date  $month   Day to add
+     * @param  string|integer|array|Zend_Date  $day     Day to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addDay($day, $locale = null)
@@ -3896,9 +3912,9 @@ class Zend_Date extends Zend_Date_DateObject
      * If a localized dayname is given it will be parsed with the default locale or the optional
      * set locale.
      *
-     * @param  string|integer|array|Zend_Date  $month   Day to sub
+     * @param  string|integer|array|Zend_Date  $day     Day to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subDay($day, $locale = null)
@@ -3928,7 +3944,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Weekday is always from 1-7
      * Example: 09-Jan-2007 -> 2 = Tuesday -> 02-Jan-1970 (when 02.01.1970 is also Tuesday)
      *
-     * @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
+     * @param Zend_Locale $locale OPTIONAL Locale for parsing input
      * @return Zend_Date
      */
     public function getWeekday($locale = null)
@@ -3946,9 +3962,9 @@ class Zend_Date extends Zend_Date_DateObject
     /**
      * Returns the calculated weekday
      *
-     * @param  $calc     string                          Type of calculation to make
-     * @param  $weekday  string|integer|array|Zend_Date  Weekday to calculate, when null the actual weekday is calculated
-     * @param  $locale   string|Zend_Locale              Locale for parsing input
+     * @param  string      $calc     Type of calculation to make
+     * @param  Zend_Date   $weekday  Weekday to calculate, when null the actual weekday is calculated
+     * @param  Zend_Locale $locale   Locale for parsing input
      * @return Zend_Date|integer
      * @throws Zend_Date_Exception
      */
@@ -4008,9 +4024,9 @@ class Zend_Date extends Zend_Date_DateObject
      * Returned is the new date object.
      * Example: setWeekday(3); will set the wednesday of this week as day.
      *
-     * @param  string|integer|array|Zend_Date  $month   Weekday to set
+     * @param  string|integer|array|Zend_Date  $weekday Weekday to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setWeekday($weekday, $locale = null)
@@ -4028,9 +4044,9 @@ class Zend_Date extends Zend_Date_DateObject
      * Example: addWeekday(3); will add the difference of days from the begining of the month until
      * wednesday.
      *
-     * @param  string|integer|array|Zend_Date  $month   Weekday to add
+     * @param  string|integer|array|Zend_Date  $weekday Weekday to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addWeekday($weekday, $locale = null)
@@ -4048,9 +4064,9 @@ class Zend_Date extends Zend_Date_DateObject
      * Example: subWeekday(3); will subtract the difference of days from the begining of the month until
      * wednesday.
      *
-     * @param  string|integer|array|Zend_Date  $month   Weekday to sub
+     * @param  string|integer|array|Zend_Date  $weekday Weekday to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subWeekday($weekday, $locale = null)
@@ -4102,7 +4118,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $day     Day of Year to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setDayOfYear($day, $locale = null)
@@ -4119,7 +4135,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $day     Day of Year to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addDayOfYear($day, $locale = null)
@@ -4136,7 +4152,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $day     Day of Year to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subDayOfYear($day, $locale = null)
@@ -4165,7 +4181,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Returns the hour as new date object
      * Example: 02.Feb.1986 10:30:25 -> 01.Jan.1970 10:00:00
      *
-     * @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
+     * @param Zend_Locale $locale OPTIONAL Locale for parsing input
      * @return Zend_Date
      */
     public function getHour($locale = null)
@@ -4182,7 +4198,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $hour    Hour to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setHour($hour, $locale = null)
@@ -4199,7 +4215,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $hour    Hour to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addHour($hour, $locale = null)
@@ -4216,7 +4232,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $hour    Hour to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subHour($hour, $locale = null)
@@ -4268,7 +4284,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $minute  Minute to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setMinute($minute, $locale = null)
@@ -4285,7 +4301,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $minute  Minute to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addMinute($minute, $locale = null)
@@ -4302,7 +4318,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $minute  Minute to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subMinute($minute, $locale = null)
@@ -4354,7 +4370,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date $second Second to set
      * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setSecond($second, $locale = null)
@@ -4371,7 +4387,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date $second Second to add
      * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addSecond($second, $locale = null)
@@ -4388,7 +4404,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date $second Second to sub
      * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subSecond($second, $locale = null)
@@ -4429,7 +4445,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  integer $precision Precision for the fractional datepart 3 = milliseconds
      * @throws Zend_Date_Exception
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      */
     public function setFractionalPrecision($precision)
     {
@@ -4459,14 +4475,14 @@ class Zend_Date extends Zend_Date_DateObject
         return $this->_fractional;
     }
 
-
     /**
      * Sets new milliseconds for the date object
      * Example: setMilliSecond(550, 2) -> equals +5 Sec +50 MilliSec
      *
      * @param  integer|Zend_Date $milli     (Optional) Millisecond to set, when null the actual millisecond is set
      * @param  integer           $precision (Optional) Fraction precision of the given milliseconds
-     * @return Zend_Date Provides fluid interface
+     * @throws Zend_Date_Exception
+     * @return Zend_Date Provides a fluent interface
      */
     public function setMilliSecond($milli = null, $precision = null)
     {
@@ -4493,13 +4509,13 @@ class Zend_Date extends Zend_Date_DateObject
         return $this;
     }
 
-
     /**
      * Adds milliseconds to the date object
      *
      * @param  integer|Zend_Date $milli     (Optional) Millisecond to add, when null the actual millisecond is added
      * @param  integer           $precision (Optional) Fractional precision for the given milliseconds
-     * @return Zend_Date Provides fluid interface
+     * @throws Zend_Date_Exception
+     * @return Zend_Date Provides a fluent interface
      */
     public function addMilliSecond($milli = null, $precision = null)
     {
@@ -4512,15 +4528,24 @@ class Zend_Date extends Zend_Date_DateObject
         }
 
         if ($precision === null) {
-            $precision = strlen($milli);
-            if ($milli < 0) {
-                --$precision;
-            }
+            // Use internal default precision
+            // Is not as logic as using the length of the input. But this would break tests and maybe other things
+            // as an input value of integer 10, which is used in tests, must be parsed as 10 milliseconds (real milliseconds, precision 3)
+            // but with auto-detect of precision, 100 milliseconds would be added.
+            $precision = $this->_precision;
         }
 
         if (!is_int($precision) || $precision < 1 || $precision > 9) {
             require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision);
+            throw new Zend_Date_Exception(
+                "precision ($precision) must be a positive integer less than 10", 0, null, $precision
+            );
+        }
+
+        if ($this->_precision > $precision) {
+            $milli = $milli * pow(10, $this->_precision - $precision);
+        } elseif ($this->_precision < $precision) {
+            $milli = round($milli / pow(10, $precision - $this->_precision));
         }
 
         $this->_fractional += $milli;
@@ -4555,7 +4580,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  integer|Zend_Date $milli     (Optional) Millisecond to sub, when null the actual millisecond is subtracted
      * @param  integer           $precision (Optional) Fractional precision for the given milliseconds
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      */
     public function subMilliSecond($milli = null, $precision = null)
     {
@@ -4616,7 +4641,7 @@ class Zend_Date extends Zend_Date_DateObject
      * Returns the week as new date object using monday as begining of the week
      * Example: 12.Jan.2007 -> 08.Jan.1970 00:00:00
      *
-     * @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
+     * @param Zend_Locale $locale OPTIONAL Locale for parsing input
      * @return Zend_Date
      */
     public function getWeek($locale = null)
@@ -4637,7 +4662,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $week    Week to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function setWeek($week, $locale = null)
@@ -4652,7 +4677,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $week    Week to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function addWeek($week, $locale = null)
@@ -4667,7 +4692,7 @@ class Zend_Date extends Zend_Date_DateObject
      *
      * @param  string|integer|array|Zend_Date  $week    Week to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
+     * @return Zend_Date Provides a fluent interface
      * @throws Zend_Date_Exception
      */
     public function subWeek($week, $locale = null)
diff --git a/lib/zend/Zend/Date/Cities.php b/lib/zend/Zend/Date/Cities.php
index 70bc0592dc0..6934d690e05 100644
--- a/lib/zend/Zend/Date/Cities.php
+++ b/lib/zend/Zend/Date/Cities.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -28,7 +28,7 @@
  * @category   Zend
  * @package    Zend_Date
  * @subpackage Zend_Date_Cities
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Date_Cities
diff --git a/lib/zend/Zend/Date/DateObject.php b/lib/zend/Zend/Date/DateObject.php
index 5435eb4a506..0ec9fce9fc2 100644
--- a/lib/zend/Zend/Date/DateObject.php
+++ b/lib/zend/Zend/Date/DateObject.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
@@ -23,7 +23,7 @@
  * @category   Zend
  * @package    Zend_Date
  * @subpackage Zend_Date_DateObject
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Date_DateObject {
@@ -33,6 +33,7 @@ abstract class Zend_Date_DateObject {
      */
     private   $_unixTimestamp;
     protected static $_cache         = null;
+    protected static $_cacheTags     = false;
     protected static $_defaultOffset = 0;
 
     /**
@@ -254,7 +255,11 @@ abstract class Zend_Date_DateObject {
         }
 
         if (isset(self::$_cache)) {
-            self::$_cache->save( serialize($date), $id);
+            if (self::$_cacheTags) {
+                self::$_cache->save( serialize($date), $id, array('Zend_Date'));
+            } else {
+                self::$_cache->save( serialize($date), $id);
+            }
         }
 
         return $date;
@@ -307,6 +312,13 @@ abstract class Zend_Date_DateObject {
         }
 
         if (abs($timestamp) <= 0x7FFFFFFF) {
+            // See ZF-11992
+            // "o" will sometimes resolve to the previous year (see 
+            // http://php.net/date ; it's part of the ISO 8601 
+            // standard). However, this is not desired, so replacing 
+            // all occurrences of "o" not preceded by a backslash 
+            // with "Y"
+            $format = preg_replace('/(?<!\\\\)o/', 'Y', $format);
             $result = ($gmt) ? @gmdate($format, $timestamp) : @date($format, $timestamp);
             date_default_timezone_set($oldzone);
             return $result;
@@ -340,7 +352,11 @@ abstract class Zend_Date_DateObject {
             }
 
             if (isset(self::$_cache)) {
-                self::$_cache->save( serialize($timestamp), $idstamp);
+                if (self::$_cacheTags) {
+                    self::$_cache->save( serialize($timestamp), $idstamp, array('Zend_Date'));
+                } else {
+                    self::$_cache->save( serialize($timestamp), $idstamp);
+                }
             }
         }
 
@@ -828,7 +844,11 @@ abstract class Zend_Date_DateObject {
         }
 
         if (isset(self::$_cache)) {
-            self::$_cache->save( serialize($array), $id);
+            if (self::$_cacheTags) {
+                self::$_cache->save( serialize($array), $id, array('Zend_Date'));
+            } else {
+                self::$_cache->save( serialize($array), $id);
+            }
         }
 
         return $array;
@@ -1055,4 +1075,22 @@ abstract class Zend_Date_DateObject {
 
         return $offset;
     }
+
+    /**
+     * Internal method to check if the given cache supports tags
+     *
+     * @param Zend_Cache $cache
+     */
+    protected static function _getTagSupportForCache()
+    {
+        $backend = self::$_cache->getBackend();
+        if ($backend instanceof Zend_Cache_Backend_ExtendedInterface) {
+            $cacheOptions = $backend->getCapabilities();
+            self::$_cacheTags = $cacheOptions['tags'];
+        } else {
+            self::$_cacheTags = false;
+        }
+
+        return self::$_cacheTags;
+    }
 }
diff --git a/lib/zend/Zend/Date/Exception.php b/lib/zend/Zend/Date/Exception.php
index bcbfd20be52..f4573b38ce5 100644
--- a/lib/zend/Zend/Date/Exception.php
+++ b/lib/zend/Zend/Date/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Exception.php';
 /**
  * @category   Zend
  * @package    Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Date_Exception extends Zend_Exception
diff --git a/lib/zend/Zend/Exception.php b/lib/zend/Zend/Exception.php
index bbfb792e936..d97acb0f92c 100644
--- a/lib/zend/Zend/Exception.php
+++ b/lib/zend/Zend/Exception.php
@@ -14,14 +14,15 @@
  *
  * @category   Zend
  * @package    Zend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
  */
 
 /**
 * @category   Zend
 * @package    Zend
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Exception extends Exception
@@ -53,9 +54,9 @@ class Zend_Exception extends Exception
      * Overloading
      *
      * For PHP < 5.3.0, provides access to the getPrevious() method.
-     * 
-     * @param  string $method 
-     * @param  array $args 
+     *
+     * @param  string $method
+     * @param  array $args
      * @return mixed
      */
     public function __call($method, array $args)
@@ -75,8 +76,8 @@ class Zend_Exception extends Exception
     {
         if (version_compare(PHP_VERSION, '5.3.0', '<')) {
             if (null !== ($e = $this->getPrevious())) {
-                return $e->__toString() 
-                       . "\n\nNext " 
+                return $e->__toString()
+                       . "\n\nNext "
                        . parent::__toString();
             }
         }
diff --git a/lib/zend/Zend/Filter.php b/lib/zend/Zend/Filter.php
new file mode 100644
index 00000000000..1256ff9bd6b
--- /dev/null
+++ b/lib/zend/Zend/Filter.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter implements Zend_Filter_Interface
+{
+
+    const CHAIN_APPEND  = 'append';
+    const CHAIN_PREPEND = 'prepend';
+
+    /**
+     * Filter chain
+     *
+     * @var array
+     */
+    protected $_filters = array();
+
+    /**
+     * Default Namespaces
+     *
+     * @var array
+     */
+    protected static $_defaultNamespaces = array();
+
+    /**
+     * Adds a filter to the chain
+     *
+     * @param  Zend_Filter_Interface $filter
+     * @param  string $placement
+     * @return Zend_Filter Provides a fluent interface
+     */
+    public function addFilter(Zend_Filter_Interface $filter, $placement = self::CHAIN_APPEND)
+    {
+        if ($placement == self::CHAIN_PREPEND) {
+            array_unshift($this->_filters, $filter);
+        } else {
+            $this->_filters[] = $filter;
+        }
+        return $this;
+    }
+
+    /**
+     * Add a filter to the end of the chain
+     *
+     * @param  Zend_Filter_Interface $filter
+     * @return Zend_Filter Provides a fluent interface
+     */
+    public function appendFilter(Zend_Filter_Interface $filter)
+    {
+        return $this->addFilter($filter, self::CHAIN_APPEND);
+    }
+
+    /**
+     * Add a filter to the start of the chain
+     *
+     * @param  Zend_Filter_Interface $filter
+     * @return Zend_Filter Provides a fluent interface
+     */
+    public function prependFilter(Zend_Filter_Interface $filter)
+    {
+        return $this->addFilter($filter, self::CHAIN_PREPEND);
+    }
+
+    /**
+     * Get all the filters
+     *
+     * @return array
+     */
+    public function getFilters()
+    {
+        return $this->_filters;
+    }
+
+    /**
+     * Returns $value filtered through each filter in the chain
+     *
+     * Filters are run in the order in which they were added to the chain (FIFO)
+     *
+     * @param  mixed $value
+     * @return mixed
+     */
+    public function filter($value)
+    {
+        $valueFiltered = $value;
+        foreach ($this->_filters as $filter) {
+            $valueFiltered = $filter->filter($valueFiltered);
+        }
+        return $valueFiltered;
+    }
+
+    /**
+     * Returns the set default namespaces
+     *
+     * @return array
+     */
+    public static function getDefaultNamespaces()
+    {
+        return self::$_defaultNamespaces;
+    }
+
+    /**
+     * Sets new default namespaces
+     *
+     * @param array|string $namespace
+     * @return null
+     */
+    public static function setDefaultNamespaces($namespace)
+    {
+        if (!is_array($namespace)) {
+            $namespace = array((string) $namespace);
+        }
+
+        self::$_defaultNamespaces = $namespace;
+    }
+
+    /**
+     * Adds a new default namespace
+     *
+     * @param array|string $namespace
+     * @return null
+     */
+    public static function addDefaultNamespaces($namespace)
+    {
+        if (!is_array($namespace)) {
+            $namespace = array((string) $namespace);
+        }
+
+        self::$_defaultNamespaces = array_unique(array_merge(self::$_defaultNamespaces, $namespace));
+    }
+
+    /**
+     * Returns true when defaultNamespaces are set
+     *
+     * @return boolean
+     */
+    public static function hasDefaultNamespaces()
+    {
+        return (!empty(self::$_defaultNamespaces));
+    }
+
+    /**
+     * @deprecated
+     * @see Zend_Filter::filterStatic()
+     *
+     * @param  mixed        $value
+     * @param  string       $classBaseName
+     * @param  array        $args          OPTIONAL
+     * @param  array|string $namespaces    OPTIONAL
+     * @return mixed
+     * @throws Zend_Filter_Exception
+     */
+    public static function get($value, $classBaseName, array $args = array(), $namespaces = array())
+    {
+        trigger_error(
+            'Zend_Filter::get() is deprecated as of 1.9.0; please update your code to utilize Zend_Filter::filterStatic()',
+            E_USER_NOTICE
+        );
+
+        return self::filterStatic($value, $classBaseName, $args, $namespaces);
+    }
+
+    /**
+     * Returns a value filtered through a specified filter class, without requiring separate
+     * instantiation of the filter object.
+     *
+     * The first argument of this method is a data input value, that you would have filtered.
+     * The second argument is a string, which corresponds to the basename of the filter class,
+     * relative to the Zend_Filter namespace. This method automatically loads the class,
+     * creates an instance, and applies the filter() method to the data input. You can also pass
+     * an array of constructor arguments, if they are needed for the filter class.
+     *
+     * @param  mixed        $value
+     * @param  string       $classBaseName
+     * @param  array        $args          OPTIONAL
+     * @param  array|string $namespaces    OPTIONAL
+     * @return mixed
+     * @throws Zend_Filter_Exception
+     */
+    public static function filterStatic($value, $classBaseName, array $args = array(), $namespaces = array())
+    {
+        require_once 'Zend/Loader.php';
+        $namespaces = array_merge((array) $namespaces, self::$_defaultNamespaces, array('Zend_Filter'));
+        foreach ($namespaces as $namespace) {
+            $className = $namespace . '_' . ucfirst($classBaseName);
+            if (!class_exists($className, false)) {
+                try {
+                    $file = str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+                    if (Zend_Loader::isReadable($file)) {
+                        Zend_Loader::loadClass($className);
+                    } else {
+                        continue;
+                    }
+                } catch (Zend_Exception $ze) {
+                    continue;
+                }
+            }
+
+            $class = new ReflectionClass($className);
+            if ($class->implementsInterface('Zend_Filter_Interface')) {
+                if ($class->hasMethod('__construct')) {
+                    $object = $class->newInstanceArgs($args);
+                } else {
+                    $object = $class->newInstance();
+                }
+                return $object->filter($value);
+            }
+        }
+        require_once 'Zend/Filter/Exception.php';
+        throw new Zend_Filter_Exception("Filter class not found from basename '$classBaseName'");
+    }
+}
diff --git a/lib/zend/Zend/Filter/Alnum.php b/lib/zend/Zend/Filter/Alnum.php
new file mode 100644
index 00000000000..7455dafe45c
--- /dev/null
+++ b/lib/zend/Zend/Filter/Alnum.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+/**
+ * @see Zend_Locale
+ */
+require_once 'Zend/Locale.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Alnum implements Zend_Filter_Interface
+{
+    /**
+     * Whether to allow white space characters; off by default
+     *
+     * @var boolean
+     * @deprecated
+     */
+    public $allowWhiteSpace;
+
+    /**
+     * Is PCRE is compiled with UTF-8 and Unicode support
+     *
+     * @var mixed
+     **/
+    protected static $_unicodeEnabled;
+
+    /**
+     * Locale in browser.
+     *
+     * @var Zend_Locale object
+     */
+    protected $_locale;
+
+    /**
+     * The Alphabet means english alphabet.
+     *
+     * @var boolean
+     */
+    protected static $_meansEnglishAlphabet;
+
+    /**
+     * Sets default option values for this instance
+     *
+     * @param  boolean $allowWhiteSpace
+     * @return void
+     */
+    public function __construct($allowWhiteSpace = false)
+    {
+        if ($allowWhiteSpace instanceof Zend_Config) {
+            $allowWhiteSpace = $allowWhiteSpace->toArray();
+        } else if (is_array($allowWhiteSpace)) {
+            if (array_key_exists('allowwhitespace', $allowWhiteSpace)) {
+                $allowWhiteSpace = $allowWhiteSpace['allowwhitespace'];
+            } else {
+                $allowWhiteSpace = false;
+            }
+        }
+
+        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
+        if (null === self::$_unicodeEnabled) {
+            self::$_unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
+        }
+
+        if (null === self::$_meansEnglishAlphabet) {
+            $this->_locale = new Zend_Locale('auto');
+            self::$_meansEnglishAlphabet = in_array($this->_locale->getLanguage(),
+                                                    array('ja', 'ko', 'zh')
+                                                    );
+        }
+
+    }
+
+    /**
+     * Returns the allowWhiteSpace option
+     *
+     * @return boolean
+     */
+    public function getAllowWhiteSpace()
+    {
+        return $this->allowWhiteSpace;
+    }
+
+    /**
+     * Sets the allowWhiteSpace option
+     *
+     * @param boolean $allowWhiteSpace
+     * @return Zend_Filter_Alnum Provides a fluent interface
+     */
+    public function setAllowWhiteSpace($allowWhiteSpace)
+    {
+        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns the string $value, removing all but alphabetic and digit characters
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        $whiteSpace = $this->allowWhiteSpace ? '\s' : '';
+        if (!self::$_unicodeEnabled) {
+            // POSIX named classes are not supported, use alternative a-zA-Z0-9 match
+            $pattern = '/[^a-zA-Z0-9' . $whiteSpace . ']/';
+        } else if (self::$_meansEnglishAlphabet) {
+            //The Alphabet means english alphabet.
+            $pattern = '/[^a-zA-Z0-9'  . $whiteSpace . ']/u';
+        } else {
+            //The Alphabet means each language's alphabet.
+            $pattern = '/[^\p{L}\p{N}' . $whiteSpace . ']/u';
+        }
+
+        return preg_replace($pattern, '', (string) $value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/Alpha.php b/lib/zend/Zend/Filter/Alpha.php
new file mode 100644
index 00000000000..7374da1665e
--- /dev/null
+++ b/lib/zend/Zend/Filter/Alpha.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+/**
+ * @see Zend_Locale
+ */
+require_once 'Zend/Locale.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Alpha implements Zend_Filter_Interface
+{
+    /**
+     * Whether to allow white space characters; off by default
+     *
+     * @var boolean
+     * @deprecated
+     */
+    public $allowWhiteSpace;
+
+    /**
+     * Is PCRE is compiled with UTF-8 and Unicode support
+     *
+     * @var mixed
+     **/
+    protected static $_unicodeEnabled;
+
+    /**
+     * Locale in browser.
+     *
+     * @var Zend_Locale object
+     */
+    protected $_locale;
+
+    /**
+     * The Alphabet means english alphabet.
+     *
+     * @var boolean
+     */
+    protected static $_meansEnglishAlphabet;
+
+    /**
+     * Sets default option values for this instance
+     *
+     * @param  boolean $allowWhiteSpace
+     * @return void
+     */
+    public function __construct($allowWhiteSpace = false)
+    {
+        if ($allowWhiteSpace instanceof Zend_Config) {
+            $allowWhiteSpace = $allowWhiteSpace->toArray();
+        } else if (is_array($allowWhiteSpace)) {
+            if (array_key_exists('allowwhitespace', $allowWhiteSpace)) {
+                $allowWhiteSpace = $allowWhiteSpace['allowwhitespace'];
+            } else {
+                $allowWhiteSpace = false;
+            }
+        }
+
+        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
+        if (null === self::$_unicodeEnabled) {
+            self::$_unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
+        }
+
+        if (null === self::$_meansEnglishAlphabet) {
+            $this->_locale = new Zend_Locale('auto');
+            self::$_meansEnglishAlphabet = in_array($this->_locale->getLanguage(),
+                                                    array('ja', 'ko', 'zh')
+                                                    );
+        }
+
+    }
+
+    /**
+     * Returns the allowWhiteSpace option
+     *
+     * @return boolean
+     */
+    public function getAllowWhiteSpace()
+    {
+        return $this->allowWhiteSpace;
+    }
+
+    /**
+     * Sets the allowWhiteSpace option
+     *
+     * @param boolean $allowWhiteSpace
+     * @return Zend_Filter_Alpha Provides a fluent interface
+     */
+    public function setAllowWhiteSpace($allowWhiteSpace)
+    {
+        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns the string $value, removing all but alphabetic characters
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        $whiteSpace = $this->allowWhiteSpace ? '\s' : '';
+        if (!self::$_unicodeEnabled) {
+            // POSIX named classes are not supported, use alternative a-zA-Z match
+            $pattern = '/[^a-zA-Z' . $whiteSpace . ']/';
+        } else if (self::$_meansEnglishAlphabet) {
+            //The Alphabet means english alphabet.
+            $pattern = '/[^a-zA-Z'  . $whiteSpace . ']/u';
+        } else {
+            //The Alphabet means each language's alphabet.
+            $pattern = '/[^\p{L}' . $whiteSpace . ']/u';
+        }
+
+        return preg_replace($pattern, '', (string) $value);
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php b/lib/zend/Zend/Filter/BaseName.php
similarity index 57%
rename from lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php
rename to lib/zend/Zend/Filter/BaseName.php
index c907f4c96d6..8d6a6da5607 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php
+++ b/lib/zend/Zend/Filter/BaseName.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Zend Framework
  *
@@ -13,27 +14,37 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+
 /**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
+ * @see Zend_Filter_Interface
  */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
+require_once 'Zend/Filter/Interface.php';
+
 
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Zend_Service_DeveloperGarden_Request_VoiceButler_VoiceButlerAbstract
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
+class Zend_Filter_BaseName implements Zend_Filter_Interface
 {
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns basename($value)
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        return basename((string) $value);
+    }
 }
diff --git a/lib/zend/Zend/Filter/Boolean.php b/lib/zend/Zend/Filter/Boolean.php
new file mode 100644
index 00000000000..165ee6dee83
--- /dev/null
+++ b/lib/zend/Zend/Filter/Boolean.php
@@ -0,0 +1,375 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Boolean implements Zend_Filter_Interface
+{
+    const BOOLEAN      = 1;
+    const INTEGER      = 2;
+    const FLOAT        = 4;
+    const STRING       = 8;
+    const ZERO         = 16;
+    const EMPTY_ARRAY  = 32;
+    const NULL         = 64;
+    const PHP          = 127;
+    const FALSE_STRING = 128;
+    const YES          = 256;
+    const ALL          = 511;
+
+    protected $_constants = array(
+        self::BOOLEAN      => 'boolean',
+        self::INTEGER      => 'integer',
+        self::FLOAT        => 'float',
+        self::STRING       => 'string',
+        self::ZERO         => 'zero',
+        self::EMPTY_ARRAY  => 'array',
+        self::NULL         => 'null',
+        self::PHP          => 'php',
+        self::FALSE_STRING => 'false',
+        self::YES          => 'yes',
+        self::ALL          => 'all',
+    );
+
+    /**
+     * Internal type to detect
+     *
+     * @var integer
+     */
+    protected $_type = self::PHP;
+
+    /**
+     * Internal locale
+     *
+     * @var array
+     */
+    protected $_locale = array('auto');
+
+    /**
+     * Internal mode
+     *
+     * @var boolean
+     */
+    protected $_casting = true;
+
+    /**
+     * Constructor
+     *
+     * @param string|array|Zend_Config $options OPTIONAL
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } elseif (!is_array($options)) {
+            $options = func_get_args();
+            $temp    = array();
+            if (!empty($options)) {
+                $temp['type'] = array_shift($options);
+            }
+
+            if (!empty($options)) {
+                $temp['casting'] = array_shift($options);
+            }
+
+            if (!empty($options)) {
+                $temp['locale'] = array_shift($options);
+            }
+
+            $options = $temp;
+        }
+
+        if (array_key_exists('type', $options)) {
+            $this->setType($options['type']);
+        }
+
+        if (array_key_exists('casting', $options)) {
+            $this->setCasting($options['casting']);
+        }
+
+        if (array_key_exists('locale', $options)) {
+            $this->setLocale($options['locale']);
+        }
+    }
+
+    /**
+     * Returns the set null types
+     *
+     * @return int
+     */
+    public function getType()
+    {
+        return $this->_type;
+    }
+
+    /**
+     * Set the null types
+     *
+     * @param  integer|array $type
+     * @throws Zend_Filter_Exception
+     * @return Zend_Filter_Boolean
+     */
+    public function setType($type = null)
+    {
+        if (is_array($type)) {
+            $detected = 0;
+            foreach($type as $value) {
+                if (is_int($value)) {
+                    $detected += $value;
+                } elseif (in_array($value, $this->_constants)) {
+                    $detected += array_search($value, $this->_constants);
+                }
+            }
+
+            $type = $detected;
+        } elseif (is_string($type) && in_array($type, $this->_constants)) {
+            $type = array_search($type, $this->_constants);
+        }
+
+        if (!is_int($type) || ($type < 0) || ($type > self::ALL)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Unknown type');
+        }
+
+        $this->_type = $type;
+        return $this;
+    }
+
+    /**
+     * Returns the set locale
+     *
+     * @return array
+     */
+    public function getLocale()
+    {
+        return $this->_locale;
+    }
+
+    /**
+     * Set the locales which are accepted
+     *
+     * @param  string|array|Zend_Locale $locale
+     * @throws Zend_Filter_Exception
+     * @return Zend_Filter_Boolean
+     */
+    public function setLocale($locale = null)
+    {
+        if (is_string($locale)) {
+            $locale = array($locale);
+        } elseif ($locale instanceof Zend_Locale) {
+            $locale = array($locale->toString());
+        } elseif (!is_array($locale)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Locale has to be string, array or an instance of Zend_Locale');
+        }
+
+        require_once 'Zend/Locale.php';
+        foreach ($locale as $single) {
+            if (!Zend_Locale::isLocale($single)) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception("Unknown locale '$single'");
+            }
+        }
+
+        $this->_locale = $locale;
+        return $this;
+    }
+
+    /**
+     * Returns the casting option
+     *
+     * @return boolean
+     */
+    public function getCasting()
+    {
+        return $this->_casting;
+    }
+
+    /**
+     * Set the working mode
+     *
+     * @param  boolean $locale When true this filter works like cast
+     *                         When false it recognises only true and false
+     *                         and all other values are returned as is
+     * @throws Zend_Filter_Exception
+     * @return Zend_Filter_Boolean
+     */
+    public function setCasting($casting = true)
+    {
+        $this->_casting = (boolean) $casting;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns a boolean representation of $value
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        $type    = $this->getType();
+        $casting = $this->getCasting();
+
+        // STRING YES (Localized)
+        if ($type >= self::YES) {
+            $type -= self::YES;
+            if (is_string($value)) {
+                require_once 'Zend/Locale.php';
+                $locales = $this->getLocale();
+                foreach ($locales as $locale) {
+                    if ($this->_getLocalizedQuestion($value, false, $locale) === false) {
+                        return false;
+                    }
+
+                    if (!$casting && ($this->_getLocalizedQuestion($value, true, $locale) === true)) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        // STRING FALSE ('false')
+        if ($type >= self::FALSE_STRING) {
+            $type -= self::FALSE_STRING;
+            if (is_string($value) && (strtolower($value) == 'false')) {
+                return false;
+            }
+
+            if ((!$casting) && is_string($value) && (strtolower($value) == 'true')) {
+                return true;
+            }
+        }
+
+        // NULL (null)
+        if ($type >= self::NULL) {
+            $type -= self::NULL;
+            if ($value === null) {
+                return false;
+            }
+        }
+
+        // EMPTY_ARRAY (array())
+        if ($type >= self::EMPTY_ARRAY) {
+            $type -= self::EMPTY_ARRAY;
+            if (is_array($value) && ($value == array())) {
+                return false;
+            }
+        }
+
+        // ZERO ('0')
+        if ($type >= self::ZERO) {
+            $type -= self::ZERO;
+            if (is_string($value) && ($value == '0')) {
+                return false;
+            }
+
+            if ((!$casting) && (is_string($value)) && ($value == '1')) {
+                return true;
+            }
+        }
+
+        // STRING ('')
+        if ($type >= self::STRING) {
+            $type -= self::STRING;
+            if (is_string($value) && ($value == '')) {
+                return false;
+            }
+        }
+
+        // FLOAT (0.0)
+        if ($type >= self::FLOAT) {
+            $type -= self::FLOAT;
+            if (is_float($value) && ($value == 0.0)) {
+                return false;
+            }
+
+            if ((!$casting) && is_float($value) && ($value == 1.0)) {
+                return true;
+            }
+        }
+
+        // INTEGER (0)
+        if ($type >= self::INTEGER) {
+            $type -= self::INTEGER;
+            if (is_int($value) && ($value == 0)) {
+                return false;
+            }
+
+            if ((!$casting) && is_int($value) && ($value == 1)) {
+                return true;
+            }
+        }
+
+        // BOOLEAN (false)
+        if ($type >= self::BOOLEAN) {
+            $type -= self::BOOLEAN;
+            if (is_bool($value)) {
+                return $value;
+            }
+        }
+
+        if ($casting) {
+            return true;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Determine the value of a localized string, and compare it to a given value
+     *
+     * @param  string $value
+     * @param  boolean $yes
+     * @param  array $locale
+     * @return boolean
+     */
+    protected function _getLocalizedQuestion($value, $yes, $locale)
+    {
+        if ($yes == true) {
+            $question = 'yes';
+            $return   = true;
+        } else {
+            $question = 'no';
+            $return   = false;
+        }
+        $str = Zend_Locale::getTranslation($question, 'question', $locale);
+        $str = explode(':', $str);
+        if (!empty($str)) {
+            foreach($str as $no) {
+                if (($no == $value) || (strtolower($no) == strtolower($value))) {
+                    return $return;
+                }
+            }
+        }
+    }
+}
diff --git a/lib/zend/Zend/Filter/Callback.php b/lib/zend/Zend/Filter/Callback.php
new file mode 100644
index 00000000000..f7961ea5110
--- /dev/null
+++ b/lib/zend/Zend/Filter/Callback.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Callback implements Zend_Filter_Interface
+{
+    /**
+     * Callback in a call_user_func format
+     *
+     * @var string|array
+     */
+    protected $_callback = null;
+
+    /**
+     * Default options to set for the filter
+     *
+     * @var mixed
+     */
+    protected $_options = null;
+
+    /**
+     * Constructor
+     *
+     * @param string|array $callback Callback in a call_user_func format
+     * @param mixed        $options  (Optional) Default options for this filter
+     */
+    public function __construct($options)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if (!is_array($options) || !array_key_exists('callback', $options)) {
+            $options          = func_get_args();
+            $temp['callback'] = array_shift($options);
+            if (!empty($options)) {
+                $temp['options'] = array_shift($options);
+            }
+
+            $options = $temp;
+        }
+
+        if (!array_key_exists('callback', $options)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Missing callback to use');
+        }
+
+        $this->setCallback($options['callback']);
+        if (array_key_exists('options', $options)) {
+            $this->setOptions($options['options']);
+        }
+    }
+
+    /**
+     * Returns the set callback
+     *
+     * @return string|array Set callback
+     */
+    public function getCallback()
+    {
+        return $this->_callback;
+    }
+
+    /**
+     * Sets a new callback for this filter
+     *
+     * @param unknown_type $callback
+     * @return unknown
+     */
+    public function setCallback($callback, $options = null)
+    {
+        if (!is_callable($callback)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Callback can not be accessed');
+        }
+
+        $this->_callback = $callback;
+        $this->setOptions($options);
+        return $this;
+    }
+
+    /**
+     * Returns the set default options
+     *
+     * @return mixed
+     */
+    public function getOptions()
+    {
+        return $this->_options;
+    }
+
+    /**
+     * Sets new default options to the callback filter
+     *
+     * @param mixed $options Default options to set
+     * @return Zend_Filter_Callback
+     */
+    public function setOptions($options)
+    {
+        $this->_options = $options;
+        return $this;
+    }
+
+    /**
+     * Calls the filter per callback
+     *
+     * @param mixed $value Options for the set callback
+     * @return mixed       Result from the filter which was callbacked
+     */
+    public function filter($value)
+    {
+        $options = array();
+
+        if ($this->_options !== null) {
+            if (!is_array($this->_options)) {
+                $options = array($this->_options);
+            } else {
+                $options = $this->_options;
+            }
+        }
+
+        array_unshift($options, $value);
+
+        return call_user_func_array($this->_callback, $options);
+    }
+}
diff --git a/lib/zend/Zend/Filter/Compress.php b/lib/zend/Zend/Filter/Compress.php
new file mode 100644
index 00000000000..e9361f7a437
--- /dev/null
+++ b/lib/zend/Zend/Filter/Compress.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * Compresses a given string
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Compress implements Zend_Filter_Interface
+{
+    /**
+     * Compression adapter
+     */
+    protected $_adapter = 'Gz';
+
+    /**
+     * Compression adapter constructor options
+     */
+    protected $_adapterOptions = array();
+
+    /**
+     * Class constructor
+     *
+     * @param string|array $options (Optional) Options to set
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+        if (is_string($options)) {
+            $this->setAdapter($options);
+        } elseif ($options instanceof Zend_Filter_Compress_CompressInterface) {
+            $this->setAdapter($options);
+        } elseif (is_array($options)) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * Set filter setate
+     *
+     * @param  array $options
+     * @return Zend_Filter_Compress
+     */
+    public function setOptions(array $options)
+    {
+        foreach ($options as $key => $value) {
+            if ($key == 'options') {
+                $key = 'adapterOptions';
+            }
+            $method = 'set' . ucfirst($key);
+            if (method_exists($this, $method)) {
+                $this->$method($value);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Returns the current adapter, instantiating it if necessary
+     *
+     * @return string
+     */
+    public function getAdapter()
+    {
+        if ($this->_adapter instanceof Zend_Filter_Compress_CompressInterface) {
+            return $this->_adapter;
+        }
+
+        $adapter = $this->_adapter;
+        $options = $this->getAdapterOptions();
+        if (!class_exists($adapter)) {
+            require_once 'Zend/Loader.php';
+            if (Zend_Loader::isReadable('Zend/Filter/Compress/' . ucfirst($adapter) . '.php')) {
+                $adapter = 'Zend_Filter_Compress_' . ucfirst($adapter);
+            }
+            Zend_Loader::loadClass($adapter);
+        }
+
+        $this->_adapter = new $adapter($options);
+        if (!$this->_adapter instanceof Zend_Filter_Compress_CompressInterface) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Compression adapter '" . $adapter . "' does not implement Zend_Filter_Compress_CompressInterface");
+        }
+        return $this->_adapter;
+    }
+
+    /**
+     * Retrieve adapter name
+     *
+     * @return string
+     */
+    public function getAdapterName()
+    {
+        return $this->getAdapter()->toString();
+    }
+
+    /**
+     * Sets compression adapter
+     *
+     * @param  string|Zend_Filter_Compress_CompressInterface $adapter Adapter to use
+     * @return Zend_Filter_Compress
+     */
+    public function setAdapter($adapter)
+    {
+        if ($adapter instanceof Zend_Filter_Compress_CompressInterface) {
+            $this->_adapter = $adapter;
+            return $this;
+        }
+        if (!is_string($adapter)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Invalid adapter provided; must be string or instance of Zend_Filter_Compress_CompressInterface');
+        }
+        $this->_adapter = $adapter;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve adapter options
+     *
+     * @return array
+     */
+    public function getAdapterOptions()
+    {
+        return $this->_adapterOptions;
+    }
+
+    /**
+     * Set adapter options
+     *
+     * @param  array $options
+     * @return void
+     */
+    public function setAdapterOptions(array $options)
+    {
+        $this->_adapterOptions = $options;
+        return $this;
+    }
+
+    /**
+     * Calls adapter methods
+     *
+     * @param string       $method  Method to call
+     * @param string|array $options Options for this method
+     */
+    public function __call($method, $options)
+    {
+        $adapter = $this->getAdapter();
+        if (!method_exists($adapter, $method)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Unknown method '{$method}'");
+        }
+
+        return call_user_func_array(array($adapter, $method), $options);
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Compresses the content $value with the defined settings
+     *
+     * @param  string $value Content to compress
+     * @return string The compressed content
+     */
+    public function filter($value)
+    {
+        return $this->getAdapter()->compress($value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/Compress/Bz2.php b/lib/zend/Zend/Filter/Compress/Bz2.php
new file mode 100644
index 00000000000..6bd4451f7bd
--- /dev/null
+++ b/lib/zend/Zend/Filter/Compress/Bz2.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Compress_CompressAbstract
+ */
+require_once 'Zend/Filter/Compress/CompressAbstract.php';
+
+/**
+ * Compression adapter for Bz2
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract
+{
+    /**
+     * Compression Options
+     * array(
+     *     'blocksize' => Blocksize to use from 0-9
+     *     'archive'   => Archive to use
+     * )
+     *
+     * @var array
+     */
+    protected $_options = array(
+        'blocksize' => 4,
+        'archive'   => null,
+    );
+
+    /**
+     * Class constructor
+     *
+     * @param array|Zend_Config $options (Optional) Options to set
+     */
+    public function __construct($options = null)
+    {
+        if (!extension_loaded('bz2')) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('This filter needs the bz2 extension');
+        }
+        parent::__construct($options);
+    }
+
+    /**
+     * Returns the set blocksize
+     *
+     * @return integer
+     */
+    public function getBlocksize()
+    {
+        return $this->_options['blocksize'];
+    }
+
+    /**
+     * Sets a new blocksize
+     *
+     * @param integer $level
+     * @return Zend_Filter_Compress_Bz2
+     */
+    public function setBlocksize($blocksize)
+    {
+        if (($blocksize < 0) || ($blocksize > 9)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Blocksize must be between 0 and 9');
+        }
+
+        $this->_options['blocksize'] = (int) $blocksize;
+        return $this;
+    }
+
+    /**
+     * Returns the set archive
+     *
+     * @return string
+     */
+    public function getArchive()
+    {
+        return $this->_options['archive'];
+    }
+
+    /**
+     * Sets the archive to use for de-/compression
+     *
+     * @param string $archive Archive to use
+     * @return Zend_Filter_Compress_Bz2
+     */
+    public function setArchive($archive)
+    {
+        $this->_options['archive'] = (string) $archive;
+        return $this;
+    }
+
+    /**
+     * Compresses the given content
+     *
+     * @param  string $content
+     * @return string
+     */
+    public function compress($content)
+    {
+        $archive = $this->getArchive();
+        if (!empty($archive)) {
+            $file = bzopen($archive, 'w');
+            if (!$file) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception("Error opening the archive '" . $archive . "'");
+            }
+
+            bzwrite($file, $content);
+            bzclose($file);
+            $compressed = true;
+        } else {
+            $compressed = bzcompress($content, $this->getBlocksize());
+        }
+
+        if (is_int($compressed)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Error during compression');
+        }
+
+        return $compressed;
+    }
+
+    /**
+     * Decompresses the given content
+     *
+     * @param  string $content
+     * @return string
+     */
+    public function decompress($content)
+    {
+        $archive = $this->getArchive();
+        if (@file_exists($content)) {
+            $archive = $content;
+        }
+
+        if (@file_exists($archive)) {
+            $file = bzopen($archive, 'r');
+            if (!$file) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception("Error opening the archive '" . $content . "'");
+            }
+
+            $compressed = bzread($file);
+            bzclose($file);
+        } else {
+            $compressed = bzdecompress($content);
+        }
+
+        if (is_int($compressed)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Error during decompression');
+        }
+
+        return $compressed;
+    }
+
+    /**
+     * Returns the adapter name
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Bz2';
+    }
+}
diff --git a/lib/zend/Zend/Filter/Compress/CompressAbstract.php b/lib/zend/Zend/Filter/Compress/CompressAbstract.php
new file mode 100644
index 00000000000..2b20ac6f071
--- /dev/null
+++ b/lib/zend/Zend/Filter/Compress/CompressAbstract.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Compress_CompressInterface
+ */
+require_once 'Zend/Filter/Compress/CompressInterface.php';
+
+/**
+ * Abstract compression adapter
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Filter_Compress_CompressAbstract implements Zend_Filter_Compress_CompressInterface
+{
+    /**
+     * Class constructor
+     *
+     * @param array|Zend_Config $options (Optional) Options to set
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+
+        if (is_array($options)) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * Returns one or all set options
+     *
+     * @param string $option (Optional) Option to return
+     * @return mixed
+     */
+    public function getOptions($option = null)
+    {
+        if ($option === null) {
+            return $this->_options;
+        }
+
+        if (!array_key_exists($option, $this->_options)) {
+            return null;
+        }
+
+        return $this->_options[$option];
+    }
+
+    /**
+     * Sets all or one option
+     *
+     * @param  array $options
+     * @return Zend_Filter_Compress_Bz2
+     */
+    public function setOptions(array $options)
+    {
+        foreach ($options as $key => $option) {
+            $method = 'set' . $key;
+            if (method_exists($this, $method)) {
+                $this->$method($option);
+            }
+        }
+
+        return $this;
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php b/lib/zend/Zend/Filter/Compress/CompressInterface.php
similarity index 54%
rename from lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php
rename to lib/zend/Zend/Filter/Compress/CompressInterface.php
index 37c609ba15e..75f0a4063bc 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php
+++ b/lib/zend/Zend/Filter/Compress/CompressInterface.php
@@ -13,50 +13,42 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
+ * Compression interface
+ *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount
+interface Zend_Filter_Compress_CompressInterface
 {
     /**
-     * type of billing
+     * Compresses $value with the defined settings
      *
-     * @var string
+     * @param  string $value Data to compress
+     * @return string The compressed data
      */
-    public $billingtype = null;
+    public function compress($value);
 
     /**
-     * account id
+     * Decompresses $value with the defined settings
      *
-     * @var integer
+     * @param  string $value Data to decompress
+     * @return string The decompressed data
      */
-    public $account = null;
-
-    /**
-     * @return integer
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
+    public function decompress($value);
 
     /**
+     * Return the adapter name
+     *
      * @return string
      */
-    public function getBillingType()
-    {
-        return $this->billingtype;
-    }
+    public function toString();
 }
diff --git a/lib/zend/Zend/Filter/Compress/Gz.php b/lib/zend/Zend/Filter/Compress/Gz.php
new file mode 100644
index 00000000000..819795c5c97
--- /dev/null
+++ b/lib/zend/Zend/Filter/Compress/Gz.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Compress_CompressAbstract
+ */
+require_once 'Zend/Filter/Compress/CompressAbstract.php';
+
+/**
+ * Compression adapter for Gzip (ZLib)
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract
+{
+    /**
+     * Compression Options
+     * array(
+     *     'level'    => Compression level 0-9
+     *     'mode'     => Compression mode, can be 'compress', 'deflate'
+     *     'archive'  => Archive to use
+     * )
+     *
+     * @var array
+     */
+    protected $_options = array(
+        'level'   => 9,
+        'mode'    => 'compress',
+        'archive' => null,
+    );
+
+    /**
+     * Class constructor
+     *
+     * @param array|Zend_Config|null $options (Optional) Options to set
+     */
+    public function __construct($options = null)
+    {
+        if (!extension_loaded('zlib')) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('This filter needs the zlib extension');
+        }
+        parent::__construct($options);
+    }
+
+    /**
+     * Returns the set compression level
+     *
+     * @return integer
+     */
+    public function getLevel()
+    {
+        return $this->_options['level'];
+    }
+
+    /**
+     * Sets a new compression level
+     *
+     * @param integer $level
+     * @return Zend_Filter_Compress_Gz
+     */
+    public function setLevel($level)
+    {
+        if (($level < 0) || ($level > 9)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Level must be between 0 and 9');
+        }
+
+        $this->_options['level'] = (int) $level;
+        return $this;
+    }
+
+    /**
+     * Returns the set compression mode
+     *
+     * @return string
+     */
+    public function getMode()
+    {
+        return $this->_options['mode'];
+    }
+
+    /**
+     * Sets a new compression mode
+     *
+     * @param string $mode Supported are 'compress', 'deflate' and 'file'
+     */
+    public function setMode($mode)
+    {
+        if (($mode != 'compress') && ($mode != 'deflate')) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Given compression mode not supported');
+        }
+
+        $this->_options['mode'] = $mode;
+        return $this;
+    }
+
+    /**
+     * Returns the set archive
+     *
+     * @return string
+     */
+    public function getArchive()
+    {
+        return $this->_options['archive'];
+    }
+
+    /**
+     * Sets the archive to use for de-/compression
+     *
+     * @param string $archive Archive to use
+     * @return Zend_Filter_Compress_Gz
+     */
+    public function setArchive($archive)
+    {
+        $this->_options['archive'] = (string) $archive;
+        return $this;
+    }
+
+    /**
+     * Compresses the given content
+     *
+     * @param  string $content
+     * @return string
+     */
+    public function compress($content)
+    {
+        $archive = $this->getArchive();
+        if (!empty($archive)) {
+            $file = gzopen($archive, 'w' . $this->getLevel());
+            if (!$file) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception("Error opening the archive '" . $this->_options['archive'] . "'");
+            }
+
+            gzwrite($file, $content);
+            gzclose($file);
+            $compressed = true;
+        } else if ($this->_options['mode'] == 'deflate') {
+            $compressed = gzdeflate($content, $this->getLevel());
+        } else {
+            $compressed = gzcompress($content, $this->getLevel());
+        }
+
+        if (!$compressed) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Error during compression');
+        }
+
+        return $compressed;
+    }
+
+    /**
+     * Decompresses the given content
+     *
+     * @param  string $content
+     * @return string
+     */
+    public function decompress($content)
+    {
+        $archive = $this->getArchive();
+        $mode    = $this->getMode();
+        if (@file_exists($content)) {
+            $archive = $content;
+        }
+
+        if (@file_exists($archive)) {
+            $handler = fopen($archive, "rb");
+            if (!$handler) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception("Error opening the archive '" . $archive . "'");
+            }
+
+            fseek($handler, -4, SEEK_END);
+            $packet = fread($handler, 4);
+            $bytes  = unpack("V", $packet);
+            $size   = end($bytes);
+            fclose($handler);
+
+            $file       = gzopen($archive, 'r');
+            $compressed = gzread($file, $size);
+            gzclose($file);
+        } else if ($mode == 'deflate') {
+            $compressed = gzinflate($content);
+        } else {
+            $compressed = gzuncompress($content);
+        }
+
+        if (!$compressed) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Error during compression');
+        }
+
+        return $compressed;
+    }
+
+    /**
+     * Returns the adapter name
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Gz';
+    }
+}
diff --git a/lib/zend/Zend/Filter/Compress/Lzf.php b/lib/zend/Zend/Filter/Compress/Lzf.php
new file mode 100644
index 00000000000..33115105a00
--- /dev/null
+++ b/lib/zend/Zend/Filter/Compress/Lzf.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Compress_CompressInterface
+ */
+require_once 'Zend/Filter/Compress/CompressInterface.php';
+
+/**
+ * Compression adapter for Lzf
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Compress_Lzf implements Zend_Filter_Compress_CompressInterface
+{
+    /**
+     * Class constructor
+     */
+    public function __construct()
+    {
+        if (!extension_loaded('lzf')) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('This filter needs the lzf extension');
+        }
+    }
+
+    /**
+     * Compresses the given content
+     *
+     * @param  string $content
+     * @return string
+     */
+    public function compress($content)
+    {
+        $compressed = lzf_compress($content);
+        if (!$compressed) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Error during compression');
+        }
+
+        return $compressed;
+    }
+
+    /**
+     * Decompresses the given content
+     *
+     * @param  string $content
+     * @return string
+     */
+    public function decompress($content)
+    {
+        $compressed = lzf_decompress($content);
+        if (!$compressed) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Error during compression');
+        }
+
+        return $compressed;
+    }
+
+    /**
+     * Returns the adapter name
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Lzf';
+    }
+}
diff --git a/lib/zend/Zend/Filter/Compress/Rar.php b/lib/zend/Zend/Filter/Compress/Rar.php
new file mode 100644
index 00000000000..934cd031624
--- /dev/null
+++ b/lib/zend/Zend/Filter/Compress/Rar.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Compress_CompressAbstract
+ */
+require_once 'Zend/Filter/Compress/CompressAbstract.php';
+
+/**
+ * Compression adapter for Rar
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract
+{
+    /**
+     * Compression Options
+     * array(
+     *     'callback' => Callback for compression
+     *     'archive'  => Archive to use
+     *     'password' => Password to use
+     *     'target'   => Target to write the files to
+     * )
+     *
+     * @var array
+     */
+    protected $_options = array(
+        'callback' => null,
+        'archive'  => null,
+        'password' => null,
+        'target'   => '.',
+    );
+
+    /**
+     * Class constructor
+     *
+     * @param array $options (Optional) Options to set
+     */
+    public function __construct($options = null)
+    {
+        if (!extension_loaded('rar')) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('This filter needs the rar extension');
+        }
+        parent::__construct($options);
+    }
+
+    /**
+     * Returns the set callback for compression
+     *
+     * @return string
+     */
+    public function getCallback()
+    {
+        return $this->_options['callback'];
+    }
+
+    /**
+     * Sets the callback to use
+     *
+     * @param string $callback
+     * @return Zend_Filter_Compress_Rar
+     */
+    public function setCallback($callback)
+    {
+        if (!is_callable($callback)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Callback can not be accessed');
+        }
+
+        $this->_options['callback'] = $callback;
+        return $this;
+    }
+
+    /**
+     * Returns the set archive
+     *
+     * @return string
+     */
+    public function getArchive()
+    {
+        return $this->_options['archive'];
+    }
+
+    /**
+     * Sets the archive to use for de-/compression
+     *
+     * @param string $archive Archive to use
+     * @return Zend_Filter_Compress_Rar
+     */
+    public function setArchive($archive)
+    {
+        $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $archive);
+        $this->_options['archive'] = (string) $archive;
+
+        return $this;
+    }
+
+    /**
+     * Returns the set password
+     *
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->_options['password'];
+    }
+
+    /**
+     * Sets the password to use
+     *
+     * @param string $password
+     * @return Zend_Filter_Compress_Rar
+     */
+    public function setPassword($password)
+    {
+        $this->_options['password'] = (string) $password;
+        return $this;
+    }
+
+    /**
+     * Returns the set targetpath
+     *
+     * @return string
+     */
+    public function getTarget()
+    {
+        return $this->_options['target'];
+    }
+
+    /**
+     * Sets the targetpath to use
+     *
+     * @param string $target
+     * @return Zend_Filter_Compress_Rar
+     */
+    public function setTarget($target)
+    {
+        if (!file_exists(dirname($target))) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("The directory '$target' does not exist");
+        }
+
+        $target = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $target);
+        $this->_options['target'] = (string) $target;
+        return $this;
+    }
+
+    /**
+     * Compresses the given content
+     *
+     * @param  string|array $content
+     * @return string
+     */
+    public function compress($content)
+    {
+        $callback = $this->getCallback();
+        if ($callback === null) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('No compression callback available');
+        }
+
+        $options = $this->getOptions();
+        unset($options['callback']);
+
+        $result = call_user_func($callback, $options, $content);
+        if ($result !== true) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Error compressing the RAR Archive');
+        }
+
+        return $this->getArchive();
+    }
+
+    /**
+     * Decompresses the given content
+     *
+     * @param  string $content
+     * @return boolean
+     */
+    public function decompress($content)
+    {
+        $archive = $this->getArchive();
+        if (file_exists($content)) {
+            $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
+        } elseif (empty($archive) || !file_exists($archive)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('RAR Archive not found');
+        }
+
+        $password = $this->getPassword();
+        if ($password !== null) {
+            $archive = rar_open($archive, $password);
+        } else {
+            $archive = rar_open($archive);
+        }
+
+        if (!$archive) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Error opening the RAR Archive");
+        }
+
+        $target = $this->getTarget();
+        if (!is_dir($target)) {
+            $target = dirname($target);
+        }
+
+        $filelist = rar_list($archive);
+        if (!$filelist) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Error reading the RAR Archive");
+        }
+
+        foreach($filelist as $file) {
+            $file->extract($target);
+        }
+
+        rar_close($archive);
+        return true;
+    }
+
+    /**
+     * Returns the adapter name
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Rar';
+    }
+}
diff --git a/lib/zend/Zend/Filter/Compress/Tar.php b/lib/zend/Zend/Filter/Compress/Tar.php
new file mode 100644
index 00000000000..d2ce0d89a9b
--- /dev/null
+++ b/lib/zend/Zend/Filter/Compress/Tar.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Compress_CompressAbstract
+ */
+require_once 'Zend/Filter/Compress/CompressAbstract.php';
+
+/**
+ * Compression adapter for Tar
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract
+{
+    /**
+     * Compression Options
+     * array(
+     *     'archive'  => Archive to use
+     *     'target'   => Target to write the files to
+     * )
+     *
+     * @var array
+     */
+    protected $_options = array(
+        'archive'  => null,
+        'target'   => '.',
+        'mode'     => null,
+    );
+
+    /**
+     * Class constructor
+     *
+     * @param array $options (Optional) Options to set
+     */
+    public function __construct($options = null)
+    {
+        if (!class_exists('Archive_Tar')) {
+            require_once 'Zend/Loader.php';
+            try {
+                Zend_Loader::loadClass('Archive_Tar');
+            } catch (Zend_Exception $e) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception('This filter needs PEARs Archive_Tar', 0, $e);
+            }
+        }
+
+        parent::__construct($options);
+    }
+
+    /**
+     * Returns the set archive
+     *
+     * @return string
+     */
+    public function getArchive()
+    {
+        return $this->_options['archive'];
+    }
+
+    /**
+     * Sets the archive to use for de-/compression
+     *
+     * @param string $archive Archive to use
+     * @return Zend_Filter_Compress_Tar
+     */
+    public function setArchive($archive)
+    {
+        $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $archive);
+        $this->_options['archive'] = (string) $archive;
+
+        return $this;
+    }
+
+    /**
+     * Returns the set targetpath
+     *
+     * @return string
+     */
+    public function getTarget()
+    {
+        return $this->_options['target'];
+    }
+
+    /**
+     * Sets the targetpath to use
+     *
+     * @param string $target
+     * @return Zend_Filter_Compress_Tar
+     */
+    public function setTarget($target)
+    {
+        if (!file_exists(dirname($target))) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("The directory '$target' does not exist");
+        }
+
+        $target = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $target);
+        $this->_options['target'] = (string) $target;
+        return $this;
+    }
+
+    /**
+     * Returns the set compression mode
+     */
+    public function getMode()
+    {
+        return $this->_options['mode'];
+    }
+
+    /**
+     * Compression mode to use
+     * Eighter Gz or Bz2
+     *
+     * @param string $mode
+     */
+    public function setMode($mode)
+    {
+        $mode = ucfirst(strtolower($mode));
+        if (($mode != 'Bz2') && ($mode != 'Gz')) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("The mode '$mode' is unknown");
+        }
+
+        if (($mode == 'Bz2') && (!extension_loaded('bz2'))) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('This mode needs the bz2 extension');
+        }
+
+        if (($mode == 'Gz') && (!extension_loaded('zlib'))) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('This mode needs the zlib extension');
+        }
+    }
+
+    /**
+     * Compresses the given content
+     *
+     * @param  string $content
+     * @return string
+     */
+    public function compress($content)
+    {
+        $archive = new Archive_Tar($this->getArchive(), $this->getMode());
+        if (!file_exists($content)) {
+            $file = $this->getTarget();
+            if (is_dir($file)) {
+                $file .= DIRECTORY_SEPARATOR . "tar.tmp";
+            }
+
+            $result = file_put_contents($file, $content);
+            if ($result === false) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception('Error creating the temporary file');
+            }
+
+            $content = $file;
+        }
+
+        if (is_dir($content)) {
+            // collect all file infos
+            foreach (new RecursiveIteratorIterator(
+                        new RecursiveDirectoryIterator($content, RecursiveDirectoryIterator::KEY_AS_PATHNAME),
+                        RecursiveIteratorIterator::SELF_FIRST
+                    ) as $directory => $info
+            ) {
+                if ($info->isFile()) {
+                    $file[] = $directory;
+                }
+            }
+
+            $content = $file;
+        }
+
+        $result  = $archive->create($content);
+        if ($result === false) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Error creating the Tar archive');
+        }
+
+        return $this->getArchive();
+    }
+
+    /**
+     * Decompresses the given content
+     *
+     * @param  string $content
+     * @return boolean
+     */
+    public function decompress($content)
+    {
+        $archive = $this->getArchive();
+        if (file_exists($content)) {
+            $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
+        } elseif (empty($archive) || !file_exists($archive)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Tar Archive not found');
+        }
+
+        $archive = new Archive_Tar($archive, $this->getMode());
+        $target  = $this->getTarget();
+        if (!is_dir($target)) {
+            $target = dirname($target);
+        }
+
+        $result = $archive->extract($target);
+        if ($result === false) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Error while extracting the Tar archive');
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the adapter name
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Tar';
+    }
+}
diff --git a/lib/zend/Zend/Filter/Compress/Zip.php b/lib/zend/Zend/Filter/Compress/Zip.php
new file mode 100644
index 00000000000..9921fe9648a
--- /dev/null
+++ b/lib/zend/Zend/Filter/Compress/Zip.php
@@ -0,0 +1,355 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Compress_CompressAbstract
+ */
+require_once 'Zend/Filter/Compress/CompressAbstract.php';
+
+/**
+ * Compression adapter for zip
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract
+{
+    /**
+     * Compression Options
+     * array(
+     *     'archive'  => Archive to use
+     *     'password' => Password to use
+     *     'target'   => Target to write the files to
+     * )
+     *
+     * @var array
+     */
+    protected $_options = array(
+        'archive' => null,
+        'target'  => null,
+    );
+
+    /**
+     * Class constructor
+     *
+     * @param string|array $options (Optional) Options to set
+     */
+    public function __construct($options = null)
+    {
+        if (!extension_loaded('zip')) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('This filter needs the zip extension');
+        }
+        parent::__construct($options);
+    }
+
+    /**
+     * Returns the set archive
+     *
+     * @return string
+     */
+    public function getArchive()
+    {
+        return $this->_options['archive'];
+    }
+
+    /**
+     * Sets the archive to use for de-/compression
+     *
+     * @param string $archive Archive to use
+     * @return Zend_Filter_Compress_Rar
+     */
+    public function setArchive($archive)
+    {
+        $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $archive);
+        $this->_options['archive'] = (string) $archive;
+
+        return $this;
+    }
+
+    /**
+     * Returns the set targetpath
+     *
+     * @return string
+     */
+    public function getTarget()
+    {
+        return $this->_options['target'];
+    }
+
+    /**
+     * Sets the target to use
+     *
+     * @param string $target
+     * @return Zend_Filter_Compress_Rar
+     */
+    public function setTarget($target)
+    {
+        if (!file_exists(dirname($target))) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("The directory '$target' does not exist");
+        }
+
+        $target = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $target);
+        $this->_options['target'] = (string) $target;
+        return $this;
+    }
+
+    /**
+     * Compresses the given content
+     *
+     * @param  string $content
+     * @return string Compressed archive
+     */
+    public function compress($content)
+    {
+        $zip = new ZipArchive();
+        $res = $zip->open($this->getArchive(), ZipArchive::CREATE | ZipArchive::OVERWRITE);
+
+        if ($res !== true) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception($this->_errorString($res));
+        }
+
+        if (file_exists($content)) {
+            $content  = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
+            $basename = substr($content, strrpos($content, DIRECTORY_SEPARATOR) + 1);
+            if (is_dir($content)) {
+                $index    = strrpos($content, DIRECTORY_SEPARATOR) + 1;
+                $content .= DIRECTORY_SEPARATOR;
+                $stack    = array($content);
+                while (!empty($stack)) {
+                    $current = array_pop($stack);
+                    $files   = array();
+
+                    $dir = dir($current);
+                    while (false !== ($node = $dir->read())) {
+                        if (($node == '.') || ($node == '..')) {
+                            continue;
+                        }
+
+                        if (is_dir($current . $node)) {
+                            array_push($stack, $current . $node . DIRECTORY_SEPARATOR);
+                        }
+
+                        if (is_file($current . $node)) {
+                            $files[] = $node;
+                        }
+                    }
+
+                    $local = substr($current, $index);
+                    $zip->addEmptyDir(substr($local, 0, -1));
+
+                    foreach ($files as $file) {
+                        $zip->addFile($current . $file, $local . $file);
+                        if ($res !== true) {
+                            require_once 'Zend/Filter/Exception.php';
+                            throw new Zend_Filter_Exception($this->_errorString($res));
+                        }
+                    }
+                }
+            } else {
+                $res = $zip->addFile($content, $basename);
+                if ($res !== true) {
+                    require_once 'Zend/Filter/Exception.php';
+                    throw new Zend_Filter_Exception($this->_errorString($res));
+                }
+            }
+        } else {
+            $file = $this->getTarget();
+            if (!is_dir($file)) {
+                $file = basename($file);
+            } else {
+                $file = "zip.tmp";
+            }
+
+            $res = $zip->addFromString($file, $content);
+            if ($res !== true) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception($this->_errorString($res));
+            }
+        }
+
+        $zip->close();
+        return $this->_options['archive'];
+    }
+
+    /**
+     * Decompresses the given content
+     *
+     * @param  string $content
+     * @return string
+     */
+    public function decompress($content)
+    {
+        $archive = $this->getArchive();
+        if (file_exists($content)) {
+            $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
+        } elseif (empty($archive) || !file_exists($archive)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('ZIP Archive not found');
+        }
+
+        $zip = new ZipArchive();
+        $res = $zip->open($archive);
+
+        $target = $this->getTarget();
+
+        if (!empty($target) && !is_dir($target)) {
+            $target = dirname($target);
+        }
+
+        if (!empty($target)) {
+            $target = rtrim($target, '/\\') . DIRECTORY_SEPARATOR;
+        }
+
+        if (empty($target) || !is_dir($target)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('No target for ZIP decompression set');
+        }
+
+        if ($res !== true) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception($this->_errorString($res));
+        }
+
+        if (version_compare(PHP_VERSION, '5.2.8', '<')) {
+            for ($i = 0; $i < $zip->numFiles; $i++) {
+                $statIndex = $zip->statIndex($i);
+                $currName = $statIndex['name'];
+                if (($currName{0} == '/') ||
+                    (substr($currName, 0, 2) == '..') ||
+                    (substr($currName, 0, 4) == './..')
+                    )
+                {
+                    require_once 'Zend/Filter/Exception.php';
+                    throw new Zend_Filter_Exception('Upward directory traversal was detected inside ' . $archive
+                        . ' please use PHP 5.2.8 or greater to take advantage of path resolution features of '
+                        . 'the zip extension in this decompress() method.'
+                        );
+                }
+            }
+        }
+
+        $res = @$zip->extractTo($target);
+        if ($res !== true) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception($this->_errorString($res));
+        }
+
+        $zip->close();
+        return $target;
+    }
+
+    /**
+     * Returns the proper string based on the given error constant
+     *
+     * @param string $error
+     */
+    protected function _errorString($error)
+    {
+        switch($error) {
+            case ZipArchive::ER_MULTIDISK :
+                return 'Multidisk ZIP Archives not supported';
+
+            case ZipArchive::ER_RENAME :
+                return 'Failed to rename the temporary file for ZIP';
+
+            case ZipArchive::ER_CLOSE :
+                return 'Failed to close the ZIP Archive';
+
+            case ZipArchive::ER_SEEK :
+                return 'Failure while seeking the ZIP Archive';
+
+            case ZipArchive::ER_READ :
+                return 'Failure while reading the ZIP Archive';
+
+            case ZipArchive::ER_WRITE :
+                return 'Failure while writing the ZIP Archive';
+
+            case ZipArchive::ER_CRC :
+                return 'CRC failure within the ZIP Archive';
+
+            case ZipArchive::ER_ZIPCLOSED :
+                return 'ZIP Archive already closed';
+
+            case ZipArchive::ER_NOENT :
+                return 'No such file within the ZIP Archive';
+
+            case ZipArchive::ER_EXISTS :
+                return 'ZIP Archive already exists';
+
+            case ZipArchive::ER_OPEN :
+                return 'Can not open ZIP Archive';
+
+            case ZipArchive::ER_TMPOPEN :
+                return 'Failure creating temporary ZIP Archive';
+
+            case ZipArchive::ER_ZLIB :
+                return 'ZLib Problem';
+
+            case ZipArchive::ER_MEMORY :
+                return 'Memory allocation problem while working on a ZIP Archive';
+
+            case ZipArchive::ER_CHANGED :
+                return 'ZIP Entry has been changed';
+
+            case ZipArchive::ER_COMPNOTSUPP :
+                return 'Compression method not supported within ZLib';
+
+            case ZipArchive::ER_EOF :
+                return 'Premature EOF within ZIP Archive';
+
+            case ZipArchive::ER_INVAL :
+                return 'Invalid argument for ZLIB';
+
+            case ZipArchive::ER_NOZIP :
+                return 'Given file is no zip archive';
+
+            case ZipArchive::ER_INTERNAL :
+                return 'Internal error while working on a ZIP Archive';
+
+            case ZipArchive::ER_INCONS :
+                return 'Inconsistent ZIP archive';
+
+            case ZipArchive::ER_REMOVE :
+                return 'Can not remove ZIP Archive';
+
+            case ZipArchive::ER_DELETED :
+                return 'ZIP Entry has been deleted';
+
+            default :
+                return 'Unknown error within ZIP Archive';
+        }
+    }
+
+    /**
+     * Returns the adapter name
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Zip';
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php b/lib/zend/Zend/Filter/Decompress.php
similarity index 54%
rename from lib/zend/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php
rename to lib/zend/Zend/Filter/Decompress.php
index 0471d5f4c9b..02e9a8e5d4f 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php
+++ b/lib/zend/Zend/Filter/Decompress.php
@@ -13,34 +13,37 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
+ * @see Zend_Filter_Compress
  */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php';
+require_once 'Zend/Filter/Compress.php';
 
 /**
+ * Decompresses a given string
+ *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Request_SendSms_SendFlashSMS
-    extends Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
+class Zend_Filter_Decompress extends Zend_Filter_Compress
 {
     /**
-     * this is the sms type
-     * 2 = FlashSMS
+     * Defined by Zend_Filter_Interface
      *
-     * @var integer
+     * Decompresses the content $value with the defined settings
+     *
+     * @param  string $value Content to decompress
+     * @return string The decompressed content
      */
-    protected $_smsType = 2;
+    public function filter($value)
+    {
+        return $this->getAdapter()->decompress($value);
+    }
 }
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php b/lib/zend/Zend/Filter/Decrypt.php
similarity index 54%
rename from lib/zend/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php
rename to lib/zend/Zend/Filter/Decrypt.php
index 2ff7d145a75..844d95b86f7 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php
+++ b/lib/zend/Zend/Filter/Decrypt.php
@@ -13,34 +13,37 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
+ * @see Zend_Filter_Encrypt
  */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php';
+require_once 'Zend/Filter/Encrypt.php';
 
 /**
+ * Decrypts a given string
+ *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Request_SendSms_SendSMS
-    extends Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
+class Zend_Filter_Decrypt extends Zend_Filter_Encrypt
 {
     /**
-     * this is the sms type
-     * 1 = normal SMS
+     * Defined by Zend_Filter_Interface
      *
-     * @var integer
+     * Decrypts the content $value with the defined settings
+     *
+     * @param  string $value Content to decrypt
+     * @return string The decrypted content
      */
-    protected $_smsType = 1;
+    public function filter($value)
+    {
+        return $this->_adapter->decrypt($value);
+    }
 }
diff --git a/lib/zend/Zend/Filter/Digits.php b/lib/zend/Zend/Filter/Digits.php
new file mode 100644
index 00000000000..01c3ed5a733
--- /dev/null
+++ b/lib/zend/Zend/Filter/Digits.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Digits implements Zend_Filter_Interface
+{
+    /**
+     * Is PCRE is compiled with UTF-8 and Unicode support
+     *
+     * @var mixed
+     **/
+    protected static $_unicodeEnabled;
+
+    /**
+     * Class constructor
+     *
+     * Checks if PCRE is compiled with UTF-8 and Unicode support
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        if (null === self::$_unicodeEnabled) {
+            self::$_unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
+        }
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns the string $value, removing all but digit characters
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        if (!self::$_unicodeEnabled) {
+            // POSIX named classes are not supported, use alternative 0-9 match
+            $pattern = '/[^0-9]/';
+        } else if (extension_loaded('mbstring')) {
+            // Filter for the value with mbstring
+            $pattern = '/[^[:digit:]]/';
+        } else {
+            // Filter for the value without mbstring
+            $pattern = '/[\p{^N}]/';
+        }
+
+        return preg_replace($pattern, '', (string) $value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/Dir.php b/lib/zend/Zend/Filter/Dir.php
new file mode 100644
index 00000000000..487b03b4ae1
--- /dev/null
+++ b/lib/zend/Zend/Filter/Dir.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Dir implements Zend_Filter_Interface
+{
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns dirname($value)
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        return dirname((string) $value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/Encrypt.php b/lib/zend/Zend/Filter/Encrypt.php
new file mode 100644
index 00000000000..881c9489f76
--- /dev/null
+++ b/lib/zend/Zend/Filter/Encrypt.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @see Zend_Loader
+ */
+require_once 'Zend/Loader.php';
+
+/**
+ * Encrypts a given string
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Encrypt implements Zend_Filter_Interface
+{
+    /**
+     * Encryption adapter
+     */
+    protected $_adapter;
+
+    /**
+     * Class constructor
+     *
+     * @param string|array $options (Optional) Options to set, if null mcrypt is used
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+
+        $this->setAdapter($options);
+    }
+
+    /**
+     * Returns the name of the set adapter
+     *
+     * @return string
+     */
+    public function getAdapter()
+    {
+        return $this->_adapter->toString();
+    }
+
+    /**
+     * Sets new encryption options
+     *
+     * @param  string|array $options (Optional) Encryption options
+     * @return Zend_Filter_Encrypt
+     */
+    public function setAdapter($options = null)
+    {
+        if (is_string($options)) {
+            $adapter = $options;
+        } else if (isset($options['adapter'])) {
+            $adapter = $options['adapter'];
+            unset($options['adapter']);
+        } else {
+            $adapter = 'Mcrypt';
+        }
+
+        if (!is_array($options)) {
+            $options = array();
+        }
+
+        if (Zend_Loader::isReadable('Zend/Filter/Encrypt/' . ucfirst($adapter). '.php')) {
+            $adapter = 'Zend_Filter_Encrypt_' . ucfirst($adapter);
+        }
+
+        if (!class_exists($adapter)) {
+            Zend_Loader::loadClass($adapter);
+        }
+
+        $this->_adapter = new $adapter($options);
+        if (!$this->_adapter instanceof Zend_Filter_Encrypt_Interface) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Encoding adapter '" . $adapter . "' does not implement Zend_Filter_Encrypt_Interface");
+        }
+
+        return $this;
+    }
+
+    /**
+     * Calls adapter methods
+     *
+     * @param string       $method  Method to call
+     * @param string|array $options Options for this method
+     */
+    public function __call($method, $options)
+    {
+        $part = substr($method, 0, 3);
+        if ((($part != 'get') and ($part != 'set')) or !method_exists($this->_adapter, $method)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Unknown method '{$method}'");
+        }
+
+        return call_user_func_array(array($this->_adapter, $method), $options);
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Encrypts the content $value with the defined settings
+     *
+     * @param  string $value Content to encrypt
+     * @return string The encrypted content
+     */
+    public function filter($value)
+    {
+        return $this->_adapter->encrypt($value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/Encrypt/Interface.php b/lib/zend/Zend/Filter/Encrypt/Interface.php
new file mode 100644
index 00000000000..1510e7ff90f
--- /dev/null
+++ b/lib/zend/Zend/Filter/Encrypt/Interface.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Encryption interface
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Filter_Encrypt_Interface
+{
+    /**
+     * Encrypts $value with the defined settings
+     *
+     * @param  string $value Data to encrypt
+     * @return string The encrypted data
+     */
+    public function encrypt($value);
+
+    /**
+     * Decrypts $value with the defined settings
+     *
+     * @param  string $value Data to decrypt
+     * @return string The decrypted data
+     */
+    public function decrypt($value);
+}
diff --git a/lib/zend/Zend/Filter/Encrypt/Mcrypt.php b/lib/zend/Zend/Filter/Encrypt/Mcrypt.php
new file mode 100644
index 00000000000..a1cc3a73e40
--- /dev/null
+++ b/lib/zend/Zend/Filter/Encrypt/Mcrypt.php
@@ -0,0 +1,364 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Encrypt_Interface
+ */
+require_once 'Zend/Filter/Encrypt/Interface.php';
+
+/**
+ * Encryption adapter for mcrypt
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface
+{
+    /**
+     * Definitions for encryption
+     * array(
+     *     'key' => encryption key string
+     *     'algorithm' => algorithm to use
+     *     'algorithm_directory' => directory where to find the algorithm
+     *     'mode' => encryption mode to use
+     *     'modedirectory' => directory where to find the mode
+     * )
+     */
+    protected $_encryption = array(
+        'key'                 => 'ZendFramework',
+        'algorithm'           => 'blowfish',
+        'algorithm_directory' => '',
+        'mode'                => 'cbc',
+        'mode_directory'      => '',
+        'vector'              => null,
+        'salt'                => false
+    );
+
+    /**
+     * Internal compression
+     *
+     * @var array
+     */
+    protected $_compression;
+
+    protected static $_srandCalled = false;
+
+    /**
+     * Class constructor
+     *
+     * @param string|array|Zend_Config $options Cryption Options
+     */
+    public function __construct($options)
+    {
+        if (!extension_loaded('mcrypt')) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('This filter needs the mcrypt extension');
+        }
+
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } elseif (is_string($options)) {
+            $options = array('key' => $options);
+        } elseif (!is_array($options)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Invalid options argument provided to filter');
+        }
+
+        if (array_key_exists('compression', $options)) {
+            $this->setCompression($options['compression']);
+            unset($options['compress']);
+        }
+
+        $this->setEncryption($options);
+    }
+
+    /**
+     * Returns the set encryption options
+     *
+     * @return array
+     */
+    public function getEncryption()
+    {
+        return $this->_encryption;
+    }
+
+    /**
+     * Sets new encryption options
+     *
+     * @param  string|array $options Encryption options
+     * @return Zend_Filter_File_Encryption
+     */
+    public function setEncryption($options)
+    {
+        if (is_string($options)) {
+            $options = array('key' => $options);
+        }
+
+        if (!is_array($options)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Invalid options argument provided to filter');
+        }
+
+        $options = $options + $this->getEncryption();
+        $algorithms = mcrypt_list_algorithms($options['algorithm_directory']);
+        if (!in_array($options['algorithm'], $algorithms)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("The algorithm '{$options['algorithm']}' is not supported");
+        }
+
+        $modes = mcrypt_list_modes($options['mode_directory']);
+        if (!in_array($options['mode'], $modes)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("The mode '{$options['mode']}' is not supported");
+        }
+
+        if (!mcrypt_module_self_test($options['algorithm'], $options['algorithm_directory'])) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('The given algorithm can not be used due an internal mcrypt problem');
+        }
+
+        if (!isset($options['vector'])) {
+            $options['vector'] = null;
+        }
+
+        $this->_encryption = $options;
+        $this->setVector($options['vector']);
+
+        return $this;
+    }
+
+    /**
+     * Returns the set vector
+     *
+     * @return string
+     */
+    public function getVector()
+    {
+        return $this->_encryption['vector'];
+    }
+
+    /**
+     * Sets the initialization vector
+     *
+     * @param string $vector (Optional) Vector to set
+     * @return Zend_Filter_Encrypt_Mcrypt
+     */
+    public function setVector($vector = null)
+    {
+        $cipher = $this->_openCipher();
+        $size   = mcrypt_enc_get_iv_size($cipher);
+        if (empty($vector)) {
+            $this->_srand();
+            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && version_compare(PHP_VERSION, '5.3.0', '<')) {
+                $method = MCRYPT_RAND;
+            } else {
+                if (file_exists('/dev/urandom') || (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')) {
+                    $method = MCRYPT_DEV_URANDOM;
+                } elseif (file_exists('/dev/random')) {
+                    $method = MCRYPT_DEV_RANDOM;
+                } else {
+                    $method = MCRYPT_RAND;
+                }
+            }
+            $vector = mcrypt_create_iv($size, $method);
+        } else if (strlen($vector) != $size) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('The given vector has a wrong size for the set algorithm');
+        }
+
+        $this->_encryption['vector'] = $vector;
+        $this->_closeCipher($cipher);
+
+        return $this;
+    }
+
+    /**
+     * Returns the compression
+     *
+     * @return array
+     */
+    public function getCompression()
+    {
+        return $this->_compression;
+    }
+
+    /**
+     * Sets a internal compression for values to encrypt
+     *
+     * @param string|array $compression
+     * @return Zend_Filter_Encrypt_Mcrypt
+     */
+    public function setCompression($compression)
+    {
+        if (is_string($this->_compression)) {
+            $compression = array('adapter' => $compression);
+        }
+
+        $this->_compression = $compression;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Encrypts $value with the defined settings
+     *
+     * @param  string $value The content to encrypt
+     * @return string The encrypted content
+     */
+    public function encrypt($value)
+    {
+        // compress prior to encryption
+        if (!empty($this->_compression)) {
+            require_once 'Zend/Filter/Compress.php';
+            $compress = new Zend_Filter_Compress($this->_compression);
+            $value    = $compress->filter($value);
+        }
+
+        $cipher  = $this->_openCipher();
+        $this->_initCipher($cipher);
+        $encrypted = mcrypt_generic($cipher, $value);
+        mcrypt_generic_deinit($cipher);
+        $this->_closeCipher($cipher);
+
+        return $encrypted;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Decrypts $value with the defined settings
+     *
+     * @param  string $value Content to decrypt
+     * @return string The decrypted content
+     */
+    public function decrypt($value)
+    {
+        $cipher = $this->_openCipher();
+        $this->_initCipher($cipher);
+        $decrypted = mdecrypt_generic($cipher, $value);
+        mcrypt_generic_deinit($cipher);
+        $this->_closeCipher($cipher);
+
+        // decompress after decryption
+        if (!empty($this->_compression)) {
+            require_once 'Zend/Filter/Decompress.php';
+            $decompress = new Zend_Filter_Decompress($this->_compression);
+            $decrypted  = $decompress->filter($decrypted);
+        }
+
+        return $decrypted;
+    }
+
+    /**
+     * Returns the adapter name
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Mcrypt';
+    }
+
+    /**
+     * Open a cipher
+     *
+     * @throws Zend_Filter_Exception When the cipher can not be opened
+     * @return resource Returns the opened cipher
+     */
+    protected function _openCipher()
+    {
+        $cipher = mcrypt_module_open(
+            $this->_encryption['algorithm'],
+            $this->_encryption['algorithm_directory'],
+            $this->_encryption['mode'],
+            $this->_encryption['mode_directory']);
+
+        if ($cipher === false) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Mcrypt can not be opened with your settings');
+        }
+
+        return $cipher;
+    }
+
+    /**
+     * Close a cipher
+     *
+     * @param  resource $cipher Cipher to close
+     * @return Zend_Filter_Encrypt_Mcrypt
+     */
+    protected function _closeCipher($cipher)
+    {
+        mcrypt_module_close($cipher);
+
+        return $this;
+    }
+
+    /**
+     * Initialises the cipher with the set key
+     *
+     * @param  resource $cipher
+     * @throws
+     * @return resource
+     */
+    protected function _initCipher($cipher)
+    {
+        $key = $this->_encryption['key'];
+
+        $keysizes = mcrypt_enc_get_supported_key_sizes($cipher);
+        if (empty($keysizes) || ($this->_encryption['salt'] == true)) {
+            $this->_srand();
+            $keysize = mcrypt_enc_get_key_size($cipher);
+            $key     = substr(md5($key), 0, $keysize);
+        } else if (!in_array(strlen($key), $keysizes)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('The given key has a wrong size for the set algorithm');
+        }
+
+        $result = mcrypt_generic_init($cipher, $key, $this->_encryption['vector']);
+        if ($result < 0) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Mcrypt could not be initialize with the given setting');
+        }
+
+        return $this;
+    }
+
+    /**
+     * _srand() interception
+     *
+     * @see ZF-8742
+     */
+    protected function _srand()
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            return;
+        }
+
+        if (!self::$_srandCalled) {
+            srand((double) microtime() * 1000000);
+            self::$_srandCalled = true;
+        }
+    }
+}
diff --git a/lib/zend/Zend/Filter/Encrypt/Openssl.php b/lib/zend/Zend/Filter/Encrypt/Openssl.php
new file mode 100644
index 00000000000..7d1f70bd0ae
--- /dev/null
+++ b/lib/zend/Zend/Filter/Encrypt/Openssl.php
@@ -0,0 +1,492 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Encrypt_Interface
+ */
+require_once 'Zend/Filter/Encrypt/Interface.php';
+
+/**
+ * Encryption adapter for openssl
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface
+{
+    /**
+     * Definitions for encryption
+     * array(
+     *     'public'   => public keys
+     *     'private'  => private keys
+     *     'envelope' => resulting envelope keys
+     * )
+     */
+    protected $_keys = array(
+        'public'   => array(),
+        'private'  => array(),
+        'envelope' => array()
+    );
+
+    /**
+     * Internal passphrase
+     *
+     * @var string
+     */
+    protected $_passphrase;
+
+    /**
+     * Internal compression
+     *
+     * @var array
+     */
+    protected $_compression;
+
+    /**
+     * Internal create package
+     *
+     * @var boolean
+     */
+    protected $_package = false;
+
+    /**
+     * Class constructor
+     * Available options
+     *   'public'      => public key
+     *   'private'     => private key
+     *   'envelope'    => envelope key
+     *   'passphrase'  => passphrase
+     *   'compression' => compress value with this compression adapter
+     *   'package'     => pack envelope keys into encrypted string, simplifies decryption
+     *
+     * @param string|array $options Options for this adapter
+     */
+    public function __construct($options = array())
+    {
+        if (!extension_loaded('openssl')) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('This filter needs the openssl extension');
+        }
+
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+
+        if (!is_array($options)) {
+            $options = array('public' => $options);
+        }
+
+        if (array_key_exists('passphrase', $options)) {
+            $this->setPassphrase($options['passphrase']);
+            unset($options['passphrase']);
+        }
+
+        if (array_key_exists('compression', $options)) {
+            $this->setCompression($options['compression']);
+            unset($options['compress']);
+        }
+
+        if (array_key_exists('package', $options)) {
+            $this->setPackage($options['package']);
+            unset($options['package']);
+        }
+
+        $this->_setKeys($options);
+    }
+
+    /**
+     * Sets the encryption keys
+     *
+     * @param  string|array $keys Key with type association
+     * @return Zend_Filter_Encrypt_Openssl
+     */
+    protected function _setKeys($keys)
+    {
+        if (!is_array($keys)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Invalid options argument provided to filter');
+        }
+
+        foreach ($keys as $type => $key) {
+            if (ctype_print($key) && is_file(realpath($key)) && is_readable($key)) {
+                $file = fopen($key, 'r');
+                $cert = fread($file, 8192);
+                fclose($file);
+            } else {
+                $cert = $key;
+                $key  = count($this->_keys[$type]);
+            }
+
+            switch ($type) {
+                case 'public':
+                    $test = openssl_pkey_get_public($cert);
+                    if ($test === false) {
+                        require_once 'Zend/Filter/Exception.php';
+                        throw new Zend_Filter_Exception("Public key '{$cert}' not valid");
+                    }
+
+                    openssl_free_key($test);
+                    $this->_keys['public'][$key] = $cert;
+                    break;
+                case 'private':
+                    $test = openssl_pkey_get_private($cert, $this->_passphrase);
+                    if ($test === false) {
+                        require_once 'Zend/Filter/Exception.php';
+                        throw new Zend_Filter_Exception("Private key '{$cert}' not valid");
+                    }
+
+                    openssl_free_key($test);
+                    $this->_keys['private'][$key] = $cert;
+                    break;
+                case 'envelope':
+                    $this->_keys['envelope'][$key] = $cert;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns all public keys
+     *
+     * @return array
+     */
+    public function getPublicKey()
+    {
+        $key = $this->_keys['public'];
+        return $key;
+    }
+
+    /**
+     * Sets public keys
+     *
+     * @param  string|array $key Public keys
+     * @return Zend_Filter_Encrypt_Openssl
+     */
+    public function setPublicKey($key)
+    {
+        if (is_array($key)) {
+            foreach($key as $type => $option) {
+                if ($type !== 'public') {
+                    $key['public'] = $option;
+                    unset($key[$type]);
+                }
+            }
+        } else {
+            $key = array('public' => $key);
+        }
+
+        return $this->_setKeys($key);
+    }
+
+    /**
+     * Returns all private keys
+     *
+     * @return array
+     */
+    public function getPrivateKey()
+    {
+        $key = $this->_keys['private'];
+        return $key;
+    }
+
+    /**
+     * Sets private keys
+     *
+     * @param  string $key Private key
+     * @param  string $passphrase
+     * @return Zend_Filter_Encrypt_Openssl
+     */
+    public function setPrivateKey($key, $passphrase = null)
+    {
+        if (is_array($key)) {
+            foreach($key as $type => $option) {
+                if ($type !== 'private') {
+                    $key['private'] = $option;
+                    unset($key[$type]);
+                }
+            }
+        } else {
+            $key = array('private' => $key);
+        }
+
+        if ($passphrase !== null) {
+            $this->setPassphrase($passphrase);
+        }
+
+        return $this->_setKeys($key);
+    }
+
+    /**
+     * Returns all envelope keys
+     *
+     * @return array
+     */
+    public function getEnvelopeKey()
+    {
+        $key = $this->_keys['envelope'];
+        return $key;
+    }
+
+    /**
+     * Sets envelope keys
+     *
+     * @param  string|array $options Envelope keys
+     * @return Zend_Filter_Encrypt_Openssl
+     */
+    public function setEnvelopeKey($key)
+    {
+        if (is_array($key)) {
+            foreach($key as $type => $option) {
+                if ($type !== 'envelope') {
+                    $key['envelope'] = $option;
+                    unset($key[$type]);
+                }
+            }
+        } else {
+            $key = array('envelope' => $key);
+        }
+
+        return $this->_setKeys($key);
+    }
+
+    /**
+     * Returns the passphrase
+     *
+     * @return string
+     */
+    public function getPassphrase()
+    {
+        return $this->_passphrase;
+    }
+
+    /**
+     * Sets a new passphrase
+     *
+     * @param string $passphrase
+     * @return Zend_Filter_Encrypt_Openssl
+     */
+    public function setPassphrase($passphrase)
+    {
+        $this->_passphrase = $passphrase;
+        return $this;
+    }
+
+    /**
+     * Returns the compression
+     *
+     * @return array
+     */
+    public function getCompression()
+    {
+        return $this->_compression;
+    }
+
+    /**
+     * Sets a internal compression for values to encrypt
+     *
+     * @param string|array $compression
+     * @return Zend_Filter_Encrypt_Openssl
+     */
+    public function setCompression($compression)
+    {
+        if (is_string($this->_compression)) {
+            $compression = array('adapter' => $compression);
+        }
+
+        $this->_compression = $compression;
+        return $this;
+    }
+
+    /**
+     * Returns if header should be packaged
+     *
+     * @return boolean
+     */
+    public function getPackage()
+    {
+        return $this->_package;
+    }
+
+    /**
+     * Sets if the envelope keys should be included in the encrypted value
+     *
+     * @param boolean $package
+     * @return Zend_Filter_Encrypt_Openssl
+     */
+    public function setPackage($package)
+    {
+        $this->_package = (boolean) $package;
+        return $this;
+    }
+
+    /**
+     * Encrypts $value with the defined settings
+     * Note that you also need the "encrypted" keys to be able to decrypt
+     *
+     * @param  string $value Content to encrypt
+     * @return string The encrypted content
+     * @throws Zend_Filter_Exception
+     */
+    public function encrypt($value)
+    {
+        $encrypted     = array();
+        $encryptedkeys = array();
+
+        if (count($this->_keys['public']) == 0) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Openssl can not encrypt without public keys');
+        }
+
+        $keys         = array();
+        $fingerprints = array();
+        $count        = -1;
+        foreach($this->_keys['public'] as $key => $cert) {
+            $keys[$key] = openssl_pkey_get_public($cert);
+            if ($this->_package) {
+                $details = openssl_pkey_get_details($keys[$key]);
+                if ($details === false) {
+                    $details = array('key' => 'ZendFramework');
+                }
+
+                ++$count;
+                $fingerprints[$count] = md5($details['key']);
+            }
+        }
+
+        // compress prior to encryption
+        if (!empty($this->_compression)) {
+            require_once 'Zend/Filter/Compress.php';
+            $compress = new Zend_Filter_Compress($this->_compression);
+            $value    = $compress->filter($value);
+        }
+
+        $crypt  = openssl_seal($value, $encrypted, $encryptedkeys, $keys);
+        foreach ($keys as $key) {
+            openssl_free_key($key);
+        }
+
+        if ($crypt === false) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Openssl was not able to encrypt your content with the given options');
+        }
+
+        $this->_keys['envelope'] = $encryptedkeys;
+
+        // Pack data and envelope keys into single string
+        if ($this->_package) {
+            $header = pack('n', count($this->_keys['envelope']));
+            foreach($this->_keys['envelope'] as $key => $envKey) {
+                $header .= pack('H32n', $fingerprints[$key], strlen($envKey)) . $envKey;
+            }
+
+            $encrypted = $header . $encrypted;
+        }
+
+        return $encrypted;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Decrypts $value with the defined settings
+     *
+     * @param  string $value Content to decrypt
+     * @return string The decrypted content
+     * @throws Zend_Filter_Exception
+     */
+    public function decrypt($value)
+    {
+        $decrypted = "";
+        $envelope  = current($this->getEnvelopeKey());
+
+        if (count($this->_keys['private']) !== 1) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Please give a private key for decryption with Openssl');
+        }
+
+        if (!$this->_package && empty($envelope)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Please give a envelope key for decryption with Openssl');
+        }
+
+        foreach($this->_keys['private'] as $key => $cert) {
+            $keys = openssl_pkey_get_private($cert, $this->getPassphrase());
+        }
+
+        if ($this->_package) {
+            $details = openssl_pkey_get_details($keys);
+            if ($details !== false) {
+                $fingerprint = md5($details['key']);
+            } else {
+                $fingerprint = md5("ZendFramework");
+            }
+
+            $count = unpack('ncount', $value);
+            $count = $count['count'];
+            $length  = 2;
+            for($i = $count; $i > 0; --$i) {
+                $header = unpack('H32print/nsize', substr($value, $length, 18));
+                $length  += 18;
+                if ($header['print'] == $fingerprint) {
+                    $envelope = substr($value, $length, $header['size']);
+                }
+
+                $length += $header['size'];
+            }
+
+            // remainder of string is the value to decrypt
+            $value = substr($value, $length);
+        }
+
+        $crypt  = openssl_open($value, $decrypted, $envelope, $keys);
+        openssl_free_key($keys);
+
+        if ($crypt === false) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Openssl was not able to decrypt you content with the given options');
+        }
+
+        // decompress after decryption
+        if (!empty($this->_compression)) {
+            require_once 'Zend/Filter/Decompress.php';
+            $decompress = new Zend_Filter_Decompress($this->_compression);
+            $decrypted  = $decompress->filter($decrypted);
+        }
+
+        return $decrypted;
+    }
+
+    /**
+     * Returns the adapter name
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Openssl';
+    }
+}
diff --git a/lib/zend/Zend/Filter/Exception.php b/lib/zend/Zend/Filter/Exception.php
new file mode 100644
index 00000000000..5763b2456ec
--- /dev/null
+++ b/lib/zend/Zend/Filter/Exception.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Exception extends Zend_Exception
+{}
diff --git a/lib/zend/Zend/Filter/File/Decrypt.php b/lib/zend/Zend/Filter/File/Decrypt.php
new file mode 100644
index 00000000000..9e167d90ecd
--- /dev/null
+++ b/lib/zend/Zend/Filter/File/Decrypt.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Decrypt
+ */
+require_once 'Zend/Filter/Decrypt.php';
+
+/**
+ * Decrypts a given file and stores the decrypted file content
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_File_Decrypt extends Zend_Filter_Decrypt
+{
+    /**
+     * New filename to set
+     *
+     * @var string
+     */
+    protected $_filename;
+
+    /**
+     * Returns the new filename where the content will be stored
+     *
+     * @return string
+     */
+    public function getFilename()
+    {
+        return $this->_filename;
+    }
+
+    /**
+     * Sets the new filename where the content will be stored
+     *
+     * @param  string $filename (Optional) New filename to set
+     * @return Zend_Filter_File_Encryt
+     */
+    public function setFilename($filename = null)
+    {
+        $this->_filename = $filename;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Decrypts the file $value with the defined settings
+     *
+     * @param  string $value Full path of file to change
+     * @return string The filename which has been set, or false when there were errors
+     */
+    public function filter($value)
+    {
+        if (!file_exists($value)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("File '$value' not found");
+        }
+
+        if (!isset($this->_filename)) {
+            $this->_filename = $value;
+        }
+
+        if (file_exists($this->_filename) and !is_writable($this->_filename)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("File '{$this->_filename}' is not writable");
+        }
+
+        $content = file_get_contents($value);
+        if (!$content) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Problem while reading file '$value'");
+        }
+
+        $decrypted = parent::filter($content);
+        $result    = file_put_contents($this->_filename, $decrypted);
+
+        if (!$result) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Problem while writing file '{$this->_filename}'");
+        }
+
+        return $this->_filename;
+    }
+}
diff --git a/lib/zend/Zend/Filter/File/Encrypt.php b/lib/zend/Zend/Filter/File/Encrypt.php
new file mode 100644
index 00000000000..23c71b4b0aa
--- /dev/null
+++ b/lib/zend/Zend/Filter/File/Encrypt.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Encrypt
+ */
+require_once 'Zend/Filter/Encrypt.php';
+
+/**
+ * Encrypts a given file and stores the encrypted file content
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_File_Encrypt extends Zend_Filter_Encrypt
+{
+    /**
+     * New filename to set
+     *
+     * @var string
+     */
+    protected $_filename;
+
+    /**
+     * Returns the new filename where the content will be stored
+     *
+     * @return string
+     */
+    public function getFilename()
+    {
+        return $this->_filename;
+    }
+
+    /**
+     * Sets the new filename where the content will be stored
+     *
+     * @param  string $filename (Optional) New filename to set
+     * @return Zend_Filter_File_Encryt
+     */
+    public function setFilename($filename = null)
+    {
+        $this->_filename = $filename;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Encrypts the file $value with the defined settings
+     *
+     * @param  string $value Full path of file to change
+     * @return string The filename which has been set, or false when there were errors
+     */
+    public function filter($value)
+    {
+        if (!file_exists($value)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("File '$value' not found");
+        }
+
+        if (!isset($this->_filename)) {
+            $this->_filename = $value;
+        }
+
+        if (file_exists($this->_filename) and !is_writable($this->_filename)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("File '{$this->_filename}' is not writable");
+        }
+
+        $content = file_get_contents($value);
+        if (!$content) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Problem while reading file '$value'");
+        }
+
+        $encrypted = parent::filter($content);
+        $result    = file_put_contents($this->_filename, $encrypted);
+
+        if (!$result) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Problem while writing file '{$this->_filename}'");
+        }
+
+        return $this->_filename;
+    }
+}
diff --git a/lib/zend/Zend/Filter/File/LowerCase.php b/lib/zend/Zend/Filter/File/LowerCase.php
new file mode 100644
index 00000000000..dd34321dea7
--- /dev/null
+++ b/lib/zend/Zend/Filter/File/LowerCase.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_StringToLower
+ */
+require_once 'Zend/Filter/StringToLower.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_File_LowerCase extends Zend_Filter_StringToLower
+{
+    /**
+     * Adds options to the filter at initiation
+     *
+     * @param string $options
+     */
+    public function __construct($options = null)
+    {
+        if (!empty($options)) {
+            $this->setEncoding($options);
+        }
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Does a lowercase on the content of the given file
+     *
+     * @param  string $value Full path of file to change
+     * @return string The given $value
+     * @throws Zend_Filter_Exception
+     */
+    public function filter($value)
+    {
+        if (!file_exists($value)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("File '$value' not found");
+        }
+
+        if (!is_writable($value)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("File '$value' is not writable");
+        }
+
+        $content = file_get_contents($value);
+        if (!$content) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Problem while reading file '$value'");
+        }
+
+        $content = parent::filter($content);
+        $result  = file_put_contents($value, $content);
+
+        if (!$result) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Problem while writing file '$value'");
+        }
+
+        return $value;
+    }
+}
diff --git a/lib/zend/Zend/Filter/File/Rename.php b/lib/zend/Zend/Filter/File/Rename.php
new file mode 100644
index 00000000000..b70acbe301f
--- /dev/null
+++ b/lib/zend/Zend/Filter/File/Rename.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_File_Rename implements Zend_Filter_Interface
+{
+    /**
+     * Internal array of array(source, target, overwrite)
+     */
+    protected $_files = array();
+
+    /**
+     * Class constructor
+     *
+     * Options argument may be either a string, a Zend_Config object, or an array.
+     * If an array or Zend_Config object, it accepts the following keys:
+     * 'source'    => Source filename or directory which will be renamed
+     * 'target'    => Target filename or directory, the new name of the sourcefile
+     * 'overwrite' => Shall existing files be overwritten ?
+     *
+     * @param  string|array $options Target file or directory to be renamed
+     * @param  string $target Source filename or directory (deprecated)
+     * @param  bool $overwrite Should existing files be overwritten (deprecated)
+     * @return void
+     */
+    public function __construct($options)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } elseif (is_string($options)) {
+            $options = array('target' => $options);
+        } elseif (!is_array($options)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Invalid options argument provided to filter');
+        }
+
+        if (1 < func_num_args()) {
+            $argv = func_get_args();
+            array_shift($argv);
+            $source    = array_shift($argv);
+            $overwrite = false;
+            if (!empty($argv)) {
+                $overwrite = array_shift($argv);
+            }
+            $options['source']    = $source;
+            $options['overwrite'] = $overwrite;
+        }
+
+        $this->setFile($options);
+    }
+
+    /**
+     * Returns the files to rename and their new name and location
+     *
+     * @return array
+     */
+    public function getFile()
+    {
+        return $this->_files;
+    }
+
+    /**
+     * Sets a new file or directory as target, deleting existing ones
+     *
+     * Array accepts the following keys:
+     * 'source'    => Source filename or directory which will be renamed
+     * 'target'    => Target filename or directory, the new name of the sourcefile
+     * 'overwrite' => Shall existing files be overwritten ?
+     *
+     * @param  string|array $options Old file or directory to be rewritten
+     * @return Zend_Filter_File_Rename
+     */
+    public function setFile($options)
+    {
+        $this->_files = array();
+        $this->addFile($options);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new file or directory as target to the existing ones
+     *
+     * Array accepts the following keys:
+     * 'source'    => Source filename or directory which will be renamed
+     * 'target'    => Target filename or directory, the new name of the sourcefile
+     * 'overwrite' => Shall existing files be overwritten ?
+     *
+     * @param  string|array $options Old file or directory to be rewritten
+     * @return Zend_Filter_File_Rename
+     */
+    public function addFile($options)
+    {
+        if (is_string($options)) {
+            $options = array('target' => $options);
+        } elseif (!is_array($options)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception ('Invalid options to rename filter provided');
+        }
+
+        $this->_convertOptions($options);
+
+        return $this;
+    }
+
+    /**
+     * Returns only the new filename without moving it
+     * But existing files will be erased when the overwrite option is true
+     *
+     * @param  string  $value  Full path of file to change
+     * @param  boolean $source Return internal informations
+     * @return string The new filename which has been set
+     */
+    public function getNewName($value, $source = false)
+    {
+        $file = $this->_getFileName($value);
+        
+        if (!is_array($file) || !array_key_exists('source', $file) || !array_key_exists('target', $file)) {
+            return $value;
+        }
+        
+        if ($file['source'] == $file['target']) {
+            return $value;
+        }
+
+        if (!file_exists($file['source'])) {
+            return $value;
+        }
+
+        if (($file['overwrite'] == true) && (file_exists($file['target']))) {
+            unlink($file['target']);
+        }
+
+        if (file_exists($file['target'])) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception(sprintf("File '%s' could not be renamed. It already exists.", $value));
+        }
+
+        if ($source) {
+            return $file;
+        }
+
+        return $file['target'];
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Renames the file $value to the new name set before
+     * Returns the file $value, removing all but digit characters
+     *
+     * @param  string $value Full path of file to change
+     * @throws Zend_Filter_Exception
+     * @return string The new filename which has been set, or false when there were errors
+     */
+    public function filter($value)
+    {
+        $file   = $this->getNewName($value, true);
+        if (is_string($file)) {
+            return $file;
+        }
+
+        $result = rename($file['source'], $file['target']);
+
+        if ($result === true) {
+            return $file['target'];
+        }
+
+        require_once 'Zend/Filter/Exception.php';
+        throw new Zend_Filter_Exception(sprintf("File '%s' could not be renamed. An error occured while processing the file.", $value));
+    }
+
+    /**
+     * Internal method for creating the file array
+     * Supports single and nested arrays
+     *
+     * @param  array $options
+     * @return array
+     */
+    protected function _convertOptions($options) {
+        $files = array();
+        foreach ($options as $key => $value) {
+            if (is_array($value)) {
+                $this->_convertOptions($value);
+                continue;
+            }
+
+            switch ($key) {
+                case "source":
+                    $files['source'] = (string) $value;
+                    break;
+
+                case 'target' :
+                    $files['target'] = (string) $value;
+                    break;
+
+                case 'overwrite' :
+                    $files['overwrite'] = (boolean) $value;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        if (empty($files)) {
+            return $this;
+        }
+
+        if (empty($files['source'])) {
+            $files['source'] = '*';
+        }
+
+        if (empty($files['target'])) {
+            $files['target'] = '*';
+        }
+
+        if (empty($files['overwrite'])) {
+            $files['overwrite'] = false;
+        }
+
+        $found = false;
+        foreach ($this->_files as $key => $value) {
+            if ($value['source'] == $files['source']) {
+                $this->_files[$key] = $files;
+                $found              = true;
+            }
+        }
+
+        if (!$found) {
+            $count                = count($this->_files);
+            $this->_files[$count] = $files;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Internal method to resolve the requested source
+     * and return all other related parameters
+     *
+     * @param  string $file Filename to get the informations for
+     * @return array
+     */
+    protected function _getFileName($file)
+    {
+        $rename = array();
+        foreach ($this->_files as $value) {
+            if ($value['source'] == '*') {
+                if (!isset($rename['source'])) {
+                    $rename           = $value;
+                    $rename['source'] = $file;
+                }
+            }
+
+            if ($value['source'] == $file) {
+                $rename = $value;
+            }
+        }
+
+        if (!isset($rename['source'])) {
+            return $file;
+        }
+
+        if (!isset($rename['target']) or ($rename['target'] == '*')) {
+            $rename['target'] = $rename['source'];
+        }
+
+        if (is_dir($rename['target'])) {
+            $name = basename($rename['source']);
+            $last = $rename['target'][strlen($rename['target']) - 1];
+            if (($last != '/') and ($last != '\\')) {
+                $rename['target'] .= DIRECTORY_SEPARATOR;
+            }
+
+            $rename['target'] .= $name;
+        }
+
+        return $rename;
+    }
+}
diff --git a/lib/zend/Zend/Filter/File/UpperCase.php b/lib/zend/Zend/Filter/File/UpperCase.php
new file mode 100644
index 00000000000..e65453e0fdb
--- /dev/null
+++ b/lib/zend/Zend/Filter/File/UpperCase.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_StringToUpper
+ */
+require_once 'Zend/Filter/StringToUpper.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_File_UpperCase extends Zend_Filter_StringToUpper
+{
+    /**
+     * Adds options to the filter at initiation
+     *
+     * @param string $options
+     */
+    public function __construct($options = null)
+    {
+        if (!empty($options)) {
+            $this->setEncoding($options);
+        }
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Does a lowercase on the content of the given file
+     *
+     * @param  string $value Full path of file to change
+     * @return string The given $value
+     * @throws Zend_Filter_Exception
+     */
+    public function filter($value)
+    {
+        if (!file_exists($value)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("File '$value' not found");
+        }
+
+        if (!is_writable($value)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("File '$value' is not writable");
+        }
+
+        $content = file_get_contents($value);
+        if (!$content) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Problem while reading file '$value'");
+        }
+
+        $content = parent::filter($content);
+        $result  = file_put_contents($value, $content);
+
+        if (!$result) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Problem while writing file '$value'");
+        }
+
+        return $value;
+    }
+}
diff --git a/lib/zend/Zend/Filter/HtmlEntities.php b/lib/zend/Zend/Filter/HtmlEntities.php
new file mode 100644
index 00000000000..0c1dfecb956
--- /dev/null
+++ b/lib/zend/Zend/Filter/HtmlEntities.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_HtmlEntities implements Zend_Filter_Interface
+{
+    /**
+     * Corresponds to the second htmlentities() argument
+     *
+     * @var integer
+     */
+    protected $_quoteStyle;
+
+    /**
+     * Corresponds to the third htmlentities() argument
+     *
+     * @var string
+     */
+    protected $_encoding;
+
+    /**
+     * Corresponds to the forth htmlentities() argument
+     *
+     * @var unknown_type
+     */
+    protected $_doubleQuote;
+
+    /**
+     * Sets filter options
+     *
+     * @param  integer|array $quoteStyle
+     * @param  string  $charSet
+     * @return void
+     */
+    public function __construct($options = array())
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if (!is_array($options)) {
+            $options = func_get_args();
+            $temp['quotestyle'] = array_shift($options);
+            if (!empty($options)) {
+                $temp['charset'] = array_shift($options);
+            }
+
+            $options = $temp;
+        }
+
+        if (!isset($options['quotestyle'])) {
+            $options['quotestyle'] = ENT_COMPAT;
+        }
+
+        if (!isset($options['encoding'])) {
+            $options['encoding'] = 'UTF-8';
+        }
+        if (isset($options['charset'])) {
+            $options['encoding'] = $options['charset'];
+        }
+
+        if (!isset($options['doublequote'])) {
+            $options['doublequote'] = true;
+        }
+
+        $this->setQuoteStyle($options['quotestyle']);
+        $this->setEncoding($options['encoding']);
+        $this->setDoubleQuote($options['doublequote']);
+    }
+
+    /**
+     * Returns the quoteStyle option
+     *
+     * @return integer
+     */
+    public function getQuoteStyle()
+    {
+        return $this->_quoteStyle;
+    }
+
+    /**
+     * Sets the quoteStyle option
+     *
+     * @param  integer $quoteStyle
+     * @return Zend_Filter_HtmlEntities Provides a fluent interface
+     */
+    public function setQuoteStyle($quoteStyle)
+    {
+        $this->_quoteStyle = $quoteStyle;
+        return $this;
+    }
+
+
+    /**
+     * Get encoding
+     *
+     * @return string
+     */
+    public function getEncoding()
+    {
+         return $this->_encoding;
+    }
+
+    /**
+     * Set encoding
+     *
+     * @param  string $value
+     * @return Zend_Filter_HtmlEntities
+     */
+    public function setEncoding($value)
+    {
+        $this->_encoding = (string) $value;
+        return $this;
+    }
+
+    /**
+     * Returns the charSet option
+     *
+     * Proxies to {@link getEncoding()}
+     *
+     * @return string
+     */
+    public function getCharSet()
+    {
+        return $this->getEncoding();
+    }
+
+    /**
+     * Sets the charSet option
+     *
+     * Proxies to {@link setEncoding()}
+     *
+     * @param  string $charSet
+     * @return Zend_Filter_HtmlEntities Provides a fluent interface
+     */
+    public function setCharSet($charSet)
+    {
+        return $this->setEncoding($charSet);
+    }
+
+    /**
+     * Returns the doubleQuote option
+     *
+     * @return boolean
+     */
+    public function getDoubleQuote()
+    {
+        return $this->_doubleQuote;
+    }
+
+    /**
+     * Sets the doubleQuote option
+     *
+     * @param boolean $doubleQuote
+     * @return Zend_Filter_HtmlEntities Provides a fluent interface
+     */
+    public function setDoubleQuote($doubleQuote)
+    {
+        $this->_doubleQuote = (boolean) $doubleQuote;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns the string $value, converting characters to their corresponding HTML entity
+     * equivalents where they exist
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        $filtered = htmlentities((string) $value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote());
+        if (strlen((string) $value) && !strlen($filtered)) {
+            if (!function_exists('iconv')) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception('Encoding mismatch has resulted in htmlentities errors');
+            }
+            $enc      = $this->getEncoding();
+            $value    = iconv('', $enc . '//IGNORE', (string) $value);
+            $filtered = htmlentities($value, $this->getQuoteStyle(), $enc, $this->getDoubleQuote());
+            if (!strlen($filtered)) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception('Encoding mismatch has resulted in htmlentities errors');
+            }
+        }
+        return $filtered;
+    }
+}
diff --git a/lib/zend/Zend/Filter/Inflector.php b/lib/zend/Zend/Filter/Inflector.php
new file mode 100644
index 00000000000..00eea7d64b2
--- /dev/null
+++ b/lib/zend/Zend/Filter/Inflector.php
@@ -0,0 +1,527 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter.php';
+
+/**
+ * @see Zend_Loader_PluginLoader
+ */
+require_once 'Zend/Loader/PluginLoader.php';
+
+/**
+ * Filter chain for string inflection
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Inflector implements Zend_Filter_Interface
+{
+    /**
+     * @var Zend_Loader_PluginLoader_Interface
+     */
+    protected $_pluginLoader = null;
+
+    /**
+     * @var string
+     */
+    protected $_target = null;
+
+    /**
+     * @var bool
+     */
+    protected $_throwTargetExceptionsOn = true;
+
+    /**
+     * @var string
+     */
+    protected $_targetReplacementIdentifier = ':';
+
+    /**
+     * @var array
+     */
+    protected $_rules = array();
+
+    /**
+     * Constructor
+     *
+     * @param string|array $options Options to set
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if (!is_array($options)) {
+            $options = func_get_args();
+            $temp    = array();
+
+            if (!empty($options)) {
+                $temp['target'] = array_shift($options);
+            }
+
+            if (!empty($options)) {
+                $temp['rules'] = array_shift($options);
+            }
+
+            if (!empty($options)) {
+                $temp['throwTargetExceptionsOn'] = array_shift($options);
+            }
+
+            if (!empty($options)) {
+                $temp['targetReplacementIdentifier'] = array_shift($options);
+            }
+
+            $options = $temp;
+        }
+
+        $this->setOptions($options);
+    }
+
+    /**
+     * Retreive PluginLoader
+     *
+     * @return Zend_Loader_PluginLoader_Interface
+     */
+    public function getPluginLoader()
+    {
+        if (!$this->_pluginLoader instanceof Zend_Loader_PluginLoader_Interface) {
+            $this->_pluginLoader = new Zend_Loader_PluginLoader(array('Zend_Filter_' => 'Zend/Filter/'), __CLASS__);
+        }
+
+        return $this->_pluginLoader;
+    }
+
+    /**
+     * Set PluginLoader
+     *
+     * @param Zend_Loader_PluginLoader_Interface $pluginLoader
+     * @return Zend_Filter_Inflector
+     */
+    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $pluginLoader)
+    {
+        $this->_pluginLoader = $pluginLoader;
+        return $this;
+    }
+
+    /**
+     * Use Zend_Config object to set object state
+     *
+     * @deprecated Use setOptions() instead
+     * @param  Zend_Config $config
+     * @return Zend_Filter_Inflector
+     */
+    public function setConfig(Zend_Config $config)
+    {
+        return $this->setOptions($config);
+    }
+
+    /**
+     * Set options
+     *
+     * @param  array $options
+     * @return Zend_Filter_Inflector
+     */
+    public function setOptions($options) {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+
+        // Set Präfix Path
+        if (array_key_exists('filterPrefixPath', $options)) {
+            if (!is_scalar($options['filterPrefixPath'])) {
+                foreach ($options['filterPrefixPath'] as $prefix => $path) {
+                    $this->addFilterPrefixPath($prefix, $path);
+                }
+            }
+        }
+
+        if (array_key_exists('throwTargetExceptionsOn', $options)) {
+            $this->setThrowTargetExceptionsOn($options['throwTargetExceptionsOn']);
+        }
+
+        if (array_key_exists('targetReplacementIdentifier', $options)) {
+            $this->setTargetReplacementIdentifier($options['targetReplacementIdentifier']);
+        }
+
+        if (array_key_exists('target', $options)) {
+            $this->setTarget($options['target']);
+        }
+
+        if (array_key_exists('rules', $options)) {
+            $this->addRules($options['rules']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Convienence method to add prefix and path to PluginLoader
+     *
+     * @param string $prefix
+     * @param string $path
+     * @return Zend_Filter_Inflector
+     */
+    public function addFilterPrefixPath($prefix, $path)
+    {
+        $this->getPluginLoader()->addPrefixPath($prefix, $path);
+        return $this;
+    }
+
+    /**
+     * Set Whether or not the inflector should throw an exception when a replacement
+     * identifier is still found within an inflected target.
+     *
+     * @param bool $throwTargetExceptions
+     * @return Zend_Filter_Inflector
+     */
+    public function setThrowTargetExceptionsOn($throwTargetExceptionsOn)
+    {
+        $this->_throwTargetExceptionsOn = ($throwTargetExceptionsOn == true) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Will exceptions be thrown?
+     *
+     * @return bool
+     */
+    public function isThrowTargetExceptionsOn()
+    {
+        return $this->_throwTargetExceptionsOn;
+    }
+
+    /**
+     * Set the Target Replacement Identifier, by default ':'
+     *
+     * @param string $targetReplacementIdentifier
+     * @return Zend_Filter_Inflector
+     */
+    public function setTargetReplacementIdentifier($targetReplacementIdentifier)
+    {
+        if ($targetReplacementIdentifier) {
+            $this->_targetReplacementIdentifier = (string) $targetReplacementIdentifier;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Target Replacement Identifier
+     *
+     * @return string
+     */
+    public function getTargetReplacementIdentifier()
+    {
+        return $this->_targetReplacementIdentifier;
+    }
+
+    /**
+     * Set a Target
+     * ex: 'scripts/:controller/:action.:suffix'
+     *
+     * @param string
+     * @return Zend_Filter_Inflector
+     */
+    public function setTarget($target)
+    {
+        $this->_target = (string) $target;
+        return $this;
+    }
+
+    /**
+     * Retrieve target
+     *
+     * @return string
+     */
+    public function getTarget()
+    {
+        return $this->_target;
+    }
+
+    /**
+     * Set Target Reference
+     *
+     * @param reference $target
+     * @return Zend_Filter_Inflector
+     */
+    public function setTargetReference(&$target)
+    {
+        $this->_target =& $target;
+        return $this;
+    }
+
+    /**
+     * SetRules() is the same as calling addRules() with the exception that it
+     * clears the rules before adding them.
+     *
+     * @param array $rules
+     * @return Zend_Filter_Inflector
+     */
+    public function setRules(Array $rules)
+    {
+        $this->clearRules();
+        $this->addRules($rules);
+        return $this;
+    }
+
+    /**
+     * AddRules(): multi-call to setting filter rules.
+     *
+     * If prefixed with a ":" (colon), a filter rule will be added.  If not
+     * prefixed, a static replacement will be added.
+     *
+     * ex:
+     * array(
+     *     ':controller' => array('CamelCaseToUnderscore','StringToLower'),
+     *     ':action'     => array('CamelCaseToUnderscore','StringToLower'),
+     *     'suffix'      => 'phtml'
+     *     );
+     *
+     * @param array
+     * @return Zend_Filter_Inflector
+     */
+    public function addRules(Array $rules)
+    {
+        $keys = array_keys($rules);
+        foreach ($keys as $spec) {
+            if ($spec[0] == ':') {
+                $this->addFilterRule($spec, $rules[$spec]);
+            } else {
+                $this->setStaticRule($spec, $rules[$spec]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get rules
+     *
+     * By default, returns all rules. If a $spec is provided, will return those
+     * rules if found, false otherwise.
+     *
+     * @param  string $spec
+     * @return array|false
+     */
+    public function getRules($spec = null)
+    {
+        if (null !== $spec) {
+            $spec = $this->_normalizeSpec($spec);
+            if (isset($this->_rules[$spec])) {
+                return $this->_rules[$spec];
+            }
+            return false;
+        }
+
+        return $this->_rules;
+    }
+
+    /**
+     * getRule() returns a rule set by setFilterRule(), a numeric index must be provided
+     *
+     * @param string $spec
+     * @param int $index
+     * @return Zend_Filter_Interface|false
+     */
+    public function getRule($spec, $index)
+    {
+        $spec = $this->_normalizeSpec($spec);
+        if (isset($this->_rules[$spec]) && is_array($this->_rules[$spec])) {
+            if (isset($this->_rules[$spec][$index])) {
+                return $this->_rules[$spec][$index];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * ClearRules() clears the rules currently in the inflector
+     *
+     * @return Zend_Filter_Inflector
+     */
+    public function clearRules()
+    {
+        $this->_rules = array();
+        return $this;
+    }
+
+    /**
+     * Set a filtering rule for a spec.  $ruleSet can be a string, Filter object
+     * or an array of strings or filter objects.
+     *
+     * @param string $spec
+     * @param array|string|Zend_Filter_Interface $ruleSet
+     * @return Zend_Filter_Inflector
+     */
+    public function setFilterRule($spec, $ruleSet)
+    {
+        $spec = $this->_normalizeSpec($spec);
+        $this->_rules[$spec] = array();
+        return $this->addFilterRule($spec, $ruleSet);
+    }
+
+    /**
+     * Add a filter rule for a spec
+     *
+     * @param mixed $spec
+     * @param mixed $ruleSet
+     * @return void
+     */
+    public function addFilterRule($spec, $ruleSet)
+    {
+        $spec = $this->_normalizeSpec($spec);
+        if (!isset($this->_rules[$spec])) {
+            $this->_rules[$spec] = array();
+        }
+
+        if (!is_array($ruleSet)) {
+            $ruleSet = array($ruleSet);
+        }
+
+        if (is_string($this->_rules[$spec])) {
+            $temp = $this->_rules[$spec];
+            $this->_rules[$spec] = array();
+            $this->_rules[$spec][] = $temp;
+        }
+
+        foreach ($ruleSet as $rule) {
+            $this->_rules[$spec][] = $this->_getRule($rule);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set a static rule for a spec.  This is a single string value
+     *
+     * @param string $name
+     * @param string $value
+     * @return Zend_Filter_Inflector
+     */
+    public function setStaticRule($name, $value)
+    {
+        $name = $this->_normalizeSpec($name);
+        $this->_rules[$name] = (string) $value;
+        return $this;
+    }
+
+    /**
+     * Set Static Rule Reference.
+     *
+     * This allows a consuming class to pass a property or variable
+     * in to be referenced when its time to build the output string from the
+     * target.
+     *
+     * @param string $name
+     * @param mixed $reference
+     * @return Zend_Filter_Inflector
+     */
+    public function setStaticRuleReference($name, &$reference)
+    {
+        $name = $this->_normalizeSpec($name);
+        $this->_rules[$name] =& $reference;
+        return $this;
+    }
+
+    /**
+     * Inflect
+     *
+     * @param  string|array $source
+     * @return string
+     */
+    public function filter($source)
+    {
+        // clean source
+        foreach ( (array) $source as $sourceName => $sourceValue) {
+            $source[ltrim($sourceName, ':')] = $sourceValue;
+        }
+
+        $pregQuotedTargetReplacementIdentifier = preg_quote($this->_targetReplacementIdentifier, '#');
+        $processedParts = array();
+
+        foreach ($this->_rules as $ruleName => $ruleValue) {
+            if (isset($source[$ruleName])) {
+                if (is_string($ruleValue)) {
+                    // overriding the set rule
+                    $processedParts['#'.$pregQuotedTargetReplacementIdentifier.$ruleName.'#'] = str_replace('\\', '\\\\', $source[$ruleName]);
+                } elseif (is_array($ruleValue)) {
+                    $processedPart = $source[$ruleName];
+                    foreach ($ruleValue as $ruleFilter) {
+                        $processedPart = $ruleFilter->filter($processedPart);
+                    }
+                    $processedParts['#'.$pregQuotedTargetReplacementIdentifier.$ruleName.'#'] = str_replace('\\', '\\\\', $processedPart);
+                }
+            } elseif (is_string($ruleValue)) {
+                $processedParts['#'.$pregQuotedTargetReplacementIdentifier.$ruleName.'#'] = str_replace('\\', '\\\\', $ruleValue);
+            }
+        }
+
+        // all of the values of processedParts would have been str_replace('\\', '\\\\', ..)'d to disable preg_replace backreferences
+        $inflectedTarget = preg_replace(array_keys($processedParts), array_values($processedParts), $this->_target);
+
+        if ($this->_throwTargetExceptionsOn && (preg_match('#(?='.$pregQuotedTargetReplacementIdentifier.'[A-Za-z]{1})#', $inflectedTarget) == true)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('A replacement identifier ' . $this->_targetReplacementIdentifier . ' was found inside the inflected target, perhaps a rule was not satisfied with a target source?  Unsatisfied inflected target: ' . $inflectedTarget);
+        }
+
+        return $inflectedTarget;
+    }
+
+    /**
+     * Normalize spec string
+     *
+     * @param  string $spec
+     * @return string
+     */
+    protected function _normalizeSpec($spec)
+    {
+        return ltrim((string) $spec, ':&');
+    }
+
+    /**
+     * Resolve named filters and convert them to filter objects.
+     *
+     * @param  string $rule
+     * @return Zend_Filter_Interface
+     */
+    protected function _getRule($rule)
+    {
+        if ($rule instanceof Zend_Filter_Interface) {
+            return $rule;
+        }
+
+        $rule = (string) $rule;
+
+        $className  = $this->getPluginLoader()->load($rule);
+        $ruleObject = new $className();
+        if (!$ruleObject instanceof Zend_Filter_Interface) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('No class named ' . $rule . ' implementing Zend_Filter_Interface could be found');
+        }
+
+        return $ruleObject;
+    }
+}
diff --git a/lib/zend/Zend/Filter/Input.php b/lib/zend/Zend/Filter/Input.php
new file mode 100644
index 00000000000..c3229fa6fb4
--- /dev/null
+++ b/lib/zend/Zend/Filter/Input.php
@@ -0,0 +1,1209 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Loader
+ */
+require_once 'Zend/Loader.php';
+
+/**
+ * @see Zend_Filter
+ */
+require_once 'Zend/Filter.php';
+
+/**
+ * @see Zend_Validate
+ */
+require_once 'Zend/Validate.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Input
+{
+
+    const ALLOW_EMPTY           = 'allowEmpty';
+    const BREAK_CHAIN           = 'breakChainOnFailure';
+    const DEFAULT_VALUE         = 'default';
+    const MESSAGES              = 'messages';
+    const ESCAPE_FILTER         = 'escapeFilter';
+    const FIELDS                = 'fields';
+    const FILTER                = 'filter';
+    const FILTER_CHAIN          = 'filterChain';
+    const MISSING_MESSAGE       = 'missingMessage';
+    const INPUT_NAMESPACE       = 'inputNamespace';
+    const VALIDATOR_NAMESPACE   = 'validatorNamespace';
+    const FILTER_NAMESPACE      = 'filterNamespace';
+    const NOT_EMPTY_MESSAGE     = 'notEmptyMessage';
+    const PRESENCE              = 'presence';
+    const PRESENCE_OPTIONAL     = 'optional';
+    const PRESENCE_REQUIRED     = 'required';
+    const RULE                  = 'rule';
+    const RULE_WILDCARD         = '*';
+    const VALIDATE              = 'validate';
+    const VALIDATOR             = 'validator';
+    const VALIDATOR_CHAIN       = 'validatorChain';
+    const VALIDATOR_CHAIN_COUNT = 'validatorChainCount';
+
+    /**
+     * @var array Input data, before processing.
+     */
+    protected $_data = array();
+
+    /**
+     * @var array Association of rules to filters.
+     */
+    protected $_filterRules = array();
+
+    /**
+     * @var array Association of rules to validators.
+     */
+    protected $_validatorRules = array();
+
+    /**
+     * @var array After processing data, this contains mapping of valid fields
+     * to field values.
+     */
+    protected $_validFields = array();
+
+    /**
+     * @var array After processing data, this contains mapping of validation
+     * rules that did not pass validation to the array of messages returned
+     * by the validator chain.
+     */
+    protected $_invalidMessages = array();
+
+    /**
+     * @var array After processing data, this contains mapping of validation
+     * rules that did not pass validation to the array of error identifiers
+     * returned by the validator chain.
+     */
+    protected $_invalidErrors = array();
+
+    /**
+     * @var array After processing data, this contains mapping of validation
+     * rules in which some fields were missing to the array of messages
+     * indicating which fields were missing.
+     */
+    protected $_missingFields = array();
+
+    /**
+     * @var array After processing, this contains a copy of $_data elements
+     * that were not mentioned in any validation rule.
+     */
+    protected $_unknownFields = array();
+
+    /**
+     * @var Zend_Filter_Interface The filter object that is run on values
+     * returned by the getEscaped() method.
+     */
+    protected $_defaultEscapeFilter = null;
+
+    /**
+     * Plugin loaders
+     * @var array
+     */
+    protected $_loaders = array();
+
+    /**
+     * @var array Default values to use when processing filters and validators.
+     */
+    protected $_defaults = array(
+        self::ALLOW_EMPTY         => false,
+        self::BREAK_CHAIN         => false,
+        self::ESCAPE_FILTER       => 'HtmlEntities',
+        self::MISSING_MESSAGE     => "Field '%field%' is required by rule '%rule%', but the field is missing",
+        self::NOT_EMPTY_MESSAGE   => "You must give a non-empty value for field '%field%'",
+        self::PRESENCE            => self::PRESENCE_OPTIONAL
+    );
+
+    /**
+     * @var boolean Set to False initially, this is set to True after the
+     * input data have been processed.  Reset to False in setData() method.
+     */
+    protected $_processed = false;
+
+    /**
+     * Translation object
+     * @var Zend_Translate
+     */
+    protected $_translator;
+
+    /**
+     * Is translation disabled?
+     * @var Boolean
+     */
+    protected $_translatorDisabled = false;
+
+    /**
+     * @param array $filterRules
+     * @param array $validatorRules
+     * @param array $data       OPTIONAL
+     * @param array $options    OPTIONAL
+     */
+    public function __construct($filterRules, $validatorRules, array $data = null, array $options = null)
+    {
+        if ($options) {
+            $this->setOptions($options);
+        }
+
+        $this->_filterRules = (array) $filterRules;
+        $this->_validatorRules = (array) $validatorRules;
+
+        if ($data) {
+            $this->setData($data);
+        }
+    }
+
+    /**
+     * @param mixed $namespaces
+     * @return Zend_Filter_Input
+     * @deprecated since 1.5.0RC1 - use addFilterPrefixPath() or addValidatorPrefixPath instead.
+     */
+    public function addNamespace($namespaces)
+    {
+        if (!is_array($namespaces)) {
+            $namespaces = array($namespaces);
+        }
+
+        foreach ($namespaces as $namespace) {
+            $prefix = $namespace;
+            $path = str_replace('_', DIRECTORY_SEPARATOR, $prefix);
+            $this->addFilterPrefixPath($prefix, $path);
+            $this->addValidatorPrefixPath($prefix, $path);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add prefix path for all elements
+     *
+     * @param  string $prefix
+     * @param  string $path
+     * @return Zend_Filter_Input
+     */
+    public function addFilterPrefixPath($prefix, $path)
+    {
+        $this->getPluginLoader(self::FILTER)->addPrefixPath($prefix, $path);
+
+        return $this;
+    }
+
+    /**
+     * Add prefix path for all elements
+     *
+     * @param  string $prefix
+     * @param  string $path
+     * @return Zend_Filter_Input
+     */
+    public function addValidatorPrefixPath($prefix, $path)
+    {
+        $this->getPluginLoader(self::VALIDATE)->addPrefixPath($prefix, $path);
+
+        return $this;
+    }
+
+    /**
+     * Set plugin loaders for use with decorators and elements
+     *
+     * @param  Zend_Loader_PluginLoader_Interface $loader
+     * @param  string $type 'filter' or 'validate'
+     * @return Zend_Filter_Input
+     * @throws Zend_Filter_Exception on invalid type
+     */
+    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type)
+    {
+        $type = strtolower($type);
+        switch ($type) {
+            case self::FILTER:
+            case self::VALIDATE:
+                $this->_loaders[$type] = $loader;
+                return $this;
+            default:
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve plugin loader for given type
+     *
+     * $type may be one of:
+     * - filter
+     * - validator
+     *
+     * If a plugin loader does not exist for the given type, defaults are
+     * created.
+     *
+     * @param  string $type 'filter' or 'validate'
+     * @return Zend_Loader_PluginLoader_Interface
+     * @throws Zend_Filter_Exception on invalid type
+     */
+    public function getPluginLoader($type)
+    {
+        $type = strtolower($type);
+        if (!isset($this->_loaders[$type])) {
+            switch ($type) {
+                case self::FILTER:
+                    $prefixSegment = 'Zend_Filter_';
+                    $pathSegment   = 'Zend/Filter/';
+                    break;
+                case self::VALIDATE:
+                    $prefixSegment = 'Zend_Validate_';
+                    $pathSegment   = 'Zend/Validate/';
+                    break;
+                default:
+                    require_once 'Zend/Filter/Exception.php';
+                    throw new Zend_Filter_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
+            }
+
+            require_once 'Zend/Loader/PluginLoader.php';
+            $this->_loaders[$type] = new Zend_Loader_PluginLoader(
+                array($prefixSegment => $pathSegment)
+            );
+        }
+
+        return $this->_loaders[$type];
+    }
+
+    /**
+     * @return array
+     */
+    public function getMessages()
+    {
+        $this->_process();
+        return array_merge($this->_invalidMessages, $this->_missingFields);
+    }
+
+    /**
+     * @return array
+     */
+    public function getErrors()
+    {
+        $this->_process();
+        return $this->_invalidErrors;
+    }
+
+    /**
+     * @return array
+     */
+    public function getInvalid()
+    {
+        $this->_process();
+        return $this->_invalidMessages;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMissing()
+    {
+        $this->_process();
+        return $this->_missingFields;
+    }
+
+    /**
+     * @return array
+     */
+    public function getUnknown()
+    {
+        $this->_process();
+        return $this->_unknownFields;
+    }
+
+    /**
+     * @param string $fieldName OPTIONAL
+     * @return mixed
+     */
+    public function getEscaped($fieldName = null)
+    {
+        $this->_process();
+        $this->_getDefaultEscapeFilter();
+
+        if ($fieldName === null) {
+            return $this->_escapeRecursive($this->_validFields);
+        }
+        if (array_key_exists($fieldName, $this->_validFields)) {
+            return $this->_escapeRecursive($this->_validFields[$fieldName]);
+        }
+        return null;
+    }
+
+    /**
+     * @param mixed $value
+     * @return mixed
+     */
+    protected function _escapeRecursive($data)
+    {
+        if($data === null) {
+            return $data;
+        }
+
+        if (!is_array($data)) {
+            return $this->_getDefaultEscapeFilter()->filter($data);
+        }
+        foreach ($data as &$element) {
+            $element = $this->_escapeRecursive($element);
+        }
+        return $data;
+    }
+
+    /**
+     * @param string $fieldName OPTIONAL
+     * @return mixed
+     */
+    public function getUnescaped($fieldName = null)
+    {
+        $this->_process();
+        if ($fieldName === null) {
+            return $this->_validFields;
+        }
+        if (array_key_exists($fieldName, $this->_validFields)) {
+            return $this->_validFields[$fieldName];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $fieldName
+     * @return mixed
+     */
+    public function __get($fieldName)
+    {
+        return $this->getEscaped($fieldName);
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasInvalid()
+    {
+        $this->_process();
+        return !(empty($this->_invalidMessages));
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasMissing()
+    {
+        $this->_process();
+        return !(empty($this->_missingFields));
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasUnknown()
+    {
+        $this->_process();
+        return !(empty($this->_unknownFields));
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasValid()
+    {
+        $this->_process();
+        return !(empty($this->_validFields));
+    }
+
+    /**
+     * @param string $fieldName
+     * @return boolean
+     */
+    public function isValid($fieldName = null)
+    {
+        $this->_process();
+        if ($fieldName === null) {
+            return !($this->hasMissing() || $this->hasInvalid());
+        }
+        return array_key_exists($fieldName, $this->_validFields);
+    }
+
+    /**
+     * @param string $fieldName
+     * @return boolean
+     */
+    public function __isset($fieldName)
+    {
+        $this->_process();
+        return isset($this->_validFields[$fieldName]);
+    }
+
+    /**
+     * @return Zend_Filter_Input
+     * @throws Zend_Filter_Exception
+     */
+    public function process()
+    {
+        $this->_process();
+        if ($this->hasInvalid()) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Input has invalid fields");
+        }
+        if ($this->hasMissing()) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Input has missing fields");
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param array $data
+     * @return Zend_Filter_Input
+     */
+    public function setData(array $data)
+    {
+        $this->_data = $data;
+
+        /**
+         * Reset to initial state
+         */
+        $this->_validFields = array();
+        $this->_invalidMessages = array();
+        $this->_invalidErrors = array();
+        $this->_missingFields = array();
+        $this->_unknownFields = array();
+
+        $this->_processed = false;
+
+        return $this;
+    }
+
+    /**
+     * @param mixed $escapeFilter
+     * @return Zend_Filter_Interface
+     */
+    public function setDefaultEscapeFilter($escapeFilter)
+    {
+        if (is_string($escapeFilter) || is_array($escapeFilter)) {
+            $escapeFilter = $this->_getFilter($escapeFilter);
+        }
+        if (!$escapeFilter instanceof Zend_Filter_Interface) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Escape filter specified does not implement Zend_Filter_Interface');
+        }
+        $this->_defaultEscapeFilter = $escapeFilter;
+        return $escapeFilter;
+    }
+
+    /**
+     * @param array $options
+     * @return Zend_Filter_Input
+     * @throws Zend_Filter_Exception if an unknown option is given
+     */
+    public function setOptions(array $options)
+    {
+        foreach ($options as $option => $value) {
+            switch ($option) {
+                case self::ESCAPE_FILTER:
+                    $this->setDefaultEscapeFilter($value);
+                    break;
+                case self::INPUT_NAMESPACE:
+                    $this->addNamespace($value);
+                    break;
+                case self::VALIDATOR_NAMESPACE:
+                    if(is_string($value)) {
+                        $value = array($value);
+                    }
+
+                    foreach($value AS $prefix) {
+                        $this->addValidatorPrefixPath(
+                                $prefix,
+                                str_replace('_', DIRECTORY_SEPARATOR, $prefix)
+                        );
+                    }
+                    break;
+                case self::FILTER_NAMESPACE:
+                    if(is_string($value)) {
+                        $value = array($value);
+                    }
+
+                    foreach($value AS $prefix) {
+                        $this->addFilterPrefixPath(
+                                $prefix,
+                                str_replace('_', DIRECTORY_SEPARATOR, $prefix)
+                        );
+                    }
+                    break;
+                case self::ALLOW_EMPTY:
+                case self::BREAK_CHAIN:
+                case self::MISSING_MESSAGE:
+                case self::NOT_EMPTY_MESSAGE:
+                case self::PRESENCE:
+                    $this->_defaults[$option] = $value;
+                    break;
+                default:
+                    require_once 'Zend/Filter/Exception.php';
+                    throw new Zend_Filter_Exception("Unknown option '$option'");
+                    break;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set translation object
+     *
+     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
+     * @return Zend_Filter_Input
+     */
+    public function setTranslator($translator = null)
+    {
+        if ((null === $translator) || ($translator instanceof Zend_Translate_Adapter)) {
+            $this->_translator = $translator;
+        } elseif ($translator instanceof Zend_Translate) {
+            $this->_translator = $translator->getAdapter();
+        } else {
+            require_once 'Zend/Validate/Exception.php';
+            throw new Zend_Validate_Exception('Invalid translator specified');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return translation object
+     *
+     * @return Zend_Translate_Adapter|null
+     */
+    public function getTranslator()
+    {
+        if ($this->translatorIsDisabled()) {
+            return null;
+        }
+
+        if ($this->_translator === null) {
+            require_once 'Zend/Registry.php';
+            if (Zend_Registry::isRegistered('Zend_Translate')) {
+                $translator = Zend_Registry::get('Zend_Translate');
+                if ($translator instanceof Zend_Translate_Adapter) {
+                    return $translator;
+                } elseif ($translator instanceof Zend_Translate) {
+                    return $translator->getAdapter();
+                }
+            }
+        }
+
+        return $this->_translator;
+    }
+
+    /**
+     * Indicate whether or not translation should be disabled
+     *
+     * @param  bool $flag
+     * @return Zend_Filter_Input
+     */
+    public function setDisableTranslator($flag)
+    {
+        $this->_translatorDisabled = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Is translation disabled?
+     *
+     * @return bool
+     */
+    public function translatorIsDisabled()
+    {
+        return $this->_translatorDisabled;
+    }
+
+    /*
+     * Protected methods
+     */
+
+    /**
+     * @return void
+     */
+    protected function _filter()
+    {
+        foreach ($this->_filterRules as $ruleName => &$filterRule) {
+            /**
+             * Make sure we have an array representing this filter chain.
+             * Don't typecast to (array) because it might be a Zend_Filter object
+             */
+            if (!is_array($filterRule)) {
+                $filterRule = array($filterRule);
+            }
+
+            /**
+             * Filters are indexed by integer, metacommands are indexed by string.
+             * Pick out the filters.
+             */
+            $filterList = array();
+            foreach ($filterRule as $key => $value) {
+                if (is_int($key)) {
+                    $filterList[] = $value;
+                }
+            }
+
+            /**
+             * Use defaults for filter metacommands.
+             */
+            $filterRule[self::RULE] = $ruleName;
+            if (!isset($filterRule[self::FIELDS])) {
+                $filterRule[self::FIELDS] = $ruleName;
+            }
+
+            /**
+             * Load all the filter classes and add them to the chain.
+             */
+            if (!isset($filterRule[self::FILTER_CHAIN])) {
+                $filterRule[self::FILTER_CHAIN] = new Zend_Filter();
+                foreach ($filterList as $filter) {
+                    if (is_string($filter) || is_array($filter)) {
+                        $filter = $this->_getFilter($filter);
+                    }
+                    $filterRule[self::FILTER_CHAIN]->addFilter($filter);
+                }
+            }
+
+            /**
+             * If the ruleName is the special wildcard rule,
+             * then apply the filter chain to all input data.
+             * Else just process the field named by the rule.
+             */
+            if ($ruleName == self::RULE_WILDCARD) {
+                foreach (array_keys($this->_data) as $field)  {
+                    $this->_filterRule(array_merge($filterRule, array(self::FIELDS => $field)));
+                }
+            } else {
+                $this->_filterRule($filterRule);
+            }
+        }
+    }
+
+    /**
+     * @param array $filterRule
+     * @return void
+     */
+    protected function _filterRule(array $filterRule)
+    {
+        $field = $filterRule[self::FIELDS];
+        if (!array_key_exists($field, $this->_data)) {
+            return;
+        }
+        if (is_array($this->_data[$field])) {
+            foreach ($this->_data[$field] as $key => $value) {
+                $this->_data[$field][$key] = $filterRule[self::FILTER_CHAIN]->filter($value);
+            }
+        } else {
+            $this->_data[$field] =
+                $filterRule[self::FILTER_CHAIN]->filter($this->_data[$field]);
+        }
+    }
+
+    /**
+     * @return Zend_Filter_Interface
+     */
+    protected function _getDefaultEscapeFilter()
+    {
+        if ($this->_defaultEscapeFilter !== null) {
+            return $this->_defaultEscapeFilter;
+        }
+        return $this->setDefaultEscapeFilter($this->_defaults[self::ESCAPE_FILTER]);
+    }
+
+    /**
+     * @param string $rule
+     * @param string $field
+     * @return string
+     */
+    protected function _getMissingMessage($rule, $field)
+    {
+        $message = $this->_defaults[self::MISSING_MESSAGE];
+
+        if (null !== ($translator = $this->getTranslator())) {
+            if ($translator->isTranslated(self::MISSING_MESSAGE)) {
+                $message = $translator->translate(self::MISSING_MESSAGE);
+            } else {
+                $message = $translator->translate($message);
+            }
+        }
+
+        $message = str_replace('%rule%', $rule, $message);
+        $message = str_replace('%field%', $field, $message);
+        return $message;
+    }
+
+    /**
+     * @return string
+     */
+    protected function _getNotEmptyMessage($rule, $field)
+    {
+        $message = $this->_defaults[self::NOT_EMPTY_MESSAGE];
+
+        if (null !== ($translator = $this->getTranslator())) {
+            if ($translator->isTranslated(self::NOT_EMPTY_MESSAGE)) {
+                $message = $translator->translate(self::NOT_EMPTY_MESSAGE);
+            } else {
+                $message = $translator->translate($message);
+            }
+        }
+
+        $message = str_replace('%rule%', $rule, $message);
+        $message = str_replace('%field%', $field, $message);
+        return $message;
+    }
+
+    /**
+     * @return void
+     */
+    protected function _process()
+    {
+        if ($this->_processed === false) {
+            $this->_filter();
+            $this->_validate();
+            $this->_processed = true;
+        }
+    }
+
+    /**
+     * @return void
+     */
+    protected function _validate()
+    {
+        /**
+         * Special case: if there are no validators, treat all fields as valid.
+         */
+        if (!$this->_validatorRules) {
+            $this->_validFields = $this->_data;
+            $this->_data = array();
+            return;
+        }
+        
+        // remember the default not empty message in case we want to temporarily change it        
+        $preserveDefaultNotEmptyMessage = $this->_defaults[self::NOT_EMPTY_MESSAGE];
+
+        foreach ($this->_validatorRules as $ruleName => &$validatorRule) {
+            /**
+             * Make sure we have an array representing this validator chain.
+             * Don't typecast to (array) because it might be a Zend_Validate object
+             */
+            if (!is_array($validatorRule)) {
+                $validatorRule = array($validatorRule);
+            }
+
+            /**
+             * Validators are indexed by integer, metacommands are indexed by string.
+             * Pick out the validators.
+             */
+            $validatorList = array();
+            foreach ($validatorRule as $key => $value) {
+                if (is_int($key)) {
+                    $validatorList[$key] = $value;
+                }
+            }
+
+            /**
+             * Use defaults for validation metacommands.
+             */
+            $validatorRule[self::RULE] = $ruleName;
+            if (!isset($validatorRule[self::FIELDS])) {
+                $validatorRule[self::FIELDS] = $ruleName;
+            }
+            if (!isset($validatorRule[self::BREAK_CHAIN])) {
+                $validatorRule[self::BREAK_CHAIN] = $this->_defaults[self::BREAK_CHAIN];
+            }
+            if (!isset($validatorRule[self::PRESENCE])) {
+                $validatorRule[self::PRESENCE] = $this->_defaults[self::PRESENCE];
+            }
+            if (!isset($validatorRule[self::ALLOW_EMPTY])) {
+                $foundNotEmptyValidator = false;
+                
+                foreach ($validatorRule as $rule) {
+                    if ($rule === 'NotEmpty') {
+                        $foundNotEmptyValidator = true;
+                        // field may not be empty, we are ready
+                        break 1;
+                    }
+                    
+                    if (is_array($rule)) {
+                        $keys      = array_keys($rule);
+                        $classKey  = array_shift($keys);
+                        if (isset($rule[$classKey])) {
+                            $ruleClass = $rule[$classKey];
+                            if ($ruleClass === 'NotEmpty') {
+                                $foundNotEmptyValidator = true;
+                                // field may not be empty, we are ready
+                                break 1;
+                            }
+                        }
+                    }
+
+                    // we must check if it is an object before using instanceof
+                    if (!is_object($rule)) {
+                        // it cannot be a NotEmpty validator, skip this one
+                        continue;
+                    }
+                    
+                    if($rule instanceof Zend_Validate_NotEmpty) {
+                        $foundNotEmptyValidator = true;
+                        // field may not be empty, we are ready
+                        break 1;
+                    }
+                }
+                
+                if (!$foundNotEmptyValidator) {
+                    $validatorRule[self::ALLOW_EMPTY] = $this->_defaults[self::ALLOW_EMPTY];
+                } else {
+                    $validatorRule[self::ALLOW_EMPTY] = false;
+                }
+            }
+
+            if (!isset($validatorRule[self::MESSAGES])) {
+                $validatorRule[self::MESSAGES] = array();
+            } else if (!is_array($validatorRule[self::MESSAGES])) {
+                $validatorRule[self::MESSAGES] = array($validatorRule[self::MESSAGES]);
+            } else if (array_intersect_key($validatorList, $validatorRule[self::MESSAGES])) {
+                // this seems pointless... it just re-adds what it already has...
+                // I can disable all this and not a single unit test fails...
+                // There are now corresponding numeric keys in the validation rule messages array
+                // Treat it as a named messages list for all rule validators
+                $unifiedMessages = $validatorRule[self::MESSAGES];
+                $validatorRule[self::MESSAGES] = array();
+
+                foreach ($validatorList as $key => $validator) {
+                    if (array_key_exists($key, $unifiedMessages)) {
+                        $validatorRule[self::MESSAGES][$key] = $unifiedMessages[$key];
+                    }
+                }
+            }
+
+            /**
+             * Load all the validator classes and add them to the chain.
+             */
+            if (!isset($validatorRule[self::VALIDATOR_CHAIN])) {
+                $validatorRule[self::VALIDATOR_CHAIN] = new Zend_Validate();
+
+                foreach ($validatorList as $key => $validator) {
+                    if (is_string($validator) || is_array($validator)) {
+                        $validator = $this->_getValidator($validator);
+                    }
+
+                    if (isset($validatorRule[self::MESSAGES][$key])) {
+                        $value = $validatorRule[self::MESSAGES][$key];
+                        if (is_array($value)) {
+                            $validator->setMessages($value);
+                        } else {
+                            $validator->setMessage($value);
+                        }
+
+                        if ($validator instanceof Zend_Validate_NotEmpty) {
+                            /** we are changing the defaults here, this is alright if all subsequent validators are also a not empty
+                            * validator, but it goes wrong if one of them is not AND is required!!!
+                            * that is why we restore the default value at the end of this loop
+                            */ 
+                            if (is_array($value)) {
+                                $temp = $value; // keep the original value
+                                $this->_defaults[self::NOT_EMPTY_MESSAGE] = array_pop($temp);
+                                unset($temp);
+                            } else {
+                                $this->_defaults[self::NOT_EMPTY_MESSAGE] = $value;
+                            }
+                        }
+                    }
+
+                    $validatorRule[self::VALIDATOR_CHAIN]->addValidator($validator, $validatorRule[self::BREAK_CHAIN]);
+                }
+                $validatorRule[self::VALIDATOR_CHAIN_COUNT] = count($validatorList);
+            }
+
+            /**
+             * If the ruleName is the special wildcard rule,
+             * then apply the validator chain to all input data.
+             * Else just process the field named by the rule.
+             */
+            if ($ruleName == self::RULE_WILDCARD) {
+                foreach (array_keys($this->_data) as $field)  {
+                    $this->_validateRule(array_merge($validatorRule, array(self::FIELDS => $field)));
+                }
+            } else {
+                $this->_validateRule($validatorRule);
+            }
+            
+            // reset the default not empty message
+            $this->_defaults[self::NOT_EMPTY_MESSAGE] = $preserveDefaultNotEmptyMessage;
+        }
+        
+
+
+        /**
+         * Unset fields in $_data that have been added to other arrays.
+         * We have to wait until all rules have been processed because
+         * a given field may be referenced by multiple rules.
+         */
+        foreach (array_merge(array_keys($this->_missingFields), array_keys($this->_invalidMessages)) as $rule) {
+            foreach ((array) $this->_validatorRules[$rule][self::FIELDS] as $field) {
+                unset($this->_data[$field]);
+            }
+        }
+        foreach ($this->_validFields as $field => $value) {
+            unset($this->_data[$field]);
+        }
+
+        /**
+         * Anything left over in $_data is an unknown field.
+         */
+        $this->_unknownFields = $this->_data;
+    }
+
+    /**
+     * @param array $validatorRule
+     * @return void
+     */
+    protected function _validateRule(array $validatorRule)
+    {
+        /**
+         * Get one or more data values from input, and check for missing fields.
+         * Apply defaults if fields are missing.
+         */
+        $data = array();
+        foreach ((array) $validatorRule[self::FIELDS] as $key => $field) {
+            if (array_key_exists($field, $this->_data)) {
+                $data[$field] = $this->_data[$field];
+            } else if (isset($validatorRule[self::DEFAULT_VALUE])) {
+                /** @todo according to this code default value can't be an array. It has to be reviewed */
+                if (!is_array($validatorRule[self::DEFAULT_VALUE])) {
+                    // Default value is a scalar
+                    $data[$field] = $validatorRule[self::DEFAULT_VALUE];
+                } else {
+                    // Default value is an array. Search for corresponding key
+                    if (isset($validatorRule[self::DEFAULT_VALUE][$key])) {
+                        $data[$field] = $validatorRule[self::DEFAULT_VALUE][$key];
+                    } else if ($validatorRule[self::PRESENCE] == self::PRESENCE_REQUIRED) {
+                        // Default value array is provided, but it doesn't have an entry for current field
+                        // and presence is required
+                        $this->_missingFields[$validatorRule[self::RULE]][] =
+                           $this->_getMissingMessage($validatorRule[self::RULE], $field);
+                    }
+                }
+            } else if ($validatorRule[self::PRESENCE] == self::PRESENCE_REQUIRED) {
+                $this->_missingFields[$validatorRule[self::RULE]][] =
+                    $this->_getMissingMessage($validatorRule[self::RULE], $field);
+            }
+        }
+
+        /**
+         * If any required fields are missing, break the loop.
+         */
+        if (isset($this->_missingFields[$validatorRule[self::RULE]]) && count($this->_missingFields[$validatorRule[self::RULE]]) > 0) {
+            return;
+        }
+
+        /**
+         * Evaluate the inputs against the validator chain.
+         */
+        if (count((array) $validatorRule[self::FIELDS]) > 1) {
+            if (!$validatorRule[self::ALLOW_EMPTY]) {
+                $emptyFieldsFound = false;
+                $errorsList       = array();
+                $messages         = array();
+
+                foreach ($data as $fieldKey => $field) {
+                    // if there is no Zend_Validate_NotEmpty instance in the rules, we will use the default
+                    if (!($notEmptyValidator = $this->_getNotEmptyValidatorInstance($validatorRule))) {
+                        $notEmptyValidator = $this->_getValidator('NotEmpty');
+                        $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldKey));
+                    }            
+                            
+                    if (!$notEmptyValidator->isValid($field)) {
+                        foreach ($notEmptyValidator->getMessages() as $messageKey => $message) {
+                            if (!isset($messages[$messageKey])) {
+                                $messages[$messageKey] = $message;
+                            } else {
+                                $messages[] = $message;
+                            }
+                        }
+                        $errorsList[] = $notEmptyValidator->getErrors();
+                        $emptyFieldsFound = true;
+                    }
+                }
+
+                if ($emptyFieldsFound) {
+                    $this->_invalidMessages[$validatorRule[self::RULE]] = $messages;
+                    $this->_invalidErrors[$validatorRule[self::RULE]]   = array_unique(call_user_func_array('array_merge', $errorsList));
+                    return;
+                }
+            }
+
+            if (!$validatorRule[self::VALIDATOR_CHAIN]->isValid($data)) {
+                $this->_invalidMessages[$validatorRule[self::RULE]] = $validatorRule[self::VALIDATOR_CHAIN]->getMessages();
+                $this->_invalidErrors[$validatorRule[self::RULE]] = $validatorRule[self::VALIDATOR_CHAIN]->getErrors();
+                return;
+            }
+        } else if (count($data) > 0) {
+            // $data is actually a one element array
+            $fieldNames = array_keys($data);
+            $fieldName = reset($fieldNames);
+            $field     = reset($data);
+
+            $failed = false;
+            if (!is_array($field)) {
+                $field = array($field);
+            }
+
+            // if there is no Zend_Validate_NotEmpty instance in the rules, we will use the default
+            if (!($notEmptyValidator = $this->_getNotEmptyValidatorInstance($validatorRule))) {
+                $notEmptyValidator = $this->_getValidator('NotEmpty');
+                $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldName));
+            }
+            
+            if ($validatorRule[self::ALLOW_EMPTY]) {
+                $validatorChain = $validatorRule[self::VALIDATOR_CHAIN];
+            } else {
+                $validatorChain = new Zend_Validate();
+                $validatorChain->addValidator($notEmptyValidator, true /* Always break on failure */);
+                $validatorChain->addValidator($validatorRule[self::VALIDATOR_CHAIN]);
+            }
+
+            foreach ($field as $key => $value) {
+                if ($validatorRule[self::ALLOW_EMPTY]  &&  !$notEmptyValidator->isValid($value)) {
+                    // Field is empty AND it's allowed. Do nothing.
+                    continue;
+                }
+
+                if (!$validatorChain->isValid($value)) {
+                    if (isset($this->_invalidMessages[$validatorRule[self::RULE]])) {
+                        $collectedMessages = $this->_invalidMessages[$validatorRule[self::RULE]];
+                    } else {
+                        $collectedMessages = array();
+                    }
+
+                    foreach ($validatorChain->getMessages() as $messageKey => $message) {
+                        if (!isset($collectedMessages[$messageKey])) {
+                            $collectedMessages[$messageKey] = $message;
+                        } else {
+                            $collectedMessages[] = $message;
+                        }
+                    }
+
+                    $this->_invalidMessages[$validatorRule[self::RULE]] = $collectedMessages;
+                    if (isset($this->_invalidErrors[$validatorRule[self::RULE]])) {
+                        $this->_invalidErrors[$validatorRule[self::RULE]] = array_merge($this->_invalidErrors[$validatorRule[self::RULE]],
+                                                                                        $validatorChain->getErrors());
+                    } else {
+                        $this->_invalidErrors[$validatorRule[self::RULE]] = $validatorChain->getErrors();
+                    }
+                    unset($this->_validFields[$fieldName]);
+                    $failed = true;
+                    if ($validatorRule[self::BREAK_CHAIN]) {
+                        return;
+                    }
+                }
+            }
+            if ($failed) {
+                return;
+            }
+        }
+
+        /**
+         * If we got this far, the inputs for this rule pass validation.
+         */
+        foreach ((array) $validatorRule[self::FIELDS] as $field) {
+            if (array_key_exists($field, $data)) {
+                $this->_validFields[$field] = $data[$field];
+            }
+        }
+    }
+    
+    /**
+     * Check a validatorRule for the presence of a NotEmpty validator instance.
+     * The purpose is to preserve things like a custom message, that may have been 
+     * set on the validator outside Zend_Filter_Input.
+     * @param array $validatorRule
+     * @return mixed false if none is found, Zend_Validate_NotEmpty instance if found
+     */
+    protected function _getNotEmptyValidatorInstance($validatorRule) {
+        foreach ($validatorRule as $rule => $value) {
+            if (is_object($value) and $value instanceof Zend_Validate_NotEmpty) {
+                return $value;
+            }
+        }
+        
+        return false;
+    }
+
+    /**
+     * @param mixed $classBaseName
+     * @return Zend_Filter_Interface
+     */
+    protected function _getFilter($classBaseName)
+    {
+        return $this->_getFilterOrValidator(self::FILTER, $classBaseName);
+    }
+
+    /**
+     * @param mixed $classBaseName
+     * @return Zend_Validate_Interface
+     */
+    protected function _getValidator($classBaseName)
+    {
+        return $this->_getFilterOrValidator(self::VALIDATE, $classBaseName);
+    }
+
+    /**
+     * @param string $type
+     * @param mixed $classBaseName
+     * @return Zend_Filter_Interface|Zend_Validate_Interface
+     * @throws Zend_Filter_Exception
+     */
+    protected function _getFilterOrValidator($type, $classBaseName)
+    {
+        $args = array();
+
+        if (is_array($classBaseName)) {
+            $args = $classBaseName;
+            $classBaseName = array_shift($args);
+        }
+
+        $interfaceName = 'Zend_' . ucfirst($type) . '_Interface';
+        $className = $this->getPluginLoader($type)->load(ucfirst($classBaseName));
+
+        $class = new ReflectionClass($className);
+
+        if (!$class->implementsInterface($interfaceName)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception("Class '$className' based on basename '$classBaseName' must implement the '$interfaceName' interface");
+        }
+
+        if ($class->hasMethod('__construct')) {
+            $object = $class->newInstanceArgs($args);
+        } else {
+            $object = $class->newInstance();
+        }
+
+        return $object;
+    }
+
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php b/lib/zend/Zend/Filter/Int.php
similarity index 57%
rename from lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php
rename to lib/zend/Zend/Filter/Int.php
index b7fff44f88e..ee20702559e 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php
+++ b/lib/zend/Zend/Filter/Int.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Zend Framework
  *
@@ -13,27 +14,37 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+
 /**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
+ * @see Zend_Filter_Interface
  */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
+require_once 'Zend/Filter/Interface.php';
+
 
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Request_SmsValidation_GetValidatedNumbers
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
+class Zend_Filter_Int implements Zend_Filter_Interface
 {
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns (int) $value
+     *
+     * @param  string $value
+     * @return integer
+     */
+    public function filter($value)
+    {
+        return (int) ((string) $value);
+    }
 }
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php b/lib/zend/Zend/Filter/Interface.php
similarity index 62%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php
rename to lib/zend/Zend/Filter/Interface.php
index b1c25319767..3d9e65a3f6b 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php
+++ b/lib/zend/Zend/Filter/Interface.php
@@ -14,27 +14,27 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
+interface Zend_Filter_Interface
 {
     /**
-     * returns true if the stored token data is valid
+     * Returns the result of filtering $value
      *
-     * @return boolean
+     * @param  mixed $value
+     * @throws Zend_Filter_Exception If filtering $value is impossible
+     * @return mixed
      */
-    public function isValid();
+    public function filter($value);
 }
diff --git a/lib/zend/Zend/Filter/LocalizedToNormalized.php b/lib/zend/Zend/Filter/LocalizedToNormalized.php
new file mode 100644
index 00000000000..8e833215424
--- /dev/null
+++ b/lib/zend/Zend/Filter/LocalizedToNormalized.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @see Zend_Loader
+ */
+require_once 'Zend/Locale/Format.php';
+
+/**
+ * Normalizes given localized input
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_LocalizedToNormalized implements Zend_Filter_Interface
+{
+    /**
+     * Set options
+     * @var array
+     */
+    protected $_options = array(
+        'locale'      => null,
+        'date_format' => null,
+        'precision'   => null
+    );
+
+    /**
+     * Class constructor
+     *
+     * @param string|Zend_Locale $locale (Optional) Locale to set
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+
+        if (null !== $options) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * Returns the set options
+     *
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->_options;
+    }
+
+    /**
+     * Sets options to use
+     *
+     * @param  array $options (Optional) Options to use
+     * @return Zend_Filter_LocalizedToNormalized
+     */
+    public function setOptions(array $options = null)
+    {
+        $this->_options = $options + $this->_options;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Normalizes the given input
+     *
+     * @param  string $value Value to normalized
+     * @return string|array The normalized value
+     */
+    public function filter($value)
+    {
+        if (Zend_Locale_Format::isNumber($value, $this->_options)) {
+            return Zend_Locale_Format::getNumber($value, $this->_options);
+        } else if (($this->_options['date_format'] === null) && (strpos($value, ':') !== false)) {
+            // Special case, no date format specified, detect time input
+            return Zend_Locale_Format::getTime($value, $this->_options);
+        } else if (Zend_Locale_Format::checkDateFormat($value, $this->_options)) {
+            // Detect date or time input
+            return Zend_Locale_Format::getDate($value, $this->_options);
+        }
+
+        return $value;
+    }
+}
diff --git a/lib/zend/Zend/Filter/NormalizedToLocalized.php b/lib/zend/Zend/Filter/NormalizedToLocalized.php
new file mode 100644
index 00000000000..60dbb9e0657
--- /dev/null
+++ b/lib/zend/Zend/Filter/NormalizedToLocalized.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @see Zend_Loader
+ */
+require_once 'Zend/Locale/Format.php';
+
+/**
+ * Localizes given normalized input
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_NormalizedToLocalized implements Zend_Filter_Interface
+{
+    /**
+     * Set options
+     */
+    protected $_options = array(
+        'locale'      => null,
+        'date_format' => null,
+        'precision'   => null
+    );
+
+    /**
+     * Class constructor
+     *
+     * @param string|Zend_Locale $locale (Optional) Locale to set
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+
+        if (null !== $options) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * Returns the set options
+     *
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->_options;
+    }
+
+    /**
+     * Sets options to use
+     *
+     * @param  array $options (Optional) Options to use
+     * @return Zend_Filter_LocalizedToNormalized
+     */
+    public function setOptions(array $options = null)
+    {
+        $this->_options = $options + $this->_options;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Normalizes the given input
+     *
+     * @param  string $value Value to normalized
+     * @return string|array The normalized value
+     */
+    public function filter($value)
+    {
+        if (is_array($value)) {
+            require_once 'Zend/Date.php';
+            $date = new Zend_Date($value, $this->_options['locale']);
+            return $date->toString($this->_options['date_format']);
+        } else if ($this->_options['precision'] === 0) {
+            return Zend_Locale_Format::toInteger($value, $this->_options);
+        } else if ($this->_options['precision'] === null) {
+            return Zend_Locale_Format::toFloat($value, $this->_options);
+        }
+
+        return Zend_Locale_Format::toNumber($value, $this->_options);
+    }
+}
diff --git a/lib/zend/Zend/Filter/Null.php b/lib/zend/Zend/Filter/Null.php
new file mode 100644
index 00000000000..c7988004160
--- /dev/null
+++ b/lib/zend/Zend/Filter/Null.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Null implements Zend_Filter_Interface
+{
+    const BOOLEAN      = 1;
+    const INTEGER      = 2;
+    const EMPTY_ARRAY  = 4;
+    const STRING       = 8;
+    const ZERO         = 16;
+    const ALL          = 31;
+
+    protected $_constants = array(
+        self::BOOLEAN     => 'boolean',
+        self::INTEGER     => 'integer',
+        self::EMPTY_ARRAY => 'array',
+        self::STRING      => 'string',
+        self::ZERO        => 'zero',
+        self::ALL         => 'all'
+    );
+
+    /**
+     * Internal type to detect
+     *
+     * @var integer
+     */
+    protected $_type = self::ALL;
+
+    /**
+     * Constructor
+     *
+     * @param string|array|Zend_Config $options OPTIONAL
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if (!is_array($options)) {
+            $options = func_get_args();
+            $temp    = array();
+            if (!empty($options)) {
+                $temp = array_shift($options);
+            }
+            $options = $temp;
+        } else if (is_array($options) && array_key_exists('type', $options)) {
+            $options = $options['type'];
+        }
+
+        if (!empty($options)) {
+            $this->setType($options);
+        }
+    }
+
+    /**
+     * Returns the set null types
+     *
+     * @return array
+     */
+    public function getType()
+    {
+        return $this->_type;
+    }
+
+    /**
+     * Set the null types
+     *
+     * @param  integer|array $type
+     * @throws Zend_Filter_Exception
+     * @return Zend_Filter_Null
+     */
+    public function setType($type = null)
+    {
+        if (is_array($type)) {
+            $detected = 0;
+            foreach($type as $value) {
+                if (is_int($value)) {
+                    $detected += $value;
+                } else if (in_array($value, $this->_constants)) {
+                    $detected += array_search($value, $this->_constants);
+                }
+            }
+
+            $type = $detected;
+        } else if (is_string($type)) {
+            if (in_array($type, $this->_constants)) {
+                $type = array_search($type, $this->_constants);
+            }
+        }
+
+        if (!is_int($type) || ($type < 0) || ($type > self::ALL)) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('Unknown type');
+        }
+
+        $this->_type = $type;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns null representation of $value, if value is empty and matches
+     * types that should be considered null.
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        $type = $this->getType();
+
+        // STRING ZERO ('0')
+        if ($type >= self::ZERO) {
+            $type -= self::ZERO;
+            if (is_string($value) && ($value == '0')) {
+                return null;
+            }
+        }
+
+        // STRING ('')
+        if ($type >= self::STRING) {
+            $type -= self::STRING;
+            if (is_string($value) && ($value == '')) {
+                return null;
+            }
+        }
+
+        // EMPTY_ARRAY (array())
+        if ($type >= self::EMPTY_ARRAY) {
+            $type -= self::EMPTY_ARRAY;
+            if (is_array($value) && ($value == array())) {
+                return null;
+            }
+        }
+
+        // INTEGER (0)
+        if ($type >= self::INTEGER) {
+            $type -= self::INTEGER;
+            if (is_int($value) && ($value == 0)) {
+                return null;
+            }
+        }
+
+        // BOOLEAN (false)
+        if ($type >= self::BOOLEAN) {
+            $type -= self::BOOLEAN;
+            if (is_bool($value) && ($value == false)) {
+                return null;
+            }
+        }
+
+        return $value;
+    }
+}
diff --git a/lib/zend/Zend/Filter/PregReplace.php b/lib/zend/Zend/Filter/PregReplace.php
new file mode 100644
index 00000000000..7100c3717d8
--- /dev/null
+++ b/lib/zend/Zend/Filter/PregReplace.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_PregReplace implements Zend_Filter_Interface
+{
+    /**
+     * Pattern to match
+     * @var mixed
+     */
+    protected $_matchPattern = null;
+
+    /**
+     * Replacement pattern
+     * @var mixed
+     */
+    protected $_replacement = '';
+
+    /**
+     * Is unicode enabled?
+     *
+     * @var bool
+     */
+    static protected $_unicodeSupportEnabled = null;
+
+    /**
+     * Is Unicode Support Enabled Utility function
+     *
+     * @return bool
+     */
+    static public function isUnicodeSupportEnabled()
+    {
+        if (self::$_unicodeSupportEnabled === null) {
+            self::_determineUnicodeSupport();
+        }
+
+        return self::$_unicodeSupportEnabled;
+    }
+
+    /**
+     * Method to cache the regex needed to determine if unicode support is available
+     *
+     * @return bool
+     */
+    static protected function _determineUnicodeSupport()
+    {
+        self::$_unicodeSupportEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
+    }
+
+    /**
+     * Constructor
+     * Supported options are
+     *     'match'   => matching pattern
+     *     'replace' => replace with this
+     *
+     * @param  string|array $options
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if (!is_array($options)) {
+            $options = func_get_args();
+            $temp    = array();
+            if (!empty($options)) {
+                $temp['match'] = array_shift($options);
+            }
+
+            if (!empty($options)) {
+                $temp['replace'] = array_shift($options);
+            }
+
+            $options = $temp;
+        }
+
+        if (array_key_exists('match', $options)) {
+            $this->setMatchPattern($options['match']);
+        }
+
+        if (array_key_exists('replace', $options)) {
+            $this->setReplacement($options['replace']);
+        }
+    }
+
+    /**
+     * Set the match pattern for the regex being called within filter()
+     *
+     * @param mixed $match - same as the first argument of preg_replace
+     * @return Zend_Filter_PregReplace
+     */
+    public function setMatchPattern($match)
+    {
+        $this->_matchPattern = $match;
+        return $this;
+    }
+
+    /**
+     * Get currently set match pattern
+     *
+     * @return string
+     */
+    public function getMatchPattern()
+    {
+        return $this->_matchPattern;
+    }
+
+    /**
+     * Set the Replacement pattern/string for the preg_replace called in filter
+     *
+     * @param mixed $replacement - same as the second argument of preg_replace
+     * @return Zend_Filter_PregReplace
+     */
+    public function setReplacement($replacement)
+    {
+        $this->_replacement = $replacement;
+        return $this;
+    }
+
+    /**
+     * Get currently set replacement value
+     *
+     * @return string
+     */
+    public function getReplacement()
+    {
+        return $this->_replacement;
+    }
+
+    /**
+     * Perform regexp replacement as filter
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        if ($this->_matchPattern == null) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception(get_class($this) . ' does not have a valid MatchPattern set.');
+        }
+
+        return preg_replace($this->_matchPattern, $this->_replacement, $value);
+    }
+
+}
diff --git a/lib/zend/Zend/Filter/RealPath.php b/lib/zend/Zend/Filter/RealPath.php
new file mode 100644
index 00000000000..00881de5f52
--- /dev/null
+++ b/lib/zend/Zend/Filter/RealPath.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_RealPath implements Zend_Filter_Interface
+{
+    /**
+     * @var boolean $_pathExists
+     */
+    protected $_exists = true;
+
+    /**
+     * Class constructor
+     *
+     * @param boolean|Zend_Config $options Options to set
+     */
+    public function __construct($options = true)
+    {
+        $this->setExists($options);
+    }
+
+    /**
+     * Returns true if the filtered path must exist
+     *
+     * @return boolean
+     */
+    public function getExists()
+    {
+        return $this->_exists;
+    }
+
+    /**
+     * Sets if the path has to exist
+     * TRUE when the path must exist
+     * FALSE when not existing paths can be given
+     *
+     * @param boolean|Zend_Config $exists Path must exist
+     * @return Zend_Filter_RealPath
+     */
+    public function setExists($exists)
+    {
+        if ($exists instanceof Zend_Config) {
+            $exists = $exists->toArray();
+        }
+
+        if (is_array($exists)) {
+            if (isset($exists['exists'])) {
+                $exists = (boolean) $exists['exists'];
+            }
+        }
+
+        $this->_exists = (boolean) $exists;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns realpath($value)
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        $path = (string) $value;
+        if ($this->_exists) {
+            return realpath($path);
+        }
+
+        $realpath = @realpath($path);
+        if ($realpath) {
+            return $realpath;
+        }
+
+        $drive = '';
+        if (substr(PHP_OS, 0, 3) == 'WIN') {
+            $path = preg_replace('/[\\\\\/]/', DIRECTORY_SEPARATOR, $path);
+            if (preg_match('/([a-zA-Z]\:)(.*)/', $path, $matches)) {
+                list($fullMatch, $drive, $path) = $matches;
+            } else {
+                $cwd   = getcwd();
+                $drive = substr($cwd, 0, 2);
+                if (substr($path, 0, 1) != DIRECTORY_SEPARATOR) {
+                    $path = substr($cwd, 3) . DIRECTORY_SEPARATOR . $path;
+                }
+            }
+        } elseif (substr($path, 0, 1) != DIRECTORY_SEPARATOR) {
+            $path = getcwd() . DIRECTORY_SEPARATOR . $path;
+        }
+
+        $stack = array();
+        $parts = explode(DIRECTORY_SEPARATOR, $path);
+        foreach ($parts as $dir) {
+            if (strlen($dir) && $dir !== '.') {
+                if ($dir == '..') {
+                    array_pop($stack);
+                } else {
+                    array_push($stack, $dir);
+                }
+            }
+        }
+
+        return $drive . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $stack);
+    }
+}
diff --git a/lib/zend/Zend/Filter/StringToLower.php b/lib/zend/Zend/Filter/StringToLower.php
new file mode 100644
index 00000000000..b208cfe77a1
--- /dev/null
+++ b/lib/zend/Zend/Filter/StringToLower.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_StringToLower implements Zend_Filter_Interface
+{
+    /**
+     * Encoding for the input string
+     *
+     * @var string
+     */
+    protected $_encoding = null;
+
+    /**
+     * Constructor
+     *
+     * @param string|array|Zend_Config $options OPTIONAL
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if (!is_array($options)) {
+            $options = func_get_args();
+            $temp    = array();
+            if (!empty($options)) {
+                $temp['encoding'] = array_shift($options);
+            }
+            $options = $temp;
+        }
+
+        if (!array_key_exists('encoding', $options) && function_exists('mb_internal_encoding')) {
+            $options['encoding'] = mb_internal_encoding();
+        }
+
+        if (array_key_exists('encoding', $options)) {
+            $this->setEncoding($options['encoding']);
+        }
+    }
+
+    /**
+     * Returns the set encoding
+     *
+     * @return string
+     */
+    public function getEncoding()
+    {
+        return $this->_encoding;
+    }
+
+    /**
+     * Set the input encoding for the given string
+     *
+     * @param  string $encoding
+     * @return Zend_Filter_StringToLower Provides a fluent interface
+     * @throws Zend_Filter_Exception
+     */
+    public function setEncoding($encoding = null)
+    {
+        if ($encoding !== null) {
+            if (!function_exists('mb_strtolower')) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception('mbstring is required for this feature');
+            }
+
+            $encoding = (string) $encoding;
+            if (!in_array(strtolower($encoding), array_map('strtolower', mb_list_encodings()))) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception("The given encoding '$encoding' is not supported by mbstring");
+            }
+        }
+
+        $this->_encoding = $encoding;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns the string $value, converting characters to lowercase as necessary
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        if ($this->_encoding !== null) {
+            return mb_strtolower((string) $value, $this->_encoding);
+        }
+
+        return strtolower((string) $value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/StringToUpper.php b/lib/zend/Zend/Filter/StringToUpper.php
new file mode 100644
index 00000000000..8fe362055f2
--- /dev/null
+++ b/lib/zend/Zend/Filter/StringToUpper.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_StringToUpper implements Zend_Filter_Interface
+{
+    /**
+     * Encoding for the input string
+     *
+     * @var string
+     */
+    protected $_encoding = null;
+
+    /**
+     * Constructor
+     *
+     * @param string|array $options OPTIONAL
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if (!is_array($options)) {
+            $options = func_get_args();
+            $temp    = array();
+            if (!empty($options)) {
+                $temp['encoding'] = array_shift($options);
+            }
+            $options = $temp;
+        }
+
+        if (!array_key_exists('encoding', $options) && function_exists('mb_internal_encoding')) {
+            $options['encoding'] = mb_internal_encoding();
+        }
+
+        if (array_key_exists('encoding', $options)) {
+            $this->setEncoding($options['encoding']);
+        }
+    }
+
+    /**
+     * Returns the set encoding
+     *
+     * @return string
+     */
+    public function getEncoding()
+    {
+        return $this->_encoding;
+    }
+
+    /**
+     * Set the input encoding for the given string
+     *
+     * @param  string $encoding
+     * @return Zend_Filter_StringToUpper Provides a fluent interface
+     * @throws Zend_Filter_Exception
+     */
+    public function setEncoding($encoding = null)
+    {
+        if ($encoding !== null) {
+            if (!function_exists('mb_strtoupper')) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception('mbstring is required for this feature');
+            }
+
+            $encoding = (string) $encoding;
+            if (!in_array(strtolower($encoding), array_map('strtolower', mb_list_encodings()))) {
+                require_once 'Zend/Filter/Exception.php';
+                throw new Zend_Filter_Exception("The given encoding '$encoding' is not supported by mbstring");
+            }
+        }
+
+        $this->_encoding = $encoding;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns the string $value, converting characters to uppercase as necessary
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        if ($this->_encoding) {
+            return mb_strtoupper((string) $value, $this->_encoding);
+        }
+
+        return strtoupper((string) $value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/StringTrim.php b/lib/zend/Zend/Filter/StringTrim.php
new file mode 100644
index 00000000000..4f86d89e2c0
--- /dev/null
+++ b/lib/zend/Zend/Filter/StringTrim.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_StringTrim implements Zend_Filter_Interface
+{
+    /**
+     * List of characters provided to the trim() function
+     *
+     * If this is null, then trim() is called with no specific character list,
+     * and its default behavior will be invoked, trimming whitespace.
+     *
+     * @var string|null
+     */
+    protected $_charList;
+
+    /**
+     * Sets filter options
+     *
+     * @param  string|array|Zend_Config $options
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if (!is_array($options)) {
+            $options          = func_get_args();
+            $temp['charlist'] = array_shift($options);
+            $options          = $temp;
+        }
+
+        if (array_key_exists('charlist', $options)) {
+            $this->setCharList($options['charlist']);
+        }
+    }
+
+    /**
+     * Returns the charList option
+     *
+     * @return string|null
+     */
+    public function getCharList()
+    {
+        return $this->_charList;
+    }
+
+    /**
+     * Sets the charList option
+     *
+     * @param  string|null $charList
+     * @return Zend_Filter_StringTrim Provides a fluent interface
+     */
+    public function setCharList($charList)
+    {
+        $this->_charList = $charList;
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns the string $value with characters stripped from the beginning and end
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        if (null === $this->_charList) {
+            return $this->_unicodeTrim((string) $value);
+        } else {
+            return $this->_unicodeTrim((string) $value, $this->_charList);
+        }
+    }
+
+    /**
+     * Unicode aware trim method
+     * Fixes a PHP problem
+     *
+     * @param string $value
+     * @param string $charlist
+     * @return string
+     */
+    protected function _unicodeTrim($value, $charlist = '\\\\s')
+    {
+        $chars = preg_replace(
+            array( '/[\^\-\]\\\]/S', '/\\\{4}/S', '/\//'),
+            array( '\\\\\\0', '\\', '\/' ),
+            $charlist
+        );
+
+        $pattern = '^[' . $chars . ']*|[' . $chars . ']*$';
+        return preg_replace("/$pattern/sSD", '', $value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/StripNewlines.php b/lib/zend/Zend/Filter/StripNewlines.php
new file mode 100644
index 00000000000..667c6aae240
--- /dev/null
+++ b/lib/zend/Zend/Filter/StripNewlines.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_StripNewlines implements Zend_Filter_Interface
+{
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns $value without newline control characters
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter ($value)
+    {
+        return str_replace(array("\n", "\r"), '', $value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/StripTags.php b/lib/zend/Zend/Filter/StripTags.php
new file mode 100644
index 00000000000..e1e1935e60d
--- /dev/null
+++ b/lib/zend/Zend/Filter/StripTags.php
@@ -0,0 +1,352 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Interface.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_StripTags implements Zend_Filter_Interface
+{
+    /**
+     * Unique ID prefix used for allowing comments
+     */
+    const UNIQUE_ID_PREFIX = '__Zend_Filter_StripTags__';
+
+    /**
+     * Whether comments are allowed
+     *
+     * If false (the default), then comments are removed from the input string.
+     *
+     * This setting is now deprecated, and ignored internally.
+     *
+     * @deprecated
+     * @var boolean
+     */
+    public $commentsAllowed = false;
+
+    /**
+     * Array of allowed tags and allowed attributes for each allowed tag
+     *
+     * Tags are stored in the array keys, and the array values are themselves
+     * arrays of the attributes allowed for the corresponding tag.
+     *
+     * @var array
+     */
+    protected $_tagsAllowed = array();
+
+    /**
+     * Array of allowed attributes for all allowed tags
+     *
+     * Attributes stored here are allowed for all of the allowed tags.
+     *
+     * @var array
+     */
+    protected $_attributesAllowed = array();
+
+    /**
+     * Sets the filter options
+     * Allowed options are
+     *     'allowTags'     => Tags which are allowed
+     *     'allowAttribs'  => Attributes which are allowed
+     *     'allowComments' => Are comments allowed ?
+     *
+     * @param  string|array|Zend_Config $options
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if ((!is_array($options)) || (is_array($options) && !array_key_exists('allowTags', $options) &&
+            !array_key_exists('allowAttribs', $options) && !array_key_exists('allowComments', $options))) {
+            $options = func_get_args();
+            $temp['allowTags'] = array_shift($options);
+            if (!empty($options)) {
+                $temp['allowAttribs'] = array_shift($options);
+            }
+
+            if (!empty($options)) {
+                $temp['allowComments'] = array_shift($options);
+            }
+
+            $options = $temp;
+        }
+
+        if (array_key_exists('allowTags', $options)) {
+            $this->setTagsAllowed($options['allowTags']);
+        }
+
+        if (array_key_exists('allowAttribs', $options)) {
+            $this->setAttributesAllowed($options['allowAttribs']);
+        }
+
+        if (array_key_exists('allowComments', $options)) {
+            $this->setCommentsAllowed($options['allowComments']);
+        }
+    }
+
+    /**
+     * Returns the commentsAllowed option
+     *
+     * This setting is now deprecated and ignored internally.
+     *
+     * @deprecated
+     * @return bool
+     */
+    public function getCommentsAllowed()
+    {
+        return $this->commentsAllowed;
+    }
+
+    /**
+     * Sets the commentsAllowed option
+     *
+     * This setting is now deprecated and ignored internally.
+     *
+     * @deprecated
+     * @param  boolean $commentsAllowed
+     * @return Zend_Filter_StripTags Provides a fluent interface
+     */
+    public function setCommentsAllowed($commentsAllowed)
+    {
+       $this->commentsAllowed = (boolean) $commentsAllowed;
+       return $this;
+    }
+
+    /**
+     * Returns the tagsAllowed option
+     *
+     * @return array
+     */
+    public function getTagsAllowed()
+    {
+        return $this->_tagsAllowed;
+    }
+
+    /**
+     * Sets the tagsAllowed option
+     *
+     * @param  array|string $tagsAllowed
+     * @return Zend_Filter_StripTags Provides a fluent interface
+     */
+    public function setTagsAllowed($tagsAllowed)
+    {
+        if (!is_array($tagsAllowed)) {
+            $tagsAllowed = array($tagsAllowed);
+        }
+
+        foreach ($tagsAllowed as $index => $element) {
+            // If the tag was provided without attributes
+            if (is_int($index) && is_string($element)) {
+                // Canonicalize the tag name
+                $tagName = strtolower($element);
+                // Store the tag as allowed with no attributes
+                $this->_tagsAllowed[$tagName] = array();
+            }
+            // Otherwise, if a tag was provided with attributes
+            else if (is_string($index) && (is_array($element) || is_string($element))) {
+                // Canonicalize the tag name
+                $tagName = strtolower($index);
+                // Canonicalize the attributes
+                if (is_string($element)) {
+                    $element = array($element);
+                }
+                // Store the tag as allowed with the provided attributes
+                $this->_tagsAllowed[$tagName] = array();
+                foreach ($element as $attribute) {
+                    if (is_string($attribute)) {
+                        // Canonicalize the attribute name
+                        $attributeName = strtolower($attribute);
+                        $this->_tagsAllowed[$tagName][$attributeName] = null;
+                    }
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the attributesAllowed option
+     *
+     * @return array
+     */
+    public function getAttributesAllowed()
+    {
+        return $this->_attributesAllowed;
+    }
+
+    /**
+     * Sets the attributesAllowed option
+     *
+     * @param  array|string $attributesAllowed
+     * @return Zend_Filter_StripTags Provides a fluent interface
+     */
+    public function setAttributesAllowed($attributesAllowed)
+    {
+        if (!is_array($attributesAllowed)) {
+            $attributesAllowed = array($attributesAllowed);
+        }
+
+        // Store each attribute as allowed
+        foreach ($attributesAllowed as $attribute) {
+            if (is_string($attribute)) {
+                // Canonicalize the attribute name
+                $attributeName = strtolower($attribute);
+                $this->_attributesAllowed[$attributeName] = null;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * @todo improve docblock descriptions
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        $value = (string) $value;
+
+        // Strip HTML comments first
+        while (strpos($value, '<!--') !== false) {
+            $pos   = strrpos($value, '<!--');
+            $start = substr($value, 0, $pos);
+            $value = substr($value, $pos);
+
+            // If there is no comment closing tag, strip whole text
+            if (!preg_match('/--\s*>/s', $value)) {
+                $value = '';
+            } else {
+                $value = preg_replace('/<(?:!(?:--[\s\S]*?--\s*)?(>))/s', '',  $value);
+            }
+
+            $value = $start . $value;
+        }
+
+        // Initialize accumulator for filtered data
+        $dataFiltered = '';
+        // Parse the input data iteratively as regular pre-tag text followed by a
+        // tag; either may be empty strings
+        preg_match_all('/([^<]*)(<?[^>]*>?)/', (string) $value, $matches);
+
+        // Iterate over each set of matches
+        foreach ($matches[1] as $index => $preTag) {
+            // If the pre-tag text is non-empty, strip any ">" characters from it
+            if (strlen($preTag)) {
+                $preTag = str_replace('>', '', $preTag);
+            }
+            // If a tag exists in this match, then filter the tag
+            $tag = $matches[2][$index];
+            if (strlen($tag)) {
+                $tagFiltered = $this->_filterTag($tag);
+            } else {
+                $tagFiltered = '';
+            }
+            // Add the filtered pre-tag text and filtered tag to the data buffer
+            $dataFiltered .= $preTag . $tagFiltered;
+        }
+
+        // Return the filtered data
+        return $dataFiltered;
+    }
+
+    /**
+     * Filters a single tag against the current option settings
+     *
+     * @param  string $tag
+     * @return string
+     */
+    protected function _filterTag($tag)
+    {
+        // Parse the tag into:
+        // 1. a starting delimiter (mandatory)
+        // 2. a tag name (if available)
+        // 3. a string of attributes (if available)
+        // 4. an ending delimiter (if available)
+        $isMatch = preg_match('~(</?)(\w*)((/(?!>)|[^/>])*)(/?>)~', $tag, $matches);
+
+        // If the tag does not match, then strip the tag entirely
+        if (!$isMatch) {
+            return '';
+        }
+
+        // Save the matches to more meaningfully named variables
+        $tagStart      = $matches[1];
+        $tagName       = strtolower($matches[2]);
+        $tagAttributes = $matches[3];
+        $tagEnd        = $matches[5];
+
+        // If the tag is not an allowed tag, then remove the tag entirely
+        if (!isset($this->_tagsAllowed[$tagName])) {
+            return '';
+        }
+
+        // Trim the attribute string of whitespace at the ends
+        $tagAttributes = trim($tagAttributes);
+
+        // If there are non-whitespace characters in the attribute string
+        if (strlen($tagAttributes)) {
+            // Parse iteratively for well-formed attributes
+            preg_match_all('/([\w-]+)\s*=\s*(?:(")(.*?)"|(\')(.*?)\')/s', $tagAttributes, $matches);
+
+            // Initialize valid attribute accumulator
+            $tagAttributes = '';
+
+            // Iterate over each matched attribute
+            foreach ($matches[1] as $index => $attributeName) {
+                $attributeName      = strtolower($attributeName);
+                $attributeDelimiter = empty($matches[2][$index]) ? $matches[4][$index] : $matches[2][$index];
+                $attributeValue     = empty($matches[3][$index]) ? $matches[5][$index] : $matches[3][$index];
+
+                // If the attribute is not allowed, then remove it entirely
+                if (!array_key_exists($attributeName, $this->_tagsAllowed[$tagName])
+                    && !array_key_exists($attributeName, $this->_attributesAllowed)) {
+                    continue;
+                }
+                // Add the attribute to the accumulator
+                $tagAttributes .= " $attributeName=" . $attributeDelimiter
+                                . $attributeValue . $attributeDelimiter;
+            }
+        }
+
+        // Reconstruct tags ending with "/>" as backwards-compatible XHTML tag
+        if (strpos($tagEnd, '/') !== false) {
+            $tagEnd = " $tagEnd";
+        }
+
+        // Return the filtered tag
+        return $tagStart . $tagName . $tagAttributes . $tagEnd;
+    }
+}
diff --git a/lib/zend/Zend/Filter/Word/CamelCaseToDash.php b/lib/zend/Zend/Filter/Word/CamelCaseToDash.php
new file mode 100644
index 00000000000..d77fe4867ef
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/CamelCaseToDash.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Word/CamelCaseToSeparator.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_CamelCaseToDash extends Zend_Filter_Word_CamelCaseToSeparator
+{
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct('-');
+    }
+}
diff --git a/lib/zend/Zend/Filter/Word/CamelCaseToSeparator.php b/lib/zend/Zend/Filter/Word/CamelCaseToSeparator.php
new file mode 100644
index 00000000000..bea4b6612cd
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/CamelCaseToSeparator.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_PregReplace
+ */
+require_once 'Zend/Filter/Word/Separator/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_CamelCaseToSeparator extends Zend_Filter_Word_Separator_Abstract
+{
+
+    public function filter($value)
+    {
+        if (self::isUnicodeSupportEnabled()) {
+            parent::setMatchPattern(array('#(?<=(?:\p{Lu}))(\p{Lu}\p{Ll})#','#(?<=(?:\p{Ll}|\p{Nd}))(\p{Lu})#'));
+            parent::setReplacement(array($this->_separator . '\1', $this->_separator . '\1'));
+        } else {
+            parent::setMatchPattern(array('#(?<=(?:[A-Z]))([A-Z]+)([A-Z][A-z])#', '#(?<=(?:[a-z0-9]))([A-Z])#'));
+            parent::setReplacement(array('\1' . $this->_separator . '\2', $this->_separator . '\1'));
+        }
+
+        return parent::filter($value);
+    }
+
+}
diff --git a/lib/zend/Zend/Filter/Word/CamelCaseToUnderscore.php b/lib/zend/Zend/Filter/Word/CamelCaseToUnderscore.php
new file mode 100644
index 00000000000..bb5dc5ad67e
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/CamelCaseToUnderscore.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_CamelCaseToSeparator
+ */
+require_once 'Zend/Filter/Word/CamelCaseToSeparator.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_CamelCaseToUnderscore extends Zend_Filter_Word_CamelCaseToSeparator
+{
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct('_');
+    }
+}
diff --git a/lib/zend/Zend/Filter/Word/DashToCamelCase.php b/lib/zend/Zend/Filter/Word/DashToCamelCase.php
new file mode 100644
index 00000000000..d4874c5adf2
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/DashToCamelCase.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Word/SeparatorToCamelCase.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_DashToCamelCase extends Zend_Filter_Word_SeparatorToCamelCase
+{
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct('-');
+    }
+}
diff --git a/lib/zend/Zend/Filter/Word/DashToSeparator.php b/lib/zend/Zend/Filter/Word/DashToSeparator.php
new file mode 100644
index 00000000000..8a5b0ec7dad
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/DashToSeparator.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_PregReplace
+ */
+require_once 'Zend/Filter/Word/Separator/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_DashToSeparator extends Zend_Filter_Word_Separator_Abstract
+{
+
+    public function filter($value)
+    {
+        $this->setMatchPattern('#-#');
+        $this->setReplacement($this->_separator);
+        return parent::filter($value);
+    }
+}
diff --git a/lib/zend/Zend/Filter/Word/DashToUnderscore.php b/lib/zend/Zend/Filter/Word/DashToUnderscore.php
new file mode 100644
index 00000000000..7103ae753a9
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/DashToUnderscore.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_PregReplace
+ */
+require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_DashToUnderscore extends Zend_Filter_Word_SeparatorToSeparator
+{
+    /**
+     * Constructor
+     *
+     * @param  string $separator Space by default
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct('-', '_');
+    }
+}
diff --git a/lib/zend/Zend/Filter/Word/Separator/Abstract.php b/lib/zend/Zend/Filter/Word/Separator/Abstract.php
new file mode 100644
index 00000000000..3b95aba67b6
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/Separator/Abstract.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_PregReplace
+ */
+require_once 'Zend/Filter/PregReplace.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @uses       Zend_Filter_PregReplace
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Filter_Word_Separator_Abstract extends Zend_Filter_PregReplace
+{
+
+    protected $_separator = null;
+
+    /**
+     * Constructor
+     *
+     * @param  string $separator Space by default
+     * @return void
+     */
+    public function __construct($separator = ' ')
+    {
+        $this->setSeparator($separator);
+    }
+
+    /**
+     * Sets a new seperator
+     *
+     * @param  string  $separator  Seperator
+     * @return $this
+     */
+    public function setSeparator($separator)
+    {
+        if ($separator == null) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('"' . $separator . '" is not a valid separator.');
+        }
+        $this->_separator = $separator;
+        return $this;
+    }
+
+    /**
+     * Returns the actual set seperator
+     *
+     * @return  string
+     */
+    public function getSeparator()
+    {
+        return $this->_separator;
+    }
+
+}
diff --git a/lib/zend/Zend/Filter/Word/SeparatorToCamelCase.php b/lib/zend/Zend/Filter/Word/SeparatorToCamelCase.php
new file mode 100644
index 00000000000..ae6f003c0c2
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/SeparatorToCamelCase.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_PregReplace
+ */
+require_once 'Zend/Filter/Word/Separator/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_SeparatorToCamelCase extends Zend_Filter_Word_Separator_Abstract
+{
+
+    public function filter($value)
+    {
+        // a unicode safe way of converting characters to \x00\x00 notation
+        $pregQuotedSeparator = preg_quote($this->_separator, '#');
+
+        if (self::isUnicodeSupportEnabled()) {
+            parent::setMatchPattern(array('#('.$pregQuotedSeparator.')(\p{L}{1})#','#(^\p{Ll}{1})#'));
+            parent::setReplacement(array('Zend_Filter_Word_SeparatorToCamelCase', '_strtoupperArray'));
+        } else {
+            parent::setMatchPattern(array('#('.$pregQuotedSeparator.')([A-Za-z]{1})#','#(^[A-Za-z]{1})#'));
+            parent::setReplacement(array('Zend_Filter_Word_SeparatorToCamelCase', '_strtoupperArray'));
+        }
+
+        return preg_replace_callback($this->_matchPattern, $this->_replacement, $value);
+    }
+
+    /**
+     * @param array $matches
+     * @return string
+     */
+    private static function _strtoupperArray(array $matches)
+    {
+        if (array_key_exists(2, $matches)) {
+            return strtoupper($matches[2]);
+        }
+        return strtoupper($matches[1]);
+    }
+
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php b/lib/zend/Zend/Filter/Word/SeparatorToDash.php
similarity index 55%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php
rename to lib/zend/Zend/Filter/Word/SeparatorToDash.php
index 9189eb6b2af..d4ed9a84b9f 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php
+++ b/lib/zend/Zend/Filter/Word/SeparatorToDash.php
@@ -13,32 +13,34 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
+ * @see Zend_Filter_SeperatorToSeparator
  */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
+require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
 
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
+class Zend_Filter_Word_SeparatorToDash extends Zend_Filter_Word_SeparatorToSeparator
 {
     /**
-     * contains the result object
-     * @var mixed
+     * Constructor
+     *
+     * @param  string  $searchSeparator  Seperator to search for change
+     * @return void
      */
-    public $searchResult = null;
+    public function __construct($searchSeparator = ' ')
+    {
+        parent::__construct($searchSeparator, '-');
+    }
+
 }
diff --git a/lib/zend/Zend/Filter/Word/SeparatorToSeparator.php b/lib/zend/Zend/Filter/Word/SeparatorToSeparator.php
new file mode 100644
index 00000000000..148a137227e
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/SeparatorToSeparator.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_PregReplace
+ */
+require_once 'Zend/Filter/PregReplace.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_SeparatorToSeparator extends Zend_Filter_PregReplace
+{
+
+    protected $_searchSeparator = null;
+    protected $_replacementSeparator = null;
+
+    /**
+     * Constructor
+     *
+     * @param  string  $searchSeparator      Seperator to search for
+     * @param  string  $replacementSeperator Seperator to replace with
+     * @return void
+     */
+    public function __construct($searchSeparator = ' ', $replacementSeparator = '-')
+    {
+        $this->setSearchSeparator($searchSeparator);
+        $this->setReplacementSeparator($replacementSeparator);
+    }
+
+    /**
+     * Sets a new seperator to search for
+     *
+     * @param  string  $separator  Seperator to search for
+     * @return $this
+     */
+    public function setSearchSeparator($separator)
+    {
+        $this->_searchSeparator = $separator;
+        return $this;
+    }
+
+    /**
+     * Returns the actual set seperator to search for
+     *
+     * @return  string
+     */
+    public function getSearchSeparator()
+    {
+        return $this->_searchSeparator;
+    }
+
+    /**
+     * Sets a new seperator which replaces the searched one
+     *
+     * @param  string  $separator  Seperator which replaces the searched one
+     * @return $this
+     */
+    public function setReplacementSeparator($separator)
+    {
+        $this->_replacementSeparator = $separator;
+        return $this;
+    }
+
+    /**
+     * Returns the actual set seperator which replaces the searched one
+     *
+     * @return  string
+     */
+    public function getReplacementSeparator()
+    {
+        return $this->_replacementSeparator;
+    }
+
+    /**
+     * Defined by Zend_Filter_Interface
+     *
+     * Returns the string $value, replacing the searched seperators with the defined ones
+     *
+     * @param  string $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        return $this->_separatorToSeparatorFilter($value);
+    }
+
+    /**
+     * Do the real work, replaces the seperator to search for with the replacement seperator
+     *
+     * Returns the replaced string
+     *
+     * @param  string $value
+     * @return string
+     */
+    protected function _separatorToSeparatorFilter($value)
+    {
+        if ($this->_searchSeparator == null) {
+            require_once 'Zend/Filter/Exception.php';
+            throw new Zend_Filter_Exception('You must provide a search separator for this filter to work.');
+        }
+
+        $this->setMatchPattern('#' . preg_quote($this->_searchSeparator, '#') . '#');
+        $this->setReplacement($this->_replacementSeparator);
+        return parent::filter($value);
+    }
+
+}
diff --git a/lib/zend/Zend/Filter/Word/UnderscoreToCamelCase.php b/lib/zend/Zend/Filter/Word/UnderscoreToCamelCase.php
new file mode 100644
index 00000000000..2974c6b382f
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/UnderscoreToCamelCase.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_Interface
+ */
+require_once 'Zend/Filter/Word/SeparatorToCamelCase.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_UnderscoreToCamelCase extends Zend_Filter_Word_SeparatorToCamelCase
+{
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct('_');
+    }
+}
diff --git a/lib/zend/Zend/Filter/Word/UnderscoreToDash.php b/lib/zend/Zend/Filter/Word/UnderscoreToDash.php
new file mode 100644
index 00000000000..e8bbe7f7813
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/UnderscoreToDash.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_PregReplace
+ */
+require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_UnderscoreToDash extends Zend_Filter_Word_SeparatorToSeparator
+{
+    /**
+     * Constructor
+     *
+     * @param  string $separator Space by default
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct('_', '-');
+    }
+}
diff --git a/lib/zend/Zend/Filter/Word/UnderscoreToSeparator.php b/lib/zend/Zend/Filter/Word/UnderscoreToSeparator.php
new file mode 100644
index 00000000000..a01531584f5
--- /dev/null
+++ b/lib/zend/Zend/Filter/Word/UnderscoreToSeparator.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Filter_PregReplace
+ */
+require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Word_UnderscoreToSeparator extends Zend_Filter_Word_SeparatorToSeparator
+{
+    /**
+     * Constructor
+     *
+     * @param  string $separator Space by default
+     * @return void
+     */
+    public function __construct($replacementSeparator = ' ')
+    {
+        parent::__construct('_', $replacementSeparator);
+    }
+}
diff --git a/lib/zend/Zend/Gdata.php b/lib/zend/Zend/Gdata.php
index 0445c6a5f14..7ffabc9063b 100644
--- a/lib/zend/Zend/Gdata.php
+++ b/lib/zend/Zend/Gdata.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/App.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata extends Zend_Gdata_App
@@ -121,7 +121,7 @@ class Zend_Gdata extends Zend_Gdata_App
      *                                    useObjectMapping() function.
      */
     public static function import($uri, $client = null,
-        $className='Zend_Gdata_Feed')
+        $className='Zend_Gdata_Feed', $useObjectMapping = true)
     {
         $app = new Zend_Gdata($client);
         $requestData = $app->decodeRequest('GET', $uri);
diff --git a/lib/zend/Zend/Gdata/Analytics.php b/lib/zend/Zend/Gdata/Analytics.php
new file mode 100644
index 00000000000..bbc74ea80d7
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata
+ */
+require_once 'Zend/Gdata.php';
+
+/**
+ * @see Zend_Gdata_Analytics_AccountEntry
+ */
+require_once 'Zend/Gdata/Analytics/AccountEntry.php';
+
+/**
+ * @see Zend_Gdata_Analytics_AccountFeed
+ */
+require_once 'Zend/Gdata/Analytics/AccountFeed.php';
+
+/**
+ * @see Zend_Gdata_Analytics_DataEntry
+ */
+require_once 'Zend/Gdata/Analytics/DataEntry.php';
+
+/**
+ * @see Zend_Gdata_Analytics_DataFeed
+ */
+require_once 'Zend/Gdata/Analytics/DataFeed.php';
+
+/**
+ * @see Zend_Gdata_Analytics_DataQuery
+ */
+require_once 'Zend/Gdata/Analytics/DataQuery.php';
+
+/**
+ * @see Zend_Gdata_Analytics_AccountQuery
+ */
+require_once 'Zend/Gdata/Analytics/AccountQuery.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics extends Zend_Gdata
+{
+
+    const AUTH_SERVICE_NAME = 'analytics';
+    const ANALYTICS_FEED_URI = 'https://www.googleapis.com/analytics/v2.4/data';
+    const ANALYTICS_ACCOUNT_FEED_URI = 'https://www.googleapis.com/analytics/v2.4/management/accounts';
+
+    public static $namespaces = array(
+        array('analytics', 'http://schemas.google.com/analytics/2009', 1, 0),
+        array('ga', 'http://schemas.google.com/ga/2009', 1, 0)
+     );
+
+    /**
+     * Create Gdata object
+     *
+     * @param Zend_Http_Client $client
+     * @param string $applicationId The identity of the app in the form of
+     *          Company-AppName-Version
+     */
+    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
+    {
+        $this->registerPackage('Zend_Gdata_Analytics');
+        $this->registerPackage('Zend_Gdata_Analytics_Extension');
+        parent::__construct($client, $applicationId);
+        $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME);
+    }
+
+    /**
+     * Retrieve account feed object
+     * 
+     * @param string|Zend_Uri_Uri $uri
+     * @return Zend_Gdata_Analytics_AccountFeed
+     */
+    public function getAccountFeed($uri = self::ANALYTICS_ACCOUNT_FEED_URI)
+    {
+        if ($uri instanceof Query) {
+            $uri = $uri->getQueryUrl();
+        }
+        return parent::getFeed($uri, 'Zend_Gdata_Analytics_AccountFeed');
+    }
+
+    /**
+     * Retrieve data feed object
+     * 
+     * @param string|Zend_Uri_Uri $uri
+     * @return Zend_Gdata_Analytics_DataFeed
+     */
+    public function getDataFeed($uri = self::ANALYTICS_FEED_URI)
+    {
+        if ($uri instanceof Query) {
+            $uri = $uri->getQueryUrl();
+        }
+        return parent::getFeed($uri, 'Zend_Gdata_Analytics_DataFeed');
+    }
+
+    /**
+     * Returns a new DataQuery object.
+     * 
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function newDataQuery()
+    {
+        return new Zend_Gdata_Analytics_DataQuery();
+    }
+    
+    /**
+     * Returns a new AccountQuery object.
+     *
+     * @return Zend_Gdata_Analytics_AccountQuery
+     */
+    public function newAccountQuery()
+    {
+        return new Zend_Gdata_Analytics_AccountQuery();
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/AccountEntry.php b/lib/zend/Zend/Gdata/Analytics/AccountEntry.php
new file mode 100644
index 00000000000..4896c6e205e
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/AccountEntry.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Entry
+ */
+require_once 'Zend/Gdata/Entry.php';
+
+/**
+ * @see Zend_Gdata_Analytics_Extension_Dimension
+ */
+require_once 'Zend/Gdata/Analytics/Extension/Dimension.php';
+
+/**
+ * @see Zend_Gdata_Analytics_Extension_Metric
+ */
+require_once 'Zend/Gdata/Analytics/Extension/Metric.php';
+
+/**
+ * @see Zend_Gdata_Analytics_Extension_Property
+ */
+require_once 'Zend/Gdata/Analytics/Extension/Property.php';
+
+/**
+ * @see Zend_Gdata_Analytics_Extension_TableId
+ */
+require_once 'Zend/Gdata/Analytics/Extension/TableId.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_AccountEntry extends Zend_Gdata_Entry
+{
+    protected $_accountId;
+    protected $_accountName;
+    protected $_profileId;
+    protected $_webPropertyId;
+    protected $_currency;
+    protected $_timezone;
+    protected $_tableId;
+    protected $_profileName;
+    protected $_goal;
+
+    /**
+     * @see Zend_Gdata_Entry::__construct()
+     */
+    public function __construct($element = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Analytics::$namespaces);
+        parent::__construct($element);
+    }
+
+    /**
+     * @param DOMElement $child
+     * @return void
+     */
+    protected function takeChildFromDOM($child)
+    {
+        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
+        switch ($absoluteNodeName){
+            case $this->lookupNamespace('analytics') . ':' . 'property';
+                $property = new Zend_Gdata_Analytics_Extension_Property();
+                $property->transferFromDOM($child);
+                $this->{$property->getName()} = $property;
+                break;
+            case $this->lookupNamespace('analytics') . ':' . 'tableId';
+                $tableId = new Zend_Gdata_Analytics_Extension_TableId();
+                $tableId->transferFromDOM($child);
+                $this->_tableId = $tableId;
+                break;
+            case $this->lookupNamespace('ga') . ':' . 'goal';
+                $goal = new Zend_Gdata_Analytics_Extension_Goal();
+                $goal->transferFromDOM($child);
+                $this->_goal = $goal;
+                break;
+            default:
+                parent::takeChildFromDOM($child);
+                break;
+        }
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/AccountFeed.php b/lib/zend/Zend/Gdata/Analytics/AccountFeed.php
new file mode 100644
index 00000000000..c4f44e8c0fb
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/AccountFeed.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Feed
+ */
+require_once 'Zend/Gdata/Feed.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_AccountFeed extends Zend_Gdata_Feed
+{
+    /**
+     * The classname for individual feed elements.
+     *
+     * @var string
+     */
+    protected $_entryClassName = 'Zend_Gdata_Analytics_AccountEntry';
+
+    /**
+     * The classname for the feed.
+     *
+     * @var string
+     */
+    protected $_feedClassName = 'Zend_Gdata_Analytics_AccountFeed';
+
+    /**
+     * @see Zend_GData_Feed::__construct()
+     */
+    public function __construct($element = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Analytics::$namespaces);
+        parent::__construct($element);
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/AccountQuery.php b/lib/zend/Zend/Gdata/Analytics/AccountQuery.php
new file mode 100644
index 00000000000..2f2f14f7275
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/AccountQuery.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Query
+ */
+require_once 'Zend/Gdata/Query.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_AccountQuery extends Zend_Gdata_Query
+{
+    const ANALYTICS_FEED_URI = 'https://www.googleapis.com/analytics/v2.4/management/accounts';
+
+    /**
+     * The default URI used for feeds.
+     */
+    protected $_defaultFeedUri = self::ANALYTICS_FEED_URI;
+    
+    /**
+     * @var string
+     */
+    protected $_accountId = '~all';
+    /**
+     * @var string
+     */
+    protected $_webpropertyId = '~all';
+    /**
+     * @var string
+     */
+    protected $_profileId = '~all';
+   
+    /**
+     * @var bool
+     */ 
+    protected $_webproperties = false;
+    /**
+     * @var bool
+     */
+    protected $_profiles = false;
+    /**
+     * @var bool
+     */
+    protected $_goals = false;
+    
+    /**
+     * @param string $accountId
+     * @return Zend_Gdata_Analytics_AccountQuery
+     */
+    public function setAccountId($accountId)
+    {
+        $this->_accountId = $accountId;
+        return $this;
+    }
+    
+    /**
+     * @return string
+     */
+    public function getAccountId()
+    {
+        return $this->_accountId;
+    }
+
+    /**
+     * @param string $webpropertyId
+     * @return Zend_Gdata_Analytics_AccountQuery
+     */
+    public function setWebpropertyId($webpropertyId)
+    {
+        $this->_webpropertyId = $webpropertyId;
+        return $this;
+    }
+    
+    /**
+     * @return string
+     */
+    public function getWebpropertyId()
+    {
+        return $this->_webpropertyId;
+    }
+    
+    /**
+     * @param string $profileId
+     * @return Zend_Gdata_Analytics_AccountQuery
+     */
+    public function setProfileId($profileId)
+    {
+        $this->_profileId = $profileId;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getProfileId()
+    {
+        return $this->_profileId;
+    }
+    
+    /**
+     * @param string $accountId
+     * @return Zend_Gdata_Analytics_AccountQuery
+     */
+    public function webproperties($accountId = '~all')
+    {
+        $this->_webproperties = true;
+        $this->setAccountId($accountId);    
+        return $this;
+    }
+    
+    /**
+     * @param string $webpropertyId
+     * @param string $accountId
+     * @return Zend_Gdata_Analytics_AccountQuery
+     */
+    public function profiles($webpropertyId = '~all', $accountId = '~all')
+    {
+        $this->_profiles = true;
+        if (null !== $accountId) {
+            $this->setAccountId($accountId);    
+        }
+        $this->setWebpropertyId($webpropertyId);
+        return $this;
+    }
+    
+    /**
+     * @param string $webpropertyId
+     * @param string $accountId
+     * @param string $accountId
+     * @return Zend_Gdata_Analytics_AccountQuery
+     */
+    public function goals($profileId = '~all', $webpropertyId = '~all', $accountId = '~all')
+    {
+        $this->_goals = true;
+        if (null !== $accountId) {
+            $this->setAccountId($accountId);    
+        }
+        if (null !== $webpropertyId) {
+            $this->setWebpropertyId($webpropertyId);    
+        }
+        $this->setProfileId($profileId);
+        return $this;
+    }
+    
+    /**
+     * @return string url
+     */
+    public function getQueryUrl()
+    {
+        $url = $this->_defaultFeedUri;
+        
+        // add account id
+        if ($this->_webproperties or $this->_profiles or $this->_goals) {
+            $url .= '/' . $this->_accountId . '/webproperties';
+        }
+        
+        if ($this->_profiles or $this->_goals) {
+            $url .= '/' . $this->_webpropertyId . '/profiles';
+        }
+        
+        if ($this->_goals) {
+            $url .= '/' . $this->_profileId . '/goals';
+        }
+
+        $url .= $this->getQueryString();
+        return $url;
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/DataEntry.php b/lib/zend/Zend/Gdata/Analytics/DataEntry.php
new file mode 100644
index 00000000000..db6fad89783
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/DataEntry.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Entry
+ */
+require_once 'Zend/Gdata/Entry.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_DataEntry extends Zend_Gdata_Entry
+{
+    /**
+     * @var array
+     */
+    protected $_dimensions = array();
+    /**
+     * @var array
+     */
+    protected $_metrics = array();
+
+    /**
+     * @param DOMElement $element
+     */
+    public function __construct($element = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Analytics::$namespaces);
+        parent::__construct($element);
+    }
+
+    /**
+     * @param DOMElement $child
+     * @return void
+     */
+    protected function takeChildFromDOM($child)
+    {
+        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
+        switch ($absoluteNodeName) {
+            case $this->lookupNamespace('analytics') . ':' . 'dimension';
+                $dimension = new Zend_Gdata_Analytics_Extension_Dimension();
+                $dimension->transferFromDOM($child);
+                $this->_dimensions[] = $dimension;
+                break;
+            case $this->lookupNamespace('analytics') . ':' . 'metric';
+                $metric = new Zend_Gdata_Analytics_Extension_Metric();
+                $metric->transferFromDOM($child);
+                $this->_metrics[] = $metric;
+                break;
+            default:
+                parent::takeChildFromDOM($child);
+                break;
+        }
+    }
+
+    /**
+     * @param string $name 
+     * @return mixed
+     */
+    public function getDimension($name)
+    {
+        foreach ($this->_dimensions as $dimension) {
+            if ($dimension->getName() == $name) {
+                return $dimension;
+            }
+        }
+        return null;
+    }
+    
+    /** 
+     * @param string $name 
+     * @return mixed
+     */
+    public function getMetric($name)
+    {
+        foreach ($this->_metrics as $metric) {
+            if ($metric->getName() == $name) {
+                return $metric;
+            }
+        }
+        return null;
+    }
+    
+    /**
+     * @param string $name 
+     * @return mixed
+     */
+    public function getValue($name)
+    {
+        if (null !== ($metric = $this->getMetric($name))) {
+            return $metric;
+        }
+        return $this->getDimension($name);
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/DataFeed.php b/lib/zend/Zend/Gdata/Analytics/DataFeed.php
new file mode 100644
index 00000000000..44db7e3af36
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/DataFeed.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Feed
+ */
+require_once 'Zend/Gdata/Feed.php';
+
+/**
+ * @see Zend_Gdata_Analytics
+ */
+require_once 'Zend/Gdata/Analytics.php';
+
+/**
+ * @see Zend_Gdata_Geo_Entry
+ */
+require_once 'Zend/Gdata/Analytics/DataEntry.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_DataFeed extends Zend_Gdata_Feed
+{
+
+    /**
+     * The classname for individual feed elements.
+     *
+     * @var string
+     */
+    protected $_entryClassName = 'Zend_Gdata_Analytics_DataEntry';
+    /**
+     * The classname for the feed.
+     *
+     * @var string
+     */
+    protected $_feedClassName = 'Zend_Gdata_Analytics_DataFeed';
+
+    public function __construct($element = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Analytics::$namespaces);
+        parent::__construct($element);
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/DataQuery.php b/lib/zend/Zend/Gdata/Analytics/DataQuery.php
new file mode 100644
index 00000000000..237c306e396
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/DataQuery.php
@@ -0,0 +1,403 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Query
+ */
+require_once 'Zend/Gdata/Query.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_DataQuery extends Zend_Gdata_Query
+{
+    const ANALYTICS_FEED_URI = 'https://www.googleapis.com/analytics/v2.4/data';
+
+    /**
+     * The default URI used for feeds.
+     */
+    protected $_defaultFeedUri = self::ANALYTICS_FEED_URI;
+
+    // D1. Visitor
+    const DIMENSION_BROWSER = 'ga:browser';
+    const DIMENSION_BROWSER_VERSION = 'ga:browserVersion';
+    const DIMENSION_CITY = 'ga:city';
+    const DIMENSION_CONNECTIONSPEED = 'ga:connectionSpeed';
+    const DIMENSION_CONTINENT = 'ga:continent';
+    const DIMENSION_COUNTRY = 'ga:country';
+    const DIMENSION_DATE = 'ga:date';
+    const DIMENSION_DAY = 'ga:day';
+    const DIMENSION_DAYS_SINCE_LAST_VISIT= 'ga:daysSinceLastVisit';
+    const DIMENSION_FLASH_VERSION = 'ga:flashVersion';
+    const DIMENSION_HOSTNAME = 'ga:hostname';
+    const DIMENSION_HOUR = 'ga:hour';
+    const DIMENSION_JAVA_ENABLED= 'ga:javaEnabled';
+    const DIMENSION_LANGUAGE= 'ga:language';
+    const DIMENSION_LATITUDE = 'ga:latitude';
+    const DIMENSION_LONGITUDE = 'ga:longitude';
+    const DIMENSION_MONTH = 'ga:month';
+    const DIMENSION_NETWORK_DOMAIN = 'ga:networkDomain';
+    const DIMENSION_NETWORK_LOCATION = 'ga:networkLocation';
+    const DIMENSION_OPERATING_SYSTEM = 'ga:operatingSystem';
+    const DIMENSION_OPERATING_SYSTEM_VERSION = 'ga:operatingSystemVersion';
+    const DIMENSION_PAGE_DEPTH = 'ga:pageDepth';
+    const DIMENSION_REGION = 'ga:region';
+    const DIMENSION_SCREEN_COLORS= 'ga:screenColors';
+    const DIMENSION_SCREEN_RESOLUTION = 'ga:screenResolution';
+    const DIMENSION_SUB_CONTINENT = 'ga:subContinent';
+    const DIMENSION_USER_DEFINED_VALUE = 'ga:userDefinedValue';
+    const DIMENSION_VISIT_COUNT = 'ga:visitCount';
+    const DIMENSION_VISIT_LENGTH = 'ga:visitLength';
+    const DIMENSION_VISITOR_TYPE = 'ga:visitorType';
+    const DIMENSION_WEEK = 'ga:week';
+    const DIMENSION_YEAR = 'ga:year';
+
+    // D2. Campaign
+    const DIMENSION_AD_CONTENT = 'ga:adContent';
+    const DIMENSION_AD_GROUP = 'ga:adGroup';
+    const DIMENSION_AD_SLOT = 'ga:adSlot';
+    const DIMENSION_AD_SLOT_POSITION = 'ga:adSlotPosition';
+    const DIMENSION_CAMPAIGN = 'ga:campaign';
+    const DIMENSION_KEYWORD = 'ga:keyword';
+    const DIMENSION_MEDIUM = 'ga:medium';
+    const DIMENSION_REFERRAL_PATH = 'ga:referralPath';
+    const DIMENSION_SOURCE = 'ga:source';
+
+    // D3. Content
+    const DIMENSION_EXIT_PAGE_PATH = 'ga:exitPagePath';
+    const DIMENSION_LANDING_PAGE_PATH = 'ga:landingPagePath';
+    const DIMENSION_PAGE_PATH = 'ga:pagePath';
+    const DIMENSION_PAGE_TITLE = 'ga:pageTitle';
+    const DIMENSION_SECOND_PAGE_PATH = 'ga:secondPagePath';
+
+    // D4. Ecommerce
+    const DIMENSION_AFFILIATION = 'ga:affiliation';
+    const DIMENSION_DAYS_TO_TRANSACTION = 'ga:daysToTransaction';
+    const DIMENSION_PRODUCT_CATEGORY = 'ga:productCategory';
+    const DIMENSION_PRODUCT_NAME = 'ga:productName';
+    const DIMENSION_PRODUCT_SKU = 'ga:productSku';
+    const DIMENSION_TRANSACTION_ID = 'ga:transactionId';
+    const DIMENSION_VISITS_TO_TRANSACTION = 'ga:visitsToTransaction';
+
+    // D5. Internal Search
+    const DIMENSION_SEARCH_CATEGORY = 'ga:searchCategory';
+    const DIMENSION_SEARCH_DESTINATION_PAGE = 'ga:searchDestinationPage';
+    const DIMENSION_SEARCH_KEYWORD = 'ga:searchKeyword';
+    const DIMENSION_SEARCH_KEYWORD_REFINEMENT = 'ga:searchKeywordRefinement';
+    const DIMENSION_SEARCH_START_PAGE = 'ga:searchStartPage';
+    const DIMENSION_SEARCH_USED = 'ga:searchUsed';
+
+    // D6. Navigation
+    const DIMENSION_NEXT_PAGE_PATH = 'ga:nextPagePath';
+    const DIMENSION_PREV_PAGE_PATH= 'ga:previousPagePath';
+
+    // D7. Events
+    const DIMENSION_EVENT_CATEGORY = 'ga:eventCategory';
+    const DIMENSION_EVENT_ACTION = 'ga:eventAction';
+    const DIMENSION_EVENT_LABEL = 'ga:eventLabel';
+
+    // D8. Custon Variables
+    const DIMENSION_CUSTOM_VAR_NAME_1 = 'ga:customVarName1';
+    const DIMENSION_CUSTOM_VAR_NAME_2 = 'ga:customVarName2';
+    const DIMENSION_CUSTOM_VAR_NAME_3 = 'ga:customVarName3';
+    const DIMENSION_CUSTOM_VAR_NAME_4 = 'ga:customVarName4';
+    const DIMENSION_CUSTOM_VAR_NAME_5 = 'ga:customVarName5';
+    const DIMENSION_CUSTOM_VAR_VALUE_1 = 'ga:customVarValue1';
+    const DIMENSION_CUSTOM_VAR_VALUE_2 = 'ga:customVarValue2';
+    const DIMENSION_CUSTOM_VAR_VALUE_3 = 'ga:customVarValue3';
+    const DIMENSION_CUSTOM_VAR_VALUE_4 = 'ga:customVarValue4';
+    const DIMENSION_CUSTOM_VAR_VALUE_5 = 'ga:customVarValue5';
+
+    // M1. Visitor
+    const METRIC_BOUNCES = 'ga:bounces';
+    const METRIC_ENTRANCES = 'ga:entrances';
+    const METRIC_EXITS = 'ga:exits';
+    const METRIC_NEW_VISITS = 'ga:newVisits';
+    const METRIC_PAGEVIEWS = 'ga:pageviews';
+    const METRIC_TIME_ON_PAGE = 'ga:timeOnPage';
+    const METRIC_TIME_ON_SITE = 'ga:timeOnSite';
+    const METRIC_VISITORS = 'ga:visitors';
+    const METRIC_VISITS = 'ga:visits';
+
+    // M2. Campaign
+    const METRIC_AD_CLICKS = 'ga:adClicks';
+    const METRIC_AD_COST = 'ga:adCost';
+    const METRIC_CPC = 'ga:CPC';
+    const METRIC_CPM = 'ga:CPM';
+    const METRIC_CTR = 'ga:CTR';
+    const METRIC_IMPRESSIONS = 'ga:impressions';
+
+    // M3. Content
+    const METRIC_UNIQUE_PAGEVIEWS = 'ga:uniquePageviews';
+
+    // M4. Ecommerce
+    const METRIC_ITEM_REVENUE = 'ga:itemRevenue';
+    const METRIC_ITEM_QUANTITY = 'ga:itemQuantity';
+    const METRIC_TRANSACTIONS = 'ga:transactions';
+    const METRIC_TRANSACTION_REVENUE = 'ga:transactionRevenue';
+    const METRIC_TRANSACTION_SHIPPING = 'ga:transactionShipping';
+    const METRIC_TRANSACTION_TAX = 'ga:transactionTax';
+    const METRIC_UNIQUE_PURCHASES = 'ga:uniquePurchases';
+
+    // M5. Internal Search
+    const METRIC_SEARCH_DEPTH = 'ga:searchDepth';
+    const METRIC_SEARCH_DURATION = 'ga:searchDuration';
+    const METRIC_SEARCH_EXITS = 'ga:searchExits';
+    const METRIC_SEARCH_REFINEMENTS = 'ga:searchRefinements';
+    const METRIC_SEARCH_UNIQUES = 'ga:searchUniques';
+    const METRIC_SEARCH_VISIT = 'ga:searchVisits';
+
+    // M6. Goals
+    const METRIC_GOAL_COMPLETIONS_ALL = 'ga:goalCompletionsAll';
+    const METRIC_GOAL_STARTS_ALL = 'ga:goalStartsAll';
+    const METRIC_GOAL_VALUE_ALL = 'ga:goalValueAll';
+    // TODO goals 1-20
+    const METRIC_GOAL_1_COMPLETION = 'ga:goal1Completions';
+    const METRIC_GOAL_1_STARTS = 'ga:goal1Starts';
+    const METRIC_GOAL_1_VALUE = 'ga:goal1Value';
+
+    // M7. Events
+    const METRIC_TOTAL_EVENTS = 'ga:totalEvents';
+    const METRIC_UNIQUE_EVENTS = 'ga:uniqueEvents';
+    const METRIC_EVENT_VALUE = 'ga:eventValue';
+    
+    // suported filter operators
+    const EQUALS = "==";
+    const EQUALS_NOT = "!=";
+    const GREATER = ">";
+    const LESS = ">";
+    const GREATER_EQUAL = ">=";
+    const LESS_EQUAL = "<=";
+    const CONTAINS = "=@";
+    const CONTAINS_NOT ="!@";
+    const REGULAR ="=~";
+    const REGULAR_NOT ="!~";
+    
+    /**
+     * @var string
+     */
+    protected $_profileId;
+    /**
+     * @var array
+     */
+    protected $_dimensions = array();
+    /**
+     * @var array
+     */
+    protected $_metrics = array();
+    /**
+     * @var array
+     */
+    protected $_sort = array();
+    /**
+     * @var array
+     */
+    protected $_filters = array();
+    
+    /**
+     * @param string $id
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function setProfileId($id)
+    {
+        $this->_profileId = $id;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getProfileId()
+    {
+        return $this->_profileId;
+    }
+
+    /**
+     * @param string $dimension
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function addDimension($dimension)
+    {
+        $this->_dimensions[$dimension] = true;        
+        return $this;
+    }
+
+    /**
+     * @param string $metric
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function addMetric($metric)
+    {
+        $this->_metrics[$metric] = true;
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getDimensions()
+    {
+        return $this->_dimensions;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMetrics()
+    {
+        return $this->_metrics;
+    }
+
+    /**
+     * @param string $dimension
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function removeDimension($dimension)
+    {
+        unset($this->_dimensions[$dimension]);
+        return $this;
+    }
+    /**
+     * @param string $metric
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function removeMetric($metric)
+    {
+        unset($this->_metrics[$metric]);
+        return $this;
+    }
+    /**
+     * @param string $value
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function setStartDate($date)
+    {
+        $this->setParam("start-date", $date);
+        return $this;
+    }
+    /**
+     * @param string $value
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function setEndDate($date)
+    {
+        $this->setParam("end-date", $date);
+        return $this;
+    }
+    
+    /**
+     * @param string $filter
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function addFilter($filter)
+    {
+        $this->_filters[] = array($filter, true);
+        return $this;
+    }
+    
+    /**
+     * @param string $filter
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function addOrFilter($filter)
+    {
+        $this->_filters[] = array($filter, false);
+        return $this;
+    }
+    
+    /**
+     * @param string $sort
+     * @param boolean[optional] $descending
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function addSort($sort, $descending=false)
+    {
+        // add to sort storage
+        $this->_sort[] = ($descending?'-':'').$sort;
+        return $this;
+    }
+    
+    /**
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function clearSort()
+    {
+        $this->_sort = array();
+        return $this;
+    }
+    
+    /**
+     * @param string $segment
+     * @return Zend_Gdata_Analytics_DataQuery
+     */
+    public function setSegment($segment)
+    {
+        $this->setParam('segment', $segment);
+        return $this;
+    }
+
+    /**
+     * @return string url
+     */
+    public function getQueryUrl()
+    {
+        $uri = $this->_defaultFeedUri;
+        if (isset($this->_url)) {
+            $uri = $this->_url;
+        }
+        
+        $dimensions = $this->getDimensions();
+        if (!empty($dimensions)) {
+            $this->setParam('dimensions', implode(",", array_keys($dimensions)));
+        }
+        
+        $metrics = $this->getMetrics();
+        if (!empty($metrics)) {
+            $this->setParam('metrics', implode(",", array_keys($metrics)));
+        }
+        
+        // profile id (ga:tableId)
+        if ($this->getProfileId() != null) {
+            $this->setParam('ids', 'ga:'.ltrim($this->getProfileId(), "ga:"));
+        }
+                
+        // sorting
+        if ($this->_sort) {
+            $this->setParam('sort', implode(",", $this->_sort));
+        }
+        
+        // filtering
+        $filters = "";
+        foreach ($this->_filters as $filter) {
+            $filters.=($filter[1]===true?';':',').$filter[0];
+        }
+        
+        if ($filters!="") {
+            $this->setParam('filters', ltrim($filters, ",;"));
+        }
+        
+        $uri .= $this->getQueryString();
+        return $uri;
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/Extension/Dimension.php b/lib/zend/Zend/Gdata/Analytics/Extension/Dimension.php
new file mode 100644
index 00000000000..294adb52028
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/Extension/Dimension.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Extension_Metric
+ */
+require_once 'Zend/Gdata/Analytics/Extension/Metric.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_Extension_Dimension 
+    extends Zend_Gdata_Analytics_Extension_Metric
+{
+    protected $_rootNamespace = 'ga';
+    protected $_rootElement = 'dimension';
+    protected $_value = null;
+    protected $_name = null;
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/Extension/Goal.php b/lib/zend/Zend/Gdata/Analytics/Extension/Goal.php
new file mode 100644
index 00000000000..a37b0ecc475
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/Extension/Goal.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Extension
+ */
+require_once 'Zend/Gdata/Extension.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_Goal extends Zend_Gdata_Extension
+{
+    protected $_rootNamespace = 'ga';
+    protected $_rootElement = 'goal';
+
+    public function __construct()
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Analytics::$namespaces);
+        parent::__construct();
+    }
+    
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        $attribs = $this->getExtensionAttributes();
+        return $attribs['name']['value'];
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/Extension/Metric.php b/lib/zend/Zend/Gdata/Analytics/Extension/Metric.php
new file mode 100644
index 00000000000..ea041292e12
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/Extension/Metric.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Extension_Property
+ */
+require_once 'Zend/Gdata/Analytics/Extension/Property.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_Extension_Metric 
+    extends Zend_Gdata_Analytics_Extension_Property
+{
+    protected $_rootNamespace = 'ga';
+    protected $_rootElement = 'metric';
+    protected $_value = null;
+    protected $_name = null;
+
+    protected function takeAttributeFromDOM($attribute)
+    {
+        switch ($attribute->localName) {
+            case 'name':
+                $this->_name = $attribute->nodeValue;
+                break;
+            case 'value':
+                $this->_value = $attribute->nodeValue;
+                break;
+            default:
+                parent::takeAttributeFromDOM($attribute);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/Extension/Property.php b/lib/zend/Zend/Gdata/Analytics/Extension/Property.php
new file mode 100644
index 00000000000..7dd48d6f23f
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/Extension/Property.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Extension
+ */
+require_once 'Zend/Gdata/Extension.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_Extension_Property extends Zend_Gdata_Extension
+{
+    protected $_rootNamespace = 'ga';
+    protected $_rootElement = 'property';
+    protected $_value = null;
+    protected $_name = null;
+
+    /**
+     * Constructs a new Zend_Gdata_Calendar_Extension_Timezone object.
+     * @param string $value (optional) The text content of the element.
+     */
+    public function __construct($value = null, $name = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Analytics::$namespaces);
+        parent::__construct();
+        $this->_value = $value;
+        $this->_name = $name;
+    }
+
+    /**
+     * Given a DOMNode representing an attribute, tries to map the data into
+     * instance members.  If no mapping is defined, the name and value are
+     * stored in an array.
+     *
+     * @param DOMNode $attribute The DOMNode attribute needed to be handled
+     */
+    protected function takeAttributeFromDOM($attribute)
+    {
+        switch ($attribute->localName) {
+            case 'name':
+                $name = explode(':', $attribute->nodeValue);
+                $this->_name = end($name);
+                break;
+            case 'value':
+                $this->_value = $attribute->nodeValue;
+                break;
+            default:
+                parent::takeAttributeFromDOM($attribute);
+        }
+    }
+
+    /**
+     * Get the value for this element's value attribute.
+     *
+     * @return string The value associated with this attribute.
+     */
+    public function getValue()
+    {
+        return $this->_value;
+    }
+
+    /**
+     * Set the value for this element's value attribute.
+     *
+     * @param string $value The desired value for this attribute.
+     * @return Zend_Gdata_Analytics_Extension_Property The element being modified.
+     */
+    public function setValue($value)
+    {
+        $this->_value = $value;
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @return Zend_Gdata_Analytics_Extension_Property
+     */
+    public function setName($name)
+    {
+        $this->_name = $name;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Magic toString method allows using this directly via echo
+     * Works best in PHP >= 4.2.0
+     */
+    public function __toString()
+    {
+        return $this->getValue();
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Analytics/Extension/TableId.php b/lib/zend/Zend/Gdata/Analytics/Extension/TableId.php
new file mode 100644
index 00000000000..852fa589fec
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Analytics/Extension/TableId.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Gdata_Extension
+ */
+require_once 'Zend/Gdata/Extension.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Analytics
+ */
+class Zend_Gdata_Analytics_Extension_TableId extends Zend_Gdata_Extension
+{
+
+    protected $_rootNamespace = 'ga';
+    protected $_rootElement = 'tableId';
+    protected $_value = null;
+
+    /**
+     * Constructs a new Zend_Gdata_Calendar_Extension_Timezone object.
+     * @param string $value (optional) The text content of the element.
+     */
+    public function __construct($value = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Analytics::$namespaces);
+        parent::__construct();
+        $this->_value = $value;
+    }
+
+    /**
+     * Retrieves a DOMElement which corresponds to this element and all
+     * child properties.  This is used to build an entry back into a DOM
+     * and eventually XML text for sending to the server upon updates, or
+     * for application storage/persistence.
+     *
+     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
+     * @return DOMElement The DOMElement representing this element and all
+     * child properties.
+     */
+    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
+    {
+        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
+        if ($this->_value != null) {
+            $element->setAttribute('value', $this->_value);
+        }
+        return $element;
+    }
+
+    /**
+     * Given a DOMNode representing an attribute, tries to map the data into
+     * instance members.  If no mapping is defined, the name and value are
+     * stored in an array.
+     *
+     * @param DOMNode $attribute The DOMNode attribute needed to be handled
+     */
+    protected function takeChildFromDOM($child)
+    {
+       $this->_value = $child->nodeValue;
+    }
+
+    /**
+     * Get the value for this element's value attribute.
+     *
+     * @return string The value associated with this attribute.
+     */
+    public function getValue()
+    {
+        return $this->_value;
+    }
+
+    /**
+     * Set the value for this element's value attribute.
+     *
+     * @param string $value The desired value for this attribute.
+     * @return Zend_Gdata_Calendar_Extension_Timezone The element being modified.
+     */
+    public function setValue($value)
+    {
+        $this->_value = $value;
+        return $this;
+    }
+
+    /**
+     * Magic toString method allows using this directly via echo
+     * Works best in PHP >= 4.2.0
+     */
+    public function __toString()
+    {
+        return $this->getValue();
+    }
+}
diff --git a/lib/zend/Zend/Gdata/App.php b/lib/zend/Zend/Gdata/App.php
index d3230c5c203..1508743d7ff 100644
--- a/lib/zend/Zend/Gdata/App.php
+++ b/lib/zend/Zend/Gdata/App.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,6 +41,14 @@ require_once 'Zend/Version.php';
  */
 require_once 'Zend/Gdata/App/MediaSource.php';
 
+/**
+ * Zend_Uri/Http
+ */
+require_once 'Zend/Uri/Http.php';
+
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /**
  * Provides Atom Publishing Protocol (APP) functionality.  This class and all
  * other components of Zend_Gdata_App are designed to work independently from
@@ -49,7 +57,7 @@ require_once 'Zend/Gdata/App/MediaSource.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App
@@ -640,7 +648,16 @@ class Zend_Gdata_App
 
         // Set the params for the new request to be performed
         $this->_httpClient->setHeaders($headers);
-        $this->_httpClient->setUri($url);
+        require_once 'Zend/Uri/Http.php';
+        $uri = Zend_Uri_Http::fromString($url);
+        preg_match("/^(.*?)(\?.*)?$/", $url, $matches);
+        $this->_httpClient->setUri($matches[1]);
+        $queryArray = $uri->getQueryAsArray();
+        foreach ($queryArray as $name => $value) {
+            $this->_httpClient->setParameterGet($name, $value);
+        }
+
+
         $this->_httpClient->setConfig(array('maxredirects' => 0));
 
         // Set the proper adapter if we are handling a streaming upload
@@ -710,14 +727,14 @@ class Zend_Gdata_App
      * @param  string $uri
      * @param  Zend_Http_Client $client The client used for communication
      * @param  string $className The class which is used as the return type
+     * @param  bool $useObjectMapping Enable/disable the use of XML to object mapping.
      * @throws Zend_Gdata_App_Exception
-     * @return string|Zend_Gdata_App_Feed Returns string only if the object
-     *                                    mapping has been disabled explicitly
-     *                                    by passing false to the
-     *                                    useObjectMapping() function.
+     * @return string|Zend_Gdata_App_Feed Returns string only if the fourth
+     *                                    parameter ($useObjectMapping) is set
+     *                                    to false.
      */
     public static function import($uri, $client = null,
-        $className='Zend_Gdata_App_Feed')
+        $className='Zend_Gdata_App_Feed', $useObjectMapping = true)
     {
         $app = new Zend_Gdata_App($client);
         $requestData = $app->prepareRequest('GET', $uri);
@@ -725,7 +742,7 @@ class Zend_Gdata_App
             $requestData['method'], $requestData['url']);
 
         $feedContent = $response->getBody();
-        if (!$this->_useObjectMapping) {
+        if (false === $useObjectMapping) {
             return $feedContent;
         }
         $feed = self::importString($feedContent, $className);
@@ -800,13 +817,18 @@ class Zend_Gdata_App
         $className='Zend_Gdata_App_Feed', $majorProtocolVersion = null,
         $minorProtocolVersion = null)
     {
+        if (!class_exists($className, false)) {
+          require_once 'Zend/Loader.php';
+          @Zend_Loader::loadClass($className);
+        }
+
         // Load the feed as an XML DOMDocument object
         @ini_set('track_errors', 1);
         $doc = new DOMDocument();
-        $success = @$doc->loadXML($string);
+        $doc = @Zend_Xml_Security::scan($string, $doc);
         @ini_restore('track_errors');
 
-        if (!$success) {
+        if (!$doc) {
             require_once 'Zend/Gdata/App/Exception.php';
             throw new Zend_Gdata_App_Exception(
                 "DOMDocument cannot parse XML: $php_errormsg");
@@ -953,6 +975,11 @@ class Zend_Gdata_App
     public function insertEntry($data, $uri, $className='Zend_Gdata_App_Entry',
         $extraHeaders = array())
     {
+        if (!class_exists($className, false)) {
+          require_once 'Zend/Loader.php';
+          @Zend_Loader::loadClass($className);
+        }
+
         $response = $this->post($data, $uri, null, null, $extraHeaders);
 
         $returnEntry = new $className($response->getBody());
@@ -989,6 +1016,11 @@ class Zend_Gdata_App
             $className = 'Zend_Gdata_App_Entry';
         }
 
+        if (!class_exists($className, false)) {
+          require_once 'Zend/Loader.php';
+          @Zend_Loader::loadClass($className);
+        }
+
         $response = $this->put($data, $uri, null, null, $extraHeaders);
         $returnEntry = new $className($response->getBody());
         $returnEntry->setHttpClient(self::getstaticHttpClient());
@@ -1031,6 +1063,9 @@ class Zend_Gdata_App
                      break;
                  } catch (Zend_Exception $e) {
                      // package wasn't here- continue searching
+                 } catch (ErrorException $e) {
+                     // package wasn't here- continue searching
+                     // @see ZF-7013 and ZF-11959
                  }
             }
             if ($foundClassName != null) {
@@ -1063,7 +1098,7 @@ class Zend_Gdata_App
      * significant amount of time to complete. In some cases this may cause
      * execution to timeout without proper precautions in place.
      *
-     * @param $feed The feed to iterate through.
+     * @param object $feed The feed to iterate through.
      * @return mixed A new feed of the same type as the one originally
      *          passed in, containing all relevent entries.
      */
@@ -1093,7 +1128,7 @@ class Zend_Gdata_App
      * NOTE: This will not work if you have customized the adapter
      * already to use a proxy server or other interface.
      *
-     * @param $logfile The logfile to use when logging the requests
+     * @param string $logfile The logfile to use when logging the requests
      */
     public function enableRequestDebugLogging($logfile)
     {
diff --git a/lib/zend/Zend/Gdata/App/AuthException.php b/lib/zend/Zend/Gdata/App/AuthException.php
index f205a38f8d0..c98215d0af3 100644
--- a/lib/zend/Zend/Gdata/App/AuthException.php
+++ b/lib/zend/Zend/Gdata/App/AuthException.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata/App/Exception.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_AuthException extends Zend_Gdata_App_Exception
diff --git a/lib/zend/Zend/Gdata/App/BadMethodCallException.php b/lib/zend/Zend/Gdata/App/BadMethodCallException.php
index b9bf33c6f37..25916810668 100644
--- a/lib/zend/Zend/Gdata/App/BadMethodCallException.php
+++ b/lib/zend/Zend/Gdata/App/BadMethodCallException.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,7 +34,7 @@ require_once 'Zend/Gdata/App/Exception.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_BadMethodCallException extends Zend_Gdata_App_Exception
diff --git a/lib/zend/Zend/Gdata/App/Base.php b/lib/zend/Zend/Gdata/App/Base.php
index dbf1d7f22b0..46358403705 100644
--- a/lib/zend/Zend/Gdata/App/Base.php
+++ b/lib/zend/Zend/Gdata/App/Base.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,13 +26,16 @@
  */
 require_once 'Zend/Gdata/App/Util.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /**
  * Abstract class for all XML elements
  *
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Gdata_App_Base
@@ -301,9 +304,9 @@ abstract class Zend_Gdata_App_Base
             // Load the feed as an XML DOMDocument object
             @ini_set('track_errors', 1);
             $doc = new DOMDocument();
-            $success = @$doc->loadXML($xml);
+            $doc = @Zend_Xml_Security::scan($xml, $doc);
             @ini_restore('track_errors');
-            if (!$success) {
+            if (!$doc) {
                 require_once 'Zend/Gdata/App/Exception.php';
                 throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $php_errormsg");
             }
@@ -375,8 +378,8 @@ abstract class Zend_Gdata_App_Base
     {
         // Check for a memoized result
         $key = $prefix . ' ' .
-               (is_null($majorVersion) ? 'NULL' : $majorVersion) .
-               ' '. (is_null($minorVersion) ? 'NULL' : $minorVersion);
+               ($majorVersion === null ? 'NULL' : $majorVersion) .
+               ' '. ($minorVersion === null ? 'NULL' : $minorVersion);
         if (array_key_exists($key, self::$_namespaceLookupCache))
           return self::$_namespaceLookupCache[$key];
         // If no match, return the prefix by default
diff --git a/lib/zend/Zend/Gdata/App/BaseMediaSource.php b/lib/zend/Zend/Gdata/App/BaseMediaSource.php
index 51b6f3a9adb..7e136ac4557 100644
--- a/lib/zend/Zend/Gdata/App/BaseMediaSource.php
+++ b/lib/zend/Zend/Gdata/App/BaseMediaSource.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/MediaSource.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Gdata_App_BaseMediaSource implements Zend_Gdata_App_MediaSource
diff --git a/lib/zend/Zend/Gdata/App/CaptchaRequiredException.php b/lib/zend/Zend/Gdata/App/CaptchaRequiredException.php
index 897f5bbad0d..c91e506a996 100644
--- a/lib/zend/Zend/Gdata/App/CaptchaRequiredException.php
+++ b/lib/zend/Zend/Gdata/App/CaptchaRequiredException.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/App/AuthException.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_CaptchaRequiredException extends Zend_Gdata_App_AuthException
diff --git a/lib/zend/Zend/Gdata/App/Entry.php b/lib/zend/Zend/Gdata/App/Entry.php
index a6fd3e76f45..db8cb251cec 100644
--- a/lib/zend/Zend/Gdata/App/Entry.php
+++ b/lib/zend/Zend/Gdata/App/Entry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -62,7 +62,7 @@ require_once 'Zend/Gdata/App/Extension/Control.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Entry extends Zend_Gdata_App_FeedEntryParent
diff --git a/lib/zend/Zend/Gdata/App/Exception.php b/lib/zend/Zend/Gdata/App/Exception.php
index 052cef4853d..733fb4035a7 100644
--- a/lib/zend/Zend/Gdata/App/Exception.php
+++ b/lib/zend/Zend/Gdata/App/Exception.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -35,7 +35,7 @@ require_once 'Zend/Exception.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Exception extends Zend_Exception
diff --git a/lib/zend/Zend/Gdata/App/Extension.php b/lib/zend/Zend/Gdata/App/Extension.php
index 40de85bbc9d..6d26f3da4a0 100644
--- a/lib/zend/Zend/Gdata/App/Extension.php
+++ b/lib/zend/Zend/Gdata/App/Extension.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Base.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Gdata_App_Extension extends Zend_Gdata_App_Base
diff --git a/lib/zend/Zend/Gdata/App/Extension/Author.php b/lib/zend/Zend/Gdata/App/Extension/Author.php
index 83086005c26..74944c1e4eb 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Author.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Author.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Person.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Author extends Zend_Gdata_App_Extension_Person
diff --git a/lib/zend/Zend/Gdata/App/Extension/Category.php b/lib/zend/Zend/Gdata/App/Extension/Category.php
index 012b5aa67d4..5d60b467c3b 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Category.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Category.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Category extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Content.php b/lib/zend/Zend/Gdata/App/Extension/Content.php
index 634767a975c..11cbbe9c95b 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Content.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Content.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Content extends Zend_Gdata_App_Extension_Text
diff --git a/lib/zend/Zend/Gdata/App/Extension/Contributor.php b/lib/zend/Zend/Gdata/App/Extension/Contributor.php
index 5224be04f5f..3ec1864634b 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Contributor.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Contributor.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Person.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Contributor extends Zend_Gdata_App_Extension_Person
diff --git a/lib/zend/Zend/Gdata/App/Extension/Control.php b/lib/zend/Zend/Gdata/App/Extension/Control.php
index 517486874a3..aa76544c40b 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Control.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Control.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/App/Extension/Draft.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Control extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Draft.php b/lib/zend/Zend/Gdata/App/Extension/Draft.php
index fa9746660bb..db5ada334fd 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Draft.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Draft.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Draft extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Edited.php b/lib/zend/Zend/Gdata/App/Extension/Edited.php
index 69913b40db3..7f07e652e76 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Edited.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Edited.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Edited extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Element.php b/lib/zend/Zend/Gdata/App/Extension/Element.php
index 91b8c8cbe34..57ab5fc2460 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Element.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Element.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Element extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Email.php b/lib/zend/Zend/Gdata/App/Extension/Email.php
index 2cf71f56395..475b949f3dc 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Email.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Email.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Email extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Generator.php b/lib/zend/Zend/Gdata/App/Extension/Generator.php
index e438a2a1fa4..363af0d6bd7 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Generator.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Generator.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Generator extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Icon.php b/lib/zend/Zend/Gdata/App/Extension/Icon.php
index da4beaae332..984a692e268 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Icon.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Icon.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Icon extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Id.php b/lib/zend/Zend/Gdata/App/Extension/Id.php
index 9101b0f9b71..5ba05b471d2 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Id.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Id.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Id extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Link.php b/lib/zend/Zend/Gdata/App/Extension/Link.php
index d0a61149c68..5f7587fc279 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Link.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Link.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Link extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Logo.php b/lib/zend/Zend/Gdata/App/Extension/Logo.php
index 820cf4be415..1f78fbe303e 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Logo.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Logo.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Logo extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Name.php b/lib/zend/Zend/Gdata/App/Extension/Name.php
index db347c23a54..67214d0ef2a 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Name.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Name.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Name extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Person.php b/lib/zend/Zend/Gdata/App/Extension/Person.php
index 8dbc59c4b7a..e2bf7dd87c7 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Person.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Person.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -47,7 +47,7 @@ require_once 'Zend/Gdata/App/Extension/Uri.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Gdata_App_Extension_Person extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Published.php b/lib/zend/Zend/Gdata/App/Extension/Published.php
index a68a94a8141..f7b3e12148f 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Published.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Published.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Published extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Rights.php b/lib/zend/Zend/Gdata/App/Extension/Rights.php
index 59726ba8b4f..82f8833c9e2 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Rights.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Rights.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Rights extends Zend_Gdata_App_Extension_Text
diff --git a/lib/zend/Zend/Gdata/App/Extension/Source.php b/lib/zend/Zend/Gdata/App/Extension/Source.php
index 55dd52f945b..52d598d9ce0 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Source.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Source.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -35,7 +35,7 @@ require_once 'Zend/Gdata/App/FeedSourceParent.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Source extends Zend_Gdata_App_FeedSourceParent
diff --git a/lib/zend/Zend/Gdata/App/Extension/Subtitle.php b/lib/zend/Zend/Gdata/App/Extension/Subtitle.php
index 148a2e8d8af..59e9dad40ed 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Subtitle.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Subtitle.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Subtitle extends Zend_Gdata_App_Extension_Text
diff --git a/lib/zend/Zend/Gdata/App/Extension/Summary.php b/lib/zend/Zend/Gdata/App/Extension/Summary.php
index b5f771280e7..8333688c375 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Summary.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Summary.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Summary extends Zend_Gdata_App_Extension_Text
diff --git a/lib/zend/Zend/Gdata/App/Extension/Text.php b/lib/zend/Zend/Gdata/App/Extension/Text.php
index 25d86866622..7ddaa2d7497 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Text.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Text.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Gdata_App_Extension_Text extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Title.php b/lib/zend/Zend/Gdata/App/Extension/Title.php
index 57e339692ac..51b64b92ea9 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Title.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Title.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Title extends Zend_Gdata_App_Extension_Text
diff --git a/lib/zend/Zend/Gdata/App/Extension/Updated.php b/lib/zend/Zend/Gdata/App/Extension/Updated.php
index cee6ed18abe..72db6684d40 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Updated.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Updated.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Updated extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Extension/Uri.php b/lib/zend/Zend/Gdata/App/Extension/Uri.php
index efa1283ef2c..5f61243d804 100644
--- a/lib/zend/Zend/Gdata/App/Extension/Uri.php
+++ b/lib/zend/Zend/Gdata/App/Extension/Uri.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Extension_Uri extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/App/Feed.php b/lib/zend/Zend/Gdata/App/Feed.php
old mode 100644
new mode 100755
index 3df3705564c..2e07bd0bd4a
--- a/lib/zend/Zend/Gdata/App/Feed.php
+++ b/lib/zend/Zend/Gdata/App/Feed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,11 +37,11 @@ require_once 'Zend/Gdata/App/FeedSourceParent.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Feed extends Zend_Gdata_App_FeedSourceParent
-        implements Iterator, ArrayAccess
+        implements Iterator, ArrayAccess, Countable
 {
 
     /**
diff --git a/lib/zend/Zend/Gdata/App/FeedEntryParent.php b/lib/zend/Zend/Gdata/App/FeedEntryParent.php
old mode 100644
new mode 100755
index ec0821f56d1..89c6fcc150d
--- a/lib/zend/Zend/Gdata/App/FeedEntryParent.php
+++ b/lib/zend/Zend/Gdata/App/FeedEntryParent.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -77,7 +77,7 @@ require_once 'Zend/Version.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base
diff --git a/lib/zend/Zend/Gdata/App/FeedSourceParent.php b/lib/zend/Zend/Gdata/App/FeedSourceParent.php
index 276d57166dd..9bdbbad769d 100644
--- a/lib/zend/Zend/Gdata/App/FeedSourceParent.php
+++ b/lib/zend/Zend/Gdata/App/FeedSourceParent.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -57,7 +57,7 @@ require_once 'Zend/Gdata/App/Extension/Subtitle.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Gdata_App_FeedSourceParent extends Zend_Gdata_App_FeedEntryParent
diff --git a/lib/zend/Zend/Gdata/App/HttpException.php b/lib/zend/Zend/Gdata/App/HttpException.php
index cca9ec48ec6..ccd4a89d9f7 100644
--- a/lib/zend/Zend/Gdata/App/HttpException.php
+++ b/lib/zend/Zend/Gdata/App/HttpException.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Http/Client/Exception.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_HttpException extends Zend_Gdata_App_Exception
diff --git a/lib/zend/Zend/Gdata/App/IOException.php b/lib/zend/Zend/Gdata/App/IOException.php
index 03e44bd3848..472f9739c2d 100644
--- a/lib/zend/Zend/Gdata/App/IOException.php
+++ b/lib/zend/Zend/Gdata/App/IOException.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -35,7 +35,7 @@ require_once 'Zend/Gdata/App/Exception.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_IOException extends Zend_Gdata_App_Exception
diff --git a/lib/zend/Zend/Gdata/App/InvalidArgumentException.php b/lib/zend/Zend/Gdata/App/InvalidArgumentException.php
index 389c86433ca..5db8d3c8f48 100644
--- a/lib/zend/Zend/Gdata/App/InvalidArgumentException.php
+++ b/lib/zend/Zend/Gdata/App/InvalidArgumentException.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,7 +34,7 @@ require_once 'Zend/Gdata/App/Exception.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_InvalidArgumentException extends Zend_Gdata_App_Exception
diff --git a/lib/zend/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php b/lib/zend/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php
index 62c78bd2a31..ee85da807fb 100644
--- a/lib/zend/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php
+++ b/lib/zend/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php
@@ -17,7 +17,7 @@
  * @package    Zend_Gdata
  * @subpackage App
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -35,7 +35,7 @@ require_once 'Zend/Http/Client/Adapter/Socket.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_LoggingHttpClientAdapterSocket extends Zend_Http_Client_Adapter_Socket
diff --git a/lib/zend/Zend/Gdata/App/MediaEntry.php b/lib/zend/Zend/Gdata/App/MediaEntry.php
index cc64c1def83..183d3c6386d 100644
--- a/lib/zend/Zend/Gdata/App/MediaEntry.php
+++ b/lib/zend/Zend/Gdata/App/MediaEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/MediaMimeStream.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_MediaEntry extends Zend_Gdata_App_Entry
diff --git a/lib/zend/Zend/Gdata/App/MediaFileSource.php b/lib/zend/Zend/Gdata/App/MediaFileSource.php
index 74f167973c2..57f5f219a1f 100644
--- a/lib/zend/Zend/Gdata/App/MediaFileSource.php
+++ b/lib/zend/Zend/Gdata/App/MediaFileSource.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/BaseMediaSource.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
diff --git a/lib/zend/Zend/Gdata/App/MediaSource.php b/lib/zend/Zend/Gdata/App/MediaSource.php
index 734263103d6..31f509c53b6 100644
--- a/lib/zend/Zend/Gdata/App/MediaSource.php
+++ b/lib/zend/Zend/Gdata/App/MediaSource.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Zend_Gdata_App_MediaSource
diff --git a/lib/zend/Zend/Gdata/App/Util.php b/lib/zend/Zend/Gdata/App/Util.php
index 34744a52838..556490c847a 100644
--- a/lib/zend/Zend/Gdata/App/Util.php
+++ b/lib/zend/Zend/Gdata/App/Util.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_Util
@@ -45,7 +45,7 @@ class Zend_Gdata_App_Util
         $rfc3339 = '/^(\d{4})\-?(\d{2})\-?(\d{2})((T|t)(\d{2})\:?(\d{2})' .
                    '\:?(\d{2})(\.\d{1,})?((Z|z)|([\+\-])(\d{2})\:?(\d{2})))?$/';
 
-        if (ctype_digit($timestamp)) {
+        if (ctype_digit((string)$timestamp)) {
             return gmdate('Y-m-d\TH:i:sP', $timestamp);
         } elseif (preg_match($rfc3339, $timestamp) > 0) {
             // timestamp is already properly formatted
diff --git a/lib/zend/Zend/Gdata/App/VersionException.php b/lib/zend/Zend/Gdata/App/VersionException.php
index e2c2248e541..c35181e3b5e 100644
--- a/lib/zend/Zend/Gdata/App/VersionException.php
+++ b/lib/zend/Zend/Gdata/App/VersionException.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,7 +34,7 @@ require_once 'Zend/Gdata/App/Exception.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_App_VersionException extends Zend_Gdata_App_Exception
diff --git a/lib/zend/Zend/Gdata/AuthSub.php b/lib/zend/Zend/Gdata/AuthSub.php
index d959747c785..3958706ccc2 100644
--- a/lib/zend/Zend/Gdata/AuthSub.php
+++ b/lib/zend/Zend/Gdata/AuthSub.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -40,7 +40,7 @@ require_once 'Zend/Version.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_AuthSub
@@ -169,6 +169,7 @@ class Zend_Gdata_AuthSub
         try {
             $response = $client->request('GET');
         } catch (Zend_Http_Client_Exception $e) {
+            ob_end_clean();
             require_once 'Zend/Gdata/App/HttpException.php';
             throw new Zend_Gdata_App_HttpException($e->getMessage(), $e);
         }
@@ -210,6 +211,7 @@ class Zend_Gdata_AuthSub
         try {
             $response = $client->request('GET');
         } catch (Zend_Http_Client_Exception $e) {
+            ob_end_clean();
             require_once 'Zend/Gdata/App/HttpException.php';
             throw new Zend_Gdata_App_HttpException($e->getMessage(), $e);
         }
@@ -229,9 +231,9 @@ class Zend_Gdata_AuthSub
         if ($client == null) {
             $client = new Zend_Gdata_HttpClient();
         }
-        if (!$client instanceof Zend_Http_Client) {
+        if (!$client instanceof Zend_Gdata_HttpClient) {
             require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException('Client is not an instance of Zend_Http_Client.');
+            throw new Zend_Gdata_App_HttpException('Client is not an instance of Zend_Gdata_HttpClient.');
         }
         $useragent = 'Zend_Framework_Gdata/' . Zend_Version::VERSION;
         $client->setConfig(array(
diff --git a/lib/zend/Zend/Gdata/Books.php b/lib/zend/Zend/Gdata/Books.php
old mode 100644
new mode 100755
index b0d6179d1cd..48c5bb867cc
--- a/lib/zend/Zend/Gdata/Books.php
+++ b/lib/zend/Zend/Gdata/Books.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -57,14 +57,14 @@ require_once 'Zend/Gdata/Books/VolumeFeed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books extends Zend_Gdata
 {
-    const VOLUME_FEED_URI = 'http://books.google.com/books/feeds/volumes';
-    const MY_LIBRARY_FEED_URI = 'http://books.google.com/books/feeds/users/me/collections/library/volumes';
-    const MY_ANNOTATION_FEED_URI = 'http://books.google.com/books/feeds/users/me/volumes';
+    const VOLUME_FEED_URI = 'https://books.google.com/books/feeds/volumes';
+    const MY_LIBRARY_FEED_URI = 'https://books.google.com/books/feeds/users/me/collections/library/volumes';
+    const MY_ANNOTATION_FEED_URI = 'https://books.google.com/books/feeds/users/me/volumes';
     const AUTH_SERVICE_NAME = 'print';
 
     /**
diff --git a/lib/zend/Zend/Gdata/Books/CollectionEntry.php b/lib/zend/Zend/Gdata/Books/CollectionEntry.php
index f77cd57e838..04e0eb88d9e 100644
--- a/lib/zend/Zend/Gdata/Books/CollectionEntry.php
+++ b/lib/zend/Zend/Gdata/Books/CollectionEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_CollectionEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Books/CollectionFeed.php b/lib/zend/Zend/Gdata/Books/CollectionFeed.php
index 1b6de1a9a9a..63cb1d3898b 100644
--- a/lib/zend/Zend/Gdata/Books/CollectionFeed.php
+++ b/lib/zend/Zend/Gdata/Books/CollectionFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_CollectionFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Books/Extension/AnnotationLink.php b/lib/zend/Zend/Gdata/Books/Extension/AnnotationLink.php
index 28333c9c612..2c8b1ae1f11 100644
--- a/lib/zend/Zend/Gdata/Books/Extension/AnnotationLink.php
+++ b/lib/zend/Zend/Gdata/Books/Extension/AnnotationLink.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Books/Extension/BooksLink.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_Extension_AnnotationLink extends
diff --git a/lib/zend/Zend/Gdata/Books/Extension/BooksCategory.php b/lib/zend/Zend/Gdata/Books/Extension/BooksCategory.php
index 74d624e41b2..897454820b3 100644
--- a/lib/zend/Zend/Gdata/Books/Extension/BooksCategory.php
+++ b/lib/zend/Zend/Gdata/Books/Extension/BooksCategory.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_Extension_BooksCategory extends
diff --git a/lib/zend/Zend/Gdata/Books/Extension/BooksLink.php b/lib/zend/Zend/Gdata/Books/Extension/BooksLink.php
index 0f027a636ed..114d614fe2d 100644
--- a/lib/zend/Zend/Gdata/Books/Extension/BooksLink.php
+++ b/lib/zend/Zend/Gdata/Books/Extension/BooksLink.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Link.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_Extension_BooksLink extends Zend_Gdata_App_Extension_Link
diff --git a/lib/zend/Zend/Gdata/Books/Extension/Embeddability.php b/lib/zend/Zend/Gdata/Books/Extension/Embeddability.php
index 081a79bd854..573531cde16 100644
--- a/lib/zend/Zend/Gdata/Books/Extension/Embeddability.php
+++ b/lib/zend/Zend/Gdata/Books/Extension/Embeddability.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_Extension_Embeddability extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Books/Extension/InfoLink.php b/lib/zend/Zend/Gdata/Books/Extension/InfoLink.php
index 6ed26329c48..42168727810 100644
--- a/lib/zend/Zend/Gdata/Books/Extension/InfoLink.php
+++ b/lib/zend/Zend/Gdata/Books/Extension/InfoLink.php
@@ -31,7 +31,7 @@ require_once 'Zend/Gdata/Books/Extension/BooksLink.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_Extension_InfoLink extends
diff --git a/lib/zend/Zend/Gdata/Books/Extension/PreviewLink.php b/lib/zend/Zend/Gdata/Books/Extension/PreviewLink.php
index 6a4ec3216ea..bece515ba5a 100644
--- a/lib/zend/Zend/Gdata/Books/Extension/PreviewLink.php
+++ b/lib/zend/Zend/Gdata/Books/Extension/PreviewLink.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Books/Extension/BooksLink.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_Extension_PreviewLink extends
diff --git a/lib/zend/Zend/Gdata/Books/Extension/Review.php b/lib/zend/Zend/Gdata/Books/Extension/Review.php
index 0340177be8f..a942a1db427 100644
--- a/lib/zend/Zend/Gdata/Books/Extension/Review.php
+++ b/lib/zend/Zend/Gdata/Books/Extension/Review.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_Extension_Review extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Books/Extension/ThumbnailLink.php b/lib/zend/Zend/Gdata/Books/Extension/ThumbnailLink.php
index 96d605064dd..9bf76849eef 100644
--- a/lib/zend/Zend/Gdata/Books/Extension/ThumbnailLink.php
+++ b/lib/zend/Zend/Gdata/Books/Extension/ThumbnailLink.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Books/Extension/BooksLink.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_Extension_ThumbnailLink extends
diff --git a/lib/zend/Zend/Gdata/Books/Extension/Viewability.php b/lib/zend/Zend/Gdata/Books/Extension/Viewability.php
index d37e9a73b88..fd83b47d38c 100644
--- a/lib/zend/Zend/Gdata/Books/Extension/Viewability.php
+++ b/lib/zend/Zend/Gdata/Books/Extension/Viewability.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_Extension_Viewability extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Books/VolumeEntry.php b/lib/zend/Zend/Gdata/Books/VolumeEntry.php
index 3b911684be8..1ac15ffc549 100644
--- a/lib/zend/Zend/Gdata/Books/VolumeEntry.php
+++ b/lib/zend/Zend/Gdata/Books/VolumeEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -102,7 +102,7 @@ require_once 'Zend/Gdata/Books/Extension/Viewability.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_VolumeEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Books/VolumeFeed.php b/lib/zend/Zend/Gdata/Books/VolumeFeed.php
index 950f5ca4311..feb2e7c1060 100644
--- a/lib/zend/Zend/Gdata/Books/VolumeFeed.php
+++ b/lib/zend/Zend/Gdata/Books/VolumeFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_VolumeFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Books/VolumeQuery.php b/lib/zend/Zend/Gdata/Books/VolumeQuery.php
old mode 100644
new mode 100755
index 617bb7b1361..37853f37c5a
--- a/lib/zend/Zend/Gdata/Books/VolumeQuery.php
+++ b/lib/zend/Zend/Gdata/Books/VolumeQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once('Zend/Gdata/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Books_VolumeQuery extends Zend_Gdata_Query
diff --git a/lib/zend/Zend/Gdata/Calendar.php b/lib/zend/Zend/Gdata/Calendar.php
index 740bb931764..6169d9ca5f1 100644
--- a/lib/zend/Zend/Gdata/Calendar.php
+++ b/lib/zend/Zend/Gdata/Calendar.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -53,14 +53,14 @@ require_once 'Zend/Gdata/Calendar/ListEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar extends Zend_Gdata
 {
 
-    const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds';
-    const CALENDAR_EVENT_FEED_URI = 'http://www.google.com/calendar/feeds/default/private/full';
+    const CALENDAR_FEED_URI = 'https://www.google.com/calendar/feeds';
+    const CALENDAR_EVENT_FEED_URI = 'https://www.google.com/calendar/feeds/default/private/full';
     const AUTH_SERVICE_NAME = 'cl';
 
     protected $_defaultPostUri = self::CALENDAR_EVENT_FEED_URI;
diff --git a/lib/zend/Zend/Gdata/Calendar/EventEntry.php b/lib/zend/Zend/Gdata/Calendar/EventEntry.php
index b76a4851680..f3b9e186c86 100644
--- a/lib/zend/Zend/Gdata/Calendar/EventEntry.php
+++ b/lib/zend/Zend/Gdata/Calendar/EventEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -57,7 +57,7 @@ require_once 'Zend/Gdata/Calendar/Extension/QuickAdd.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_EventEntry extends Zend_Gdata_Kind_EventEntry
diff --git a/lib/zend/Zend/Gdata/Calendar/EventFeed.php b/lib/zend/Zend/Gdata/Calendar/EventFeed.php
index f898fa9152d..9e30f9549a1 100644
--- a/lib/zend/Zend/Gdata/Calendar/EventFeed.php
+++ b/lib/zend/Zend/Gdata/Calendar/EventFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Calendar/Extension/Timezone.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_EventFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Calendar/EventQuery.php b/lib/zend/Zend/Gdata/Calendar/EventQuery.php
index 0ff18d56332..6e986be97c8 100644
--- a/lib/zend/Zend/Gdata/Calendar/EventQuery.php
+++ b/lib/zend/Zend/Gdata/Calendar/EventQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,13 +39,13 @@ require_once('Zend/Gdata/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query
 {
 
-    const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds';
+    const CALENDAR_FEED_URI = 'https://www.google.com/calendar/feeds';
 
     /**
      * The default URI used for feeds.
@@ -91,9 +91,9 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query
     /**
      * Create Gdata_Calendar_EventQuery object.  If a URL is provided,
      * it becomes the base URL, and additional URL components may be
-     * appended.  For instance, if $url is 'http://www.google.com/calendar',
+     * appended.  For instance, if $url is 'https://www.google.com/calendar',
      * the default URL constructed will be
-     * 'http://www.google.com/calendar/default/public/full'.
+     * 'https://www.google.com/calendar/default/public/full'.
      *
      * If the URL already contains a calendar ID, projection, visibility,
      * event ID, or comment ID, you will need to set these fields to null
diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/AccessLevel.php b/lib/zend/Zend/Gdata/Calendar/Extension/AccessLevel.php
index 0e636a2b991..3478132fa0c 100644
--- a/lib/zend/Zend/Gdata/Calendar/Extension/AccessLevel.php
+++ b/lib/zend/Zend/Gdata/Calendar/Extension/AccessLevel.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_Extension_AccessLevel extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Color.php b/lib/zend/Zend/Gdata/Calendar/Extension/Color.php
index 0c7bcefeefd..bbdf0a54673 100644
--- a/lib/zend/Zend/Gdata/Calendar/Extension/Color.php
+++ b/lib/zend/Zend/Gdata/Calendar/Extension/Color.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_Extension_Color extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Hidden.php b/lib/zend/Zend/Gdata/Calendar/Extension/Hidden.php
index ba6afb68888..376091b6f46 100644
--- a/lib/zend/Zend/Gdata/Calendar/Extension/Hidden.php
+++ b/lib/zend/Zend/Gdata/Calendar/Extension/Hidden.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_Extension_Hidden extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Link.php b/lib/zend/Zend/Gdata/Calendar/Extension/Link.php
index e008c35b43d..b9d597b53ce 100644
--- a/lib/zend/Zend/Gdata/Calendar/Extension/Link.php
+++ b/lib/zend/Zend/Gdata/Calendar/Extension/Link.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Calendar/Extension/WebContent.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_Extension_Link extends Zend_Gdata_App_Extension_Link
diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/QuickAdd.php b/lib/zend/Zend/Gdata/Calendar/Extension/QuickAdd.php
index 6c0c1d95db3..b63df0b43de 100644
--- a/lib/zend/Zend/Gdata/Calendar/Extension/QuickAdd.php
+++ b/lib/zend/Zend/Gdata/Calendar/Extension/QuickAdd.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_Extension_QuickAdd extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Selected.php b/lib/zend/Zend/Gdata/Calendar/Extension/Selected.php
index acdf4a1071e..f65b447a1d9 100644
--- a/lib/zend/Zend/Gdata/Calendar/Extension/Selected.php
+++ b/lib/zend/Zend/Gdata/Calendar/Extension/Selected.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_Extension_Selected extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/SendEventNotifications.php b/lib/zend/Zend/Gdata/Calendar/Extension/SendEventNotifications.php
index cdd45624f6c..aa41fec0c1f 100644
--- a/lib/zend/Zend/Gdata/Calendar/Extension/SendEventNotifications.php
+++ b/lib/zend/Zend/Gdata/Calendar/Extension/SendEventNotifications.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_Extension_SendEventNotifications extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Timezone.php b/lib/zend/Zend/Gdata/Calendar/Extension/Timezone.php
index 6ba2714814a..39a9a54919b 100644
--- a/lib/zend/Zend/Gdata/Calendar/Extension/Timezone.php
+++ b/lib/zend/Zend/Gdata/Calendar/Extension/Timezone.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_Extension_Timezone extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/WebContent.php b/lib/zend/Zend/Gdata/Calendar/Extension/WebContent.php
index 511841f7adb..df50192dc02 100644
--- a/lib/zend/Zend/Gdata/Calendar/Extension/WebContent.php
+++ b/lib/zend/Zend/Gdata/Calendar/Extension/WebContent.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_Extension_WebContent extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/Calendar/ListEntry.php b/lib/zend/Zend/Gdata/Calendar/ListEntry.php
index 71f762f43de..1e232a97fad 100644
--- a/lib/zend/Zend/Gdata/Calendar/ListEntry.php
+++ b/lib/zend/Zend/Gdata/Calendar/ListEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -69,7 +69,7 @@ require_once 'Zend/Gdata/Extension/Where.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_ListEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Calendar/ListFeed.php b/lib/zend/Zend/Gdata/Calendar/ListFeed.php
index f31ffeebb28..26f7243f36a 100644
--- a/lib/zend/Zend/Gdata/Calendar/ListFeed.php
+++ b/lib/zend/Zend/Gdata/Calendar/ListFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Calendar/Extension/Timezone.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Calendar_ListFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/ClientLogin.php b/lib/zend/Zend/Gdata/ClientLogin.php
index ef84cdec6e4..2e8d9bffe72 100644
--- a/lib/zend/Zend/Gdata/ClientLogin.php
+++ b/lib/zend/Zend/Gdata/ClientLogin.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Version.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_ClientLogin
diff --git a/lib/zend/Zend/Gdata/Docs.php b/lib/zend/Zend/Gdata/Docs.php
old mode 100644
new mode 100755
index 35562d63f17..ec056c863a3
--- a/lib/zend/Zend/Gdata/Docs.php
+++ b/lib/zend/Zend/Gdata/Docs.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -53,36 +53,43 @@ require_once 'Zend/Gdata/App/Extension/Title.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Docs extends Zend_Gdata
 {
-
-    const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents/private/full';
-    const DOCUMENTS_FOLDER_FEED_URI = 'http://docs.google.com/feeds/folders/private/full';
+    const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/documents/private/full';
+    const DOCUMENTS_FOLDER_FEED_URI = 'https://docs.google.com/feeds/folders/private/full';
     const DOCUMENTS_CATEGORY_SCHEMA = 'http://schemas.google.com/g/2005#kind';
     const DOCUMENTS_CATEGORY_TERM = 'http://schemas.google.com/docs/2007#folder';
     const AUTH_SERVICE_NAME = 'writely';
 
+    /**
+     * @var string
+     */
     protected $_defaultPostUri = self::DOCUMENTS_LIST_FEED_URI;
 
-    private static $SUPPORTED_FILETYPES = array(
-      'TXT'=>'text/plain',
-      'CSV'=>'text/csv',
-      'TSV'=>'text/tab-separated-values',
-      'TAB'=>'text/tab-separated-values',
-      'HTML'=>'text/html',
-      'HTM'=>'text/html',
-      'DOC'=>'application/msword',
-      'ODS'=>'application/vnd.oasis.opendocument.spreadsheet',
-      'ODT'=>'application/vnd.oasis.opendocument.text',
-      'RTF'=>'application/rtf',
-      'SXW'=>'application/vnd.sun.xml.writer',
-      'XLS'=>'application/vnd.ms-excel',
-      'XLSX'=>'application/vnd.ms-excel',
-      'PPT'=>'application/vnd.ms-powerpoint',
-      'PPS'=>'application/vnd.ms-powerpoint');
+    /**
+     * @var array
+     */
+    protected static $SUPPORTED_FILETYPES = array(
+        'TXT'  => 'text/plain',
+        'CSV'  => 'text/csv',
+        'TSV'  => 'text/tab-separated-values',
+        'TAB'  => 'text/tab-separated-values',
+        'HTML' => 'text/html',
+        'HTM'  => 'text/html',
+        'DOC'  => 'application/msword',
+        'DOCX' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'ODS'  => 'application/vnd.oasis.opendocument.spreadsheet',
+        'ODT'  => 'application/vnd.oasis.opendocument.text',
+        'RTF'  => 'application/rtf',
+        'SXW'  => 'application/vnd.sun.xml.writer',
+        'XLS'  => 'application/vnd.ms-excel',
+        'XLSX' => 'application/vnd.ms-excel',
+        'PPT'  => 'application/vnd.ms-powerpoint',
+        'PPS'  => 'application/vnd.ms-powerpoint'
+    );
 
     /**
      * Create Gdata_Docs object
@@ -108,8 +115,9 @@ class Zend_Gdata_Docs extends Zend_Gdata
      * @return string The mime type to be sent to the server to tell it how the
      *          multipart mime data should be interpreted.
      */
-    public static function lookupMimeType($fileExtension) {
-      return self::$SUPPORTED_FILETYPES[strtoupper($fileExtension)];
+    public static function lookupMimeType($fileExtension)
+    {
+        return self::$SUPPORTED_FILETYPES[strtoupper($fileExtension)];
     }
 
     /**
@@ -135,13 +143,15 @@ class Zend_Gdata_Docs extends Zend_Gdata
      *
      * @param mixed $location The location for the entry, as a URL or Query
      * @return Zend_Gdata_Docs_DocumentListEntry
+     * @throws Zend_Gdata_App_InvalidArgumentException
      */
     public function getDocumentListEntry($location = null)
     {
         if ($location === null) {
             require_once 'Zend/Gdata/App/InvalidArgumentException.php';
             throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
+                    'Location must not be null'
+            );
         } else if ($location instanceof Zend_Gdata_Query) {
             $uri = $location->getQueryUrl();
         } else {
@@ -161,40 +171,45 @@ class Zend_Gdata_Docs extends Zend_Gdata
      *     Document List URLs. Examples: document, spreadsheet, presentation
      * @return Zend_Gdata_Docs_DocumentListEntry
      */
-    public function getDoc($docId, $docType) {
-        $location = 'http://docs.google.com/feeds/documents/private/full/' .
+    public function getDoc($docId, $docType)
+    {
+        $location = 'https://docs.google.com/feeds/documents/private/full/' .
             $docType . '%3A' . $docId;
+
         return $this->getDocumentListEntry($location);
     }
 
     /**
      * Retreive entry object for the desired word processing document.
      *
-     * @param string $id The URL id for the document. Example:
-     *     dcmg89gw_62hfjj8m
+     * @param string $id The URL id for the document. Example: dcmg89gw_62hfjj8m
+     * @return Zend_Gdata_Docs_DocumentListEntry
      */
-    public function getDocument($id) {
-      return $this->getDoc($id, 'document');
+    public function getDocument($id)
+    {
+        return $this->getDoc($id, 'document');
     }
 
     /**
      * Retreive entry object for the desired spreadsheet.
      *
-     * @param string $id The URL id for the document. Example:
-     *     pKq0CzjiF3YmGd0AIlHKqeg
+     * @param string $id The URL id for the document. Example: pKq0CzjiF3YmGd0AIlHKqeg
+     * @return Zend_Gdata_Docs_DocumentListEntry
      */
-    public function getSpreadsheet($id) {
-      return $this->getDoc($id, 'spreadsheet');
+    public function getSpreadsheet($id)
+    {
+        return $this->getDoc($id, 'spreadsheet');
     }
 
     /**
      * Retreive entry object for the desired presentation.
      *
-     * @param string $id The URL id for the document. Example:
-     *     dcmg89gw_21gtrjcn
+     * @param string $id The URL id for the document. Example: dcmg89gw_21gtrjcn
+     * @return Zend_Gdata_Docs_DocumentListEntry
      */
-    public function getPresentation($id) {
-      return $this->getDoc($id, 'presentation');
+    public function getPresentation($id)
+    {
+        return $this->getDoc($id, 'presentation');
     }
 
     /**
@@ -215,12 +230,13 @@ class Zend_Gdata_Docs extends Zend_Gdata
      *         which are enumerated in SUPPORTED_FILETYPES.
      * @param string $uri (optional) The URL to which the upload should be
      *         made.
-     *         Example: 'http://docs.google.com/feeds/documents/private/full'.
+     *         Example: 'https://docs.google.com/feeds/documents/private/full'.
      * @return Zend_Gdata_Docs_DocumentListEntry The entry for the newly
      *         created Google Document.
      */
-    public function uploadFile($fileLocation, $title=null, $mimeType=null,
-                               $uri=null)
+    public function uploadFile($fileLocation, $title = null, $mimeType = null,
+        $uri = null
+    )
     {
         // Set the URI to which the file will be uploaded.
         if ($uri === null) {
@@ -264,11 +280,14 @@ class Zend_Gdata_Docs extends Zend_Gdata
      * @todo ZF-8732: This should return a *subclass* of Zend_Gdata_Entry, but
      *       the appropriate type doesn't exist yet.
      */
-    public function createFolder($folderName, $folderResourceId=null) {
-        $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM, 
-                                                          self::DOCUMENTS_CATEGORY_SCHEMA);
-        $title = new Zend_Gdata_App_Extension_Title($folderName);
-        $entry = new Zend_Gdata_Entry();
+    public function createFolder($folderName, $folderResourceId = null)
+    {
+        $category = new Zend_Gdata_App_Extension_Category(
+            self::DOCUMENTS_CATEGORY_TERM,
+            self::DOCUMENTS_CATEGORY_SCHEMA
+        );
+        $title    = new Zend_Gdata_App_Extension_Title($folderName);
+        $entry    = new Zend_Gdata_Entry();
 
         $entry->setCategory(array($category));
         $entry->setTitle($title);
@@ -295,9 +314,8 @@ class Zend_Gdata_Docs extends Zend_Gdata
      *     service after insertion.
      */
     public function insertDocument($data, $uri,
-        $className='Zend_Gdata_Docs_DocumentListEntry')
+        $className = 'Zend_Gdata_Docs_DocumentListEntry')
     {
         return $this->insertEntry($data, $uri, $className);
     }
-
 }
diff --git a/lib/zend/Zend/Gdata/Docs/DocumentListEntry.php b/lib/zend/Zend/Gdata/Docs/DocumentListEntry.php
old mode 100644
new mode 100755
index a5d42b5192d..6cf7dd5d0b1
--- a/lib/zend/Zend/Gdata/Docs/DocumentListEntry.php
+++ b/lib/zend/Zend/Gdata/Docs/DocumentListEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Docs_DocumentListEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Docs/DocumentListFeed.php b/lib/zend/Zend/Gdata/Docs/DocumentListFeed.php
old mode 100644
new mode 100755
index 107a61ad967..2604449bad1
--- a/lib/zend/Zend/Gdata/Docs/DocumentListFeed.php
+++ b/lib/zend/Zend/Gdata/Docs/DocumentListFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Docs_DocumentListFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Docs/Query.php b/lib/zend/Zend/Gdata/Docs/Query.php
old mode 100644
new mode 100755
index 2cee9a1c232..8d32d55683b
--- a/lib/zend/Zend/Gdata/Docs/Query.php
+++ b/lib/zend/Zend/Gdata/Docs/Query.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,7 +34,7 @@ require_once('Zend/Gdata/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Docs_Query extends Zend_Gdata_Query
@@ -45,7 +45,7 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query
      *
      * @var string
      */
-    const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents';
+    const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/documents';
 
     /**
      * The generic base URL used by some inherited methods
diff --git a/lib/zend/Zend/Gdata/DublinCore.php b/lib/zend/Zend/Gdata/DublinCore.php
old mode 100644
new mode 100755
index 2f702a8291a..edeb5454d1d
--- a/lib/zend/Zend/Gdata/DublinCore.php
+++ b/lib/zend/Zend/Gdata/DublinCore.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore extends Zend_Gdata
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Creator.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Creator.php
index 89d29cbe842..3d8a3ca736f 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Creator.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Creator.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Creator extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Date.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Date.php
index e7c633ba57d..7e931f55014 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Date.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Date.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Date extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Description.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Description.php
index 6bbeb6c66ea..6e2108cadbf 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Description.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Description.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Description extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Format.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Format.php
index d14077c80f4..dd825affc2e 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Format.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Format.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Format extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Identifier.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Identifier.php
index 08ad41cac45..bf83f643f8b 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Identifier.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Identifier.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Identifier extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Language.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Language.php
index f1da3be4a6f..b9ff20e4aa4 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Language.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Language.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Language extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Publisher.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Publisher.php
index 70086f6f1d5..bf0f5c37f2d 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Publisher.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Publisher.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Publisher extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Rights.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Rights.php
index ad5cf5fd4f2..e1982e3877b 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Rights.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Rights.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Rights extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Subject.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Subject.php
index 2ddcccad1ed..e019a176743 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Subject.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Subject.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Subject extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Title.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Title.php
index f3a14397c46..37892ceea91 100644
--- a/lib/zend/Zend/Gdata/DublinCore/Extension/Title.php
+++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Title.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_DublinCore_Extension_Title extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Entry.php b/lib/zend/Zend/Gdata/Entry.php
index 267c9e5a0ad..6a7eae35684 100644
--- a/lib/zend/Zend/Gdata/Entry.php
+++ b/lib/zend/Zend/Gdata/Entry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/App/MediaEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Entry extends Zend_Gdata_App_MediaEntry
diff --git a/lib/zend/Zend/Gdata/Exif.php b/lib/zend/Zend/Gdata/Exif.php
old mode 100644
new mode 100755
index 05f858a8c44..9d82d706980
--- a/lib/zend/Zend/Gdata/Exif.php
+++ b/lib/zend/Zend/Gdata/Exif.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif extends Zend_Gdata
diff --git a/lib/zend/Zend/Gdata/Exif/Entry.php b/lib/zend/Zend/Gdata/Exif/Entry.php
old mode 100644
new mode 100755
index 5e0ee40cfc7..1ecdb67e6dc
--- a/lib/zend/Zend/Gdata/Exif/Entry.php
+++ b/lib/zend/Zend/Gdata/Exif/Entry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Exif/Extension/Tags.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Entry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Distance.php b/lib/zend/Zend/Gdata/Exif/Extension/Distance.php
old mode 100644
new mode 100755
index 11bbac19f30..564887640f2
--- a/lib/zend/Zend/Gdata/Exif/Extension/Distance.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/Distance.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_Distance extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Exposure.php b/lib/zend/Zend/Gdata/Exif/Extension/Exposure.php
old mode 100644
new mode 100755
index 2f0db751838..59465e9bbfb
--- a/lib/zend/Zend/Gdata/Exif/Extension/Exposure.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/Exposure.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_Exposure extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/FStop.php b/lib/zend/Zend/Gdata/Exif/Extension/FStop.php
old mode 100644
new mode 100755
index 4064f7880c6..4d6dbe45e69
--- a/lib/zend/Zend/Gdata/Exif/Extension/FStop.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/FStop.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_FStop extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Flash.php b/lib/zend/Zend/Gdata/Exif/Extension/Flash.php
old mode 100644
new mode 100755
index c7e0a066e45..5b635bf492e
--- a/lib/zend/Zend/Gdata/Exif/Extension/Flash.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/Flash.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_Flash extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/FocalLength.php b/lib/zend/Zend/Gdata/Exif/Extension/FocalLength.php
old mode 100644
new mode 100755
index ffbbc514e83..ae7c19f8803
--- a/lib/zend/Zend/Gdata/Exif/Extension/FocalLength.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/FocalLength.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_FocalLength extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/ImageUniqueId.php b/lib/zend/Zend/Gdata/Exif/Extension/ImageUniqueId.php
old mode 100644
new mode 100755
index 6413d3b9fcf..5963d453a92
--- a/lib/zend/Zend/Gdata/Exif/Extension/ImageUniqueId.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/ImageUniqueId.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_ImageUniqueId extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Iso.php b/lib/zend/Zend/Gdata/Exif/Extension/Iso.php
old mode 100644
new mode 100755
index 0ee637d7344..112f096497c
--- a/lib/zend/Zend/Gdata/Exif/Extension/Iso.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/Iso.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_Iso extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Make.php b/lib/zend/Zend/Gdata/Exif/Extension/Make.php
old mode 100644
new mode 100755
index d621cc6d48e..6f61d6a25d6
--- a/lib/zend/Zend/Gdata/Exif/Extension/Make.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/Make.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_Make extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Model.php b/lib/zend/Zend/Gdata/Exif/Extension/Model.php
old mode 100644
new mode 100755
index 2cc19ae6fc2..67b674c25eb
--- a/lib/zend/Zend/Gdata/Exif/Extension/Model.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/Model.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_Model extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Tags.php b/lib/zend/Zend/Gdata/Exif/Extension/Tags.php
old mode 100644
new mode 100755
index a5c0872e950..23c4ec9742e
--- a/lib/zend/Zend/Gdata/Exif/Extension/Tags.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/Tags.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -87,7 +87,7 @@ require_once 'Zend/Gdata/Exif/Extension/Time.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_Tags extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Time.php b/lib/zend/Zend/Gdata/Exif/Extension/Time.php
old mode 100644
new mode 100755
index 228954eeda6..1f9afbec1e5
--- a/lib/zend/Zend/Gdata/Exif/Extension/Time.php
+++ b/lib/zend/Zend/Gdata/Exif/Extension/Time.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Extension_Time extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Exif/Feed.php b/lib/zend/Zend/Gdata/Exif/Feed.php
old mode 100644
new mode 100755
index f793ee66e8b..e2b7ebb27d6
--- a/lib/zend/Zend/Gdata/Exif/Feed.php
+++ b/lib/zend/Zend/Gdata/Exif/Feed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Exif/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Exif_Feed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Extension.php b/lib/zend/Zend/Gdata/Extension.php
index cba779e139c..ad40db9e39e 100644
--- a/lib/zend/Zend/Gdata/Extension.php
+++ b/lib/zend/Zend/Gdata/Extension.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/AttendeeStatus.php b/lib/zend/Zend/Gdata/Extension/AttendeeStatus.php
index e8c1197c58b..79b955898b2 100644
--- a/lib/zend/Zend/Gdata/Extension/AttendeeStatus.php
+++ b/lib/zend/Zend/Gdata/Extension/AttendeeStatus.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_AttendeeStatus extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/AttendeeType.php b/lib/zend/Zend/Gdata/Extension/AttendeeType.php
index 8c6f79aa0da..eae4266e4d8 100644
--- a/lib/zend/Zend/Gdata/Extension/AttendeeType.php
+++ b/lib/zend/Zend/Gdata/Extension/AttendeeType.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_AttendeeType extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/Comments.php b/lib/zend/Zend/Gdata/Extension/Comments.php
index 7c1451043c4..b47d22cb797 100644
--- a/lib/zend/Zend/Gdata/Extension/Comments.php
+++ b/lib/zend/Zend/Gdata/Extension/Comments.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension/FeedLink.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_Comments extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/EntryLink.php b/lib/zend/Zend/Gdata/Extension/EntryLink.php
index f2c89db1e36..6fb784f5050 100644
--- a/lib/zend/Zend/Gdata/Extension/EntryLink.php
+++ b/lib/zend/Zend/Gdata/Extension/EntryLink.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_EntryLink extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/EventStatus.php b/lib/zend/Zend/Gdata/Extension/EventStatus.php
index c28bca76d7a..1dedacbe616 100644
--- a/lib/zend/Zend/Gdata/Extension/EventStatus.php
+++ b/lib/zend/Zend/Gdata/Extension/EventStatus.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_EventStatus extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/ExtendedProperty.php b/lib/zend/Zend/Gdata/Extension/ExtendedProperty.php
index 72e441ce0be..1fe5770955e 100644
--- a/lib/zend/Zend/Gdata/Extension/ExtendedProperty.php
+++ b/lib/zend/Zend/Gdata/Extension/ExtendedProperty.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_ExtendedProperty extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/FeedLink.php b/lib/zend/Zend/Gdata/Extension/FeedLink.php
index 84feac27bc3..2bed52b202d 100644
--- a/lib/zend/Zend/Gdata/Extension/FeedLink.php
+++ b/lib/zend/Zend/Gdata/Extension/FeedLink.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_FeedLink extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/OpenSearchItemsPerPage.php b/lib/zend/Zend/Gdata/Extension/OpenSearchItemsPerPage.php
index daf18d34efa..7f5ce586fb7 100644
--- a/lib/zend/Zend/Gdata/Extension/OpenSearchItemsPerPage.php
+++ b/lib/zend/Zend/Gdata/Extension/OpenSearchItemsPerPage.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_OpenSearchItemsPerPage extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/OpenSearchStartIndex.php b/lib/zend/Zend/Gdata/Extension/OpenSearchStartIndex.php
index 17290ce0d18..60dc07dc139 100644
--- a/lib/zend/Zend/Gdata/Extension/OpenSearchStartIndex.php
+++ b/lib/zend/Zend/Gdata/Extension/OpenSearchStartIndex.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_OpenSearchStartIndex extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/OpenSearchTotalResults.php b/lib/zend/Zend/Gdata/Extension/OpenSearchTotalResults.php
index 178aa379184..c0c31f4f95f 100644
--- a/lib/zend/Zend/Gdata/Extension/OpenSearchTotalResults.php
+++ b/lib/zend/Zend/Gdata/Extension/OpenSearchTotalResults.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_OpenSearchTotalResults extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/OriginalEvent.php b/lib/zend/Zend/Gdata/Extension/OriginalEvent.php
index a7cf4cd041e..21cc5866797 100644
--- a/lib/zend/Zend/Gdata/Extension/OriginalEvent.php
+++ b/lib/zend/Zend/Gdata/Extension/OriginalEvent.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Extension/When.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_OriginalEvent extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/Rating.php b/lib/zend/Zend/Gdata/Extension/Rating.php
index d17720aeda4..9301296e69f 100644
--- a/lib/zend/Zend/Gdata/Extension/Rating.php
+++ b/lib/zend/Zend/Gdata/Extension/Rating.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_Rating extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/Recurrence.php b/lib/zend/Zend/Gdata/Extension/Recurrence.php
index c5f32b9df4d..097fc4314a0 100644
--- a/lib/zend/Zend/Gdata/Extension/Recurrence.php
+++ b/lib/zend/Zend/Gdata/Extension/Recurrence.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_Recurrence extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/RecurrenceException.php b/lib/zend/Zend/Gdata/Extension/RecurrenceException.php
index 304e56a4605..8bd3bbf9c88 100644
--- a/lib/zend/Zend/Gdata/Extension/RecurrenceException.php
+++ b/lib/zend/Zend/Gdata/Extension/RecurrenceException.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Extension/OriginalEvent.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_RecurrenceException extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/Reminder.php b/lib/zend/Zend/Gdata/Extension/Reminder.php
index 409438a76d2..bdb7e64500f 100644
--- a/lib/zend/Zend/Gdata/Extension/Reminder.php
+++ b/lib/zend/Zend/Gdata/Extension/Reminder.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_Reminder extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/Transparency.php b/lib/zend/Zend/Gdata/Extension/Transparency.php
index dedd375b8cf..a3dc8cc7ee6 100644
--- a/lib/zend/Zend/Gdata/Extension/Transparency.php
+++ b/lib/zend/Zend/Gdata/Extension/Transparency.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_Transparency extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/Visibility.php b/lib/zend/Zend/Gdata/Extension/Visibility.php
index c78d7fa2837..4bacb3c589b 100644
--- a/lib/zend/Zend/Gdata/Extension/Visibility.php
+++ b/lib/zend/Zend/Gdata/Extension/Visibility.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_Visibility extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/When.php b/lib/zend/Zend/Gdata/Extension/When.php
index b6412d5c04f..ba545f0c9b6 100644
--- a/lib/zend/Zend/Gdata/Extension/When.php
+++ b/lib/zend/Zend/Gdata/Extension/When.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension/Reminder.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_When extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/Where.php b/lib/zend/Zend/Gdata/Extension/Where.php
index 58d02248712..1b6d40d42b8 100644
--- a/lib/zend/Zend/Gdata/Extension/Where.php
+++ b/lib/zend/Zend/Gdata/Extension/Where.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension/EntryLink.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_Where extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Extension/Who.php b/lib/zend/Zend/Gdata/Extension/Who.php
index 19c7a59b701..23aef6108dc 100644
--- a/lib/zend/Zend/Gdata/Extension/Who.php
+++ b/lib/zend/Zend/Gdata/Extension/Who.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -47,7 +47,7 @@ require_once 'Zend/Gdata/Extension/EntryLink.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Extension_Who extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Feed.php b/lib/zend/Zend/Gdata/Feed.php
index 07cf83f1ca8..5274e4374e7 100644
--- a/lib/zend/Zend/Gdata/Feed.php
+++ b/lib/zend/Zend/Gdata/Feed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -57,7 +57,7 @@ require_once 'Zend/Gdata/Extension/OpenSearchItemsPerPage.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Feed extends Zend_Gdata_App_Feed
diff --git a/lib/zend/Zend/Gdata/Gapps.php b/lib/zend/Zend/Gdata/Gapps.php
index 6b75521b2b0..7f2924ef4fa 100644
--- a/lib/zend/Zend/Gdata/Gapps.php
+++ b/lib/zend/Zend/Gdata/Gapps.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -36,6 +36,21 @@ require_once 'Zend/Gdata/Gapps/UserFeed.php';
  */
 require_once 'Zend/Gdata/Gapps/NicknameFeed.php';
 
+/**
+ * @see Zend_Gdata_Gapps_GroupFeed
+ */
+require_once 'Zend/Gdata/Gapps/GroupFeed.php';
+
+/**
+ * @see Zend_Gdata_Gapps_MemberFeed
+ */
+require_once 'Zend/Gdata/Gapps/MemberFeed.php';
+
+/**
+ * @see Zend_Gdata_Gapps_OwnerFeed
+ */
+require_once 'Zend/Gdata/Gapps/OwnerFeed.php';
+
 /**
  * @see Zend_Gdata_Gapps_EmailListFeed
  */
@@ -61,7 +76,7 @@ require_once 'Zend/Gdata/Gapps/EmailListRecipientFeed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps extends Zend_Gdata
@@ -80,6 +95,11 @@ class Zend_Gdata_Gapps extends Zend_Gdata
      */
     const APPS_NICKNAME_PATH = '/nickname/2.0';
 
+    /**
+     * Path to group feeds on the Google Apps server.
+     */
+    const APPS_GROUP_PATH = '/group/2.0';
+
     /**
      * Path to email list feeds on the Google Apps server.
      */
@@ -175,10 +195,10 @@ class Zend_Gdata_Gapps extends Zend_Gdata
      * @throws Zend_Gdata_Gapps_ServiceException
      * @return Zend_Gdata_App_Feed
      */
-    public static function import($uri, $client = null, $className='Zend_Gdata_App_Feed')
+    public static function import($uri, $client = null, $className='Zend_Gdata_App_Feed', $useObjectMapping = true)
     {
         try {
-            return parent::import($uri, $client, $className);
+            return parent::import($uri, $client, $className, $useObjectMapping);
         } catch (Zend_Gdata_App_HttpException $e) {
             self::throwServiceExceptionIfDetected($e);
         }
@@ -371,6 +391,80 @@ class Zend_Gdata_Gapps extends Zend_Gdata
         return parent::getFeed($uri, 'Zend_Gdata_Gapps_NicknameFeed');
     }
 
+    /**
+     * Retreive GroupFeed object containing multiple GroupEntry
+     * objects.
+     *
+     * @param mixed $location (optional) The location for the feed, as a URL
+     *          or Query.
+     * @return Zend_Gdata_Gapps_GroupFeed
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function getGroupFeed($location = null)
+    {
+        if ($location === null) {
+            $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+            $uri .= $this->getDomain();
+        } else if ($location instanceof Zend_Gdata_Query) {
+            $uri = $location->getQueryUrl();
+        } else {
+            $uri = $location;
+        }
+        return parent::getFeed($uri, 'Zend_Gdata_Gapps_GroupFeed');
+    }
+
+    /**
+     * Retreive MemberFeed object containing multiple MemberEntry
+     * objects.
+     *
+     * @param mixed $location (optional) The location for the feed, as a URL
+     *          or Query.
+     * @return Zend_Gdata_Gapps_MemberFeed
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function getMemberFeed($location = null)
+    {
+        if ($location === null) {
+            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
+            throw new Zend_Gdata_App_InvalidArgumentException(
+                    'Location must not be null');
+        } else if ($location instanceof Zend_Gdata_Query) {
+            $uri = $location->getQueryUrl();
+        } else {
+            $uri = $location;
+        }
+        return parent::getFeed($uri, 'Zend_Gdata_Gapps_MemberFeed');
+    }
+
+    /**
+     * Retreive OwnerFeed object containing multiple OwnerEntry
+     * objects.
+     *
+     * @param mixed $location (optional) The location for the feed, as a URL
+     *          or Query.
+     * @return Zend_Gdata_Gapps_OwnerFeed
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function getOwnerFeed($location = null)
+    {
+        if ($location === null) {
+            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
+            throw new Zend_Gdata_App_InvalidArgumentException(
+                    'Location must not be null');
+        } else if ($location instanceof Zend_Gdata_Query) {
+            $uri = $location->getQueryUrl();
+        } else {
+            $uri = $location;
+        }
+        return parent::getFeed($uri, 'Zend_Gdata_Gapps_OwnerFeed');
+    }
+
     /**
      * Retreive EmailListFeed object containing multiple EmailListEntry
      * objects.
@@ -464,6 +558,75 @@ class Zend_Gdata_Gapps extends Zend_Gdata
         return parent::getEntry($uri, 'Zend_Gdata_Gapps_NicknameEntry');
     }
 
+    /**
+     * Retreive a single GroupEntry object.
+     *
+     * @param mixed $location The location for the feed, as a URL or Query.
+     * @return Zend_Gdata_Gapps_GroupEntry
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function getGroupEntry($location = null)
+    {
+        if ($location === null) {
+            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
+            throw new Zend_Gdata_App_InvalidArgumentException(
+                    'Location must not be null');
+        } else if ($location instanceof Zend_Gdata_Query) {
+            $uri = $location->getQueryUrl();
+        } else {
+            $uri = $location;
+        }
+        return parent::getEntry($uri, 'Zend_Gdata_Gapps_GroupEntry');
+    }
+
+    /**
+     * Retreive a single MemberEntry object.
+     *
+     * @param mixed $location The location for the feed, as a URL or Query.
+     * @return Zend_Gdata_Gapps_MemberEntry
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function getMemberEntry($location = null)
+    {
+        if ($location === null) {
+            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
+            throw new Zend_Gdata_App_InvalidArgumentException(
+                    'Location must not be null');
+        } else if ($location instanceof Zend_Gdata_Query) {
+            $uri = $location->getQueryUrl();
+        } else {
+            $uri = $location;
+        }
+        return parent::getEntry($uri, 'Zend_Gdata_Gapps_MemberEntry');
+    }
+
+    /**
+     * Retreive a single OwnerEntry object.
+     *
+     * @param mixed $location The location for the feed, as a URL or Query.
+     * @return Zend_Gdata_Gapps_OwnerEntry
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function getOwnerEntry($location = null)
+    {
+        if ($location === null) {
+            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
+            throw new Zend_Gdata_App_InvalidArgumentException(
+                    'Location must not be null');
+        } else if ($location instanceof Zend_Gdata_Query) {
+            $uri = $location->getQueryUrl();
+        } else {
+            $uri = $location;
+        }
+        return parent::getEntry($uri, 'Zend_Gdata_Gapps_OwnerEntry');
+    }
+
     /**
      * Retreive a single EmailListEntry object.
      *
@@ -555,6 +718,77 @@ class Zend_Gdata_Gapps extends Zend_Gdata
         return $newEntry;
     }
 
+    /**
+     * Create a new group from a GroupEntry.
+     *
+     * @param Zend_Gdata_Gapps_GroupEntry $group The group entry to insert.
+     * @param string $uri (optional) The URI where the group should be
+     *          uploaded to. If null, the default user creation URI for
+     *          this domain will be used.
+     * @return Zend_Gdata_Gapps_GroupEntry The inserted group entry as
+     *          returned by the server.
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function insertGroup($group, $uri = null)
+    {
+        if ($uri === null) {
+            $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+            $uri .= $this->getDomain();
+        }
+        $newEntry = $this->insertEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry');
+        return $newEntry;
+    }
+
+    /**
+     * Create a new member from a MemberEntry.
+     *
+     * @param Zend_Gdata_Gapps_MemberEntry $member The member entry to insert.
+     * @param string $uri (optional) The URI where the group should be
+     *          uploaded to. If null, the default user creation URI for
+     *          this domain will be used.
+     * @return Zend_Gdata_Gapps_MemberEntry The inserted member entry as
+     *          returned by the server.
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function insertMember($member, $uri = null)
+    {
+        if ($uri === null) {
+            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
+            throw new Zend_Gdata_App_InvalidArgumentException(
+                    'URI must not be null');
+        }
+        $newEntry = $this->insertEntry($member, $uri, 'Zend_Gdata_Gapps_MemberEntry');
+        return $newEntry;
+    }
+
+    /**
+     * Create a new group from a OwnerEntry.
+     *
+     * @param Zend_Gdata_Gapps_OwnerEntry $owner The owner entry to insert.
+     * @param string $uri (optional) The URI where the owner should be
+     *          uploaded to. If null, the default user creation URI for
+     *          this domain will be used.
+     * @return Zend_Gdata_Gapps_OwnerEntry The inserted owner entry as
+     *          returned by the server.
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function insertOwner($owner, $uri = null)
+    {
+        if ($uri === null) {
+            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
+            throw new Zend_Gdata_App_InvalidArgumentException(
+                    'URI must not be null');
+        }
+        $newEntry = $this->insertEntry($owner, $uri, 'Zend_Gdata_Gapps_OwnerEntry');
+        return $newEntry;
+    }
+
     /**
      * Create a new email list from an EmailListEntry.
      *
@@ -931,6 +1165,358 @@ class Zend_Gdata_Gapps extends Zend_Gdata
         $this->delete($this->getBaseUrl() . self::APPS_NICKNAME_PATH . '/' . $nickname);
     }
 
+    /**
+     * Create a new group.
+     *
+     * @param string $groupId A unique identifier for the group
+     * @param string $groupName The name of the group
+     * @param string $description A description of the group
+     * @param string $emailPermission The subscription permission of the group
+     * @return Zend_Gdata_Gapps_GroupEntry The group entry as created on the server.
+     */
+    public function createGroup($groupId, $groupName, $description = null, $emailPermission = null)
+    {
+        $i = 0;
+        $group = $this->newGroupEntry();
+
+        $properties[$i] = $this->newProperty();
+        $properties[$i]->name = 'groupId';
+        $properties[$i]->value = $groupId;
+        $i++;
+        $properties[$i] = $this->newProperty();
+        $properties[$i]->name = 'groupName';
+        $properties[$i]->value = $groupName;
+        $i++;
+
+        if($description != null) {
+            $properties[$i] = $this->newProperty();
+            $properties[$i]->name = 'description';
+            $properties[$i]->value = $description;
+            $i++;
+        }
+
+        if($emailPermission != null) {
+            $properties[$i] = $this->newProperty();
+            $properties[$i]->name = 'emailPermission';
+            $properties[$i]->value = $emailPermission;
+            $i++;
+        }
+
+        $group->property = $properties;
+
+        return $this->insertGroup($group);
+    }
+
+    /**
+     * Retrieves a group based on group id
+     *
+     * @param string $groupId The unique identifier for the group
+     * @return Zend_Gdata_Gapps_GroupEntry The group entry as returned by the server.
+     */
+    public function retrieveGroup($groupId)
+    {
+        $query = $this->newGroupQuery($groupId);
+        //$query->setGroupId($groupId);
+
+        try {
+            $group = $this->getGroupEntry($query);
+        } catch (Zend_Gdata_Gapps_ServiceException $e) {
+            // Set the group to null if not found
+            if ($e->hasError(Zend_Gdata_Gapps_Error::ENTITY_DOES_NOT_EXIST)) {
+                $group = null;
+            } else {
+                throw $e;
+            }
+        }
+        return $group;
+    }
+
+    /**
+     * Retrieve all groups in the current domain. Be aware that
+     * calling this function on a domain with many groups will take a
+     * signifigant amount of time to complete. On larger domains this may
+     * may cause execution to timeout without proper precautions in place.
+     *
+     * @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry objects
+     *              representing all groups apart of the domain.
+     */
+    public function retrieveAllGroups()
+    {
+        return $this->retrieveAllEntriesForFeed($this->retrievePageOfGroups());
+    }
+
+    /**
+     * Delete a group
+     *
+     * @param string $groupId The unique identifier for the group
+     */
+    public function deleteGroup($groupId)
+    {
+        $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+        $uri .= $this->getDomain() . '/' . $groupId;
+
+        $this->delete($uri);
+    }
+
+    /**
+     * Check to see if a member id or group id is a member of group
+     *
+     * @param string $memberId Member id or group group id
+     * @param string $groupId Group to be checked for
+     * @return bool True, if given entity is a member
+     */
+    public function isMember($memberId, $groupId)
+    {
+        $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+        $uri .= $this->getDomain() . '/' . $groupId . '/member/' . $memberId;
+
+        //if the enitiy is not a member, an exception is thrown
+        try {
+            $results = $this->get($uri);
+        } catch (Exception $e) {
+            $results = false;
+        }
+
+        if($results) {
+            return TRUE;
+        } else {
+            return FALSE;
+        }
+    }
+
+    /**
+     * Add an email address to a group as a member
+     *
+     * @param string $recipientAddress Email address, member id, or group id
+     * @param string $groupId The unique id of the group
+     * @return Zend_Gdata_Gapps_MemberEntry The member entry returned by the server
+     */
+    public function addMemberToGroup($recipientAddress, $groupId)
+    {
+        $member = $this->newMemberEntry();
+
+        $properties[] = $this->newProperty();
+        $properties[0]->name = 'memberId';
+        $properties[0]->value = $recipientAddress;
+
+        $member->property = $properties;
+
+        $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+        $uri .= $this->getDomain() . '/' . $groupId . '/member';
+
+        return $this->insertMember($member, $uri);
+    }
+
+    /**
+     * Remove a member id from a group
+     *
+     * @param string $memberId Member id or group id
+     * @param string $groupId The unique id of the group
+     */
+    public function removeMemberFromGroup($memberId, $groupId)
+    {
+        $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+        $uri .= $this->getDomain() . '/' . $groupId . '/member/' . $memberId;
+
+        return $this->delete($uri);
+    }
+
+    /**
+     * Retrieves all the members of a group
+     *
+     * @param string $groupId The unique id of the group
+     * @return Zend_Gdata_Gapps_MemberFeed Collection of MemberEntry objects
+     *              representing all members apart of the group.
+     */
+    public function retrieveAllMembers($groupId)
+    {
+        return $this->retrieveAllEntriesForFeed(
+                $this->retrievePageOfMembers($groupId));
+    }
+
+    /**
+     * Add an email as an owner of a group
+     *
+     * @param string $email Owner's email
+     * @param string $groupId Group ownership to be checked for
+     * @return Zend_Gdata_Gapps_OwnerEntry The OwnerEntry returned by the server
+     */
+    public function addOwnerToGroup($email, $groupId)
+    {
+        $owner = $this->newOwnerEntry();
+
+        $properties[] = $this->newProperty();
+        $properties[0]->name = 'email';
+        $properties[0]->value = $email;
+
+        $owner->property = $properties;
+
+        $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+        $uri .= $this->getDomain() . '/' . $groupId . '/owner';
+
+        return $this->insertOwner($owner, $uri);
+    }
+
+    /**
+     * Retrieves all the owners of a group
+     *
+     * @param string $groupId The unique identifier for the group
+     * @return Zend_Gdata_Gapps_OwnerFeed Collection of Zend_Gdata_OwnerEntry
+     *              objects representing all owners apart of the group.
+     */
+    public function retrieveGroupOwners($groupId)
+    {
+        $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+        $uri .= $this->getDomain() . '/' . $groupId . '/owner';
+
+        return $this->getOwnerFeed($uri);
+    }
+
+    /**
+     * Checks to see if an email is an owner of a group
+     *
+     * @param string $email Owner's email
+     * @param string $groupId Group ownership to be checked for
+     * @return bool True, if given entity is an owner
+     */
+    public function isOwner($email, $groupId)
+    {
+        $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+        $uri .= $this->getDomain() . '/' . $groupId . '/owner/' . $email;
+
+        //if the enitiy is not an owner of the group, an exception is thrown
+        try {
+            $results = $this->get($uri);
+        } catch (Exception $e) {
+            $results = false;
+        }
+
+        if($results) {
+            return TRUE;
+        } else {
+            return FALSE;
+        }
+    }
+
+    /**
+     * Remove email as an owner of a group
+     *
+     * @param string $email Owner's email
+     * @param string $groupId The unique identifier for the group
+     */
+    public function removeOwnerFromGroup($email, $groupId)
+    {
+        $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+        $uri .= $this->getDomain() . '/' . $groupId . '/owner/' . $email;
+
+        return $this->delete($uri);
+    }
+
+    /**
+     * Update group properties with new values. any property not defined will not
+     * be updated
+     *
+     * @param string $groupId A unique identifier for the group
+     * @param string $groupName The name of the group
+     * @param string $description A description of the group
+     * @param string $emailPermission The subscription permission of the group
+     * @return Zend_Gdata_Gapps_GroupEntry The group entry as updated on the server.
+     */
+    public function updateGroup($groupId, $groupName = null, $description = null,
+            $emailPermission = null)
+    {
+        $i = 0;
+        $group = $this->newGroupEntry();
+
+        $properties[$i] = $this->newProperty();
+        $properties[$i]->name = 'groupId';
+        $properties[$i]->value = $groupId;
+        $i++;
+
+        if($groupName != null) {
+            $properties[$i] = $this->newProperty();
+            $properties[$i]->name = 'groupName';
+            $properties[$i]->value = $groupName;
+            $i++;
+        }
+
+        if($description != null) {
+            $properties[$i] = $this->newProperty();
+            $properties[$i]->name = 'description';
+            $properties[$i]->value = $description;
+            $i++;
+        }
+
+        if($emailPermission != null) {
+            $properties[$i] = $this->newProperty();
+            $properties[$i]->name = 'emailPermission';
+            $properties[$i]->value = $emailPermission;
+            $i++;
+        }
+
+        $group->property = $properties;
+
+        $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
+        $uri .= $this->getDomain() . '/' . $groupId;
+
+        return $this->updateEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry');
+    }
+
+    /**
+     * Retrieve all of the groups that a user is a member of
+     *
+     * @param string $memberId Member username
+     * @param bool $directOnly (Optional) If true, members with direct association
+     *             only will be considered
+     * @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry
+     *              objects representing all groups member is apart of in the domain.
+     */
+    public function retrieveGroups($memberId, $directOnly = null)
+    {
+        $query = $this->newGroupQuery();
+        $query->setMember($memberId);
+        if($directOnly != null) {
+            $query->setDirectOnly($directOnly);
+        }
+        return $this->getGroupFeed($query);
+    }
+
+    /**
+     * Retrieve a page of groups in alphabetical order, starting with the
+     * provided group.
+     *
+     * @param string $startGroup (optional) The first group to
+     *              retrieve. If null or not defined, the page will begin
+     *              with the first group in the domain.
+     * @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry
+     *              objects representing the groups in the domain.
+     * @throws Zend_Gdata_App_Exception
+     * @throws Zend_Gdata_App_HttpException
+     * @throws Zend_Gdata_Gapps_ServiceException
+     */
+    public function retrievePageOfGroups ($startGroup = null)
+    {
+        $query = $this->newGroupQuery();
+        $query->setStartGroupId($startGroup);
+        return $this->getGroupFeed($query);
+    }
+
+    /**
+     * Gets page of Members
+     *
+     * @param string $groupId The group id which should be searched.
+     * @param string $startMember (optinal) The address of the first member,
+     *              or null to start with the first member in the list.
+     * @return Zend_Gdata_Gapps_MemberFeed Collection of Zend_Gdata_MemberEntry
+     *              objects
+     */
+    public function retrievePageOfMembers($groupId, $startMember = null)
+    {
+        $query = $this->newMemberQuery($groupId);
+        $query->setStartMemberId($startMember);
+        return $this->getMemberFeed($query);
+    }
+
     /**
      * Create a new email list.
      *
diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListEntry.php b/lib/zend/Zend/Gdata/Gapps/EmailListEntry.php
index 8d301a14143..d5078db2132 100644
--- a/lib/zend/Zend/Gdata/Gapps/EmailListEntry.php
+++ b/lib/zend/Zend/Gdata/Gapps/EmailListEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -53,7 +53,7 @@ require_once 'Zend/Gdata/Gapps/Extension/EmailList.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_EmailListEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListFeed.php b/lib/zend/Zend/Gdata/Gapps/EmailListFeed.php
index e43a6a10a17..f7fcef5f934 100644
--- a/lib/zend/Zend/Gdata/Gapps/EmailListFeed.php
+++ b/lib/zend/Zend/Gdata/Gapps/EmailListFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,7 +41,7 @@ require_once 'Zend/Gdata/Gapps/EmailListEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_EmailListFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListQuery.php b/lib/zend/Zend/Gdata/Gapps/EmailListQuery.php
index e47767fd884..a57a0c7ddc5 100644
--- a/lib/zend/Zend/Gdata/Gapps/EmailListQuery.php
+++ b/lib/zend/Zend/Gdata/Gapps/EmailListQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once('Zend/Gdata/Gapps/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query
diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientEntry.php b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientEntry.php
index a447a2ae2be..40c70380a42 100644
--- a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientEntry.php
+++ b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -49,7 +49,7 @@ require_once 'Zend/Gdata/Extension/Who.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_EmailListRecipientEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientFeed.php b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientFeed.php
index 75ad5cb78af..8f3c88d9a34 100644
--- a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientFeed.php
+++ b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,7 +41,7 @@ require_once 'Zend/Gdata/Gapps/EmailListRecipientEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_EmailListRecipientFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientQuery.php b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientQuery.php
index 611593bfe8b..3e482eb5b56 100644
--- a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientQuery.php
+++ b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once('Zend/Gdata/Gapps/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query
diff --git a/lib/zend/Zend/Gdata/Gapps/Error.php b/lib/zend/Zend/Gdata/Gapps/Error.php
index db35f9ba9b7..ba031c4d5b6 100644
--- a/lib/zend/Zend/Gdata/Gapps/Error.php
+++ b/lib/zend/Zend/Gdata/Gapps/Error.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/App/Base.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base
diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/EmailList.php b/lib/zend/Zend/Gdata/Gapps/Extension/EmailList.php
index c57c01df41a..6abc634592f 100644
--- a/lib/zend/Zend/Gdata/Gapps/Extension/EmailList.php
+++ b/lib/zend/Zend/Gdata/Gapps/Extension/EmailList.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Gapps.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_Extension_EmailList extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/Login.php b/lib/zend/Zend/Gdata/Gapps/Extension/Login.php
index ca3843418fa..c95a05dec95 100644
--- a/lib/zend/Zend/Gdata/Gapps/Extension/Login.php
+++ b/lib/zend/Zend/Gdata/Gapps/Extension/Login.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -40,7 +40,7 @@ require_once 'Zend/Gdata/Gapps.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/Name.php b/lib/zend/Zend/Gdata/Gapps/Extension/Name.php
index 8825e0f3566..b0589d0dfc1 100644
--- a/lib/zend/Zend/Gdata/Gapps/Extension/Name.php
+++ b/lib/zend/Zend/Gdata/Gapps/Extension/Name.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Gapps.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_Extension_Name extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/Nickname.php b/lib/zend/Zend/Gdata/Gapps/Extension/Nickname.php
index 54de7917ed3..dd86fdaa3e4 100644
--- a/lib/zend/Zend/Gdata/Gapps/Extension/Nickname.php
+++ b/lib/zend/Zend/Gdata/Gapps/Extension/Nickname.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Gapps.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_Extension_Nickname extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/Property.php b/lib/zend/Zend/Gdata/Gapps/Extension/Property.php
new file mode 100644
index 00000000000..c89ae8c81d9
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/Extension/Property.php
@@ -0,0 +1,179 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: EmailList.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/**
+ * @see Zend_Gdata_Extension
+ */
+require_once 'Zend/Gdata/Extension.php';
+
+/**
+ * @see Zend_Gdata_Gapps
+ */
+require_once 'Zend/Gdata/Gapps.php';
+
+/**
+ * Represents the apps:Property element used by the Apps data API.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_Extension_Property extends Zend_Gdata_Extension
+{
+
+    protected $_rootNamespace = 'apps';
+    protected $_rootElement = 'property';
+
+    /**
+     * The name of the property
+     *
+     * @var string
+     */
+    protected $_name = null;
+
+    /**
+     * The value of the property
+     * @var string
+     */
+    protected $_value = null;
+
+    /**
+     * Constructs a new Zend_Gdata_Gapps_Extension_Property object.
+     *
+     * @param string $name The name of the property
+     * @param string $value The value of the property
+     */
+    public function __construct($name = null, $value = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
+        parent::__construct();
+        $this->_name = $name;
+        $this->_value = $value;
+
+    }
+
+
+    /**
+     * Retrieves a DOMElement which corresponds to this element and all
+     * child properties.  This is used to build an entry back into a DOM
+     * and eventually XML text for sending to the server upon updates, or
+     * for application storage/persistence.
+     *
+     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
+     * @return DOMElement The DOMElement representing this element and all
+     * child properties.
+     */
+    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
+    {
+        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
+        if ($this->_name !== null) {
+            $element->setAttribute('name', $this->_name);
+        }
+        if ($this->_value !== null) {
+            $element->setAttribute('value', $this->_value);
+        }
+
+        return $element;
+
+    }
+
+    /**
+     * Given a DOMNode representing an attribute, tries to map the data into
+     * instance members.  If no mapping is defined, the name and value are
+     * stored in an array.
+     *
+     * @param DOMNode $attribute The DOMNode attribute needed to be handled
+     */
+    protected function takeAttributeFromDOM($attribute)
+    {
+        switch ($attribute->localName) {
+        case 'name':
+            $this->_name = $attribute->nodeValue;
+            break;
+        case 'value':
+            $this->_value = $attribute->nodeValue;
+            break;
+        default:
+            parent::takeAttributeFromDOM($attribute);
+        }
+    }
+
+    /**
+     * Get the value for this element's name attribute.
+     *
+     * @see setName
+     * @return string The requested attribute.
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Set the value for this element's name attribute.
+     * @param string $value The desired value for this attribute.
+     * @return Zend_Gdata_Gapps_Extension_Property The element being modified.
+     */
+    public function setName($value)
+    {
+        $this->_name = $value;
+        return $this;
+    }
+
+    /**
+     * Get the value for this element's value attribute.
+     *
+     * @see setName
+     * @return string The requested attribute.
+     */
+    public function getValue()
+    {
+        return $this->_value;
+    }
+
+    /**
+     * Set the value for this element's value attribute.
+     *
+     * @param string $value The desired value for this attribute.
+     * @return Zend_Gdata_Gapps_Extension_Property The element being modified.
+     */
+    public function setValue($value)
+    {
+        $this->_value = $value;
+        return $this;
+    }
+
+    /**
+     * Magic toString method allows using this directly via echo
+     * Works best in PHP >= 4.2.0
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return "Property Name: " . $this->getName() .
+               "\nProperty Value: " . $this->getValue();
+    }
+}
diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/Quota.php b/lib/zend/Zend/Gdata/Gapps/Extension/Quota.php
index c64b1a39203..c5243a5c27d 100644
--- a/lib/zend/Zend/Gdata/Gapps/Extension/Quota.php
+++ b/lib/zend/Zend/Gdata/Gapps/Extension/Quota.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -40,7 +40,7 @@ require_once 'Zend/Gdata/Gapps.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_Extension_Quota extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Gapps/GroupEntry.php b/lib/zend/Zend/Gdata/Gapps/GroupEntry.php
new file mode 100644
index 00000000000..7dadd9a18ad
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/GroupEntry.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Gdata_Entry
+ */
+require_once 'Zend/Gdata/Entry.php';
+
+/**
+ * @see Zend_Gdata_Gapps_Extension_Property
+ */
+require_once 'Zend/Gdata/Gapps/Extension/Property.php';
+
+/**
+ * Data model class for a Google Apps Group Entry.
+ *
+ * Each group entry describes a single group within a Google Apps hosted
+ * domain.
+ *
+ * To transfer group entries to and from the Google Apps servers, including
+ * creating new entries, refer to the Google Apps service class,
+ * Zend_Gdata_Gapps.
+ *
+ * This class represents <atom:entry> in the Google Data protocol.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_GroupEntry extends Zend_Gdata_Entry
+{
+
+    protected $_entryClassName = 'Zend_Gdata_Gapps_GroupEntry';
+
+    /**
+     * <apps:property> element containing information about other items
+     * relevant to this entry.
+     *
+     * @var Zend_Gdata_Gapps_Extension_Property
+     */
+    protected $_property = array();
+
+    /**
+     * Create a new instance.
+     *
+     * @param DOMElement $element (optional) DOMElement from which this
+     *          object should be constructed.
+     */
+    public function __construct($element = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
+        parent::__construct($element);
+    }
+
+    /**
+     * Retrieves a DOMElement which corresponds to this element and all
+     * child properties.  This is used to build an entry back into a DOM
+     * and eventually XML text for application storage/persistence.
+     *
+     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
+     * @return DOMElement The DOMElement representing this element and all
+     *          child properties.
+     */
+    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
+    {
+        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
+
+        foreach ($this->_property as $p) {
+            $element->appendChild($p->getDOM($element->ownerDocument));
+        }
+        return $element;
+    }
+
+    /**
+     * Creates individual Entry objects of the appropriate type and
+     * stores them as members of this entry based upon DOM data.
+     *
+     * @param DOMNode $child The DOMNode to process
+     */
+    protected function takeChildFromDOM($child)
+    {
+        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
+
+        switch ($absoluteNodeName) {
+
+            case $this->lookupNamespace('apps') . ':' . 'property';
+                $property = new Zend_Gdata_Gapps_Extension_Property();
+                $property->transferFromDOM($child);
+                $this->_property[] = $property;
+                break;
+            default:
+                parent::takeChildFromDOM($child);
+                break;
+        }
+    }
+
+    /**
+     * Returns all property tags for this entry
+     *
+     * @param string $rel The rel value of the property to be found. If null,
+     *          the array of properties is returned instead.
+     * @return mixed Either an array of Zend_Gdata_Gapps_Extension_Property
+     *          objects if $rel is null, a single
+     *          Zend_Gdata_Gapps_Extension_Property object if $rel is specified
+     *          and a matching feed link is found, or null if $rel is
+     *          specified and no matching property is found.
+     */
+    public function getProperty($rel = null)
+    {
+        if ($rel == null) {
+            return $this->_property;
+        } else {
+            foreach ($this->_property as $p) {
+                if ($p->rel == $rel) {
+                    return $p;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Set the value of the  property property for this object.
+     *
+     * @param array $value A collection of
+     *          Zend_Gdata_Gapps_Extension_Property objects.
+     * @return Zend_Gdata_Gapps_GroupEntry Provides a fluent interface.
+     */
+    public function setProperty($value)
+    {
+        $this->_property = $value;
+        return $this;
+    }
+
+}
+
diff --git a/lib/zend/Zend/Gdata/Gapps/GroupFeed.php b/lib/zend/Zend/Gdata/Gapps/GroupFeed.php
new file mode 100644
index 00000000000..78269a1a449
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/GroupFeed.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Gdata_Feed
+ */
+require_once 'Zend/Gdata/Feed.php';
+
+/**
+ * @see Zend_Gdata_Gapps_GroupEntry
+ */
+require_once 'Zend/Gdata/Gapps/GroupEntry.php';
+
+/**
+ * Data model for a collection of Google Apps group entries, usually
+ * provided by the Google Apps servers.
+ *
+ * For information on requesting this feed from a server, see the Google
+ * Apps service class, Zend_Gdata_Gapps.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_GroupFeed extends Zend_Gdata_Feed
+{
+
+    protected $_entryClassName = 'Zend_Gdata_Gapps_GroupEntry';
+    protected $_feedClassName = 'Zend_Gdata_Gapps_GroupFeed';
+
+}
diff --git a/lib/zend/Zend/Gdata/Gapps/GroupQuery.php b/lib/zend/Zend/Gdata/Gapps/GroupQuery.php
new file mode 100644
index 00000000000..90b4dcccbe7
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/GroupQuery.php
@@ -0,0 +1,226 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Gdata_Gapps_Query
+ */
+require_once('Zend/Gdata/Gapps/Query.php');
+
+/**
+ * Assists in constructing queries for Google Apps group entries.
+ * Instances of this class can be provided in many places where a URL is
+ * required.
+ *
+ * For information on submitting queries to a server, see the Google Apps
+ * service class, Zend_Gdata_Gapps.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_GroupQuery extends Zend_Gdata_Gapps_Query
+{
+
+    /**
+     * If not null, specifies the group id of the group who should be
+     * retrieved by this query.
+     *
+     * @var string
+     */
+    protected $_groupId = null;
+
+    /**
+     * Create a new instance.
+     *
+     * @param string $domain (optional) The Google Apps-hosted domain to use
+     *          when constructing query URIs.
+     * @param string $groupId (optional) Value for the groupId property.
+     * @param string $startGroupName (optional) Value for the
+     *          startGroupName property.
+     */
+    public function __construct($domain = null, $groupId = null,
+            $startGroupId = null)
+    {
+        parent::__construct($domain);
+        $this->setGroupId($groupId);
+        $this->setStartGroupId($startGroupId);
+    }
+
+    /**
+     * Set the group id to query for. When set, only groups with a group id
+     * matching this value will be returned in search results. Set to
+     * null to disable filtering by group id.
+     *
+     * @see getGroupId
+     * @param string $value The group id to filter search results by, or null to
+     *              disable.
+     */
+    public function setGroupId($value)
+    {
+        $this->_groupId = $value;
+    }
+
+    /**
+     * Get the group id to query for. If no group id is set, null will be
+     * returned.
+     *
+     * @param string $value The group id to filter search results by, or
+     *          null if disabled.
+     */
+    public function getGroupId()
+    {
+        return $this->_groupId;
+    }
+
+    /**
+     * Set the member to query for. When set, only subscribers with an
+     * email address matching this value will be returned in search results.
+     * Set to null to disable filtering by username.
+     *
+     * @param string $value The member email address to filter search
+     *              results by, or null to  disable.
+     */
+    public function setMember($value)
+    {
+        if ($value !== null) {
+            $this->_params['member'] = $value;
+        }
+        else {
+            unset($this->_params['member']);
+        }
+    }
+
+    /**
+     * Get the member email address to query for. If no member is set,
+     * null will be returned.
+     *
+     * @see setMember
+     * @return string The member email address to filter search
+     *              results by, or null if disabled.
+     */
+    public function getMember()
+    {
+        if (array_key_exists('member', $this->_params)) {
+            return $this->_params['member'];
+        } else {
+            return null;
+        }
+    }
+
+
+    /**
+     * Sets the query parameter directOnly
+     * @param bool $value
+     */
+    public function setDirectOnly($value)
+    {
+        if ($value !== null) {
+            if($value == true) {
+                $this->_params['directOnly'] = 'true';
+            } else {
+                $this->_params['directOnly'] = 'false';
+            }
+        } else {
+            unset($this->_params['directOnly']);
+        }
+    }
+
+    /**
+     *
+     * @see setDirectOnly
+     * @return bool
+     */
+    public function getDirectOnly()
+    {
+        if (array_key_exists('directOnly', $this->_params)) {
+
+            if($this->_params['directOnly'] == 'true') {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Set the first group id which should be displayed when retrieving
+     * a list of groups.
+     *
+     * @param string $value The first group id to be returned, or null to
+     *          disable.
+     */
+    public function setStartGroupId($value)
+    {
+        if ($value !== null) {
+            $this->_params['start'] = $value;
+        } else {
+            unset($this->_params['start']);
+        }
+    }
+
+    /**
+     * Get the first group id which should be displayed when retrieving
+     * a list of groups.
+     *
+     * @see setStartGroupId
+     * @return string The first group id to be returned, or null if
+     *          disabled.
+     */
+    public function getStartGroupId()
+    {
+        if (array_key_exists('start', $this->_params)) {
+            return $this->_params['start'];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Returns the query URL generated by this query instance.
+     *
+     * @return string The query URL for this instance.
+     */
+    public function getQueryUrl()
+    {
+
+        $uri  = Zend_Gdata_Gapps::APPS_BASE_FEED_URI;
+        $uri .= Zend_Gdata_Gapps::APPS_GROUP_PATH;
+        $uri .= '/' . $this->_domain;
+
+        if ($this->_groupId !== null) {
+            $uri .= '/' . $this->_groupId;
+        }
+
+        if(array_key_exists('member', $this->_params)) {
+            $uri .= '/';
+        }
+
+        $uri .= $this->getQueryString();
+        return $uri;
+    }
+
+}
diff --git a/lib/zend/Zend/Gdata/Gapps/MemberEntry.php b/lib/zend/Zend/Gdata/Gapps/MemberEntry.php
new file mode 100644
index 00000000000..8b7862295ba
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/MemberEntry.php
@@ -0,0 +1,159 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Gdata_Entry
+ */
+require_once 'Zend/Gdata/Entry.php';
+
+/**
+ * @see Zend_Gdata_Gapps_Extension_Property
+ */
+require_once 'Zend/Gdata/Gapps/Extension/Property.php';
+
+/**
+ * Data model class for a Google Apps Member Entry.
+ *
+ * Each member entry describes a single member within a Google Apps hosted
+ * domain.
+ *
+ * To transfer member entries to and from the Google Apps servers, including
+ * creating new entries, refer to the Google Apps service class,
+ * Zend_Gdata_Gapps.
+ *
+ * This class represents <atom:entry> in the Google Data protocol.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_MemberEntry extends Zend_Gdata_Entry
+{
+
+    protected $_entryClassName = 'Zend_Gdata_Gapps_MemberEntry';
+
+    /**
+     * <apps:property> element containing information about other items
+     * relevant to this entry.
+     *
+     * @var Zend_Gdata_Gapps_Extension_Property
+     */
+    protected $_property = array();
+
+    /**
+     * Create a new instance.
+     *
+     * @param DOMElement $element (optional) DOMElement from which this
+     *          object should be constructed.
+     */
+    public function __construct($element = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
+        parent::__construct($element);
+    }
+
+    /**
+     * Retrieves a DOMElement which corresponds to this element and all
+     * child properties.  This is used to build an entry back into a DOM
+     * and eventually XML text for application storage/persistence.
+     *
+     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
+     * @return DOMElement The DOMElement representing this element and all
+     *          child properties.
+     */
+    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
+    {
+        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
+
+        foreach ($this->_property as $p) {
+            $element->appendChild($p->getDOM($element->ownerDocument));
+        }
+        return $element;
+    }
+
+    /**
+     * Creates individual Entry objects of the appropriate type and
+     * stores them as members of this entry based upon DOM data.
+     *
+     * @param DOMNode $child The DOMNode to process
+     */
+    protected function takeChildFromDOM($child)
+    {
+        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
+
+        switch ($absoluteNodeName) {
+
+            case $this->lookupNamespace('apps') . ':' . 'property';
+                $property = new Zend_Gdata_Gapps_Extension_Property();
+                $property->transferFromDOM($child);
+                $this->_property[] = $property;
+                break;
+            default:
+                parent::takeChildFromDOM($child);
+                break;
+        }
+    }
+
+    /**
+     * Returns all property tags for this entry
+     *
+     * @param string $rel The rel value of the property to be found. If null,
+     *          the array of properties is returned instead.
+     * @return mixed Either an array of Zend_Gdata_Gapps_Extension_Property
+     *          objects if $rel is null, a single
+     *          Zend_Gdata_Gapps_Extension_Property object if $rel is specified
+     *          and a matching feed link is found, or null if $rel is
+     *          specified and no matching property is found.
+     */
+    public function getProperty($rel = null)
+    {
+        if ($rel == null) {
+            return $this->_property;
+        } else {
+            foreach ($this->_property as $p) {
+                if ($p->rel == $rel) {
+                    return $p;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Set the value of the  property property for this object.
+     *
+     * @param array $value A collection of
+     *          Zend_Gdata_Gapps_Extension_Property objects.
+     * @return Zend_Gdata_Gapps_MemberEntry Provides a fluent interface.
+     */
+    public function setProperty($value)
+    {
+        $this->_property = $value;
+        return $this;
+    }
+
+}
+
+
diff --git a/lib/zend/Zend/Gdata/Gapps/MemberFeed.php b/lib/zend/Zend/Gdata/Gapps/MemberFeed.php
new file mode 100644
index 00000000000..4250693e53e
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/MemberFeed.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Gdata_Feed
+ */
+require_once 'Zend/Gdata/Feed.php';
+
+/**
+ * @see Zend_Gdata_Gapps_MemberEntry
+ */
+require_once 'Zend/Gdata/Gapps/MemberEntry.php';
+
+/**
+ * Data model for a collection of Google Apps member entries, usually
+ * provided by the Google Apps servers.
+ *
+ * For information on requesting this feed from a server, see the Google
+ * Apps service class, Zend_Gdata_Gapps.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_MemberFeed extends Zend_Gdata_Feed
+{
+
+    protected $_entryClassName = 'Zend_Gdata_Gapps_MemberEntry';
+    protected $_feedClassName = 'Zend_Gdata_Gapps_MemberFeed';
+
+}
diff --git a/lib/zend/Zend/Gdata/Gapps/MemberQuery.php b/lib/zend/Zend/Gdata/Gapps/MemberQuery.php
new file mode 100644
index 00000000000..008baa129e6
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/MemberQuery.php
@@ -0,0 +1,194 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Gdata_Gapps_Query
+ */
+require_once('Zend/Gdata/Gapps/Query.php');
+
+/**
+ * Assists in constructing queries for Google Apps member entries.
+ * Instances of this class can be provided in many places where a URL is
+ * required.
+ *
+ * For information on submitting queries to a server, see the Google Apps
+ * service class, Zend_Gdata_Gapps.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_MemberQuery extends Zend_Gdata_Gapps_Query
+{
+
+    /**
+     * If not null, specifies the group id
+     *
+     * @var string
+     */
+    protected $_groupId = null;
+
+    /**
+     * If not null, specifies the member id of the user who should be
+     * retrieved by this query.
+     *
+     * @var string
+     */
+    protected $_memberId = null;
+
+    /**
+     * Create a new instance.
+     *
+     * @param string $domain (optional) The Google Apps-hosted domain to use
+     *          when constructing query URIs.
+     * @param string $groupId (optional) Value for the groupId property.
+     * @param string $memberId (optional) Value for the memberId property.
+     * @param string $startMemberId (optional) Value for the
+     *          startMemberId property.
+     */
+    public function __construct($domain = null, $groupId = null, $memberId = null,
+            $startMemberId = null)
+    {
+        parent::__construct($domain);
+        $this->setGroupId($groupId);
+        $this->setMemberId($memberId);
+        $this->setStartMemberId($startMemberId);
+    }
+
+    /**
+     * Set the group id to query for.
+     *
+     * @see getGroupId
+     * @param string $value The group id to filter search results by, or null to
+     *              disable.
+     */
+    public function setGroupId($value)
+    {
+        $this->_groupId = $value;
+    }
+
+    /**
+     * Get the group id to query for. If no group id is set, null will be
+     * returned.
+     *
+     * @param string $value The group id to filter search results by, or
+     *          null if disabled.
+     * @return string The group id
+     */
+    public function getGroupId()
+    {
+        return $this->_groupId;
+    }
+
+
+    /**
+     * Set the member id to query for. When set, only users with a member id
+     * matching this value will be returned in search results. Set to
+     * null to disable filtering by member id.
+     *
+     * @see getMemberId
+     * @param string $value The member id to filter search results by, or null to
+     *              disable.
+     */
+    public function setMemberId($value)
+    {
+        $this->_memberId = $value;
+    }
+
+    /**
+     * Get the member id to query for. If no member id is set, null will be
+     * returned.
+     *
+     * @param string $value The member id to filter search results by, or
+     *          null if disabled.
+     * @return The member id
+     */
+    public function getMemberId()
+    {
+        return $this->_memberId;
+    }
+
+    /**
+     * Set the first member id which should be displayed when retrieving
+     * a list of members.
+     *
+     * @param string $value The first member id to be returned, or null to
+     *          disable.
+     */
+    public function setStartMemberId($value)
+    {
+        if ($value !== null) {
+            $this->_params['start'] = $value;
+        } else {
+            unset($this->_params['start']);
+        }
+    }
+
+    /**
+     * Get the first username which should be displayed when retrieving
+     * a list of users.
+     *
+     * @see setStartUsername
+     * @return string The first username to be returned, or null if
+     *          disabled.
+     */
+    public function getStartMemberId()
+    {
+        if (array_key_exists('start', $this->_params)) {
+            return $this->_params['start'];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Returns the query URL generated by this query instance.
+     *
+     * @return string The query URL for this instance.
+     */
+    public function getQueryUrl()
+    {
+
+        $uri = Zend_Gdata_Gapps::APPS_BASE_FEED_URI;
+        $uri .= Zend_Gdata_Gapps::APPS_GROUP_PATH;
+        $uri .= '/' . $this->_domain;
+        if ($this->_groupId !== null) {
+            $uri .= '/' . $this->_groupId;
+        } else {
+            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
+            throw new Zend_Gdata_App_InvalidArgumentException(
+                    'groupId must not be null');
+        }
+
+        $uri .= '/member';
+
+        if ($this->_memberId !== null) {
+            $uri .= '/' . $this->_memberId;
+        }
+        $uri .= $this->getQueryString();
+        return $uri;
+    }
+
+}
diff --git a/lib/zend/Zend/Gdata/Gapps/NicknameEntry.php b/lib/zend/Zend/Gdata/Gapps/NicknameEntry.php
index ce02ed4ac23..deb278ded6d 100644
--- a/lib/zend/Zend/Gdata/Gapps/NicknameEntry.php
+++ b/lib/zend/Zend/Gdata/Gapps/NicknameEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -53,7 +53,7 @@ require_once 'Zend/Gdata/Gapps/Extension/Nickname.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_NicknameEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Gapps/NicknameFeed.php b/lib/zend/Zend/Gdata/Gapps/NicknameFeed.php
index a4fb13d0cbe..11e2104f588 100644
--- a/lib/zend/Zend/Gdata/Gapps/NicknameFeed.php
+++ b/lib/zend/Zend/Gdata/Gapps/NicknameFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,7 +41,7 @@ require_once 'Zend/Gdata/Gapps/NicknameEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_NicknameFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Gapps/NicknameQuery.php b/lib/zend/Zend/Gdata/Gapps/NicknameQuery.php
index 1348775bcf8..be14ae82c51 100644
--- a/lib/zend/Zend/Gdata/Gapps/NicknameQuery.php
+++ b/lib/zend/Zend/Gdata/Gapps/NicknameQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once('Zend/Gdata/Gapps/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query
diff --git a/lib/zend/Zend/Gdata/Gapps/OwnerEntry.php b/lib/zend/Zend/Gdata/Gapps/OwnerEntry.php
new file mode 100644
index 00000000000..82391adfc52
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/OwnerEntry.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Gdata_Entry
+ */
+require_once 'Zend/Gdata/Entry.php';
+
+/**
+ * @see Zend_Gdata_Gapps_Extension_Property
+ */
+require_once 'Zend/Gdata/Gapps/Extension/Property.php';
+
+/**
+ * Data model class for a Google Apps Owner Entry.
+ *
+ * Each owner entry describes a single owner within a Google Apps hosted
+ * domain.
+ *
+ * To transfer owner entries to and from the Google Apps servers, including
+ * creating new entries, refer to the Google Apps service class,
+ * Zend_Gdata_Gapps.
+ *
+ * This class represents <atom:entry> in the Google Data protocol.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_OwnerEntry extends Zend_Gdata_Entry
+{
+
+    protected $_entryClassName = 'Zend_Gdata_Gapps_OwnerEntry';
+
+    /**
+     * <apps:property> element containing information about other items
+     * relevant to this entry.
+     *
+     * @var Zend_Gdata_Gapps_Extension_Property
+     */
+    protected $_property = array();
+
+    /**
+     * Create a new instance.
+     *
+     * @param DOMElement $element (optional) DOMElement from which this
+     *          object should be constructed.
+     */
+    public function __construct($element = null)
+    {
+        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
+        parent::__construct($element);
+    }
+
+    /**
+     * Retrieves a DOMElement which corresponds to this element and all
+     * child properties.  This is used to build an entry back into a DOM
+     * and eventually XML text for application storage/persistence.
+     *
+     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
+     * @return DOMElement The DOMElement representing this element and all
+     *          child properties.
+     */
+    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
+    {
+        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
+
+        foreach ($this->_property as $p) {
+            $element->appendChild($p->getDOM($element->ownerDocument));
+        }
+        return $element;
+    }
+
+    /**
+     * Creates individual Entry objects of the appropriate type and
+     * stores them as owners of this entry based upon DOM data.
+     *
+     * @param DOMNode $child The DOMNode to process
+     */
+    protected function takeChildFromDOM($child)
+    {
+        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
+
+        switch ($absoluteNodeName) {
+
+            case $this->lookupNamespace('apps') . ':' . 'property';
+                $property = new Zend_Gdata_Gapps_Extension_Property();
+                $property->transferFromDOM($child);
+                $this->_property[] = $property;
+                break;
+            default:
+                parent::takeChildFromDOM($child);
+                break;
+        }
+    }
+
+    /**
+     * Returns all property tags for this entry
+     *
+     * @param string $rel The rel value of the property to be found. If null,
+     *          the array of properties is returned instead.
+     * @return mixed Either an array of Zend_Gdata_Gapps_Extension_Property
+     *          objects if $rel is null, a single
+     *          Zend_Gdata_Gapps_Extension_Property object if $rel is specified
+     *          and a matching feed link is found, or null if $rel is
+     *          specified and no matching property is found.
+     */
+    public function getProperty($rel = null)
+    {
+        if ($rel == null) {
+            return $this->_property;
+        } else {
+            foreach ($this->_property as $p) {
+                if ($p->rel == $rel) {
+                    return $p;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Set the value of the  property property for this object.
+     *
+     * @param array $value A collection of
+     *          Zend_Gdata_Gapps_Extension_Property objects.
+     * @return Zend_Gdata_Gapps_OwnerEntry Provides a fluent interface.
+     */
+    public function setProperty($value)
+    {
+        $this->_property = $value;
+        return $this;
+    }
+
+}
+
diff --git a/lib/zend/Zend/Gdata/Gapps/OwnerFeed.php b/lib/zend/Zend/Gdata/Gapps/OwnerFeed.php
new file mode 100644
index 00000000000..1230f9d8025
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/OwnerFeed.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Gdata_Feed
+ */
+require_once 'Zend/Gdata/Feed.php';
+
+/**
+ * @see Zend_Gdata_Gapps_OwnerEntry
+ */
+require_once 'Zend/Gdata/Gapps/OwnerEntry.php';
+
+/**
+ * Data model for a collection of Google Apps owner entries, usually
+ * provided by the Google Apps servers.
+ *
+ * For information on requesting this feed from a server, see the Google
+ * Apps service class, Zend_Gdata_Gapps.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_OwnerFeed extends Zend_Gdata_Feed
+{
+
+    protected $_entryClassName = 'Zend_Gdata_Gapps_OwnerEntry';
+    protected $_feedClassName = 'Zend_Gdata_Gapps_OwnerFeed';
+
+}
diff --git a/lib/zend/Zend/Gdata/Gapps/OwnerQuery.php b/lib/zend/Zend/Gdata/Gapps/OwnerQuery.php
new file mode 100644
index 00000000000..4674bba67b8
--- /dev/null
+++ b/lib/zend/Zend/Gdata/Gapps/OwnerQuery.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Gdata_Gapps_Query
+ */
+require_once('Zend/Gdata/Gapps/Query.php');
+
+/**
+ * Assists in constructing queries for Google Apps owner entries.
+ * Instances of this class can be provided in many places where a URL is
+ * required.
+ *
+ * For information on submitting queries to a server, see the Google Apps
+ * service class, Zend_Gdata_Gapps.
+ *
+ * @category   Zend
+ * @package    Zend_Gdata
+ * @subpackage Gapps
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Gdata_Gapps_OwnerQuery extends Zend_Gdata_Gapps_Query
+{
+
+    /**
+     * Group owner is refering to
+     *
+     * @var string
+     */
+    protected $_groupId = null;
+
+    /**
+     * The email of the owner
+     *
+     * @var string
+     */
+    protected $_ownerEmail = null;
+
+    /**
+     * Create a new instance.
+     *
+     * @param string $domain (optional) The Google Apps-hosted domain to use
+     *          when constructing query URIs.
+     * @param string $groupId (optional) Value for the groupId property.
+     * @param string $ownerEmail (optional) Value for the OwnerEmail property.
+     */
+    public function __construct($domain = null, $groupId = null, $ownerEmail = null)
+    {
+        parent::__construct($domain);
+        $this->setGroupId($groupId);
+        $this->setOwnerEmail($ownerEmail);
+    }
+
+    /**
+     * Set the group id to query for.
+     *
+     * @see getGroupId
+     * @param string $value
+     */
+    public function setGroupId($value)
+    {
+        $this->_groupId = $value;
+    }
+
+    /**
+     * Get the group id to query for.
+     *
+     * @return string
+     *
+     */
+    public function getGroupId()
+    {
+        return $this->_groupId;
+    }
+
+    /**
+     * Set the owner email to query for.
+     *
+     * @see getOwnerEmail
+     * @param string $value
+     */
+    public function setOwnerEmail($value)
+    {
+        $this->_ownerEmail = $value;
+    }
+
+    /**
+     * Get the owner email to query for.
+     *
+     * @return string
+     *
+     */
+    public function getOwnerEmail()
+    {
+        return $this->_ownerEmail;
+    }
+
+    /**
+     * Returns the query URL generated by this query instance.
+     *
+     * @return string The query URL for this instance.
+     */
+    public function getQueryUrl()
+    {
+        $uri = Zend_Gdata_Gapps::APPS_BASE_FEED_URI;
+        $uri .= Zend_Gdata_Gapps::APPS_GROUP_PATH;
+        $uri .= '/' . $this->_domain;
+        if ($this->_groupId !== null) {
+            $uri .= '/' . $this->_groupId;
+        } else {
+            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
+            throw new Zend_Gdata_App_InvalidArgumentException(
+                    'groupId must not be null');
+        }
+
+        $uri .= '/owner';
+
+        if ($this->_ownerEmail !== null) {
+            $uri .= '/' . $this->_ownerEmail;
+        }
+
+        $uri .= $this->getQueryString();
+        return $uri;
+    }
+
+}
diff --git a/lib/zend/Zend/Gdata/Gapps/Query.php b/lib/zend/Zend/Gdata/Gapps/Query.php
index 9b220938b75..1ed266f83ae 100644
--- a/lib/zend/Zend/Gdata/Gapps/Query.php
+++ b/lib/zend/Zend/Gdata/Gapps/Query.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,7 +41,7 @@ require_once('Zend/Gdata/Gapps.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Gdata_Gapps_Query extends Zend_Gdata_Query
diff --git a/lib/zend/Zend/Gdata/Gapps/ServiceException.php b/lib/zend/Zend/Gdata/Gapps/ServiceException.php
index bdd45c6e584..674ba4d1568 100644
--- a/lib/zend/Zend/Gdata/Gapps/ServiceException.php
+++ b/lib/zend/Zend/Gdata/Gapps/ServiceException.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,6 +32,9 @@ require_once 'Zend/Exception.php';
  */
 require_once 'Zend/Gdata/Gapps/Error.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /**
  * Gdata Gapps Exception class. This is thrown when an
  * AppsForYourDomainErrors message is received from the Google Apps
@@ -43,7 +46,7 @@ require_once 'Zend/Gdata/Gapps/Error.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_ServiceException extends Zend_Exception
@@ -160,10 +163,10 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception
             // exception by referencing $php_errormsg
             @ini_set('track_errors', 1);
             $doc = new DOMDocument();
-            $success = @$doc->loadXML($string);
+            $doc = @Zend_Xml_Security::scan($string, $doc);
             @ini_restore('track_errors');
 
-            if (!$success) {
+            if (!$doc) {
                 require_once 'Zend/Gdata/App/Exception.php';
                 // $php_errormsg is automatically generated by PHP if
                 // an error occurs while calling loadXML(), above.
diff --git a/lib/zend/Zend/Gdata/Gapps/UserEntry.php b/lib/zend/Zend/Gdata/Gapps/UserEntry.php
index e973a05511d..ca718f9b1ed 100644
--- a/lib/zend/Zend/Gdata/Gapps/UserEntry.php
+++ b/lib/zend/Zend/Gdata/Gapps/UserEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -61,7 +61,7 @@ require_once 'Zend/Gdata/Gapps/Extension/Quota.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_UserEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Gapps/UserFeed.php b/lib/zend/Zend/Gdata/Gapps/UserFeed.php
index 7ab8187c319..8ea63ea455e 100644
--- a/lib/zend/Zend/Gdata/Gapps/UserFeed.php
+++ b/lib/zend/Zend/Gdata/Gapps/UserFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,7 +41,7 @@ require_once 'Zend/Gdata/Gapps/UserEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_UserFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Gapps/UserQuery.php b/lib/zend/Zend/Gdata/Gapps/UserQuery.php
index afedd1333f2..a488594729d 100644
--- a/lib/zend/Zend/Gdata/Gapps/UserQuery.php
+++ b/lib/zend/Zend/Gdata/Gapps/UserQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once('Zend/Gdata/Gapps/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query
diff --git a/lib/zend/Zend/Gdata/Gbase.php b/lib/zend/Zend/Gdata/Gbase.php
index 4e0fb2f11a5..3b5b8643bba 100644
--- a/lib/zend/Zend/Gdata/Gbase.php
+++ b/lib/zend/Zend/Gdata/Gbase.php
@@ -16,36 +16,21 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata
  */
 require_once 'Zend/Gdata.php';
 
-/**
- * @see Zend_Gdata_Gbase_ItemFeed
- */
-require_once 'Zend/Gdata/Gbase/ItemFeed.php';
-
-/**
- * @see Zend_Gdata_Gbase_ItemEntry
- */
-require_once 'Zend/Gdata/Gbase/ItemEntry.php';
-
-/**
- * @see Zend_Gdata_Gbase_SnippetEntry
- */
-require_once 'Zend/Gdata/Gbase/SnippetEntry.php';
-
-/**
- * @see Zend_Gdata_Gbase_SnippetFeed
- */
-require_once 'Zend/Gdata/Gbase/SnippetFeed.php';
-
 /**
  * Service class for interacting with the Google Base data API
  *
@@ -54,7 +39,7 @@ require_once 'Zend/Gdata/Gbase/SnippetFeed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase extends Zend_Gdata
@@ -63,35 +48,18 @@ class Zend_Gdata_Gbase extends Zend_Gdata
     /**
      * Path to the customer items feeds on the Google Base server.
      */
-    const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items';
+    const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items';
 
     /**
      * Path to the snippets feeds on the Google Base server.
      */
-    const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets';
+    const GBASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets';
 
     /**
      * Authentication service name for Google Base
      */
     const AUTH_SERVICE_NAME = 'gbase';
 
-    /**
-     * The default URI for POST methods
-     *
-     * @var string
-     */
-    protected $_defaultPostUri = self::GBASE_ITEM_FEED_URI;
-
-    /**
-     * Namespaces used for Zend_Gdata_Gbase
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('g', 'http://base.google.com/ns/1.0', 1, 0),
-        array('batch', 'http://schemas.google.com/gdata/batch', 1, 0)
-    );
-
     /**
      * Create Zend_Gdata_Gbase object
      *
@@ -101,109 +69,10 @@ class Zend_Gdata_Gbase extends Zend_Gdata
      */
     public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
     {
-        $this->registerPackage('Zend_Gdata_Gbase');
-        $this->registerPackage('Zend_Gdata_Gbase_Extension');
-        parent::__construct($client, $applicationId);
-        $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME);
-    }
-
-    /**
-     * Retreive feed object
-     *
-     * @param mixed $location The location for the feed, as a URL or Query
-     * @return Zend_Gdata_Gbase_ItemFeed
-     */
-    public function getGbaseItemFeed($location = null)
-    {
-        if ($location === null) {
-            $uri = self::GBASE_ITEM_FEED_URI;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Gbase_ItemFeed');
-    }
-
-    /**
-     * Retreive entry object
-     *
-     * @param mixed $location The location for the feed, as a URL or Query
-     * @return Zend_Gdata_Gbase_ItemEntry
-     */
-    public function getGbaseItemEntry($location = null)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Gbase_ItemEntry');
-    }
-
-    /**
-     * Insert an entry
-     *
-     * @param Zend_Gdata_Gbase_ItemEntry $entry The Base entry to upload
-     * @param boolean $dryRun Flag for the 'dry-run' parameter
-     * @return Zend_Gdata_Gbase_ItemFeed
-     */
-    public function insertGbaseItem($entry, $dryRun = false)
-    {
-        if ($dryRun == false) {
-            $uri = $this->_defaultPostUri;
-        } else {
-            $uri = $this->_defaultPostUri . '?dry-run=true';
-        }
-        $newitem = $this->insertEntry($entry, $uri, 'Zend_Gdata_Gbase_ItemEntry');
-        return $newitem;
-    }
-
-    /**
-     * Update an entry
-     *
-     * @param Zend_Gdata_Gbase_ItemEntry $entry The Base entry to be updated
-     * @param boolean $dryRun Flag for the 'dry-run' parameter
-     * @return Zend_Gdata_Gbase_ItemEntry
-     */
-    public function updateGbaseItem($entry, $dryRun = false)
-    {
-        $returnedEntry = $entry->save($dryRun);
-        return $returnedEntry;
-    }
-
-    /**
-     * Delete an entry
-     *
-     * @param Zend_Gdata_Gbase_ItemEntry $entry The Base entry to remove
-     * @param boolean $dryRun Flag for the 'dry-run' parameter
-     * @return Zend_Gdata_Gbase_ItemFeed
-     */
-    public function deleteGbaseItem($entry, $dryRun = false)
-    {
-        $entry->delete($dryRun);
-        return $this;
-    }
-
-    /**
-     * Retrieve feed object
-     *
-     * @param mixed $location The location for the feed, as a URL or Query
-     * @return Zend_Gdata_Gbase_SnippetFeed
-     */
-    public function getGbaseSnippetFeed($location = null)
-    {
-        if ($location === null) {
-            $uri = self::GBASE_SNIPPET_FEED_URI;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Gbase_SnippetFeed');
+        throw new Zend_Exception(
+            'Google Base API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html'
+        );
     }
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/Entry.php b/lib/zend/Zend/Gdata/Gbase/Entry.php
index 7a395f2dc23..856be4698f9 100644
--- a/lib/zend/Zend/Gdata/Gbase/Entry.php
+++ b/lib/zend/Zend/Gdata/Gbase/Entry.php
@@ -16,21 +16,21 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata_Entry
  */
 require_once 'Zend/Gdata/Entry.php';
 
-/**
- * @see Zend_Gdata_Gbase_Extension_BaseAttribute
- */
-require_once 'Zend/Gdata/Gbase/Extension/BaseAttribute.php';
-
 /**
  * Base class for working with Google Base entries.
  *
@@ -39,113 +39,21 @@ require_once 'Zend/Gdata/Gbase/Extension/BaseAttribute.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_Entry extends Zend_Gdata_Entry
 {
-
-    /**
-     * Name of the base class for Google Base entries
-     *
-     * var @string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_Entry';
-
-    /**
-     * Google Base attribute elements in the 'g' namespace
-     *
-     * @var array
-     */
-    protected $_baseAttributes = array();
-
     /**
      * Constructs a new Zend_Gdata_Gbase_ItemEntry object.
      * @param DOMElement $element (optional) The DOMElement on which to base this object.
      */
     public function __construct($element = null)
     {
-        $this->registerAllNamespaces(Zend_Gdata_Gbase::$namespaces);
-        parent::__construct($element);
+        throw new Zend_Exception(
+            'Google Base API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html'
+        );    
     }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        foreach ($this->_baseAttributes as $baseAttribute) {
-            $element->appendChild($baseAttribute->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        if (strstr($absoluteNodeName, $this->lookupNamespace('g') . ':')) {
-            $baseAttribute = new Zend_Gdata_Gbase_Extension_BaseAttribute();
-            $baseAttribute->transferFromDOM($child);
-            $this->_baseAttributes[] = $baseAttribute;
-        } else {
-            parent::takeChildFromDOM($child);
-        }
-    }
-
-    /**
-     * Get the value of the itme_type
-     *
-     * @return Zend_Gdata_Gbase_Extension_ItemType The requested object.
-     */
-    public function getItemType()
-    {
-        $itemType = $this->getGbaseAttribute('item_type');
-        if (is_object($itemType[0])) {
-          return $itemType[0];
-        } else {
-          return null;
-        }
-    }
-
-    /**
-     * Return all the Base attributes
-     * @return Zend_Gdata_Gbase_Extension_BaseAttribute
-     */
-    public function getGbaseAttributes() {
-        return $this->_baseAttributes;
-    }
-
-    /**
-     * Return an array of Base attributes that match the given attribute name
-     *
-     * @param string $name The name of the Base attribute to look for
-     * @return array $matches Array that contains the matching list of Base attributes
-     */
-    public function getGbaseAttribute($name)
-    {
-        $matches = array();
-        for ($i = 0; $i < count($this->_baseAttributes); $i++) {
-            $baseAttribute = $this->_baseAttributes[$i];
-            if ($baseAttribute->rootElement == $name &&
-                $baseAttribute->rootNamespaceURI == $this->lookupNamespace('g')) {
-                $matches[] = &$this->_baseAttributes[$i];
-            }
-        }
-        return $matches;
-    }
-
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/Extension/BaseAttribute.php b/lib/zend/Zend/Gdata/Gbase/Extension/BaseAttribute.php
index 14e60b3940e..c91f8ff42bd 100644
--- a/lib/zend/Zend/Gdata/Gbase/Extension/BaseAttribute.php
+++ b/lib/zend/Zend/Gdata/Gbase/Extension/BaseAttribute.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,19 +31,11 @@ require_once 'Zend/Gdata/App/Extension/Element.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_Extension_BaseAttribute extends Zend_Gdata_App_Extension_Element
 {
-
-    /**
-     * Namespace for Google Base elements
-     *
-     * var @string
-     */
-    protected $_rootNamespace = 'g';
-
     /**
      * Create a new instance.
      *
@@ -53,63 +45,10 @@ class Zend_Gdata_Gbase_Extension_BaseAttribute extends Zend_Gdata_App_Extension_
      */
     public function __construct($name = null, $text = null, $type = null)
     {
-        $this->registerAllNamespaces(Zend_Gdata_Gbase::$namespaces);
-        if ($type !== null) {
-          $attr = array('name' => 'type', 'value' => $type);
-          $typeAttr = array('type' => $attr);
-          $this->setExtensionAttributes($typeAttr);
-        }
-        parent::__construct($name,
-                            $this->_rootNamespace,
-                            $this->lookupNamespace($this->_rootNamespace),
-                            $text);
+        throw new Zend_Exception(
+            'Google Base API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html'
+        );    
     }
-
-    /**
-     * Get the name of the attribute
-     *
-     * @return attribute name The requested object.
-     */
-    public function getName() {
-      return $this->_rootElement;
-    }
-
-    /**
-     * Get the type of the attribute
-     *
-     * @return attribute type The requested object.
-     */
-    public function getType() {
-      $typeAttr = $this->getExtensionAttributes();
-      return $typeAttr['type']['value'];
-    }
-
-    /**
-     * Set the 'name' of the Base attribute object:
-     *     &lt;g:[$name] type='[$type]'&gt;[$value]&lt;/g:[$name]&gt;
-     *
-     * @param Zend_Gdata_App_Extension_Element $attribute The attribute object
-     * @param string $name The name of the Base attribute
-     * @return Zend_Gdata_Extension_ItemEntry Provides a fluent interface
-     */
-    public function setName($name) {
-      $this->_rootElement = $name;
-      return $this;
-    }
-
-    /**
-     * Set the 'type' of the Base attribute object:
-     *     &lt;g:[$name] type='[$type]'&gt;[$value]&lt;/g:[$name]&gt;
-     *
-     * @param Zend_Gdata_App_Extension_Element $attribute The attribute object
-     * @param string $type The type of the Base attribute
-     * @return Zend_Gdata_Extension_ItemEntry Provides a fluent interface
-     */
-    public function setType($type) {
-      $attr = array('name' => 'type', 'value' => $type);
-      $typeAttr = array('type' => $attr);
-      $this->setExtensionAttributes($typeAttr);
-      return $this;
-    }
-
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/Feed.php b/lib/zend/Zend/Gdata/Gbase/Feed.php
index f5d10360977..a5a39f9658c 100644
--- a/lib/zend/Zend/Gdata/Gbase/Feed.php
+++ b/lib/zend/Zend/Gdata/Gbase/Feed.php
@@ -16,11 +16,16 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata_Feed
  */
@@ -34,18 +39,11 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_Feed extends Zend_Gdata_Feed
 {
-    /**
-     * The classname for the feed.
-     *
-     * @var string
-     */
-    protected $_feedClassName = 'Zend_Gdata_Gbase_Feed';
-
     /**
      * Create a new instance.
      *
@@ -54,7 +52,10 @@ class Zend_Gdata_Gbase_Feed extends Zend_Gdata_Feed
      */
     public function __construct($element = null)
     {
-        $this->registerAllNamespaces(Zend_Gdata_Gbase::$namespaces);
-        parent::__construct($element);
+        throw new Zend_Exception(
+            'Google Base API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html'
+        );    
     }
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/ItemEntry.php b/lib/zend/Zend/Gdata/Gbase/ItemEntry.php
index ead0879289f..a0be22bccc4 100644
--- a/lib/zend/Zend/Gdata/Gbase/ItemEntry.php
+++ b/lib/zend/Zend/Gdata/Gbase/ItemEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,128 +34,9 @@ require_once 'Zend/Gdata/Gbase/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_ItemEntry extends Zend_Gdata_Gbase_Entry
 {
-    /**
-     * The classname for individual item entry elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_ItemEntry';
-
-    /**
-     * Set the value of the itme_type
-     *
-     * @param Zend_Gdata_Gbase_Extension_ItemType $value The desired value for the item_type
-     * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface
-     */
-    public function setItemType($value)
-    {
-        $this->addGbaseAttribute('item_type', $value, 'text');
-        return $this;
-    }
-
-    /**
-     * Adds a custom attribute to the entry in the following format:
-     * &lt;g:[$name] type='[$type]'&gt;[$value]&lt;/g:[$name]&gt;
-     *
-     * @param string $name The name of the attribute
-     * @param string $value The text value of the attribute
-     * @param string $type (optional) The type of the attribute.
-     *          e.g.: 'text', 'number', 'floatUnit'
-     * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface
-     */
-    public function addGbaseAttribute($name, $text, $type = null) {
-        $newBaseAttribute =  new Zend_Gdata_Gbase_Extension_BaseAttribute($name, $text, $type);
-        $this->_baseAttributes[] = $newBaseAttribute;
-        return $this;
-    }
-
-    /**
-     * Removes a Base attribute from the current list of Base attributes
-     *
-     * @param Zend_Gdata_Gbase_Extension_BaseAttribute $baseAttribute The attribute to be removed
-     * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface
-     */
-    public function removeGbaseAttribute($baseAttribute) {
-        $baseAttributes = $this->_baseAttributes;
-        for ($i = 0; $i < count($this->_baseAttributes); $i++) {
-            if ($this->_baseAttributes[$i] == $baseAttribute) {
-                array_splice($baseAttributes, $i, 1);
-                break;
-            }
-        }
-        $this->_baseAttributes = $baseAttributes;
-        return $this;
-    }
-
-    /**
-     * Uploads changes in this entry to the server using Zend_Gdata_App
-     *
-     * @param boolean $dryRun Whether the transaction is dry run or not.
-     * @param string|null $uri The URI to send requests to, or null if $data
-     *        contains the URI.
-     * @param string|null $className The name of the class that should we
-     *        deserializing the server response. If null, then
-     *        'Zend_Gdata_App_Entry' will be used.
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @return Zend_Gdata_App_Entry The updated entry
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function save($dryRun = false,
-                         $uri = null,
-                         $className = null,
-                         $extraHeaders = array())
-    {
-        if ($dryRun == true) {
-            $editLink = $this->getEditLink();
-            if ($uri == null && $editLink !== null) {
-                $uri = $editLink->getHref() . '?dry-run=true';
-            }
-            if ($uri === null) {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException('You must specify an URI which needs deleted.');
-            }
-            $service = new Zend_Gdata_App($this->getHttpClient());
-            return $service->updateEntry($this,
-                                         $uri,
-                                         $className,
-                                         $extraHeaders);
-        } else {
-            parent::save($uri, $className, $extraHeaders);
-        }
-    }
-
-    /**
-     * Deletes this entry to the server using the referenced
-     * Zend_Http_Client to do a HTTP DELETE to the edit link stored in this
-     * entry's link collection.
-     *
-     * @param boolean $dyrRun Whether the transaction is dry run or not
-     * @return void
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function delete($dryRun = false)
-    {
-        $uri = null;
-
-        if ($dryRun == true) {
-            $editLink = $this->getEditLink();
-            if ($editLink !== null) {
-                $uri = $editLink->getHref() . '?dry-run=true';
-            }
-            if ($uri === null) {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException('You must specify an URI which needs deleted.');
-            }
-            parent::delete($uri);
-        } else {
-            parent::delete();
-        }
-    }
-
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/ItemFeed.php b/lib/zend/Zend/Gdata/Gbase/ItemFeed.php
index 098e3c4d8fc..620f1b09a92 100644
--- a/lib/zend/Zend/Gdata/Gbase/ItemFeed.php
+++ b/lib/zend/Zend/Gdata/Gbase/ItemFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,15 +34,9 @@ require_once 'Zend/Gdata/Gbase/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_ItemFeed extends Zend_Gdata_Feed
 {
-    /**
-     * The classname for individual item feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_ItemEntry';
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/ItemQuery.php b/lib/zend/Zend/Gdata/Gbase/ItemQuery.php
index 29bb57d1f86..424cf102740 100644
--- a/lib/zend/Zend/Gdata/Gbase/ItemQuery.php
+++ b/lib/zend/Zend/Gdata/Gbase/ItemQuery.php
@@ -16,20 +16,20 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * @see Zend_Gdata_Query
+ * @see Zend_Exception
  */
-require_once('Zend/Gdata/Query.php');
+require_once 'Zend/Exception.php';
 
 /**
  * @see Zend_Gdata_Gbase_Query
  */
-require_once('Zend/Gdata/Gbase/Query.php');
+require_once 'Zend/Gdata/Gbase/Query.php';
 
 
 /**
@@ -40,7 +40,7 @@ require_once('Zend/Gdata/Gbase/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query
@@ -48,54 +48,5 @@ class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query
     /**
      * Path to the customer items feeds on the Google Base server.
      */
-    const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items';
-
-    /**
-     * The default URI for POST methods
-     *
-     * @var string
-     */
-    protected $_defaultFeedUri = self::GBASE_ITEM_FEED_URI;
-
-    /**
-     * The id of an item
-     *
-     * @var string
-     */
-    protected $_id = null;
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setId($value)
-    {
-        $this->_id = $value;
-        return $this;
-    }
-
-    /*
-     * @return string id
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Returns the query URL generated by this query instance.
-     *
-     * @return string The query URL for this instance.
-     */
-    public function getQueryUrl()
-    {
-        $uri = $this->_defaultFeedUri;
-        if ($this->getId() !== null) {
-            $uri .= '/' . $this->getId();
-        } else {
-            $uri .= $this->getQueryString();
-        }
-        return $uri;
-    }
-
+    const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items';
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/Query.php b/lib/zend/Zend/Gdata/Gbase/Query.php
index 77b3e460ca0..0a0b517c665 100644
--- a/lib/zend/Zend/Gdata/Gbase/Query.php
+++ b/lib/zend/Zend/Gdata/Gbase/Query.php
@@ -16,15 +16,20 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata_Query
  */
-require_once('Zend/Gdata/Query.php');
+require_once 'Zend/Gdata/Query.php';
 
 /**
  * Assists in constructing queries for Google Base
@@ -34,7 +39,7 @@ require_once('Zend/Gdata/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_Query extends Zend_Gdata_Query
@@ -43,226 +48,22 @@ class Zend_Gdata_Gbase_Query extends Zend_Gdata_Query
     /**
      * Path to the customer items feeds on the Google Base server.
      */
-    const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items';
+    const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items';
 
     /**
      * Path to the snippets feeds on the Google Base server.
      */
-    const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets';
+    const GBASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets';
 
     /**
-     * The default URI for POST methods
-     *
-     * @var string
+     * Create Gdata_Query object
      */
-    protected $_defaultFeedUri = self::GBASE_ITEM_FEED_URI;
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_Query Provides a fluent interface
-     */
-    public function setKey($value)
+    public function __construct($url = null)
     {
-        if ($value !== null) {
-            $this->_params['key'] = $value;
-        } else {
-            unset($this->_params['key']);
-        }
-        return $this;
+        throw new Zend_Exception(
+            'Google Base API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html'
+        );    
     }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setBq($value)
-    {
-        if ($value !== null) {
-            $this->_params['bq'] = $value;
-        } else {
-            unset($this->_params['bq']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setRefine($value)
-    {
-        if ($value !== null) {
-            $this->_params['refine'] = $value;
-        } else {
-            unset($this->_params['refine']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setContent($value)
-    {
-        if ($value !== null) {
-            $this->_params['content'] = $value;
-        } else {
-            unset($this->_params['content']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setOrderBy($value)
-    {
-        if ($value !== null) {
-            $this->_params['orderby'] = $value;
-        } else {
-            unset($this->_params['orderby']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setSortOrder($value)
-    {
-        if ($value !== null) {
-            $this->_params['sortorder'] = $value;
-        } else {
-            unset($this->_params['sortorder']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setCrowdBy($value)
-    {
-        if ($value !== null) {
-            $this->_params['crowdby'] = $value;
-        } else {
-            unset($this->_params['crowdby']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setAdjust($value)
-    {
-        if ($value !== null) {
-            $this->_params['adjust'] = $value;
-        } else {
-            unset($this->_params['adjust']);
-        }
-        return $this;
-    }
-
-    /**
-     * @return string key
-     */
-    public function getKey()
-    {
-        if (array_key_exists('key', $this->_params)) {
-            return $this->_params['key'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string bq
-     */
-    public function getBq()
-    {
-        if (array_key_exists('bq', $this->_params)) {
-            return $this->_params['bq'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string refine
-     */
-    public function getRefine()
-    {
-        if (array_key_exists('refine', $this->_params)) {
-            return $this->_params['refine'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string content
-     */
-    public function getContent()
-    {
-        if (array_key_exists('content', $this->_params)) {
-            return $this->_params['content'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string orderby
-     */
-    public function getOrderBy()
-    {
-        if (array_key_exists('orderby', $this->_params)) {
-            return $this->_params['orderby'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string sortorder
-     */
-    public function getSortOrder()
-    {
-        if (array_key_exists('sortorder', $this->_params)) {
-            return $this->_params['sortorder'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string crowdby
-     */
-    public function getCrowdBy()
-    {
-        if (array_key_exists('crowdby', $this->_params)) {
-            return $this->_params['crowdby'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string adjust
-     */
-    public function getAdjust()
-    {
-        if (array_key_exists('adjust', $this->_params)) {
-            return $this->_params['adjust'];
-        } else {
-            return null;
-        }
-    }
-
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/SnippetEntry.php b/lib/zend/Zend/Gdata/Gbase/SnippetEntry.php
index 231ea6cd2d5..0270a2d72f5 100644
--- a/lib/zend/Zend/Gdata/Gbase/SnippetEntry.php
+++ b/lib/zend/Zend/Gdata/Gbase/SnippetEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,15 +34,9 @@ require_once 'Zend/Gdata/Gbase/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_SnippetEntry extends Zend_Gdata_Gbase_Entry
 {
-    /**
-     * The classname for individual snippet entry elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_SnippetEntry';
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/SnippetFeed.php b/lib/zend/Zend/Gdata/Gbase/SnippetFeed.php
index 5892c58ad5e..c4ef199cae5 100644
--- a/lib/zend/Zend/Gdata/Gbase/SnippetFeed.php
+++ b/lib/zend/Zend/Gdata/Gbase/SnippetFeed.php
@@ -16,15 +16,20 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * @see Zend_Gdata_Gbase_Feed
+ * @see Zend_Exception
  */
-require_once 'Zend/Gdata/Gbase/Feed.php';
+require_once 'Zend/Exception.php';
+
+/**
+ * @see Zend_Gdata_Feed
+ */
+require_once 'Zend/Gdata/Feed.php';
 
 /**
  * Represents the Google Base Snippets Feed
@@ -34,15 +39,9 @@ require_once 'Zend/Gdata/Gbase/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_SnippetFeed extends Zend_Gdata_Feed
 {
-    /**
-     * The classname for individual snippet feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_SnippetEntry';
 }
diff --git a/lib/zend/Zend/Gdata/Gbase/SnippetQuery.php b/lib/zend/Zend/Gdata/Gbase/SnippetQuery.php
index 3944b14a605..216ce069e0b 100644
--- a/lib/zend/Zend/Gdata/Gbase/SnippetQuery.php
+++ b/lib/zend/Zend/Gdata/Gbase/SnippetQuery.php
@@ -16,20 +16,15 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * Zend_Gdata_Query
+ * @see Zend_Gdata_Gbase_Query
  */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Zend_Gdata_Gbase_Query
- */
-require_once('Zend/Gdata/Gbase/Query.php');
+require_once 'Zend/Gdata/Gbase/Query.php';
 
 /**
  * Assists in constructing queries for Google Base Snippets Feed
@@ -39,7 +34,7 @@ require_once('Zend/Gdata/Gbase/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Gbase_SnippetQuery extends Zend_Gdata_Gbase_Query
@@ -47,28 +42,5 @@ class Zend_Gdata_Gbase_SnippetQuery extends Zend_Gdata_Gbase_Query
     /**
      * Path to the snippets feeds on the Google Base server.
      */
-    const BASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets';
-
-    /**
-     * The default URI for POST methods
-     *
-     * @var string
-     */
-    protected $_defaultFeedUri = self::BASE_SNIPPET_FEED_URI;
-
-    /**
-     * Returns the query URL generated by this query instance.
-     *
-     * @return string The query URL for this instance.
-     */
-    public function getQueryUrl()
-    {
-        $uri = $this->_defaultFeedUri;
-        if ($this->getCategory() !== null) {
-            $uri .= '/-/' . $this->getCategory();
-        }
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
+    const BASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets';
 }
diff --git a/lib/zend/Zend/Gdata/Geo.php b/lib/zend/Zend/Gdata/Geo.php
old mode 100644
new mode 100755
index 9a4bdfff6c7..85e4876debb
--- a/lib/zend/Zend/Gdata/Geo.php
+++ b/lib/zend/Zend/Gdata/Geo.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -36,7 +36,7 @@ require_once 'Zend/Gdata.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Geo extends Zend_Gdata
diff --git a/lib/zend/Zend/Gdata/Geo/Entry.php b/lib/zend/Zend/Gdata/Geo/Entry.php
old mode 100644
new mode 100755
index f77eb5d3c85..c31c79d4512
--- a/lib/zend/Zend/Gdata/Geo/Entry.php
+++ b/lib/zend/Zend/Gdata/Geo/Entry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Geo_Entry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Geo/Extension/GeoRssWhere.php b/lib/zend/Zend/Gdata/Geo/Extension/GeoRssWhere.php
old mode 100644
new mode 100755
index d8827dc3194..dd5e9472d75
--- a/lib/zend/Zend/Gdata/Geo/Extension/GeoRssWhere.php
+++ b/lib/zend/Zend/Gdata/Geo/Extension/GeoRssWhere.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -43,7 +43,7 @@ require_once 'Zend/Gdata/Geo/Extension/GmlPoint.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Geo_Extension_GeoRssWhere extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Geo/Extension/GmlPoint.php b/lib/zend/Zend/Gdata/Geo/Extension/GmlPoint.php
old mode 100644
new mode 100755
index e4f55684bc3..c29bb8afd9a
--- a/lib/zend/Zend/Gdata/Geo/Extension/GmlPoint.php
+++ b/lib/zend/Zend/Gdata/Geo/Extension/GmlPoint.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -43,7 +43,7 @@ require_once 'Zend/Gdata/Geo/Extension/GmlPos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Geo_Extension_GmlPoint extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Geo/Extension/GmlPos.php b/lib/zend/Zend/Gdata/Geo/Extension/GmlPos.php
old mode 100644
new mode 100755
index a2179ba30f7..c062b2e25dd
--- a/lib/zend/Zend/Gdata/Geo/Extension/GmlPos.php
+++ b/lib/zend/Zend/Gdata/Geo/Extension/GmlPos.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Geo.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Geo_Extension_GmlPos extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Geo/Feed.php b/lib/zend/Zend/Gdata/Geo/Feed.php
old mode 100644
new mode 100755
index ad26ee256b4..de545925a06
--- a/lib/zend/Zend/Gdata/Geo/Feed.php
+++ b/lib/zend/Zend/Gdata/Geo/Feed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Geo/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Geo_Feed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Health.php b/lib/zend/Zend/Gdata/Health.php
old mode 100644
new mode 100755
index 02d84d00869..d930efd45f5
--- a/lib/zend/Zend/Gdata/Health.php
+++ b/lib/zend/Zend/Gdata/Health.php
@@ -16,36 +16,21 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata
  */
 require_once 'Zend/Gdata.php';
 
-/**
- * @see Zend_Gdata_Health_ProfileFeed
- */
-require_once 'Zend/Gdata/Health/ProfileFeed.php';
-
-/**
- * @see Zend_Gdata_Health_ProfileListFeed
- */
-require_once 'Zend/Gdata/Health/ProfileListFeed.php';
-
-/**
- * @see Zend_Gdata_Health_ProfileListEntry
- */
-require_once 'Zend/Gdata/Health/ProfileListEntry.php';
-
-/**
- * @see Zend_Gdata_Health_ProfileEntry
- */
-require_once 'Zend/Gdata/Health/ProfileEntry.php';
-
 /**
  * Service class for interacting with the Google Health Data API
  *
@@ -54,7 +39,7 @@ require_once 'Zend/Gdata/Health/ProfileEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Health extends Zend_Gdata
@@ -83,29 +68,6 @@ class Zend_Gdata_Health extends Zend_Gdata
     const HEALTH_SERVICE_NAME = 'health';
     const H9_SANDBOX_SERVICE_NAME = 'weaver';
 
-    /**
-     * Profile ID used for all API interactions.  This can only be set when
-     * using ClientLogin for authentication.
-     *
-     * @var string
-     */
-    private $_profileID = null;
-
-    /**
-     * True if API calls should be made to the H9 developer sandbox at /h9
-     * rather than /health
-     *
-     * @var bool
-     */
-    private $_useH9Sandbox = false;
-
-    public static $namespaces =
-        array('ccr' => 'urn:astm-org:CCR',
-              'batch' => 'http://schemas.google.com/gdata/batch',
-              'h9m' => 'http://schemas.google.com/health/metadata',
-              'gAcl' => 'http://schemas.google.com/acl/2007',
-              'gd' => 'http://schemas.google.com/g/2005');
-
     /**
      * Create Zend_Gdata_Health object
      *
@@ -118,157 +80,10 @@ class Zend_Gdata_Health extends Zend_Gdata
      */
     public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0', $useH9Sandbox = false)
     {
-        $this->registerPackage('Zend_Gdata_Health');
-        $this->registerPackage('Zend_Gdata_Health_Extension_Ccr');
-        parent::__construct($client, $applicationId);
-        $this->_useH9Sandbox = $useH9Sandbox;
-    }
-
-    /**
-     * Gets the id of the user's profile
-     *
-     * @return string The profile id
-     */
-    public function getProfileID()
-    {
-        return $this->_profileID;
-    }
-
-    /**
-     * Sets which of the user's profiles will be used
-     *
-     * @param string $id The profile ID
-     * @return Zend_Gdata_Health Provides a fluent interface
-     */
-    public function setProfileID($id) {
-        $this->_profileID = $id;
-        return $this;
-    }
-
-     /**
-     * Retrieves the list of profiles associated with the user's ClientLogin
-     * credentials.
-     *
-     * @param string $query The query of the feed as a URL or Query object
-     * @return Zend_Gdata_Feed
-     */
-    public function getHealthProfileListFeed($query = null)
-    {
-        if ($this->_httpClient->getClientLoginToken() === null) {
-            require_once 'Zend/Gdata/App/AuthException.php';
-            throw new Zend_Gdata_App_AuthException(
-                'Profiles list feed is only available when using ClientLogin');
-        }
-
-        if($query === null)  {
-            $uri = self::CLIENTLOGIN_PROFILELIST_FEED_URI;
-        } else if ($query instanceof Zend_Gdata_Query) {
-            $uri = $query->getQueryUrl();
-        } else {
-            $uri = $query;
-        }
-
-        // use correct feed for /h9 or /health
-        if ($this->_useH9Sandbox) {
-            $uri = preg_replace('/\/health\//', '/h9/', $uri);
-        }
-
-        return parent::getFeed($uri, 'Zend_Gdata_Health_ProfileListFeed');
-    }
-
-    /**
-     * Retrieve a user's profile as a feed object.  If ClientLogin is used, the
-     * profile associated with $this->_profileID is returned, otherwise
-     * the profile associated with the AuthSub token is read.
-     *
-     * @param mixed $query The query for the feed, as a URL or Query
-     * @return Zend_Gdata_Health_ProfileFeed
-     */
-    public function getHealthProfileFeed($query = null)
-    {
-        if ($this->_httpClient->getClientLoginToken() !== null &&
-            $this->getProfileID() == null) {
-            require_once 'Zend/Gdata/App/AuthException.php';
-            throw new Zend_Gdata_App_AuthException(
-                'Profile ID must not be null. Did you call setProfileID()?');
-        }
-
-        if ($query instanceof Zend_Gdata_Query) {
-            $uri = $query->getQueryUrl();
-        } else if ($this->_httpClient->getClientLoginToken() !== null &&
-                   $query == null) {
-            $uri = self::CLIENTLOGIN_PROFILE_FEED_URI . '/' . $this->getProfileID();
-        } else if ($query === null) {
-            $uri = self::AUTHSUB_PROFILE_FEED_URI;
-        } else {
-            $uri = $query;
-        }
-
-        // use correct feed for /h9 or /health
-        if ($this->_useH9Sandbox) {
-            $uri = preg_replace('/\/health\//', '/h9/', $uri);
-        }
-
-        return parent::getFeed($uri, 'Zend_Gdata_Health_ProfileFeed');
-    }
-
-    /**
-     * Retrieve a profile entry object
-     *
-     * @param mixed $query The query for the feed, as a URL or Query
-     * @return Zend_Gdata_Health_ProfileEntry
-     */
-    public function getHealthProfileEntry($query = null)
-    {
-        if ($query === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                'Query must not be null');
-        } else if ($query instanceof Zend_Gdata_Query) {
-            $uri = $query->getQueryUrl();
-        } else {
-            $uri = $query;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Health_ProfileEntry');
-    }
-
-    /**
-     * Posts a new notice using the register feed.  This function constructs
-     * the atom profile entry.
-     *
-     * @param string $subject The subject line of the notice
-     * @param string $body The message body of the notice
-     * @param string $bodyType The (optional) type of message body
-     *     (text, xhtml, html, etc.)
-     * @param string $ccrXML The (optional) CCR to add to the user's profile
-     * @return Zend_Gdata_Health_ProfileEntry
-     */
-    public function sendHealthNotice($subject, $body, $bodyType = null, $ccrXML = null)
-    {
-        if ($this->_httpClient->getClientLoginToken()) {
-            $profileID = $this->getProfileID();
-            if ($profileID !== null) {
-                $uri = self::CLIENTLOGIN_REGISTER_FEED_URI . '/' . $profileID;
-            } else {
-                require_once 'Zend/Gdata/App/AuthException.php';
-                throw new Zend_Gdata_App_AuthException(
-                    'Profile ID must not be null. Did you call setProfileID()?');
-            }
-        } else {
-            $uri = self::AUTHSUB_REGISTER_FEED_URI;
-        }
-
-        $entry = new Zend_Gdata_Health_ProfileEntry();
-        $entry->title = $this->newTitle($subject);
-        $entry->content = $this->newContent($body);
-        $entry->content->type = $bodyType ? $bodyType : 'text';
-        $entry->setCcr($ccrXML);
-
-        // use correct feed for /h9 or /health
-        if ($this->_useH9Sandbox) {
-            $uri = preg_replace('/\/health\//', '/h9/', $uri);
-        }
-
-        return $this->insertEntry($entry, $uri, 'Zend_Gdata_Health_ProfileEntry');
+        throw new Zend_Exception(
+            'Google Health API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html'
+        );
     }
 }
diff --git a/lib/zend/Zend/Gdata/Health/Extension/Ccr.php b/lib/zend/Zend/Gdata/Health/Extension/Ccr.php
old mode 100644
new mode 100755
index 6deeca19a6b..296af6ad568
--- a/lib/zend/Zend/Gdata/Health/Extension/Ccr.php
+++ b/lib/zend/Zend/Gdata/Health/Extension/Ccr.php
@@ -15,11 +15,16 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata_App_Extension_Element
  */
@@ -31,15 +36,11 @@ require_once 'Zend/Gdata/App/Extension/Element.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Health_Extension_Ccr extends Zend_Gdata_App_Extension_Element
 {
-    protected $_rootNamespace = 'ccr';
-    protected $_rootElement = 'ContinuityOfCareRecord';
-    protected $_ccrDom = null;
-
     /**
      * Creates a Zend_Gdata_Health_Extension_Ccr entry, representing CCR data
      *
@@ -48,77 +49,10 @@ class Zend_Gdata_Health_Extension_Ccr extends Zend_Gdata_App_Extension_Element
      */
     public function __construct($element = null)
     {
-        foreach (Zend_Gdata_Health::$namespaces as $nsPrefix => $nsUri) {
-            $this->registerNamespace($nsPrefix, $nsUri);
-        }
-    }
-
-    /**
-     * Transfers each child and attribute into member variables.
-     * This is called when XML is received over the wire and the data
-     * model needs to be built to represent this XML.
-     *
-     * @param DOMNode $node The DOMNode that represents this object's data
-     */
-    public function transferFromDOM($node)
-    {
-        $this->_ccrDom = $node;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        if ($doc === null) {
-            $doc = new DOMDocument('1.0', 'utf-8');
-        }
-        $domElement = $doc->importNode($this->_ccrDom, true);
-        return $domElement;
-    }
-
-    /**
-     * Magic helper that allows drilling down and returning specific elements
-     * in the CCR. For example, to retrieve the users medications
-     * (/ContinuityOfCareRecord/Body/Medications) from the entry's CCR, call
-     * $entry->getCcr()->getMedications().  Similarly, getConditions() would
-     * return extract the user's conditions.
-     *
-     * @param string $name Name of the function to call
-     * @param unknown $args
-     * @return array.<DOMElement> A list of the appropriate CCR data
-     */
-    public function __call($name, $args)
-    {
-        if (substr($name, 0, 3) === 'get') {
-            $category = substr($name, 3);
-
-            switch ($category) {
-                case 'Conditions':
-                    $category = 'Problems';
-                    break;
-                case 'Allergies':
-                    $category = 'Alerts';
-                    break;
-                case 'TestResults':
-                    // TestResults is an alias for LabResults
-                case 'LabResults':
-                    $category = 'Results';
-                    break;
-                default:
-                    // $category is already well formatted
-            }
-
-            return $this->_ccrDom->getElementsByTagNameNS($this->lookupNamespace('ccr'), $category);
-        } else {
-            return null;
-        }
+        throw new Zend_Exception(
+            'Google Health API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html'
+        );
     }
 }
diff --git a/lib/zend/Zend/Gdata/Health/ProfileEntry.php b/lib/zend/Zend/Gdata/Health/ProfileEntry.php
old mode 100644
new mode 100755
index 6246ee1a277..c883030bb19
--- a/lib/zend/Zend/Gdata/Health/ProfileEntry.php
+++ b/lib/zend/Zend/Gdata/Health/ProfileEntry.php
@@ -16,21 +16,21 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata_Entry
  */
 require_once 'Zend/Gdata/Entry.php';
 
-/**
- * @see Zend_Gdata_Health_Extension_Ccr
- */
-require_once 'Zend/Gdata/Health/Extension/Ccr.php';
-
 /**
  * Concrete class for working with Health profile entries.
  *
@@ -39,97 +39,21 @@ require_once 'Zend/Gdata/Health/Extension/Ccr.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Health_ProfileEntry extends Zend_Gdata_Entry
 {
-    /**
-     * The classname for individual profile entry elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Health_ProfileEntry';
-
-    /**
-     * Google Health CCR data
-     *
-     * @var Zend_Gdata_Health_Extension_Ccr
-     */
-    protected $_ccrData = null;
-
     /**
      * Constructs a new Zend_Gdata_Health_ProfileEntry object.
      * @param DOMElement $element (optional) The DOMElement on which to base this object.
      */
     public function __construct($element = null)
     {
-        foreach (Zend_Gdata_Health::$namespaces as $nsPrefix => $nsUri) {
-            $this->registerNamespace($nsPrefix, $nsUri);
-        }
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_ccrData !== null) {
-          $element->appendChild($this->_ccrData->getDOM($element->ownerDocument));
-        }
-
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        if (strstr($absoluteNodeName, $this->lookupNamespace('ccr') . ':')) {
-            $ccrElement = new Zend_Gdata_Health_Extension_Ccr();
-            $ccrElement->transferFromDOM($child);
-            $this->_ccrData = $ccrElement;
-        } else {
-            parent::takeChildFromDOM($child);
-
-        }
-    }
-
-    /**
-     * Sets the profile entry's CCR data
-     * @param string $ccrXMLStr The CCR as an xml string
-     * @return Zend_Gdata_Health_Extension_Ccr
-     */
-    public function setCcr($ccrXMLStr) {
-        $ccrElement = null;
-        if ($ccrXMLStr != null) {
-          $ccrElement = new Zend_Gdata_Health_Extension_Ccr();
-          $ccrElement->transferFromXML($ccrXMLStr);
-          $this->_ccrData = $ccrElement;
-        }
-        return $ccrElement;
-    }
-
-
-    /**
-     * Returns all the CCR data in a profile entry
-     * @return Zend_Gdata_Health_Extension_Ccr
-     */
-    public function getCcr() {
-        return $this->_ccrData;
+        throw new Zend_Exception(
+            'Google Health API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html'
+        );
     }
 }
diff --git a/lib/zend/Zend/Gdata/Health/ProfileFeed.php b/lib/zend/Zend/Gdata/Health/ProfileFeed.php
old mode 100644
new mode 100755
index 06e957732b5..0ba13b342a7
--- a/lib/zend/Zend/Gdata/Health/ProfileFeed.php
+++ b/lib/zend/Zend/Gdata/Health/ProfileFeed.php
@@ -16,11 +16,16 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata_Feed
  */
@@ -34,18 +39,11 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Health_ProfileFeed extends Zend_Gdata_Feed
 {
-    /**
-     * The class name for individual profile feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Health_ProfileEntry';
-
     /**
      * Creates a Health Profile feed, representing a user's Health profile
      *
@@ -54,14 +52,10 @@ class Zend_Gdata_Health_ProfileFeed extends Zend_Gdata_Feed
      */
     public function __construct($element = null)
     {
-        foreach (Zend_Gdata_Health::$namespaces as $nsPrefix => $nsUri) {
-            $this->registerNamespace($nsPrefix, $nsUri);
-        }
-        parent::__construct($element);
-    }
-
-    public function getEntries()
-    {
-        return $this->entry;
+        throw new Zend_Exception(
+            'Google Health API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html'
+        );
     }
 }
diff --git a/lib/zend/Zend/Gdata/Health/ProfileListEntry.php b/lib/zend/Zend/Gdata/Health/ProfileListEntry.php
old mode 100644
new mode 100755
index 5b5e065b4d1..b31277d78f5
--- a/lib/zend/Zend/Gdata/Health/ProfileListEntry.php
+++ b/lib/zend/Zend/Gdata/Health/ProfileListEntry.php
@@ -16,11 +16,16 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata_Entry
  */
@@ -34,67 +39,21 @@ require_once 'Zend/Gdata/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Health_ProfileListEntry extends Zend_Gdata_Entry
 {
-    /**
-     * The classname for individual profile list entry elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Health_ProfileListEntry';
-
     /**
      * Constructs a new Zend_Gdata_Health_ProfileListEntry object.
      * @param DOMElement $element (optional) The DOMElement on which to base this object.
      */
     public function __construct($element = null)
     {
-        parent::__construct($element);
+        throw new Zend_Exception(
+            'Google Health API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html'
+        );
     }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        parent::takeChildFromDOM($child);
-    }
-
-    /**
-     * Retrieves the profile ID for the entry, which is contained in <atom:content>
-     * @return string The profile id
-     */
-    public function getProfileID() {
-        return $this->getContent()->text;
-    }
-
-    /**
-     * Retrieves the profile's title, which is contained in <atom:title>
-     * @return string The profile name
-     */
-    public function getProfileName() {
-        return $this->getTitle()->text;
-    }
-
 }
diff --git a/lib/zend/Zend/Gdata/Health/ProfileListFeed.php b/lib/zend/Zend/Gdata/Health/ProfileListFeed.php
old mode 100644
new mode 100755
index 4cecec4b0db..3d5be649651
--- a/lib/zend/Zend/Gdata/Health/ProfileListFeed.php
+++ b/lib/zend/Zend/Gdata/Health/ProfileListFeed.php
@@ -16,11 +16,16 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata_Feed
  */
@@ -34,20 +39,17 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Health_ProfileListFeed extends Zend_Gdata_Feed
 {
-    /**
-     * The class name for individual profile feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Health_ProfileListEntry';
-
-    public function getEntries()
+    public function __construct($element = null)
     {
-        return $this->entry;
+        throw new Zend_Exception(
+            'Google Health API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html'
+        );
     }
 }
diff --git a/lib/zend/Zend/Gdata/Health/Query.php b/lib/zend/Zend/Gdata/Health/Query.php
old mode 100644
new mode 100755
index 75196615586..70df397e9f0
--- a/lib/zend/Zend/Gdata/Health/Query.php
+++ b/lib/zend/Zend/Gdata/Health/Query.php
@@ -16,11 +16,16 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
 /**
  * @see Zend_Gdata_Query
  */
@@ -34,7 +39,7 @@ require_once('Zend/Gdata/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Health_Query extends Zend_Gdata_Query
@@ -55,231 +60,16 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query
      * Namespace for an item category
      */
     const ITEM_CATEGORY_NS = 'http://schemas.google.com/health/item';
-
+    
     /**
-     * The default URI for POST methods
-     *
-     * @var string
+     * Create Gdata_Query object
      */
-    protected $_defaultFeedUri = self::HEALTH_PROFILE_FEED_URI;
-
-    /**
-     * Sets the digest parameter's value.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setDigest($value)
+    public function __construct($url = null)
     {
-        if ($value !== null) {
-            $this->_params['digest'] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the digest parameter's value.
-     *
-     * @return string The value set for the digest parameter.
-     */
-    public function getDigest()
-    {
-        if (array_key_exists('digest', $this->_params)) {
-            return $this->_params['digest'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Setter for category queries.
-     *
-     * @param string $item A category to query.
-     * @param string $name (optional) A specific item to search a category for.
-     *     An example would be 'Lipitor' if $item is set to 'medication'.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setCategory($item, $name = null)
-    {
-        $this->_category = $item .
-            ($name ? '/' . urlencode('{' . self::ITEM_CATEGORY_NS . '}' . $name) : null);
-        return $this;
-    }
-
-    /**
-     * Returns the query object's category.
-     *
-     * @return string id
-     */
-    public function getCategory()
-    {
-        return $this->_category;
-    }
-
-    /**
-     * Setter for the grouped parameter.
-     *
-     * @param string $value setting a count of results per group.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setGrouped($value)
-    {
-        if ($value !== null) {
-            $this->_params['grouped'] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the value set for the grouped parameter.
-     *
-     * @return string grouped parameter.
-     */
-    public function getGrouped()
-    {
-        if (array_key_exists('grouped', $this->_params)) {
-            return $this->_params['grouped'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Setter for the max-results-group parameter.
-     *
-     * @param int $value Specifies the maximum number of groups to be
-     *     retrieved. Must be an integer value greater than zero. This parameter
-     *     is only valid if grouped=true.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setMaxResultsGroup($value)
-    {
-        if ($value !== null) {
-            if ($value <= 0 || $this->getGrouped() !== 'true') {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException(
-                    'The max-results-group parameter must be set to a value
-                    greater than 0 and can only be used if grouped=true');
-            } else {
-              $this->_params['max-results-group'] = $value;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     *  Returns the value set for max-results-group.
-     *
-     * @return int Returns max-results-group parameter.
-     */
-    public function getMaxResultsGroup()
-    {
-        if (array_key_exists('max-results-group', $this->_params)) {
-            return $this->_params['max-results-group'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     *  Setter for the max-results-group parameter.
-     *
-     * @param int $value Specifies the maximum number of records to be
-     *     retrieved from each group.  The limits that you specify with this
-     *     parameter apply to all groups. Must be an integer value greater than
-     *     zero. This parameter is only valid if grouped=true.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setMaxResultsInGroup($value)
-    {
-        if ($value !== null) {
-            if ($value <= 0 || $this->getGrouped() !== 'true') {
-              throw new Zend_Gdata_App_InvalidArgumentException(
-                  'The max-results-in-group parameter must be set to a value
-                  greater than 0 and can only be used if grouped=true');
-            } else {
-              $this->_params['max-results-in-group'] = $value;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     *  Returns the value set for max-results-in-group.
-     *
-     * @return int Returns max-results-in-group parameter.
-     */
-    public function getMaxResultsInGroup()
-    {
-        if (array_key_exists('max-results-in-group', $this->_params)) {
-            return $this->_params['max-results-in-group'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Setter for the start-index-group parameter.
-     *
-     * @param int $value Retrieves only items whose group ranking is at
-     *     least start-index-group. This should be set to a 1-based index of the
-     *     first group to be retrieved. The range is applied per category.
-     *     This parameter is only valid if grouped=true.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setStartIndexGroup($value)
-    {
-        if ($value !== null && $this->getGrouped() !== 'true') {
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                'The start-index-group can only be used if grouped=true');
-        } else {
-          $this->_params['start-index-group'] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     *  Returns the value set for start-index-group.
-     *
-     * @return int Returns start-index-group parameter.
-     */
-    public function getStartIndexGroup()
-    {
-        if (array_key_exists('start-index-group', $this->_params)) {
-            return $this->_params['start-index-group'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     *  Setter for the start-index-in-group parameter.
-     *
-     * @param int $value  A 1-based index of the records to be retrieved from
-     *     each group. This parameter is only valid if grouped=true.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setStartIndexInGroup($value)
-    {
-        if ($value !== null && $this->getGrouped() !== 'true') {
-            throw new Zend_Gdata_App_InvalidArgumentException('start-index-in-group');
-        } else {
-          $this->_params['start-index-in-group'] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the value set for start-index-in-group.
-     *
-     * @return int Returns start-index-in-group parameter.
-     */
-    public function getStartIndexInGroup()
-    {
-        if (array_key_exists('start-index-in-group', $this->_params)) {
-            return $this->_params['start-index-in-group'];
-        } else {
-            return null;
-        }
+        throw new Zend_Exception(
+            'Google Health API has been discontinued by Google and was removed'
+            . ' from Zend Framework in 1.12.0.  For more information see: '
+            . 'http://googleblog.blogspot.ca/2011/06/update-on-google-health-and-google.html'
+        );
     }
 }
diff --git a/lib/zend/Zend/Gdata/HttpAdapterStreamingProxy.php b/lib/zend/Zend/Gdata/HttpAdapterStreamingProxy.php
index 0435bdb2bb8..aa2efeb54c8 100644
--- a/lib/zend/Zend/Gdata/HttpAdapterStreamingProxy.php
+++ b/lib/zend/Zend/Gdata/HttpAdapterStreamingProxy.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Http/Client/Adapter/Proxy.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Proxy
@@ -114,14 +114,19 @@ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Prox
                 'Error writing request to proxy server');
         }
 
-        //read from $body, write to socket
-        while ($body->hasData()) {
-            if (! @fwrite($this->socket, $body->read(self::CHUNK_SIZE))) {
+        // Read from $body, write to socket
+        $chunk = $body->read(self::CHUNK_SIZE);
+        while ($chunk !== false) {
+            if (!@fwrite($this->socket, $chunk)) {
                 require_once 'Zend/Http/Client/Adapter/Exception.php';
                 throw new Zend_Http_Client_Adapter_Exception(
-                    'Error writing request to server');
+                    'Error writing request to server'
+                );
             }
+            $chunk = $body->read(self::CHUNK_SIZE);
         }
+        $body->closeFileHandle();
+
         return 'Large upload, request is not cached.';
     }
 }
diff --git a/lib/zend/Zend/Gdata/HttpAdapterStreamingSocket.php b/lib/zend/Zend/Gdata/HttpAdapterStreamingSocket.php
index 28c8365a52f..b7a09cded66 100644
--- a/lib/zend/Zend/Gdata/HttpAdapterStreamingSocket.php
+++ b/lib/zend/Zend/Gdata/HttpAdapterStreamingSocket.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Http/Client/Adapter/Socket.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Socket
diff --git a/lib/zend/Zend/Gdata/HttpClient.php b/lib/zend/Zend/Gdata/HttpClient.php
index d4816a41af8..7591f118b5e 100644
--- a/lib/zend/Zend/Gdata/HttpClient.php
+++ b/lib/zend/Zend/Gdata/HttpClient.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,7 +34,7 @@ require_once 'Zend/Http/Client.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_HttpClient extends Zend_Http_Client
diff --git a/lib/zend/Zend/Gdata/Kind/EventEntry.php b/lib/zend/Zend/Gdata/Kind/EventEntry.php
index f475122c8aa..ce9461a7738 100644
--- a/lib/zend/Zend/Gdata/Kind/EventEntry.php
+++ b/lib/zend/Zend/Gdata/Kind/EventEntry.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -92,7 +92,7 @@ require_once 'Zend/Gdata/Extension/EntryLink.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Kind_EventEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Media.php b/lib/zend/Zend/Gdata/Media.php
old mode 100644
new mode 100755
index b7f6da6343c..2d09325e070
--- a/lib/zend/Zend/Gdata/Media.php
+++ b/lib/zend/Zend/Gdata/Media.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Gdata.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media extends Zend_Gdata
diff --git a/lib/zend/Zend/Gdata/Media/Entry.php b/lib/zend/Zend/Gdata/Media/Entry.php
old mode 100644
new mode 100755
index 5650c8a8309..5fa1225596f
--- a/lib/zend/Zend/Gdata/Media/Entry.php
+++ b/lib/zend/Zend/Gdata/Media/Entry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Media/Extension/MediaGroup.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Entry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaCategory.php b/lib/zend/Zend/Gdata/Media/Extension/MediaCategory.php
old mode 100644
new mode 100755
index 7f7e39b4c98..e76e5af7e2c
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaCategory.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaCategory.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaCategory extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaContent.php b/lib/zend/Zend/Gdata/Media/Extension/MediaContent.php
old mode 100644
new mode 100755
index 30d69ba5f82..f3dc0a2ffe4
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaContent.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaContent.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -35,7 +35,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaContent extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaCopyright.php b/lib/zend/Zend/Gdata/Media/Extension/MediaCopyright.php
old mode 100644
new mode 100755
index 84776bc279e..0148eebe51f
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaCopyright.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaCopyright.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaCopyright extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaCredit.php b/lib/zend/Zend/Gdata/Media/Extension/MediaCredit.php
old mode 100644
new mode 100755
index 446c5ccd224..e929cc445aa
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaCredit.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaCredit.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaCredit extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaDescription.php b/lib/zend/Zend/Gdata/Media/Extension/MediaDescription.php
old mode 100644
new mode 100755
index 2e1a8128fcd..7b9c0336d88
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaDescription.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaDescription.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaDescription extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaGroup.php b/lib/zend/Zend/Gdata/Media/Extension/MediaGroup.php
old mode 100644
new mode 100755
index 89ba21e1eec..7735aa56315
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaGroup.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaGroup.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -106,7 +106,7 @@ require_once 'Zend/Gdata/Media/Extension/MediaTitle.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaGroup extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaHash.php b/lib/zend/Zend/Gdata/Media/Extension/MediaHash.php
old mode 100644
new mode 100755
index abab09de904..b891fbc11ae
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaHash.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaHash.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaHash extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaKeywords.php b/lib/zend/Zend/Gdata/Media/Extension/MediaKeywords.php
old mode 100644
new mode 100755
index 34426bc549e..ede48046ce6
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaKeywords.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaKeywords.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaKeywords extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaPlayer.php b/lib/zend/Zend/Gdata/Media/Extension/MediaPlayer.php
old mode 100644
new mode 100755
index 3b9bb33e02b..2602c1b032a
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaPlayer.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaPlayer.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaPlayer extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaRating.php b/lib/zend/Zend/Gdata/Media/Extension/MediaRating.php
old mode 100644
new mode 100755
index cc5e87c0150..877e18033bf
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaRating.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaRating.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaRating extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaRestriction.php b/lib/zend/Zend/Gdata/Media/Extension/MediaRestriction.php
old mode 100644
new mode 100755
index 1434397bbf3..27277ce1b9c
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaRestriction.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaRestriction.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaRestriction extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaText.php b/lib/zend/Zend/Gdata/Media/Extension/MediaText.php
old mode 100644
new mode 100755
index 2d67b8f7895..e58be4c8760
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaText.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaText.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaText extends Zend_Gdata_Extension
@@ -64,11 +64,11 @@ class Zend_Gdata_Media_Extension_MediaText extends Zend_Gdata_Extension
     /**
      * Constructs a new MediaText element
      *
-     * @param $text string
-     * @param $type string
-     * @param $lang string
-     * @param $start string
-     * @param $end string
+     * @param string $text
+     * @param string $type
+     * @param string $lang
+     * @param string $start
+     * @param string $end
      */
     public function __construct($text = null, $type = null, $lang = null,
             $start = null, $end = null)
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaThumbnail.php b/lib/zend/Zend/Gdata/Media/Extension/MediaThumbnail.php
old mode 100644
new mode 100755
index 71f726b133a..1f7588cd151
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaThumbnail.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaThumbnail.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaThumbnail extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaTitle.php b/lib/zend/Zend/Gdata/Media/Extension/MediaTitle.php
old mode 100644
new mode 100755
index d0d75c06e36..79dee0890af
--- a/lib/zend/Zend/Gdata/Media/Extension/MediaTitle.php
+++ b/lib/zend/Zend/Gdata/Media/Extension/MediaTitle.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Extension_MediaTitle extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Media/Feed.php b/lib/zend/Zend/Gdata/Media/Feed.php
old mode 100644
new mode 100755
index 5f235d62739..858aa8cdc59
--- a/lib/zend/Zend/Gdata/Media/Feed.php
+++ b/lib/zend/Zend/Gdata/Media/Feed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Media/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Media_Feed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/MediaMimeStream.php b/lib/zend/Zend/Gdata/MediaMimeStream.php
index 7588bff41ba..8973e7e0b8f 100644
--- a/lib/zend/Zend/Gdata/MediaMimeStream.php
+++ b/lib/zend/Zend/Gdata/MediaMimeStream.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/MimeBodyString.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_MediaMimeStream
diff --git a/lib/zend/Zend/Gdata/MimeBodyString.php b/lib/zend/Zend/Gdata/MimeBodyString.php
index c8230b17578..acbeac50dbd 100644
--- a/lib/zend/Zend/Gdata/MimeBodyString.php
+++ b/lib/zend/Zend/Gdata/MimeBodyString.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_MimeBodyString
diff --git a/lib/zend/Zend/Gdata/MimeFile.php b/lib/zend/Zend/Gdata/MimeFile.php
index f97ddc3e4f8..853d121a4b1 100644
--- a/lib/zend/Zend/Gdata/MimeFile.php
+++ b/lib/zend/Zend/Gdata/MimeFile.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_MimeFile
diff --git a/lib/zend/Zend/Gdata/Photos.php b/lib/zend/Zend/Gdata/Photos.php
old mode 100644
new mode 100755
index eb040e82dd5..d052b7c0c31
--- a/lib/zend/Zend/Gdata/Photos.php
+++ b/lib/zend/Zend/Gdata/Photos.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -52,14 +52,14 @@ require_once 'Zend/Gdata/Photos/PhotoFeed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos extends Zend_Gdata
 {
 
-    const PICASA_BASE_URI = 'http://picasaweb.google.com/data';
-    const PICASA_BASE_FEED_URI = 'http://picasaweb.google.com/data/feed';
+    const PICASA_BASE_URI = 'https://picasaweb.google.com/data';
+    const PICASA_BASE_FEED_URI = 'https://picasaweb.google.com/data/feed';
     const AUTH_SERVICE_NAME = 'lh2';
 
     /**
diff --git a/lib/zend/Zend/Gdata/Photos/AlbumEntry.php b/lib/zend/Zend/Gdata/Photos/AlbumEntry.php
old mode 100644
new mode 100755
index 63f4fa20e29..0e2243c147c
--- a/lib/zend/Zend/Gdata/Photos/AlbumEntry.php
+++ b/lib/zend/Zend/Gdata/Photos/AlbumEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -98,7 +98,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_AlbumEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Photos/AlbumFeed.php b/lib/zend/Zend/Gdata/Photos/AlbumFeed.php
old mode 100644
new mode 100755
index 3cb55736a4d..0addc7a9497
--- a/lib/zend/Zend/Gdata/Photos/AlbumFeed.php
+++ b/lib/zend/Zend/Gdata/Photos/AlbumFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -46,7 +46,7 @@ require_once 'Zend/Gdata/Photos/AlbumEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_AlbumFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Photos/AlbumQuery.php b/lib/zend/Zend/Gdata/Photos/AlbumQuery.php
old mode 100644
new mode 100755
index eef5f2c9440..7452569c875
--- a/lib/zend/Zend/Gdata/Photos/AlbumQuery.php
+++ b/lib/zend/Zend/Gdata/Photos/AlbumQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once('Zend/Gdata/Photos/UserQuery.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_AlbumQuery extends Zend_Gdata_Photos_UserQuery
diff --git a/lib/zend/Zend/Gdata/Photos/CommentEntry.php b/lib/zend/Zend/Gdata/Photos/CommentEntry.php
old mode 100644
new mode 100755
index 68c008b77ee..8eb68f7060e
--- a/lib/zend/Zend/Gdata/Photos/CommentEntry.php
+++ b/lib/zend/Zend/Gdata/Photos/CommentEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -58,7 +58,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_CommentEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Access.php b/lib/zend/Zend/Gdata/Photos/Extension/Access.php
old mode 100644
new mode 100755
index 5e91246fb70..9ee7fda4a88
--- a/lib/zend/Zend/Gdata/Photos/Extension/Access.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Access.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Access extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/AlbumId.php b/lib/zend/Zend/Gdata/Photos/Extension/AlbumId.php
old mode 100644
new mode 100755
index 2f348e9ab76..9bc4c81fe9f
--- a/lib/zend/Zend/Gdata/Photos/Extension/AlbumId.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/AlbumId.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_AlbumId extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/BytesUsed.php b/lib/zend/Zend/Gdata/Photos/Extension/BytesUsed.php
old mode 100644
new mode 100755
index 62a937c963c..7eb3bf96a4f
--- a/lib/zend/Zend/Gdata/Photos/Extension/BytesUsed.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/BytesUsed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_BytesUsed extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Checksum.php b/lib/zend/Zend/Gdata/Photos/Extension/Checksum.php
old mode 100644
new mode 100755
index 61d91d8c8c4..bc370d19bc5
--- a/lib/zend/Zend/Gdata/Photos/Extension/Checksum.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Checksum.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Checksum extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Client.php b/lib/zend/Zend/Gdata/Photos/Extension/Client.php
old mode 100644
new mode 100755
index 7518a1388af..40eca3bb673
--- a/lib/zend/Zend/Gdata/Photos/Extension/Client.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Client.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Client extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/CommentCount.php b/lib/zend/Zend/Gdata/Photos/Extension/CommentCount.php
old mode 100644
new mode 100755
index 1e9b2697118..05dd76b95d6
--- a/lib/zend/Zend/Gdata/Photos/Extension/CommentCount.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/CommentCount.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_CommentCount extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/CommentingEnabled.php b/lib/zend/Zend/Gdata/Photos/Extension/CommentingEnabled.php
old mode 100644
new mode 100755
index 72021c04a9e..e955a838b0b
--- a/lib/zend/Zend/Gdata/Photos/Extension/CommentingEnabled.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/CommentingEnabled.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_CommentingEnabled extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Height.php b/lib/zend/Zend/Gdata/Photos/Extension/Height.php
old mode 100644
new mode 100755
index 211dfd20525..2f8260359d4
--- a/lib/zend/Zend/Gdata/Photos/Extension/Height.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Height.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Height extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Id.php b/lib/zend/Zend/Gdata/Photos/Extension/Id.php
old mode 100644
new mode 100755
index 07ee418b7aa..ae9288a9e5a
--- a/lib/zend/Zend/Gdata/Photos/Extension/Id.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Id.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Id extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Location.php b/lib/zend/Zend/Gdata/Photos/Extension/Location.php
old mode 100644
new mode 100755
index d151374180b..9a635a20fc6
--- a/lib/zend/Zend/Gdata/Photos/Extension/Location.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Location.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Location extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php b/lib/zend/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php
old mode 100644
new mode 100755
index 013c6d70c09..25f3e207391
--- a/lib/zend/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Name.php b/lib/zend/Zend/Gdata/Photos/Extension/Name.php
old mode 100644
new mode 100755
index 09e77faabc3..07563617b4c
--- a/lib/zend/Zend/Gdata/Photos/Extension/Name.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Name.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Name extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Nickname.php b/lib/zend/Zend/Gdata/Photos/Extension/Nickname.php
old mode 100644
new mode 100755
index 02a8ed8145e..907d8c7876e
--- a/lib/zend/Zend/Gdata/Photos/Extension/Nickname.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Nickname.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Nickname extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/NumPhotos.php b/lib/zend/Zend/Gdata/Photos/Extension/NumPhotos.php
old mode 100644
new mode 100755
index 5911e3aa4be..29f3642969c
--- a/lib/zend/Zend/Gdata/Photos/Extension/NumPhotos.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/NumPhotos.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_NumPhotos extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php b/lib/zend/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php
old mode 100644
new mode 100755
index bf0ac04e7a0..3aad7822db1
--- a/lib/zend/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_NumPhotosRemaining extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/PhotoId.php b/lib/zend/Zend/Gdata/Photos/Extension/PhotoId.php
old mode 100644
new mode 100755
index 88a0196e2a3..42c2a48ceb3
--- a/lib/zend/Zend/Gdata/Photos/Extension/PhotoId.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/PhotoId.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_PhotoId extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Position.php b/lib/zend/Zend/Gdata/Photos/Extension/Position.php
old mode 100644
new mode 100755
index a3ff42afe68..29f9957bca1
--- a/lib/zend/Zend/Gdata/Photos/Extension/Position.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Position.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Position extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/QuotaCurrent.php b/lib/zend/Zend/Gdata/Photos/Extension/QuotaCurrent.php
old mode 100644
new mode 100755
index 450a5e32e1e..2efb2fd807a
--- a/lib/zend/Zend/Gdata/Photos/Extension/QuotaCurrent.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/QuotaCurrent.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_QuotaCurrent extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/QuotaLimit.php b/lib/zend/Zend/Gdata/Photos/Extension/QuotaLimit.php
old mode 100644
new mode 100755
index 29e9f530c71..b0c03d80268
--- a/lib/zend/Zend/Gdata/Photos/Extension/QuotaLimit.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/QuotaLimit.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_QuotaLimit extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Rotation.php b/lib/zend/Zend/Gdata/Photos/Extension/Rotation.php
old mode 100644
new mode 100755
index 15fac99e826..f45a458c995
--- a/lib/zend/Zend/Gdata/Photos/Extension/Rotation.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Rotation.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Rotation extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Size.php b/lib/zend/Zend/Gdata/Photos/Extension/Size.php
old mode 100644
new mode 100755
index 3bd302bf039..1dc5bee5570
--- a/lib/zend/Zend/Gdata/Photos/Extension/Size.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Size.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Size extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Thumbnail.php b/lib/zend/Zend/Gdata/Photos/Extension/Thumbnail.php
old mode 100644
new mode 100755
index 6b02ec2b46b..eb4de6d8b57
--- a/lib/zend/Zend/Gdata/Photos/Extension/Thumbnail.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Thumbnail.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Thumbnail extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Timestamp.php b/lib/zend/Zend/Gdata/Photos/Extension/Timestamp.php
old mode 100644
new mode 100755
index baa509db03b..1385a54b507
--- a/lib/zend/Zend/Gdata/Photos/Extension/Timestamp.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Timestamp.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Timestamp extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/User.php b/lib/zend/Zend/Gdata/Photos/Extension/User.php
old mode 100644
new mode 100755
index ef81da30ffe..df38de8e56a
--- a/lib/zend/Zend/Gdata/Photos/Extension/User.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/User.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_User extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Version.php b/lib/zend/Zend/Gdata/Photos/Extension/Version.php
old mode 100644
new mode 100755
index 30b8241a0e1..2f75d566d7d
--- a/lib/zend/Zend/Gdata/Photos/Extension/Version.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Version.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Version extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Weight.php b/lib/zend/Zend/Gdata/Photos/Extension/Weight.php
old mode 100644
new mode 100755
index fa4a0ac998e..7d0f48a0042
--- a/lib/zend/Zend/Gdata/Photos/Extension/Weight.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Weight.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Weight extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Width.php b/lib/zend/Zend/Gdata/Photos/Extension/Width.php
old mode 100644
new mode 100755
index ff7fec0068b..8b83ec689f9
--- a/lib/zend/Zend/Gdata/Photos/Extension/Width.php
+++ b/lib/zend/Zend/Gdata/Photos/Extension/Width.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_Extension_Width extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Photos/PhotoEntry.php b/lib/zend/Zend/Gdata/Photos/PhotoEntry.php
old mode 100644
new mode 100755
index 00583af3750..9ce381c7628
--- a/lib/zend/Zend/Gdata/Photos/PhotoEntry.php
+++ b/lib/zend/Zend/Gdata/Photos/PhotoEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -113,7 +113,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_PhotoEntry extends Zend_Gdata_Media_Entry
diff --git a/lib/zend/Zend/Gdata/Photos/PhotoFeed.php b/lib/zend/Zend/Gdata/Photos/PhotoFeed.php
old mode 100644
new mode 100755
index 0046d76ce11..d2795c53d42
--- a/lib/zend/Zend/Gdata/Photos/PhotoFeed.php
+++ b/lib/zend/Zend/Gdata/Photos/PhotoFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -46,7 +46,7 @@ require_once 'Zend/Gdata/Photos/PhotoEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_PhotoFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Photos/PhotoQuery.php b/lib/zend/Zend/Gdata/Photos/PhotoQuery.php
old mode 100644
new mode 100755
index a4cc3b00f7b..1690f247802
--- a/lib/zend/Zend/Gdata/Photos/PhotoQuery.php
+++ b/lib/zend/Zend/Gdata/Photos/PhotoQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once('Zend/Gdata/Photos/AlbumQuery.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_PhotoQuery extends Zend_Gdata_Photos_AlbumQuery
diff --git a/lib/zend/Zend/Gdata/Photos/TagEntry.php b/lib/zend/Zend/Gdata/Photos/TagEntry.php
old mode 100644
new mode 100755
index 47d9e6e62ac..378a6d3586e
--- a/lib/zend/Zend/Gdata/Photos/TagEntry.php
+++ b/lib/zend/Zend/Gdata/Photos/TagEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -48,7 +48,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_TagEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Photos/UserEntry.php b/lib/zend/Zend/Gdata/Photos/UserEntry.php
old mode 100644
new mode 100755
index 805e70f3b34..00b5fc18163
--- a/lib/zend/Zend/Gdata/Photos/UserEntry.php
+++ b/lib/zend/Zend/Gdata/Photos/UserEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -78,7 +78,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_UserEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Photos/UserFeed.php b/lib/zend/Zend/Gdata/Photos/UserFeed.php
old mode 100644
new mode 100755
index a851ae33d0f..9f5b86231dc
--- a/lib/zend/Zend/Gdata/Photos/UserFeed.php
+++ b/lib/zend/Zend/Gdata/Photos/UserFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -66,7 +66,7 @@ require_once 'Zend/Gdata/Photos/CommentEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_UserFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Photos/UserQuery.php b/lib/zend/Zend/Gdata/Photos/UserQuery.php
old mode 100644
new mode 100755
index ddf80630bb0..02cf231a7cf
--- a/lib/zend/Zend/Gdata/Photos/UserQuery.php
+++ b/lib/zend/Zend/Gdata/Photos/UserQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once('Zend/Gdata/Gapps/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query
diff --git a/lib/zend/Zend/Gdata/Query.php b/lib/zend/Zend/Gdata/Query.php
index 2b35357fa05..fae21af6bdb 100644
--- a/lib/zend/Zend/Gdata/Query.php
+++ b/lib/zend/Zend/Gdata/Query.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,7 +34,7 @@ require_once 'Zend/Gdata/App/Util.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Query
diff --git a/lib/zend/Zend/Gdata/Spreadsheets.php b/lib/zend/Zend/Gdata/Spreadsheets.php
index 83346b126f7..8887b01ae2d 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets.php
@@ -16,7 +16,7 @@
  * @category     Zend
  * @package      Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -89,13 +89,13 @@ require_once('Zend/Gdata/Spreadsheets/CellQuery.php');
  * @category     Zend
  * @package      Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets extends Zend_Gdata
 {
-    const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds/spreadsheets';
-    const SPREADSHEETS_POST_URI = 'http://spreadsheets.google.com/feeds/spreadsheets/private/full';
+    const SPREADSHEETS_FEED_URI = 'https://spreadsheets.google.com/feeds/spreadsheets';
+    const SPREADSHEETS_POST_URI = 'https://spreadsheets.google.com/feeds/spreadsheets/private/full';
     const WORKSHEETS_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#worksheetsfeed';
     const LIST_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#listfeed';
     const CELL_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#cellsfeed';
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/CellEntry.php b/lib/zend/Zend/Gdata/Spreadsheets/CellEntry.php
index d2a9176d7d3..3f56d2c7570 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/CellEntry.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/CellEntry.php
@@ -16,7 +16,7 @@
  * @category     Zend
  * @package      Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Spreadsheets/Extension/Cell.php';
  * @category     Zend
  * @package      Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_CellEntry extends Zend_Gdata_Entry
@@ -92,7 +92,8 @@ class Zend_Gdata_Spreadsheets_CellEntry extends Zend_Gdata_Entry
 
     /**
      * Sets the Cell element of this Cell Entry.
-     * @param $cell Zend_Gdata_Spreadsheets_Extension_Cell $cell
+     * @param Zend_Gdata_Spreadsheets_Extension_Cell $cell
+		 * @return Zend_Gdata_Spreadsheets_CellEntry
      */
     public function setCell($cell)
     {
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/CellFeed.php b/lib/zend/Zend/Gdata/Spreadsheets/CellFeed.php
index b46a930d1d3..2029fff601c 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/CellFeed.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/CellFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,7 +41,7 @@ require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_CellFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/CellQuery.php b/lib/zend/Zend/Gdata/Spreadsheets/CellQuery.php
index 9663df15b85..17790f9d32f 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/CellQuery.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/CellQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,13 +39,13 @@ require_once('Zend/Gdata/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_CellQuery extends Zend_Gdata_Query
 {
 
-    const SPREADSHEETS_CELL_FEED_URI = 'http://spreadsheets.google.com/feeds/cells';
+    const SPREADSHEETS_CELL_FEED_URI = 'https://spreadsheets.google.com/feeds/cells';
 
     protected $_defaultFeedUri = self::SPREADSHEETS_CELL_FEED_URI;
     protected $_visibility = 'private';
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/DocumentQuery.php b/lib/zend/Zend/Gdata/Spreadsheets/DocumentQuery.php
index c5a54ad46b1..d5e879d68e4 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/DocumentQuery.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/DocumentQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,13 +39,13 @@ require_once('Zend/Gdata/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query
 {
 
-    const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds';
+    const SPREADSHEETS_FEED_URI = 'https://spreadsheets.google.com/feeds';
 
     protected $_defaultFeedUri = self::SPREADSHEETS_FEED_URI;
     protected $_documentType;
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/Extension/Cell.php b/lib/zend/Zend/Gdata/Spreadsheets/Extension/Cell.php
index 748f7382d45..142f7af09ad 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/Extension/Cell.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/Extension/Cell.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_Extension_Cell extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/Extension/ColCount.php b/lib/zend/Zend/Gdata/Spreadsheets/Extension/ColCount.php
index 741031b89e4..c0546ffd54d 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/Extension/ColCount.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/Extension/ColCount.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_Extension_ColCount extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/Extension/Custom.php b/lib/zend/Zend/Gdata/Spreadsheets/Extension/Custom.php
index e1a356f3ebb..a02754fbe55 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/Extension/Custom.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/Extension/Custom.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_Extension_Custom extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/Extension/RowCount.php b/lib/zend/Zend/Gdata/Spreadsheets/Extension/RowCount.php
index 416d9d05834..d7b533864cf 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/Extension/RowCount.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/Extension/RowCount.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_Extension_RowCount extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/ListEntry.php b/lib/zend/Zend/Gdata/Spreadsheets/ListEntry.php
index 575fde96195..3f950c1aa71 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/ListEntry.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/ListEntry.php
@@ -16,7 +16,7 @@
  * @category     Zend
  * @package      Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Spreadsheets/Extension/Custom.php';
  * @category     Zend
  * @package      Zend_Gdata
  * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_ListEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/ListFeed.php b/lib/zend/Zend/Gdata/Spreadsheets/ListFeed.php
index 292fc8b42e7..8ffd1796870 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/ListFeed.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/ListFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_ListFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/ListQuery.php b/lib/zend/Zend/Gdata/Spreadsheets/ListQuery.php
index b61455f1919..3a6156b291a 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/ListQuery.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/ListQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,13 +39,13 @@ require_once('Zend/Gdata/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_ListQuery extends Zend_Gdata_Query
 {
 
-    const SPREADSHEETS_LIST_FEED_URI = 'http://spreadsheets.google.com/feeds/list';
+    const SPREADSHEETS_LIST_FEED_URI = 'https://spreadsheets.google.com/feeds/list';
 
     protected $_defaultFeedUri = self::SPREADSHEETS_LIST_FEED_URI;
     protected $_visibility = 'private';
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php b/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php
index 595bcca80e3..1b35f3db1b0 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Entry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_SpreadsheetEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php b/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php
index 570ac69d6ac..69470a6633b 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_SpreadsheetFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/WorksheetEntry.php b/lib/zend/Zend/Gdata/Spreadsheets/WorksheetEntry.php
index 421fb31e30d..79b0da82142 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/WorksheetEntry.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/WorksheetEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_WorksheetEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/Spreadsheets/WorksheetFeed.php b/lib/zend/Zend/Gdata/Spreadsheets/WorksheetFeed.php
index 960da8da0ce..a0b87db40d0 100644
--- a/lib/zend/Zend/Gdata/Spreadsheets/WorksheetFeed.php
+++ b/lib/zend/Zend/Gdata/Spreadsheets/WorksheetFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Gdata/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_Spreadsheets_WorksheetFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/YouTube.php b/lib/zend/Zend/Gdata/YouTube.php
index 6383b12a081..d49c16dd34d 100644
--- a/lib/zend/Zend/Gdata/YouTube.php
+++ b/lib/zend/Zend/Gdata/YouTube.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -71,6 +71,8 @@ require_once 'Zend/Gdata/YouTube/ActivityFeed.php';
  */
 require_once 'Zend/Gdata/YouTube/InboxFeed.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
 
 /**
  * Service class for interacting with the YouTube Data API.
@@ -79,7 +81,7 @@ require_once 'Zend/Gdata/YouTube/InboxFeed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube extends Zend_Gdata_Media
@@ -88,22 +90,22 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
     const AUTH_SERVICE_NAME = 'youtube';
     const CLIENTLOGIN_URL = 'https://www.google.com/youtube/accounts/ClientLogin';
 
-    const STANDARD_TOP_RATED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/top_rated';
-    const STANDARD_MOST_VIEWED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed';
-    const STANDARD_RECENTLY_FEATURED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured';
-    const STANDARD_WATCH_ON_MOBILE_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile';
+    const STANDARD_TOP_RATED_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/top_rated';
+    const STANDARD_MOST_VIEWED_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/most_viewed';
+    const STANDARD_RECENTLY_FEATURED_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/recently_featured';
+    const STANDARD_WATCH_ON_MOBILE_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile';
 
     const STANDARD_TOP_RATED_URI_V2 =
-        'http://gdata.youtube.com/feeds/api/standardfeeds/top_rated';
+        'https://gdata.youtube.com/feeds/api/standardfeeds/top_rated';
     const STANDARD_MOST_VIEWED_URI_V2 =
-        'http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed';
+        'https://gdata.youtube.com/feeds/api/standardfeeds/most_viewed';
     const STANDARD_RECENTLY_FEATURED_URI_V2 =
-        'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured';
+        'https://gdata.youtube.com/feeds/api/standardfeeds/recently_featured';
     const STANDARD_WATCH_ON_MOBILE_URI_V2 =
-        'http://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile';
+        'https://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile';
 
-    const USER_URI = 'http://gdata.youtube.com/feeds/api/users';
-    const VIDEO_URI = 'http://gdata.youtube.com/feeds/api/videos';
+    const USER_URI = 'https://gdata.youtube.com/feeds/api/users';
+    const VIDEO_URI = 'https://gdata.youtube.com/feeds/api/videos';
     const PLAYLIST_REL = 'http://gdata.youtube.com/schemas/2007#playlist';
     const USER_UPLOADS_REL = 'http://gdata.youtube.com/schemas/2007#user.uploads';
     const USER_PLAYLISTS_REL = 'http://gdata.youtube.com/schemas/2007#user.playlists';
@@ -113,9 +115,9 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
     const VIDEO_RESPONSES_REL = 'http://gdata.youtube.com/schemas/2007#video.responses';
     const VIDEO_RATINGS_REL = 'http://gdata.youtube.com/schemas/2007#video.ratings';
     const VIDEO_COMPLAINTS_REL = 'http://gdata.youtube.com/schemas/2007#video.complaints';
-    const ACTIVITY_FEED_URI = 'http://gdata.youtube.com/feeds/api/events';
+    const ACTIVITY_FEED_URI = 'https://gdata.youtube.com/feeds/api/events';
     const FRIEND_ACTIVITY_FEED_URI =
-        'http://gdata.youtube.com/feeds/api/users/default/friendsactivity';
+        'https://gdata.youtube.com/feeds/api/users/default/friendsactivity';
 
     /**
      * The URI of the in-reply-to schema for comments in reply to
@@ -132,7 +134,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
      * @var string
      */
     const INBOX_FEED_URI =
-        'http://gdata.youtube.com/feeds/api/users/default/inbox';
+        'https://gdata.youtube.com/feeds/api/users/default/inbox';
 
     /**
      * The maximum number of users for which activity can be requested for,
@@ -256,7 +258,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
         if ($location == null) {
             $uri = self::VIDEO_URI;
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -286,7 +288,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
                 $uri = self::VIDEO_URI . "/" . $videoId;
             }
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -324,7 +326,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
             $uri = self::VIDEO_URI . "/" . $videoId . "/" .
                 self::RELATED_URI_SUFFIX;
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -346,7 +348,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
             $uri = self::VIDEO_URI . "/" . $videoId . "/" .
                 self::RESPONSES_URI_SUFFIX;
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -367,7 +369,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
         if ($videoId !== null) {
             $uri = self::VIDEO_URI . "/" . $videoId . "/comments";
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -398,7 +400,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
                     $location->setFeedType('top rated');
                 }
             }
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -430,7 +432,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
                     $location->setFeedType('most viewed');
                 }
             }
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -461,7 +463,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
                     $location->setFeedType('recently featured');
                 }
             }
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -493,7 +495,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
                     $location->setFeedType('watch on mobile');
                 }
             }
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -513,7 +515,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
         if ($user !== null) {
             $uri = self::USER_URI . '/' . $user . '/playlists';
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -531,7 +533,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
     public function getPlaylistVideoFeed($location)
     {
         if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -551,7 +553,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
         if ($user !== null) {
             $uri = self::USER_URI . '/' . $user . '/subscriptions';
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -571,7 +573,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
         if ($user !== null) {
             $uri = self::USER_URI . '/' . $user . '/contacts';
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -592,7 +594,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
             $uri = self::USER_URI . '/' . $user . '/' .
                    self::UPLOADS_URI_SUFFIX;
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -613,7 +615,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
             $uri = self::USER_URI . '/' . $user . '/' .
                    self::FAVORITES_URI_SUFFIX;
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -633,7 +635,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
         if ($user !== null) {
             $uri = self::USER_URI . '/' . $user;
         } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
+            $uri = $location->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             $uri = $location;
         }
@@ -652,10 +654,10 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
         // Load the feed as an XML DOMDocument object
         @ini_set('track_errors', 1);
         $doc = new DOMDocument();
-        $success = @$doc->loadXML($response);
+        $doc = @Zend_Xml_Security::scan($response, $doc);
         @ini_restore('track_errors');
 
-        if (!$success) {
+        if (!$doc) {
             require_once 'Zend/Gdata/App/Exception.php';
             throw new Zend_Gdata_App_Exception(
                 "Zend_Gdata_YouTube::parseFormUploadTokenResponse - " .
@@ -697,7 +699,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
      * @return array An array containing a token and URL
      */
     public function getFormUploadToken($videoEntry,
-        $url='http://gdata.youtube.com/action/GetUploadToken')
+        $url='https://gdata.youtube.com/action/GetUploadToken')
     {
         if ($url != null && is_string($url)) {
             // $response is a Zend_Http_response object
@@ -729,7 +731,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
 
         $uri = null;
         if ($username instanceof Zend_Gdata_Query) {
-            $uri = $username->getQueryUrl();
+            $uri = $username->getQueryUrl($this->getMajorProtocolVersion());
         } else {
             if (count(explode(',', $username)) >
                 self::ACTIVITY_FEED_MAX_USERS) {
@@ -834,7 +836,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
             $messageEntry->setSummary($this->newSummary($body));
         }
 
-        $insertUrl = 'http://gdata.youtube.com/feeds/api/users/' .
+        $insertUrl = 'https://gdata.youtube.com/feeds/api/users/' .
             $recipientUserName . '/inbox';
         $response = $this->insertEntry($messageEntry, $insertUrl,
             'Zend_Gdata_YouTube_InboxEntry');
@@ -844,11 +846,11 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media
     /**
      * Post a comment in reply to an existing comment
      *
-     * @param $commentEntry Zend_Gdata_YouTube_CommentEntry The comment entry
-     *        to reply to
-     * @param $commentText string The text of the comment to post
-     * @return A Zend_Gdata_YouTube_CommentEntry representing the posted
-     *         comment
+     * @param Zend_Gdata_YouTube_CommentEntry $commentEntry The comment entry
+     *         to reply to
+     * @param string                          $commentText  The text of the
+		 *         comment to post
+     * @return Zend_Gdata_YouTube_CommentEntry the posted comment
      */
     public function replyToCommentEntry($commentEntry, $commentText)
     {
diff --git a/lib/zend/Zend/Gdata/YouTube/ActivityEntry.php b/lib/zend/Zend/Gdata/YouTube/ActivityEntry.php
index c4f0e09acad..997e4847f04 100644
--- a/lib/zend/Zend/Gdata/YouTube/ActivityEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/ActivityEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -49,7 +49,7 @@ require_once 'Zend/Gdata/Extension/Rating.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_ActivityEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/YouTube/ActivityFeed.php b/lib/zend/Zend/Gdata/YouTube/ActivityFeed.php
index b4c99edfd82..9fd092e37a8 100644
--- a/lib/zend/Zend/Gdata/YouTube/ActivityFeed.php
+++ b/lib/zend/Zend/Gdata/YouTube/ActivityFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/YouTube/ActivityEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_ActivityFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/YouTube/CommentEntry.php b/lib/zend/Zend/Gdata/YouTube/CommentEntry.php
index 3740d6bbab5..fe3c9506bee 100644
--- a/lib/zend/Zend/Gdata/YouTube/CommentEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/CommentEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Media/Feed.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_CommentEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/YouTube/CommentFeed.php b/lib/zend/Zend/Gdata/YouTube/CommentFeed.php
index ae3af46d58e..d50a4ef93fb 100644
--- a/lib/zend/Zend/Gdata/YouTube/CommentFeed.php
+++ b/lib/zend/Zend/Gdata/YouTube/CommentFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/CommentEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_CommentFeed extends Zend_Gdata_Feed
diff --git a/lib/zend/Zend/Gdata/YouTube/ContactEntry.php b/lib/zend/Zend/Gdata/YouTube/ContactEntry.php
index 1ee12776f60..1428344e2b3 100644
--- a/lib/zend/Zend/Gdata/YouTube/ContactEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/ContactEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Status.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_ContactEntry extends Zend_Gdata_YouTube_UserProfileEntry
diff --git a/lib/zend/Zend/Gdata/YouTube/ContactFeed.php b/lib/zend/Zend/Gdata/YouTube/ContactFeed.php
index 2b75b2c74bc..b4a1d8b02cf 100644
--- a/lib/zend/Zend/Gdata/YouTube/ContactFeed.php
+++ b/lib/zend/Zend/Gdata/YouTube/ContactFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/ContactEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_ContactFeed extends Zend_Gdata_Media_Feed
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/AboutMe.php b/lib/zend/Zend/Gdata/YouTube/Extension/AboutMe.php
index 2dfcfae3117..28ffe46f55e 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/AboutMe.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/AboutMe.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_AboutMe extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Age.php b/lib/zend/Zend/Gdata/YouTube/Extension/Age.php
index d45ddaadc91..23ffc4a515f 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Age.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Age.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Age extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Books.php b/lib/zend/Zend/Gdata/YouTube/Extension/Books.php
index d87de9bbb3b..881e8549537 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Books.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Books.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Books extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Company.php b/lib/zend/Zend/Gdata/YouTube/Extension/Company.php
index f6fa367d4c7..cf52f1ddf40 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Company.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Company.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Company extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Control.php b/lib/zend/Zend/Gdata/YouTube/Extension/Control.php
old mode 100644
new mode 100755
index b1f8266f634..5c6321843a8
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Control.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Control.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/Extension/State.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Control extends Zend_Gdata_App_Extension_Control
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/CountHint.php b/lib/zend/Zend/Gdata/YouTube/Extension/CountHint.php
old mode 100644
new mode 100755
index c80462e5bfa..23d243d4f90
--- a/lib/zend/Zend/Gdata/YouTube/Extension/CountHint.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/CountHint.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_CountHint extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Description.php b/lib/zend/Zend/Gdata/YouTube/Extension/Description.php
index fd6bb2a4259..6f67db17b03 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Description.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Description.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Description extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Duration.php b/lib/zend/Zend/Gdata/YouTube/Extension/Duration.php
index 9a52c9c8c6d..62804005f52 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Duration.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Duration.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Duration extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/FirstName.php b/lib/zend/Zend/Gdata/YouTube/Extension/FirstName.php
index 09f5e9403eb..1decc020c16 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/FirstName.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/FirstName.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_FirstName extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Gender.php b/lib/zend/Zend/Gdata/YouTube/Extension/Gender.php
index b94c4e0e8a9..49abf548753 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Gender.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Gender.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Gender extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Hobbies.php b/lib/zend/Zend/Gdata/YouTube/Extension/Hobbies.php
index fe6c80e0e0d..77bb9e55e85 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Hobbies.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Hobbies.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Hobbies extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Hometown.php b/lib/zend/Zend/Gdata/YouTube/Extension/Hometown.php
index bec3b84d659..f7394bb0a3d 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Hometown.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Hometown.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Hometown extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/LastName.php b/lib/zend/Zend/Gdata/YouTube/Extension/LastName.php
index d6f3bce62ba..bbc355d7fac 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/LastName.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/LastName.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_LastName extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Link.php b/lib/zend/Zend/Gdata/YouTube/Extension/Link.php
old mode 100644
new mode 100755
index bf79e2132c9..9f6a60a634d
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Link.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Link.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Token.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Link extends Zend_Gdata_App_Extension_Link
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Location.php b/lib/zend/Zend/Gdata/YouTube/Extension/Location.php
index 7882e661e12..20be0d0a903 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Location.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Location.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Location extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/MediaContent.php b/lib/zend/Zend/Gdata/YouTube/Extension/MediaContent.php
old mode 100644
new mode 100755
index 3966314418a..0984f2e7a0c
--- a/lib/zend/Zend/Gdata/YouTube/Extension/MediaContent.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/MediaContent.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -35,7 +35,7 @@ require_once 'Zend/Gdata/Media/Extension/MediaContent.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_MediaContent extends Zend_Gdata_Media_Extension_MediaContent
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/MediaCredit.php b/lib/zend/Zend/Gdata/YouTube/Extension/MediaCredit.php
index 2d1db859673..618783946ad 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/MediaCredit.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/MediaCredit.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_MediaCredit extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/MediaGroup.php b/lib/zend/Zend/Gdata/YouTube/Extension/MediaGroup.php
old mode 100644
new mode 100755
index a2141bd7e1f..65e573a0aa7
--- a/lib/zend/Zend/Gdata/YouTube/Extension/MediaGroup.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/MediaGroup.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -70,7 +70,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Uploaded.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_MediaGroup extends Zend_Gdata_Media_Extension_MediaGroup
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/MediaRating.php b/lib/zend/Zend/Gdata/YouTube/Extension/MediaRating.php
old mode 100644
new mode 100755
index 6534e66d7a0..62f1dffd120
--- a/lib/zend/Zend/Gdata/YouTube/Extension/MediaRating.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/MediaRating.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_MediaRating extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Movies.php b/lib/zend/Zend/Gdata/YouTube/Extension/Movies.php
index 349ab8396c3..7d42eea3cc2 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Movies.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Movies.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Movies extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Music.php b/lib/zend/Zend/Gdata/YouTube/Extension/Music.php
index d1601a5237c..0b29883d43c 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Music.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Music.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Music extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/NoEmbed.php b/lib/zend/Zend/Gdata/YouTube/Extension/NoEmbed.php
index dfa3608260a..d7d0ea2a6e5 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/NoEmbed.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/NoEmbed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_NoEmbed extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Occupation.php b/lib/zend/Zend/Gdata/YouTube/Extension/Occupation.php
index 289e920d8db..1d4678423bf 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Occupation.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Occupation.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Occupation extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistId.php b/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistId.php
index 98b0729d342..cf8e0b2acb7 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistId.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistId.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_PlaylistId extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistTitle.php b/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistTitle.php
index 41228e246ad..da224f5df76 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistTitle.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistTitle.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_PlaylistTitle extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Position.php b/lib/zend/Zend/Gdata/YouTube/Extension/Position.php
index 401b3cda48b..bd5345ac962 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Position.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Position.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Position extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Private.php b/lib/zend/Zend/Gdata/YouTube/Extension/Private.php
old mode 100644
new mode 100755
index 2ccfb5c3e53..ddca1ee1046
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Private.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Private.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Private extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/QueryString.php b/lib/zend/Zend/Gdata/YouTube/Extension/QueryString.php
index fa959c9bc36..e99c5b96c05 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/QueryString.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/QueryString.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_QueryString extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Racy.php b/lib/zend/Zend/Gdata/YouTube/Extension/Racy.php
index 198d1d51d6a..0bfc11c40a5 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Racy.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Racy.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Racy extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Recorded.php b/lib/zend/Zend/Gdata/YouTube/Extension/Recorded.php
index 414fb67e600..161c8e2e81d 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Recorded.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Recorded.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Recorded extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Relationship.php b/lib/zend/Zend/Gdata/YouTube/Extension/Relationship.php
index 0fa3b599e38..e40b401e970 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Relationship.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Relationship.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Relationship extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/ReleaseDate.php b/lib/zend/Zend/Gdata/YouTube/Extension/ReleaseDate.php
index fa0fa98fbb3..7f92ef30def 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/ReleaseDate.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/ReleaseDate.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_ReleaseDate extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/School.php b/lib/zend/Zend/Gdata/YouTube/Extension/School.php
index ffcc7d58e51..d1bd2ed317b 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/School.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/School.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_School extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/State.php b/lib/zend/Zend/Gdata/YouTube/Extension/State.php
index c4f632afc17..88aff30e698 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/State.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/State.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_State extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Statistics.php b/lib/zend/Zend/Gdata/YouTube/Extension/Statistics.php
index 94f29ccf3ad..e0bac50526e 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Statistics.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Statistics.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Status.php b/lib/zend/Zend/Gdata/YouTube/Extension/Status.php
index 33d28bf9c54..e0d422f9e28 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Status.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Status.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Status extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Token.php b/lib/zend/Zend/Gdata/YouTube/Extension/Token.php
old mode 100644
new mode 100755
index d45ca1321f3..86230aea27b
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Token.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Token.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Token extends Zend_Gdata_App_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Uploaded.php b/lib/zend/Zend/Gdata/YouTube/Extension/Uploaded.php
index b65def761b5..f8545119b61 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Uploaded.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Uploaded.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Uploaded extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Username.php b/lib/zend/Zend/Gdata/YouTube/Extension/Username.php
index 4f13a58b218..3341059784d 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/Username.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/Username.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_Username extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/VideoId.php b/lib/zend/Zend/Gdata/YouTube/Extension/VideoId.php
index ce366ed22bf..7f61d13a240 100644
--- a/lib/zend/Zend/Gdata/YouTube/Extension/VideoId.php
+++ b/lib/zend/Zend/Gdata/YouTube/Extension/VideoId.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_Extension_VideoId extends Zend_Gdata_Extension
diff --git a/lib/zend/Zend/Gdata/YouTube/InboxEntry.php b/lib/zend/Zend/Gdata/YouTube/InboxEntry.php
index 38159cb00d9..b627352067e 100644
--- a/lib/zend/Zend/Gdata/YouTube/InboxEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/InboxEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -53,7 +53,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Description.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_InboxEntry extends Zend_Gdata_Media_Entry
diff --git a/lib/zend/Zend/Gdata/YouTube/InboxFeed.php b/lib/zend/Zend/Gdata/YouTube/InboxFeed.php
index 22957bae397..a1b957798e3 100644
--- a/lib/zend/Zend/Gdata/YouTube/InboxFeed.php
+++ b/lib/zend/Zend/Gdata/YouTube/InboxFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/InboxEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_InboxFeed extends Zend_Gdata_Media_Feed
diff --git a/lib/zend/Zend/Gdata/YouTube/MediaEntry.php b/lib/zend/Zend/Gdata/YouTube/MediaEntry.php
old mode 100644
new mode 100755
index 955405bf423..ef918877f2b
--- a/lib/zend/Zend/Gdata/YouTube/MediaEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/MediaEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_MediaEntry extends Zend_Gdata_Media_Entry
diff --git a/lib/zend/Zend/Gdata/YouTube/PlaylistListEntry.php b/lib/zend/Zend/Gdata/YouTube/PlaylistListEntry.php
index af31a3ecaa1..b8d8b716894 100644
--- a/lib/zend/Zend/Gdata/YouTube/PlaylistListEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/PlaylistListEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -57,7 +57,7 @@ require_once 'Zend/Gdata/YouTube/Extension/CountHint.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/YouTube/PlaylistListFeed.php b/lib/zend/Zend/Gdata/YouTube/PlaylistListFeed.php
index 53ba84a2510..4cfbcdb0b14 100644
--- a/lib/zend/Zend/Gdata/YouTube/PlaylistListFeed.php
+++ b/lib/zend/Zend/Gdata/YouTube/PlaylistListFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/PlaylistListEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_PlaylistListFeed extends Zend_Gdata_Media_Feed
diff --git a/lib/zend/Zend/Gdata/YouTube/PlaylistVideoEntry.php b/lib/zend/Zend/Gdata/YouTube/PlaylistVideoEntry.php
index 90af2fe788f..89459a18b05 100644
--- a/lib/zend/Zend/Gdata/YouTube/PlaylistVideoEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/PlaylistVideoEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Position.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_PlaylistVideoEntry extends Zend_Gdata_YouTube_VideoEntry
diff --git a/lib/zend/Zend/Gdata/YouTube/PlaylistVideoFeed.php b/lib/zend/Zend/Gdata/YouTube/PlaylistVideoFeed.php
index b429ba9274b..ea0bc2ce08d 100644
--- a/lib/zend/Zend/Gdata/YouTube/PlaylistVideoFeed.php
+++ b/lib/zend/Zend/Gdata/YouTube/PlaylistVideoFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/PlaylistVideoEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_PlaylistVideoFeed extends Zend_Gdata_Media_Feed
diff --git a/lib/zend/Zend/Gdata/YouTube/SubscriptionEntry.php b/lib/zend/Zend/Gdata/YouTube/SubscriptionEntry.php
index 294358bc910..c0e0509e91f 100644
--- a/lib/zend/Zend/Gdata/YouTube/SubscriptionEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/SubscriptionEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -72,7 +72,7 @@ require_once 'Zend/Gdata/YouTube/Extension/QueryString.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/YouTube/SubscriptionFeed.php b/lib/zend/Zend/Gdata/YouTube/SubscriptionFeed.php
index a59828d11c6..ce627de71a1 100644
--- a/lib/zend/Zend/Gdata/YouTube/SubscriptionFeed.php
+++ b/lib/zend/Zend/Gdata/YouTube/SubscriptionFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/SubscriptionEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_SubscriptionFeed extends Zend_Gdata_Media_Feed
diff --git a/lib/zend/Zend/Gdata/YouTube/UserProfileEntry.php b/lib/zend/Zend/Gdata/YouTube/UserProfileEntry.php
index 1d6846d029d..197e9eb40b1 100644
--- a/lib/zend/Zend/Gdata/YouTube/UserProfileEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/UserProfileEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -132,7 +132,7 @@ require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry
diff --git a/lib/zend/Zend/Gdata/YouTube/VideoEntry.php b/lib/zend/Zend/Gdata/YouTube/VideoEntry.php
index 41d1cb9051d..8e431c4540e 100644
--- a/lib/zend/Zend/Gdata/YouTube/VideoEntry.php
+++ b/lib/zend/Zend/Gdata/YouTube/VideoEntry.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -92,7 +92,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Location.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_VideoEntry extends Zend_Gdata_YouTube_MediaEntry
diff --git a/lib/zend/Zend/Gdata/YouTube/VideoFeed.php b/lib/zend/Zend/Gdata/YouTube/VideoFeed.php
index dd3ce7601b1..7e5ffcd1b4f 100644
--- a/lib/zend/Zend/Gdata/YouTube/VideoFeed.php
+++ b/lib/zend/Zend/Gdata/YouTube/VideoFeed.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/VideoEntry.php';
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_VideoFeed extends Zend_Gdata_Media_Feed
diff --git a/lib/zend/Zend/Gdata/YouTube/VideoQuery.php b/lib/zend/Zend/Gdata/YouTube/VideoQuery.php
index 7105b79867b..10b4d97264f 100644
--- a/lib/zend/Zend/Gdata/YouTube/VideoQuery.php
+++ b/lib/zend/Zend/Gdata/YouTube/VideoQuery.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once('Zend/Gdata/Query.php');
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query
@@ -92,7 +92,7 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query
                     'Video ID must be set for feed of type: ' . $feedType);
             } else {
                 $this->_url = Zend_Gdata_YouTube::VIDEO_URI . '/' . $videoId .
-                    'responses';
+                    '/responses';
             }
             break;
         case 'comments':
@@ -102,7 +102,7 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query
                     'Video ID must be set for feed of type: ' . $feedType);
             } else {
                 $this->_url = Zend_Gdata_YouTube::VIDEO_URI . '/' .
-                    $videoId . 'comments';
+                    $videoId . '/comments';
                 if ($entry !== null) {
                     $this->_url .= '/' . $entry;
                 }
diff --git a/lib/zend/Zend/Http/Client.php b/lib/zend/Zend/Http/Client.php
index b3f26bd7152..b704249cc2a 100644
--- a/lib/zend/Zend/Http/Client.php
+++ b/lib/zend/Zend/Http/Client.php
@@ -17,7 +17,7 @@
  * @package    Zend_Http
  * @subpackage Client
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -39,6 +39,12 @@ require_once 'Zend/Uri.php';
 require_once 'Zend/Http/Client/Adapter/Interface.php';
 
 
+/**
+ * @see Zend_Http_Header_HeaderValue
+ */
+require_once 'Zend/Http/Header/HeaderValue.php';
+
+
 /**
  * @see Zend_Http_Response
  */
@@ -50,17 +56,17 @@ require_once 'Zend/Http/Response.php';
 require_once 'Zend/Http/Response/Stream.php';
 
 /**
- * Zend_Http_Client is an implemetation of an HTTP client in PHP. The client
+ * Zend_Http_Client is an implementation of an HTTP client in PHP. The client
  * supports basic features like sending different HTTP requests and handling
  * redirections, as well as more advanced features like proxy settings, HTTP
- * authentication and cookie persistance (using a Zend_Http_CookieJar object)
+ * authentication and cookie persistence (using a Zend_Http_CookieJar object)
  *
  * @todo Implement proxy settings
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client
  * @throws     Zend_Http_Client_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Client
@@ -77,6 +83,7 @@ class Zend_Http_Client
     const OPTIONS = 'OPTIONS';
     const CONNECT = 'CONNECT';
     const MERGE   = 'MERGE';
+    const PATCH   = 'PATCH';
 
     /**
      * Supported HTTP Authentication methods
@@ -102,6 +109,12 @@ class Zend_Http_Client
     const ENC_URLENCODED = 'application/x-www-form-urlencoded';
     const ENC_FORMDATA   = 'multipart/form-data';
 
+    /**
+     * Value types for Body key/value pairs
+     */
+    const VTYPE_SCALAR  = 'SCALAR';
+    const VTYPE_FILE    = 'FILE';
+
     /**
      * Configuration array, set using the constructor or using ::setConfig()
      *
@@ -119,10 +132,11 @@ class Zend_Http_Client
         'strict'          => true,
         'output_stream'   => false,
         'encodecookies'   => true,
+        'rfc3986_strict'  => false
     );
 
     /**
-     * The adapter used to preform the actual connection to the server
+     * The adapter used to perform the actual connection to the server
      *
      * @var Zend_Http_Client_Adapter_Interface
      */
@@ -157,7 +171,7 @@ class Zend_Http_Client
     protected $paramsGet = array();
 
     /**
-     * Assiciative array of POST parameters
+     * Associative array of POST parameters
      *
      * @var array
      */
@@ -201,6 +215,16 @@ class Zend_Http_Client
      */
     protected $files = array();
 
+    /**
+     * Ordered list of keys from key/value pair data to include in body
+     *
+     * An associative array, where each element is of the format:
+     *   '<field name>' => VTYPE_SCALAR | VTYPE_FILE
+     *
+     * @var array
+     */
+    protected $body_field_order = array();
+
     /**
      * The client's cookie jar
      *
@@ -229,18 +253,32 @@ class Zend_Http_Client
      */
     protected $redirectCounter = 0;
 
+    /**
+     * Status for unmasking GET array params
+     *
+     * @var boolean
+     */
+    protected $_unmaskStatus = false;
+
+    /**
+     * Status if the http_build_query function escapes brackets
+     *
+     * @var boolean
+     */
+    protected $_queryBracketsEscaped = true;
+
     /**
      * Fileinfo magic database resource
      *
-     * This varaiable is populated the first time _detectFileMimeType is called
+     * This variable is populated the first time _detectFileMimeType is called
      * and is then reused on every call to this method
      *
      * @var resource
      */
-    static protected $_fileInfoDb = null;
+    protected static $_fileInfoDb = null;
 
     /**
-     * Contructor method. Will create a new HTTP client. Accepts the target
+     * Constructor method. Will create a new HTTP client. Accepts the target
      * URL and optionally configuration array.
      *
      * @param Zend_Uri_Http|string $uri
@@ -254,6 +292,8 @@ class Zend_Http_Client
         if ($config !== null) {
             $this->setConfig($config);
         }
+
+        $this->_queryBracketsEscaped = version_compare(phpversion(), '5.1.3', '>=');
     }
 
     /**
@@ -265,7 +305,10 @@ class Zend_Http_Client
      */
     public function setUri($uri)
     {
-        if (is_string($uri)) {
+        if ($uri instanceof Zend_Uri_Http) {
+            // clone the URI in order to keep the passed parameter constant
+            $uri = clone $uri;
+        } elseif (is_string($uri)) {
             $uri = Zend_Uri::factory($uri);
         }
 
@@ -349,12 +392,17 @@ class Zend_Http_Client
     public function setMethod($method = self::GET)
     {
         if (! preg_match('/^[^\x00-\x1f\x7f-\xff\(\)<>@,;:\\\\"\/\[\]\?={}\s]+$/', $method)) {
-            /** @see Zend_Http_Client_Exception */
             require_once 'Zend/Http/Client/Exception.php';
             throw new Zend_Http_Client_Exception("'{$method}' is not a valid HTTP request method.");
         }
 
-        if ($method == self::POST && $this->enctype === null) {
+        if (($method == self::POST
+                || $method == self::PUT
+                || $method == self::DELETE
+                || $method == self::PATCH
+                || $method == self::OPTIONS)
+            && $this->enctype === null
+        ) {
             $this->setEncType(self::ENC_URLENCODED);
         }
 
@@ -368,12 +416,12 @@ class Zend_Http_Client
      *
      * This function can be used in several ways to set the client's request
      * headers:
-     * 1. By providing two parameters: $name as the header to set (eg. 'Host')
-     *    and $value as it's value (eg. 'www.example.com').
+     * 1. By providing two parameters: $name as the header to set (e.g. 'Host')
+     *    and $value as it's value (e.g. 'www.example.com').
      * 2. By providing a single header string as the only parameter
-     *    eg. 'Host: www.example.com'
+     *    e.g. 'Host: www.example.com'
      * 3. By providing an array of headers as the first parameter
-     *    eg. array('host' => 'www.example.com', 'x-foo: bar'). In This case
+     *    e.g. array('host' => 'www.example.com', 'x-foo: bar'). In This case
      *    the function will call itself recursively for each array item.
      *
      * @param string|array $name Header name, full header string ('Header: value')
@@ -384,44 +432,46 @@ class Zend_Http_Client
      */
     public function setHeaders($name, $value = null)
     {
-        // If we got an array, go recusive!
+        // If we got an array, go recursive!
         if (is_array($name)) {
             foreach ($name as $k => $v) {
                 if (is_string($k)) {
                     $this->setHeaders($k, $v);
-                } else {
-                    $this->setHeaders($v, null);
+                    continue;
                 }
+                $this->setHeaders($v, null);
             }
-        } else {
-            // Check if $name needs to be split
-            if ($value === null && (strpos($name, ':') > 0)) {
-                list($name, $value) = explode(':', $name, 2);
-            }
-
-            // Make sure the name is valid if we are in strict mode
-            if ($this->config['strict'] && (! preg_match('/^[a-zA-Z0-9-]+$/', $name))) {
-                /** @see Zend_Http_Client_Exception */
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("{$name} is not a valid HTTP header name");
-            }
-
-            $normalized_name = strtolower($name);
-
-            // If $value is null or false, unset the header
-            if ($value === null || $value === false) {
-                unset($this->headers[$normalized_name]);
-
-            // Else, set the header
-            } else {
-                // Header names are stored lowercase internally.
-                if (is_string($value)) {
-                    $value = trim($value);
-                }
-                $this->headers[$normalized_name] = array($name, $value);
-            }
+            return $this;
         }
 
+        // Check if $name needs to be split
+        if ($value === null && (strpos($name, ':') > 0)) {
+            list($name, $value) = explode(':', $name, 2);
+        }
+
+        // Make sure the name is valid if we are in strict mode
+        if ($this->config['strict'] && (! preg_match('/^[a-zA-Z0-9-]+$/', $name))) {
+            require_once 'Zend/Http/Client/Exception.php';
+            throw new Zend_Http_Client_Exception("{$name} is not a valid HTTP header name");
+        }
+
+        $normalized_name = strtolower($name);
+
+        // If $value is null or false, unset the header
+        if ($value === null || $value === false) {
+            unset($this->headers[$normalized_name]);
+            return $this;
+        }
+
+        // Validate value
+        $this->_validateHeaderValue($value);
+
+        // Header names are stored lowercase internally.
+        if (is_string($value)) {
+            $value = trim($value);
+        }
+        $this->headers[$normalized_name] = array($name, $value);
+
         return $this;
     }
 
@@ -500,6 +550,12 @@ class Zend_Http_Client
                 break;
             case 'post':
                 $parray = &$this->paramsPost;
+                if ( $value === null ) {
+                    if (isset($this->body_field_order[$name]))
+                        unset($this->body_field_order[$name]);
+                } else {
+                    $this->body_field_order[$name] = self::VTYPE_SCALAR;
+                }
                 break;
         }
 
@@ -585,9 +641,7 @@ class Zend_Http_Client
      */
     public function setCookieJar($cookiejar = true)
     {
-        if (! class_exists('Zend_Http_CookieJar')) {
-            require_once 'Zend/Http/CookieJar.php';
-        }
+        Zend_Loader::loadClass('Zend_Http_CookieJar');
 
         if ($cookiejar instanceof Zend_Http_CookieJar) {
             $this->cookiejar = $cookiejar;
@@ -625,9 +679,7 @@ class Zend_Http_Client
      */
     public function setCookie($cookie, $value = null)
     {
-        if (! class_exists('Zend_Http_Cookie')) {
-            require_once 'Zend/Http/Cookie.php';
-        }
+        Zend_Loader::loadClass('Zend_Http_Cookie');
 
         if (is_array($cookie)) {
             foreach ($cookie as $c => $v) {
@@ -722,6 +774,8 @@ class Zend_Http_Client
             'data'     => $data
         );
 
+        $this->body_field_order[$formname] = self::VTYPE_FILE;
+
         return $this;
     }
 
@@ -766,6 +820,35 @@ class Zend_Http_Client
         return $this;
     }
 
+    /**
+     * Set the unmask feature for GET parameters as array
+     *
+     * Example:
+     * foo%5B0%5D=a&foo%5B1%5D=b
+     * becomes
+     * foo=a&foo=b
+     *
+     * This is usefull for some services
+     *
+     * @param boolean $status
+     * @return Zend_Http_Client
+     */
+    public function setUnmaskStatus($status = true)
+    {
+        $this->_unmaskStatus = (BOOL)$status;
+        return $this;
+    }
+
+    /**
+     * Returns the currently configured unmask status
+     *
+     * @return boolean
+     */
+    public function getUnmaskStatus()
+    {
+        return $this->_unmaskStatus;
+    }
+
     /**
      * Clear all GET and POST parameters
      *
@@ -785,6 +868,7 @@ class Zend_Http_Client
         $this->paramsPost    = array();
         $this->files         = array();
         $this->raw_post_data = null;
+        $this->enctype       = null;
 
         if($clearAll) {
             $this->headers = array();
@@ -839,15 +923,12 @@ class Zend_Http_Client
     public function setAdapter($adapter)
     {
         if (is_string($adapter)) {
-            if (!class_exists($adapter)) {
-                try {
-                    require_once 'Zend/Loader.php';
-                    Zend_Loader::loadClass($adapter);
-                } catch (Zend_Exception $e) {
-                    /** @see Zend_Http_Client_Exception */
-                    require_once 'Zend/Http/Client/Exception.php';
-                    throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}", 0, $e);
-                }
+            try {
+                Zend_Loader::loadClass($adapter);
+            } catch (Zend_Exception $e) {
+                /** @see Zend_Http_Client_Exception */
+                require_once 'Zend/Http/Client/Exception.php';
+                throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}", 0, $e);
             }
 
             $adapter = new $adapter;
@@ -872,6 +953,10 @@ class Zend_Http_Client
      */
     public function getAdapter()
     {
+        if (null === $this->adapter) {
+            $this->setAdapter($this->config['adapter']);
+        }
+
         return $this->adapter;
     }
 
@@ -917,10 +1002,10 @@ class Zend_Http_Client
                 require_once 'Zend/Http/Client/Exception.php';
                 throw new Zend_Http_Client_Exception("Could not open temp file {$this->_stream_name}");
         }
-        
+
         return $fp;
     }
-    
+
     /**
      * Send the HTTP request and return an HTTP response object
      *
@@ -957,6 +1042,18 @@ class Zend_Http_Client
                        $query .= '&';
                    }
                 $query .= http_build_query($this->paramsGet, null, '&');
+                if ($this->config['rfc3986_strict']) {
+                    $query = str_replace('+', '%20', $query);
+                }
+
+                // @see ZF-11671 to unmask for some services to foo=val1&foo=val2
+                if ($this->getUnmaskStatus()) {
+                    if ($this->_queryBracketsEscaped) {
+                        $query = preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $query);
+                    } else {
+                        $query = preg_replace('/\\[(?:[0-9]|[1-9][0-9]+)\\]=/', '=', $query);
+                    }
+                }
 
                 $uri->setQuery($query);
             }
@@ -997,7 +1094,10 @@ class Zend_Http_Client
             }
 
             if($this->config['output_stream']) {
-                rewind($stream);
+                $streamMetaData = stream_get_meta_data($stream);
+                if ($streamMetaData['seekable']) {
+                    rewind($stream);
+                }
                 // cleanup the adapter
                 $this->adapter->setOutputStream(null);
                 $response = Zend_Http_Response_Stream::fromStream($response, $stream);
@@ -1016,12 +1116,16 @@ class Zend_Http_Client
 
             // Load cookies into cookie jar
             if (isset($this->cookiejar)) {
-                $this->cookiejar->addCookiesFromResponse($response, $uri);
+                $this->cookiejar->addCookiesFromResponse($response, $uri, $this->config['encodecookies']);
             }
 
             // If we got redirected, look for the Location header
             if ($response->isRedirect() && ($location = $response->getHeader('location'))) {
 
+                // Avoid problems with buggy servers that add whitespace at the
+                // end of some headers (See ZF-11283)
+                $location = trim($location);
+
                 // Check whether we send the exact same request again, or drop the parameters
                 // and send a GET request
                 if ($response->getStatus() == 303 ||
@@ -1033,7 +1137,7 @@ class Zend_Http_Client
                 }
 
                 // If we got a well formed absolute URI
-                if (Zend_Uri_Http::check($location)) {
+                if (($scheme = substr($location, 0, 6)) && ($scheme == 'http:/' || $scheme == 'https:')) {
                     $this->setHeaders('host', null);
                     $this->setUri($location);
 
@@ -1111,7 +1215,7 @@ class Zend_Http_Client
         }
 
         // Set the Content-Type header
-        if ($this->method == self::POST &&
+        if (($this->method == self::POST || $this->method == self::PUT) &&
            (! isset($this->headers[strtolower(self::CONTENT_TYPE)]) && isset($this->enctype))) {
 
             $headers[] = self::CONTENT_TYPE . ': ' . $this->enctype;
@@ -1201,16 +1305,30 @@ class Zend_Http_Client
                     $boundary = '---ZENDHTTPCLIENT-' . md5(microtime());
                     $this->setHeaders(self::CONTENT_TYPE, self::ENC_FORMDATA . "; boundary={$boundary}");
 
-                    // Get POST parameters and encode them
-                    $params = self::_flattenParametersArray($this->paramsPost);
-                    foreach ($params as $pp) {
-                        $body .= self::encodeFormData($boundary, $pp[0], $pp[1]);
-                    }
-
-                    // Encode files
-                    foreach ($this->files as $file) {
-                        $fhead = array(self::CONTENT_TYPE => $file['ctype']);
-                        $body .= self::encodeFormData($boundary, $file['formname'], $file['data'], $file['filename'], $fhead);
+                    // Encode all files and POST vars in the order they were given
+                    foreach ($this->body_field_order as $fieldName=>$fieldType) {
+                        switch ($fieldType) {
+                            case self::VTYPE_FILE:
+                                foreach ($this->files as $file) {
+                                    if ($file['formname']===$fieldName) {
+                                        $fhead = array(self::CONTENT_TYPE => $file['ctype']);
+                                        $body .= self::encodeFormData($boundary, $file['formname'], $file['data'], $file['filename'], $fhead);
+                                    }
+                                }
+                                break;
+                            case self::VTYPE_SCALAR:
+                                if (isset($this->paramsPost[$fieldName])) {
+                                    if (is_array($this->paramsPost[$fieldName])) {
+                                        $flattened = self::_flattenParametersArray($this->paramsPost[$fieldName], $fieldName);
+                                        foreach ($flattened as $pp) {
+                                            $body .= self::encodeFormData($boundary, $pp[0], $pp[1]);
+                                        }
+                                    } else {
+                                        $body .= self::encodeFormData($boundary, $fieldName, $this->paramsPost[$fieldName]);
+                                    }
+                                }
+                                break;
+                        }
                     }
 
                     $body .= "--{$boundary}--\r\n";
@@ -1350,7 +1468,8 @@ class Zend_Http_Client
      * @param array $headers Associative array of optional headers @example ("Content-Transfer-Encoding" => "binary")
      * @return string
      */
-    public static function encodeFormData($boundary, $name, $value, $filename = null, $headers = array()) {
+    public static function encodeFormData($boundary, $name, $value, $filename = null, $headers = array())
+    {
         $ret = "--{$boundary}\r\n" .
             'Content-Disposition: form-data; name="' . $name .'"';
 
@@ -1425,7 +1544,7 @@ class Zend_Http_Client
      * @param  string $prefix
      * @return array
      */
-    static protected function _flattenParametersArray($parray, $prefix = null)
+    protected static function _flattenParametersArray($parray, $prefix = null)
     {
         if (! is_array($parray)) {
             return $parray;
@@ -1457,4 +1576,32 @@ class Zend_Http_Client
         return $parameters;
     }
 
+    /**
+     * Ensure a header value is valid per RFC 7230.
+     *
+     * @see http://tools.ietf.org/html/rfc7230#section-3.2
+     * @param string|object|array $value
+     * @param bool $recurse
+     */
+    protected function _validateHeaderValue($value, $recurse = true)
+    {
+        if (is_array($value) && $recurse) {
+            foreach ($value as $v) {
+                $this->_validateHeaderValue($v, false);
+            }
+            return;
+        }
+
+        // Cast integers and floats to strings for purposes of header representation.
+        if (is_int($value) || is_float($value)) {
+            $value = (string) $value;
+        }
+
+        if (! is_string($value) && (! is_object($value) || ! method_exists($value, '__toString'))) {
+            require_once 'Zend/Http/Exception.php';
+            throw new Zend_Http_Exception('Invalid header value detected');
+        }
+
+        Zend_Http_Header_HeaderValue::assertValid($value);
+    }
 }
diff --git a/lib/zend/Zend/Http/Client/Adapter/Curl.php b/lib/zend/Zend/Http/Client/Adapter/Curl.php
index 7f5a632a8e6..cd26f8bb86b 100644
--- a/lib/zend/Zend/Http/Client/Adapter/Curl.php
+++ b/lib/zend/Zend/Http/Client/Adapter/Curl.php
@@ -17,7 +17,7 @@
  * @package    Zend_Http
  * @subpackage Client_Adapter
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -42,7 +42,7 @@ require_once 'Zend/Http/Client/Adapter/Stream.php';
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream
@@ -221,8 +221,25 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
             curl_setopt($this->_curl, CURLOPT_PORT, intval($port));
         }
 
-        // Set timeout
-        curl_setopt($this->_curl, CURLOPT_CONNECTTIMEOUT, $this->_config['timeout']);
+        // Set connection timeout
+        $connectTimeout  = $this->_config['timeout'];
+        $constant        = CURLOPT_CONNECTTIMEOUT;
+        if (defined('CURLOPT_CONNECTTIMEOUT_MS')) {
+            $connectTimeout *= 1000;
+            $constant = constant('CURLOPT_CONNECTTIMEOUT_MS');
+        }
+        curl_setopt($this->_curl, $constant, $connectTimeout);
+
+        // Set request timeout (once connection is established)
+        if (array_key_exists('request_timeout', $this->_config)) {
+            $requestTimeout  = $this->_config['request_timeout'];
+            $constant        = CURLOPT_TIMEOUT;
+            if (defined('CURLOPT_TIMEOUT_MS')) {
+                $requestTimeout *= 1000;
+                $constant = constant('CURLOPT_TIMEOUT_MS');
+            }
+            curl_setopt($this->_curl, $constant, $requestTimeout);
+        }
 
         // Set Max redirects
         curl_setopt($this->_curl, CURLOPT_MAXREDIRS, $this->_config['maxredirects']);
@@ -320,6 +337,11 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
                 }
                 break;
 
+            case Zend_Http_Client::PATCH:
+                $curlMethod = CURLOPT_CUSTOMREQUEST;
+                $curlValue = "PATCH";
+                break;
+
             case Zend_Http_Client::DELETE:
                 $curlMethod = CURLOPT_CUSTOMREQUEST;
                 $curlValue = "DELETE";
@@ -334,7 +356,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
                 $curlMethod = CURLOPT_CUSTOMREQUEST;
                 $curlValue = "TRACE";
                 break;
-            
+
             case Zend_Http_Client::HEAD:
                 $curlMethod = CURLOPT_CUSTOMREQUEST;
                 $curlValue = "HEAD";
@@ -355,7 +377,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
         $curlHttp = ($httpVersion == 1.1) ? CURL_HTTP_VERSION_1_1 : CURL_HTTP_VERSION_1_0;
 
         // mark as HTTP request and set HTTP method
-        curl_setopt($this->_curl, $curlHttp, true);
+        curl_setopt($this->_curl, CURLOPT_HTTP_VERSION, $curlHttp);
         curl_setopt($this->_curl, $curlMethod, $curlValue);
 
         if($this->out_stream) {
@@ -367,6 +389,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
         } else {
             // ensure headers are also returned
             curl_setopt($this->_curl, CURLOPT_HEADER, true);
+            curl_setopt($this->_curl, CURLINFO_HEADER_OUT, true);
 
             // ensure actual response is returned
             curl_setopt($this->_curl, CURLOPT_RETURNTRANSFER, true);
@@ -393,6 +416,15 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
         } elseif ($method == Zend_Http_Client::PUT) {
             // This is a PUT by a setRawData string, not by file-handle
             curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body);
+        } elseif ($method == Zend_Http_Client::PATCH) {
+            // This is a PATCH by a setRawData string
+            curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body);
+        } elseif ($method == Zend_Http_Client::DELETE) {
+            // This is a DELETE by a setRawData string
+            curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body);
+        } elseif ($method == Zend_Http_Client::OPTIONS) {
+            // This is an OPTIONS by a setRawData string
+            curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body);
         }
 
         // set additional curl options
diff --git a/lib/zend/Zend/Http/Client/Adapter/Exception.php b/lib/zend/Zend/Http/Client/Adapter/Exception.php
index e618dee5321..ebdea9aa218 100644
--- a/lib/zend/Zend/Http/Client/Adapter/Exception.php
+++ b/lib/zend/Zend/Http/Client/Adapter/Exception.php
@@ -16,7 +16,7 @@
  * @package    Zend_Http
  * @subpackage Client_Adapter_Exception
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,7 +29,7 @@ require_once 'Zend/Http/Client/Exception.php';
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Client_Adapter_Exception extends Zend_Http_Client_Exception
diff --git a/lib/zend/Zend/Http/Client/Adapter/Interface.php b/lib/zend/Zend/Http/Client/Adapter/Interface.php
index 561de3a244c..3ed8a777247 100644
--- a/lib/zend/Zend/Http/Client/Adapter/Interface.php
+++ b/lib/zend/Zend/Http/Client/Adapter/Interface.php
@@ -17,7 +17,7 @@
  * @package    Zend_Http
  * @subpackage Client_Adapter
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -30,7 +30,7 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Zend_Http_Client_Adapter_Interface
diff --git a/lib/zend/Zend/Http/Client/Adapter/Proxy.php b/lib/zend/Zend/Http/Client/Adapter/Proxy.php
index b3c39fb999e..090e570cba5 100644
--- a/lib/zend/Zend/Http/Client/Adapter/Proxy.php
+++ b/lib/zend/Zend/Http/Client/Adapter/Proxy.php
@@ -17,7 +17,7 @@
  * @package    Zend_Http
  * @subpackage Client_Adapter
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -46,7 +46,7 @@ require_once 'Zend/Http/Client/Adapter/Socket.php';
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
@@ -66,7 +66,7 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
         'proxy_user'    => '',
         'proxy_pass'    => '',
         'proxy_auth'    => Zend_Http_Client::AUTH_BASIC,
-        'persistent'    => false
+        'persistent'    => false,
     );
 
     /**
@@ -75,6 +75,13 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
      * @var boolean
      */
     protected $negotiated = false;
+    
+    /**
+     * Stores the last CONNECT handshake request
+     * 
+     * @var string
+     */
+    protected $connectHandshakeRequest;
 
     /**
      * Connect to the remote server
@@ -89,13 +96,13 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
     public function connect($host, $port = 80, $secure = false)
     {
         // If no proxy is set, fall back to Socket adapter
-        if (! $this->config['proxy_host']) {
+        if (!$this->config['proxy_host']) {
             return parent::connect($host, $port, $secure);
         }
-        
+
         /* Url might require stream context even if proxy connection doesn't */
         if ($secure) {
-        	$this->config['sslusecontext'] = true;
+            $this->config['sslusecontext'] = true;
         }
 
         // Connect (a non-secure connection) to the proxy server
@@ -115,36 +122,63 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
      * @param array         $headers
      * @param string        $body
      * @return string Request as string
+     * @throws Zend_Http_Client_Adapter_Exception
      */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
+    public function write(
+        $method, $uri, $http_ver = '1.1', $headers = array(), $body = ''
+    )
     {
         // If no proxy is set, fall back to default Socket adapter
-        if (! $this->config['proxy_host']) return parent::write($method, $uri, $http_ver, $headers, $body);
+        if (!$this->config['proxy_host']) {
+            return parent::write($method, $uri, $http_ver, $headers, $body);
+        }
 
         // Make sure we're properly connected
-        if (! $this->socket) {
+        if (!$this->socket) {
             require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are not connected");
+            throw new Zend_Http_Client_Adapter_Exception(
+                'Trying to write but we are not connected'
+            );
         }
 
         $host = $this->config['proxy_host'];
         $port = $this->config['proxy_port'];
 
-        if ($this->connected_to[0] != "tcp://$host" || $this->connected_to[1] != $port) {
+        if ($this->connected_to[0] != "tcp://$host"
+            || $this->connected_to[1] != $port
+        ) {
             require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are connected to the wrong proxy server");
-        }
-
-        // Add Proxy-Authorization header
-        if ($this->config['proxy_user'] && ! isset($headers['proxy-authorization'])) {
-            $headers['proxy-authorization'] = Zend_Http_Client::encodeAuthHeader(
-                $this->config['proxy_user'], $this->config['proxy_pass'], $this->config['proxy_auth']
+            throw new Zend_Http_Client_Adapter_Exception(
+                'Trying to write but we are connected to the wrong proxy server'
             );
         }
 
+        // Add Proxy-Authorization header
+        if ($this->config['proxy_user']) {
+            // Check to see if one already exists
+            $hasProxyAuthHeader = false;
+            foreach ($headers as $k => $v) {
+                if ((string) $k == 'proxy-authorization'
+                    || preg_match("/^proxy-authorization:/i", $v)
+                ) {
+                    $hasProxyAuthHeader = true;
+                    break;
+                }
+            }
+            if (!$hasProxyAuthHeader) {
+                $headers[] = 'Proxy-authorization: '
+                    . Zend_Http_Client::encodeAuthHeader(
+                        $this->config['proxy_user'],
+                        $this->config['proxy_pass'], $this->config['proxy_auth']
+                    );
+            }
+        }
+
         // if we are proxying HTTPS, preform CONNECT handshake with the proxy
-        if ($uri->getScheme() == 'https' && (! $this->negotiated)) {
-            $this->connectHandshake($uri->getHost(), $uri->getPort(), $http_ver, $headers);
+        if ($uri->getScheme() == 'https' && (!$this->negotiated)) {
+            $this->connectHandshake(
+                $uri->getHost(), $uri->getPort(), $http_ver, $headers
+            );
             $this->negotiated = true;
         }
 
@@ -174,20 +208,24 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
             // Add the request body
             $request .= "\r\n" . $body;
         }
-        
+
         // Send the request
-        if (! @fwrite($this->socket, $request)) {
+        if (!@fwrite($this->socket, $request)) {
             require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server");
+            throw new Zend_Http_Client_Adapter_Exception(
+                'Error writing request to proxy server'
+            );
         }
-        
+
         if(is_resource($body)) {
             if(stream_copy_to_stream($body, $this->socket) == 0) {
                 require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception('Error writing request to server');
+                throw new Zend_Http_Client_Adapter_Exception(
+                    'Error writing request to server'
+                );
             }
         }
-        
+
         return $request;
     }
 
@@ -198,30 +236,41 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
      * @param integer $port
      * @param string  $http_ver
      * @param array   $headers
+     * @return void
+     * @throws Zend_Http_Client_Adapter_Exception
      */
-    protected function connectHandshake($host, $port = 443, $http_ver = '1.1', array &$headers = array())
+    protected function connectHandshake(
+        $host, $port = 443, $http_ver = '1.1', array &$headers = array()
+    )
     {
         $request = "CONNECT $host:$port HTTP/$http_ver\r\n" .
-                   "Host: " . $this->config['proxy_host'] . "\r\n";
+                   "Host: " . $host . "\r\n";
 
-        // Add the user-agent header
-        if (isset($this->config['useragent'])) {
-            $request .= "User-agent: " . $this->config['useragent'] . "\r\n";
+        // Process provided headers, including important ones to CONNECT request
+        foreach ($headers as $k => $v) {
+            switch (strtolower(substr($v,0,strpos($v,':')))) {
+                case 'proxy-authorization':
+                    // break intentionally omitted
+
+                case 'user-agent':
+                    $request .= $v . "\r\n";
+                    break;
+
+                default:
+                    break;
+            }
         }
-
-        // If the proxy-authorization header is set, send it to proxy but remove
-        // it from headers sent to target host
-        if (isset($headers['proxy-authorization'])) {
-            $request .= "Proxy-authorization: " . $headers['proxy-authorization'] . "\r\n";
-            unset($headers['proxy-authorization']);
-        }
-
         $request .= "\r\n";
+        
+        // @see ZF-3189
+        $this->connectHandshakeRequest = $request;
 
         // Send the request
-        if (! @fwrite($this->socket, $request)) {
+        if (!@fwrite($this->socket, $request)) {
             require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server");
+            throw new Zend_Http_Client_Adapter_Exception(
+                'Error writing request to proxy server'
+            );
         }
 
         // Read response headers only
@@ -231,14 +280,18 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
             $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
             if ($gotStatus) {
                 $response .= $line;
-                if (!chop($line)) break;
+                if (!chop($line)) {
+                    break;
+                }
             }
         }
 
         // Check that the response from the proxy is 200
         if (Zend_Http_Response::extractCode($response) != 200) {
             require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Unable to connect to HTTPS proxy. Server response: " . $response);
+            throw new Zend_Http_Client_Adapter_Exception(
+                'Unable to connect to HTTPS proxy. Server response: ' . $response
+            );
         }
 
         // If all is good, switch socket to secure mode. We have to fall back
@@ -253,13 +306,17 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
         $success = false;
         foreach($modes as $mode) {
             $success = stream_socket_enable_crypto($this->socket, true, $mode);
-            if ($success) break;
+            if ($success) {
+                break;
+            }
         }
 
-        if (! $success) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception("Unable to connect to" .
-                    " HTTPS server through proxy: could not negotiate secure connection.");
+        if (!$success) {
+            require_once 'Zend/Http/Client/Adapter/Exception.php';
+            throw new Zend_Http_Client_Adapter_Exception(
+                'Unable to connect to HTTPS server through proxy: could not '
+                . 'negotiate secure connection.'
+            );
         }
     }
 
@@ -279,6 +336,8 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
      */
     public function __destruct()
     {
-        if ($this->socket) $this->close();
+        if ($this->socket) {
+            $this->close();
+        }
     }
 }
diff --git a/lib/zend/Zend/Http/Client/Adapter/Socket.php b/lib/zend/Zend/Http/Client/Adapter/Socket.php
index 353cff4ca34..6ae1b1ff464 100644
--- a/lib/zend/Zend/Http/Client/Adapter/Socket.php
+++ b/lib/zend/Zend/Http/Client/Adapter/Socket.php
@@ -17,7 +17,7 @@
  * @package    Zend_Http
  * @subpackage Client_Adapter
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -41,7 +41,7 @@ require_once 'Zend/Http/Client/Adapter/Stream.php';
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream
@@ -62,11 +62,11 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
 
     /**
      * Stream for storing output
-     * 
+     *
      * @var resource
      */
     protected $out_stream = null;
-    
+
     /**
      * Parameters array
      *
@@ -124,17 +124,17 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
         }
     }
 
-	/**
- 	 * Retrieve the array of all configuration options
- 	 *
- 	 * @return array
- 	 */
- 	public function getConfig()
- 	{
- 	    return $this->config;
- 	}
+    /**
+      * Retrieve the array of all configuration options
+      *
+      * @return array
+      */
+     public function getConfig()
+     {
+         return $this->config;
+     }
 
- 	/**
+     /**
      * Set the stream context for the TCP connection to the server
      *
      * Can accept either a pre-existing stream context resource, or an array
@@ -290,13 +290,13 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
             // Add the request body
             $request .= "\r\n" . $body;
         }
-        
+
         // Send the request
         if (! @fwrite($this->socket, $request)) {
             require_once 'Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception('Error writing request to server');
         }
-        
+
         if(is_resource($body)) {
             if(stream_copy_to_stream($body, $this->socket) == 0) {
                 require_once 'Zend/Http/Client/Adapter/Exception.php';
@@ -317,7 +317,6 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
         // First, read headers only
         $response = '';
         $gotStatus = false;
-        $stream = !empty($this->config['stream']);
 
         while (($line = @fgets($this->socket)) !== false) {
             $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
@@ -326,7 +325,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
                 if (rtrim($line) === '') break;
             }
         }
-        
+
         $this->_checkSocketReadTimeout();
 
         $statusCode = Zend_Http_Response::extractCode($response);
@@ -353,7 +352,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
 
         // If we got a 'transfer-encoding: chunked' header
         if (isset($headers['transfer-encoding'])) {
-            
+
             if (strtolower($headers['transfer-encoding']) == 'chunked') {
 
                 do {
@@ -384,7 +383,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
                         if($this->out_stream) {
                             if(stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) {
                               $this->_checkSocketReadTimeout();
-                              break;   
+                              break;
                              }
                         } else {
                             $line = @fread($this->socket, $read_to - $current_pos);
@@ -405,10 +404,11 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
                 } while ($chunksize > 0);
             } else {
                 $this->close();
+        require_once 'Zend/Http/Client/Adapter/Exception.php';
                 throw new Zend_Http_Client_Adapter_Exception('Cannot handle "' .
                     $headers['transfer-encoding'] . '" transfer encoding');
             }
-            
+
             // We automatically decode chunked-messages when writing to a stream
             // this means we have to disallow the Zend_Http_Response to do it again
             if ($this->out_stream) {
@@ -420,11 +420,11 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
             // If we got more than one Content-Length header (see ZF-9404) use
             // the last value sent
             if (is_array($headers['content-length'])) {
-                $contentLength = $headers['content-length'][count($headers['content-length']) - 1]; 
+                $contentLength = $headers['content-length'][count($headers['content-length']) - 1];
             } else {
                 $contentLength = $headers['content-length'];
             }
-            
+
             $current_pos = ftell($this->socket);
             $chunk = '';
 
@@ -435,7 +435,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
                  if($this->out_stream) {
                      if(@stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) {
                           $this->_checkSocketReadTimeout();
-                          break;   
+                          break;
                      }
                  } else {
                     $chunk = @fread($this->socket, $read_to - $current_pos);
@@ -458,7 +458,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
                 if($this->out_stream) {
                     if(@stream_copy_to_stream($this->socket, $this->out_stream) == 0) {
                           $this->_checkSocketReadTimeout();
-                          break;   
+                          break;
                      }
                 }  else {
                     $buff = @fread($this->socket, 8192);
@@ -515,19 +515,19 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf
             }
         }
     }
-    
+
     /**
      * Set output stream for the response
-     * 
+     *
      * @param resource $stream
      * @return Zend_Http_Client_Adapter_Socket
      */
-    public function setOutputStream($stream) 
+    public function setOutputStream($stream)
     {
         $this->out_stream = $stream;
         return $this;
     }
-    
+
     /**
      * Destructor: make sure the socket is disconnected
      *
diff --git a/lib/zend/Zend/Http/Client/Adapter/Stream.php b/lib/zend/Zend/Http/Client/Adapter/Stream.php
old mode 100644
new mode 100755
index 12609b876eb..f0eb17823c6
--- a/lib/zend/Zend/Http/Client/Adapter/Stream.php
+++ b/lib/zend/Zend/Http/Client/Adapter/Stream.php
@@ -17,7 +17,7 @@
  * @package    Zend_Http
  * @subpackage Client_Adapter
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,18 +29,18 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Zend_Http_Client_Adapter_Stream
 {
     /**
      * Set output stream
-     * 
+     *
      * This function sets output stream where the result will be stored.
-     * 
+     *
      * @param resource $stream Stream to write the output to
-     * 
+     *
      */
-    function setOutputStream($stream);
+    public function setOutputStream($stream);
 }
diff --git a/lib/zend/Zend/Http/Client/Adapter/Test.php b/lib/zend/Zend/Http/Client/Adapter/Test.php
index d79ad58fb8c..fc70b8af1f0 100644
--- a/lib/zend/Zend/Http/Client/Adapter/Test.php
+++ b/lib/zend/Zend/Http/Client/Adapter/Test.php
@@ -16,7 +16,7 @@
  * @package    Zend_Http
  * @subpackage Client_Adapter
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -44,7 +44,7 @@ require_once 'Zend/Http/Client/Adapter/Interface.php';
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interface
@@ -235,4 +235,14 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac
         }
         $this->responseIndex = $index;
     }
+
+    /**
+     * Retrieve the array of all configuration options
+     *
+     * @return array
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
 }
diff --git a/lib/zend/Zend/Http/Client/Exception.php b/lib/zend/Zend/Http/Client/Exception.php
index a66e2ca9863..8aa959edebb 100644
--- a/lib/zend/Zend/Http/Client/Exception.php
+++ b/lib/zend/Zend/Http/Client/Exception.php
@@ -16,7 +16,7 @@
  * @package    Zend_Http
  * @subpackage Client_Exception
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,7 +29,7 @@ require_once 'Zend/Http/Exception.php';
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Client_Exception extends Zend_Http_Exception
diff --git a/lib/zend/Zend/Http/Cookie.php b/lib/zend/Zend/Http/Cookie.php
index 80c64c5a352..d4400c2e26a 100644
--- a/lib/zend/Zend/Http/Cookie.php
+++ b/lib/zend/Zend/Http/Cookie.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Cookie
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
@@ -41,7 +41,7 @@ require_once 'Zend/Uri/Http.php';
  *
  * @category   Zend
  * @package    Zend_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Cookie
@@ -277,7 +277,7 @@ class Zend_Http_Cookie
      *
      * @param string $cookieStr
      * @param Zend_Uri_Http|string $refUri Reference URI for default values (domain, path)
-     * @param boolean $encodeValue Weither or not the cookie's value should be
+     * @param boolean $encodeValue Whether or not the cookie's value should be
      *                             passed through urlencode/urldecode
      * @return Zend_Http_Cookie A new Zend_Http_Cookie object or false on failure.
      */
@@ -395,7 +395,7 @@ class Zend_Http_Cookie
 
         // Check for either exact match or suffix match
         return ($cookieDomain == $host ||
-                preg_match("/\.$cookieDomain$/", $host));
+                preg_match('/\.' . preg_quote($cookieDomain) . '$/', $host));
     }
 
     /**
diff --git a/lib/zend/Zend/Http/CookieJar.php b/lib/zend/Zend/Http/CookieJar.php
index 1f7a425c777..a76d1fcf10b 100644
--- a/lib/zend/Zend/Http/CookieJar.php
+++ b/lib/zend/Zend/Http/CookieJar.php
@@ -16,7 +16,7 @@
  * @package    Zend_Http
  * @subpackage CookieJar
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -54,7 +54,7 @@ require_once "Zend/Http/Response.php";
  * @category   Zend
  * @package    Zend_Http
  * @subpackage CookieJar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_CookieJar implements Countable, IteratorAggregate
@@ -77,6 +77,13 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate
      */
     const COOKIE_STRING_CONCAT = 2;
 
+    /**
+     * Return all cookies as one long string (strict mode)
+     *  - Single space after the semi-colon separating each cookie
+     *  - Remove trailing semi-colon, if any
+     */
+    const COOKIE_STRING_CONCAT_STRICT = 3;
+
     /**
      * Array storing cookies
      *
@@ -116,11 +123,12 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate
      *
      * @param Zend_Http_Cookie|string $cookie
      * @param Zend_Uri_Http|string    $ref_uri Optional reference URI (for domain, path, secure)
+     * @param boolean $encodeValue
      */
-    public function addCookie($cookie, $ref_uri = null)
+    public function addCookie($cookie, $ref_uri = null, $encodeValue = true)
     {
         if (is_string($cookie)) {
-            $cookie = Zend_Http_Cookie::fromString($cookie, $ref_uri);
+            $cookie = Zend_Http_Cookie::fromString($cookie, $ref_uri, $encodeValue);
         }
 
         if ($cookie instanceof Zend_Http_Cookie) {
@@ -142,8 +150,9 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate
      *
      * @param Zend_Http_Response $response
      * @param Zend_Uri_Http|string $ref_uri Requested URI
+     * @param boolean $encodeValue
      */
-    public function addCookiesFromResponse($response, $ref_uri)
+    public function addCookiesFromResponse($response, $ref_uri, $encodeValue = true)
     {
         if (! $response instanceof Zend_Http_Response) {
             require_once 'Zend/Http/Exception.php';
@@ -155,10 +164,10 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate
 
         if (is_array($cookie_hdrs)) {
             foreach ($cookie_hdrs as $cookie) {
-                $this->addCookie($cookie, $ref_uri);
+                $this->addCookie($cookie, $ref_uri, $encodeValue);
             }
         } elseif (is_string($cookie_hdrs)) {
-            $this->addCookie($cookie_hdrs, $ref_uri);
+            $this->addCookie($cookie_hdrs, $ref_uri, $encodeValue);
         }
     }
 
@@ -171,6 +180,9 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate
     public function getAllCookies($ret_as = self::COOKIE_OBJECT)
     {
         $cookies = $this->_flattenCookiesArray($this->cookies, $ret_as);
+        if($ret_as == self::COOKIE_STRING_CONCAT_STRICT) {
+            $cookies = rtrim(trim($cookies), ';');
+        }
         return $cookies;
     }
 
@@ -207,6 +219,9 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate
 
         // Now, use self::_flattenCookiesArray again - only to convert to the return format ;)
         $ret = $this->_flattenCookiesArray($ret, $ret_as);
+        if($ret_as == self::COOKIE_STRING_CONCAT_STRICT) {
+            $ret = rtrim(trim($ret), ';');
+        }
 
         return $ret;
     }
@@ -243,6 +258,10 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate
                     return $cookie;
                     break;
 
+                case self::COOKIE_STRING_CONCAT_STRICT:
+                    return rtrim(trim($cookie->__toString()), ';');
+                    break;
+
                 case self::COOKIE_STRING_ARRAY:
                 case self::COOKIE_STRING_CONCAT:
                     return $cookie->__toString();
@@ -268,9 +287,12 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate
      */
     protected function _flattenCookiesArray($ptr, $ret_as = self::COOKIE_OBJECT) {
         if (is_array($ptr)) {
-            $ret = ($ret_as == self::COOKIE_STRING_CONCAT ? '' : array());
+            $ret = ($ret_as == self::COOKIE_STRING_CONCAT || $ret_as == self::COOKIE_STRING_CONCAT_STRICT) ? '' : array();
             foreach ($ptr as $item) {
-                if ($ret_as == self::COOKIE_STRING_CONCAT) {
+                if ($ret_as == self::COOKIE_STRING_CONCAT_STRICT) {
+                    $postfix_combine = (!is_array($item) ? ' ' : '');
+                    $ret .= $this->_flattenCookiesArray($item, $ret_as) . $postfix_combine;
+                } elseif ($ret_as == self::COOKIE_STRING_CONCAT) {
                     $ret .= $this->_flattenCookiesArray($item, $ret_as);
                 } else {
                     $ret = array_merge($ret, $this->_flattenCookiesArray($item, $ret_as));
@@ -283,6 +305,9 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate
                     return array($ptr->__toString());
                     break;
 
+                case self::COOKIE_STRING_CONCAT_STRICT:
+                    // break intentionally omitted
+
                 case self::COOKIE_STRING_CONCAT:
                     return $ptr->__toString();
                     break;
diff --git a/lib/zend/Zend/Http/Exception.php b/lib/zend/Zend/Http/Exception.php
index 6e1dd98207d..0ca3457360f 100644
--- a/lib/zend/Zend/Http/Exception.php
+++ b/lib/zend/Zend/Http/Exception.php
@@ -16,7 +16,7 @@
  * @package    Zend_Http
  * @subpackage Exception
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,7 +29,7 @@ require_once 'Zend/Exception.php';
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Exception extends Zend_Exception
diff --git a/lib/zend/Zend/Http/Header/Exception/InvalidArgumentException.php b/lib/zend/Zend/Http/Header/Exception/InvalidArgumentException.php
new file mode 100644
index 00000000000..9520a65acc3
--- /dev/null
+++ b/lib/zend/Zend/Http/Header/Exception/InvalidArgumentException.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage Header_Exception
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Http_Exception
+ */
+require_once 'Zend/Http/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage Header_Exception
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_Header_Exception_InvalidArgumentException extends Zend_Http_Exception
+{}
diff --git a/lib/zend/Zend/Http/Header/Exception/RuntimeException.php b/lib/zend/Zend/Http/Header/Exception/RuntimeException.php
new file mode 100644
index 00000000000..a716fae0e29
--- /dev/null
+++ b/lib/zend/Zend/Http/Header/Exception/RuntimeException.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage Header_Exception
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Http_Exception
+ */
+require_once 'Zend/Http/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage Header_Exception
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_Header_Exception_RuntimeException extends Zend_Http_Exception
+{}
diff --git a/lib/zend/Zend/Http/Header/HeaderValue.php b/lib/zend/Zend/Http/Header/HeaderValue.php
new file mode 100644
index 00000000000..ca252267f1a
--- /dev/null
+++ b/lib/zend/Zend/Http/Header/HeaderValue.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage Header
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage Header
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+final class Zend_Http_Header_HeaderValue
+{
+    /**
+     * Private constructor; non-instantiable.
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * Filter a header value
+     *
+     * Ensures CRLF header injection vectors are filtered.
+     *
+     * Per RFC 7230, only VISIBLE ASCII characters, spaces, and horizontal
+     * tabs are allowed in values; only one whitespace character is allowed
+     * between visible characters.
+     *
+     * @see http://en.wikipedia.org/wiki/HTTP_response_splitting
+     * @param string $value
+     * @return string
+     */
+    public static function filter($value)
+    {
+        $value  = (string) $value;
+        $length = strlen($value);
+        $string = '';
+        for ($i = 0; $i < $length; $i += 1) {
+            $ascii = ord($value[$i]);
+
+            // Non-visible, non-whitespace characters
+            // 9 === horizontal tab
+            // 32-126, 128-254 === visible
+            // 127 === DEL
+            // 255 === null byte
+            if (($ascii < 32 && $ascii !== 9)
+                || $ascii === 127
+                || $ascii > 254
+            ) {
+                continue;
+            }
+
+            $string .= $value[$i];
+        }
+
+        return $string;
+    }
+
+    /**
+     * Validate a header value.
+     *
+     * Per RFC 7230, only VISIBLE ASCII characters, spaces, and horizontal
+     * tabs are allowed in values; only one whitespace character is allowed
+     * between visible characters.
+     *
+     * @see http://en.wikipedia.org/wiki/HTTP_response_splitting
+     * @param string $value
+     * @return bool
+     */
+    public static function isValid($value)
+    {
+        $value  = (string) $value;
+        $length = strlen($value);
+        for ($i = 0; $i < $length; $i += 1) {
+            $ascii = ord($value[$i]);
+
+            // Non-visible, non-whitespace characters
+            // 9 === horizontal tab
+            // 32-126, 128-254 === visible
+            // 127 === DEL
+            // 255 === null byte
+            if (($ascii < 32 && $ascii !== 9)
+                || $ascii === 127
+                || $ascii > 254
+            ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Assert a header value is valid.
+     *
+     * @param string $value
+     * @throws Exception\RuntimeException for invalid values
+     * @return void
+     */
+    public static function assertValid($value)
+    {
+        if (! self::isValid($value)) {
+            require_once 'Zend/Http/Header/Exception/InvalidArgumentException.php';
+            throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid header value');
+        }
+    }
+}
diff --git a/lib/zend/Zend/Http/Header/SetCookie.php b/lib/zend/Zend/Http/Header/SetCookie.php
new file mode 100644
index 00000000000..9cf7837167d
--- /dev/null
+++ b/lib/zend/Zend/Http/Header/SetCookie.php
@@ -0,0 +1,554 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage Header
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Http_Header_Exception_InvalidArgumentException
+ */
+require_once "Zend/Http/Header/Exception/InvalidArgumentException.php";
+
+/**
+ * @see Zend_Http_Header_Exception_RuntimeException
+ */
+require_once "Zend/Http/Header/Exception/RuntimeException.php";
+
+/**
+ * @see Zend_Http_Header_HeaderValue
+ */
+require_once "Zend/Http/Header/HeaderValue.php";
+
+/**
+ * Zend_Http_Client is an implementation of an HTTP client in PHP. The client
+ * supports basic features like sending different HTTP requests and handling
+ * redirections, as well as more advanced features like proxy settings, HTTP
+ * authentication and cookie persistence (using a Zend_Http_CookieJar object)
+ *
+ * @todo Implement proxy settings
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage Header
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_Header_SetCookie
+{
+
+    /**
+     * Cookie name
+     *
+     * @var string
+     */
+    protected $name = null;
+
+    /**
+     * Cookie value
+     *
+     * @var string
+     */
+    protected $value = null;
+
+    /**
+     * Version
+     *
+     * @var integer
+     */
+    protected $version = null;
+
+    /**
+     * Max Age
+     *
+     * @var integer
+     */
+    protected $maxAge = null;
+
+    /**
+     * Cookie expiry date
+     *
+     * @var int
+     */
+    protected $expires = null;
+
+    /**
+     * Cookie domain
+     *
+     * @var string
+     */
+    protected $domain = null;
+
+    /**
+     * Cookie path
+     *
+     * @var string
+     */
+    protected $path = null;
+
+    /**
+     * Whether the cookie is secure or not
+     *
+     * @var boolean
+     */
+    protected $secure = null;
+
+    /**
+     * @var true
+     */
+    protected $httponly = null;
+
+    /**
+     * Generate a new Cookie object from a cookie string
+     * (for example the value of the Set-Cookie HTTP header)
+     *
+     * @static
+     * @throws Zend_Http_Header_Exception_InvalidArgumentException
+     * @param  $headerLine
+     * @param  bool $bypassHeaderFieldName
+     * @return array|SetCookie
+     */
+    public static function fromString($headerLine, $bypassHeaderFieldName = false)
+    {
+        list($name, $value) = explode(': ', $headerLine, 2);
+
+        // check to ensure proper header type for this factory
+        if (strtolower($name) !== 'set-cookie') {
+            throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid header line for Set-Cookie string: "' . $name . '"');
+        }
+
+        $multipleHeaders = preg_split('#(?<!Sun|Mon|Tue|Wed|Thu|Fri|Sat),\s*#', $value);
+        $headers = array();
+        foreach ($multipleHeaders as $headerLine) {
+            $header = new self();
+            $keyValuePairs = preg_split('#;\s*#', $headerLine);
+            foreach ($keyValuePairs as $keyValue) {
+                if (strpos($keyValue, '=')) {
+                    list($headerKey, $headerValue) = preg_split('#=\s*#', $keyValue, 2);
+                } else {
+                    $headerKey = $keyValue;
+                    $headerValue = null;
+                }
+
+                // First K=V pair is always the cookie name and value
+                if ($header->getName() === NULL) {
+                    $header->setName($headerKey);
+                    $header->setValue($headerValue);
+                    continue;
+                }
+
+                // Process the remanining elements
+                switch (str_replace(array('-', '_'), '', strtolower($headerKey))) {
+                    case 'expires' : $header->setExpires($headerValue); break;
+                    case 'domain'  : $header->setDomain($headerValue); break;
+                    case 'path'    : $header->setPath($headerValue); break;
+                    case 'secure'  : $header->setSecure(true); break;
+                    case 'httponly': $header->setHttponly(true); break;
+                    case 'version' : $header->setVersion((int) $headerValue); break;
+                    case 'maxage'  : $header->setMaxAge((int) $headerValue); break;
+                    default:
+                        // Intentionally omitted
+                }
+            }
+            $headers[] = $header;
+        }
+        return count($headers) == 1 ? array_pop($headers) : $headers;
+    }
+
+    /**
+     * Cookie object constructor
+     *
+     * @todo Add validation of each one of the parameters (legal domain, etc.)
+     *
+     * @param string $name
+     * @param string $value
+     * @param int $expires
+     * @param string $path
+     * @param string $domain
+     * @param bool $secure
+     * @param bool $httponly
+     * @param string $maxAge
+     * @param int $version
+     * @return SetCookie
+     */
+    public function __construct($name = null, $value = null, $expires = null, $path = null, $domain = null, $secure = false, $httponly = false, $maxAge = null, $version = null)
+    {
+        $this->type = 'Cookie';
+
+        if ($name) {
+            $this->setName($name);
+        }
+
+        if ($value) {
+            $this->setValue($value); // in parent
+        }
+
+        if ($version) {
+            $this->setVersion($version);
+        }
+
+        if ($maxAge) {
+            $this->setMaxAge($maxAge);
+        }
+
+        if ($domain) {
+            $this->setDomain($domain);
+        }
+
+        if ($expires) {
+            $this->setExpires($expires);
+        }
+
+        if ($path) {
+            $this->setPath($path);
+        }
+
+        if ($secure) {
+            $this->setSecure($secure);
+        }
+
+        if ($httponly) {
+            $this->setHttponly($httponly);
+        }
+    }
+
+    /**
+     * @return string 'Set-Cookie'
+     */
+    public function getFieldName()
+    {
+        return 'Set-Cookie';
+    }
+
+    /**
+     * @throws Zend_Http_Header_Exception_RuntimeException
+     * @return string
+     */
+    public function getFieldValue()
+    {
+        if ($this->getName() == '') {
+            throw new Zend_Http_Header_Exception_RuntimeException('A cookie name is required to generate a field value for this cookie');
+        }
+
+        $value = $this->getValue();
+        if (strpos($value,'"')!==false) {
+            $value = '"'.urlencode(str_replace('"', '', $value)).'"';
+        } else {
+            $value = urlencode($value);
+        }
+        $fieldValue = $this->getName() . '=' . $value;
+
+        $version = $this->getVersion();
+        if ($version!==null) {
+            $fieldValue .= '; Version=' . $version;
+        }
+
+        $maxAge = $this->getMaxAge();
+        if ($maxAge!==null) {
+            $fieldValue .= '; Max-Age=' . $maxAge;
+        }
+
+        $expires = $this->getExpires();
+        if ($expires) {
+            $fieldValue .= '; Expires=' . $expires;
+        }
+
+        $domain = $this->getDomain();
+        if ($domain) {
+            $fieldValue .= '; Domain=' . $domain;
+        }
+
+        $path = $this->getPath();
+        if ($path) {
+            $fieldValue .= '; Path=' . $path;
+        }
+
+        if ($this->isSecure()) {
+            $fieldValue .= '; Secure';
+        }
+
+        if ($this->isHttponly()) {
+            $fieldValue .= '; HttpOnly';
+        }
+
+        return $fieldValue;
+    }
+
+    /**
+     * @param string $name
+     * @return SetCookie
+     */
+    public function setName($name)
+    {
+        if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
+            throw new Zend_Http_Header_Exception_InvalidArgumentException("Cookie name cannot contain these characters: =,; \\t\\r\\n\\013\\014 ({$name})");
+        }
+
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $value
+     */
+    public function setValue($value)
+    {
+        Zend_Http_Header_HeaderValue::assertValid($value);
+        $this->value = $value;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set version
+     *
+     * @param integer $version
+     */
+    public function setVersion($version)
+    {
+        if (!is_int($version)) {
+            throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid Version number specified');
+        }
+        $this->version = $version;
+    }
+
+    /**
+     * Get version
+     *
+     * @return integer
+     */
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * Set Max-Age
+     *
+     * @param integer $maxAge
+     */
+    public function setMaxAge($maxAge)
+    {
+        if (!is_int($maxAge) || ($maxAge<0)) {
+            throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid Max-Age number specified');
+        }
+        $this->maxAge = $maxAge;
+    }
+
+    /**
+     * Get Max-Age
+     *
+     * @return integer
+     */
+    public function getMaxAge()
+    {
+        return $this->maxAge;
+    }
+
+    /**
+     * @param int $expires
+     * @return SetCookie
+     */
+    public function setExpires($expires)
+    {
+        if (!empty($expires)) {
+            if (is_string($expires)) {
+                $expires = strtotime($expires);
+            } elseif (!is_int($expires)) {
+                throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid expires time specified');
+            }
+            $this->expires = (int) $expires;
+        }
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getExpires($inSeconds = false)
+    {
+        if ($this->expires == null) {
+            return;
+        }
+        if ($inSeconds) {
+            return $this->expires;
+        }
+        return gmdate('D, d-M-Y H:i:s', $this->expires) . ' GMT';
+    }
+
+    /**
+     * @param string $domain
+     */
+    public function setDomain($domain)
+    {
+        Zend_Http_Header_HeaderValue::assertValid($domain);
+        $this->domain = $domain;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDomain()
+    {
+        return $this->domain;
+    }
+
+    /**
+     * @param string $path
+     */
+    public function setPath($path)
+    {
+        Zend_Http_Header_HeaderValue::assertValid($path);
+        $this->path = $path;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * @param boolean $secure
+     */
+    public function setSecure($secure)
+    {
+        $this->secure = $secure;
+        return $this;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isSecure()
+    {
+        return $this->secure;
+    }
+
+    /**
+     * @param bool $httponly
+     */
+    public function setHttponly($httponly)
+    {
+        $this->httponly = $httponly;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isHttponly()
+    {
+        return $this->httponly;
+    }
+
+    /**
+     * Check whether the cookie has expired
+     *
+     * Always returns false if the cookie is a session cookie (has no expiry time)
+     *
+     * @param int $now Timestamp to consider as "now"
+     * @return boolean
+     */
+    public function isExpired($now = null)
+    {
+        if ($now === null) {
+            $now = time();
+        }
+
+        if (is_int($this->expires) && $this->expires < $now) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Check whether the cookie is a session cookie (has no expiry time set)
+     *
+     * @return boolean
+     */
+    public function isSessionCookie()
+    {
+        return ($this->expires === null);
+    }
+
+    public function isValidForRequest($requestDomain, $path, $isSecure = false)
+    {
+        if ($this->getDomain() && (strrpos($requestDomain, $this->getDomain()) !== false)) {
+            return false;
+        }
+
+        if ($this->getPath() && (strpos($path, $this->getPath()) !== 0)) {
+            return false;
+        }
+
+        if ($this->secure && $this->isSecure()!==$isSecure) {
+            return false;
+        }
+
+        return true;
+
+    }
+
+    public function toString()
+    {
+        return $this->getFieldName() . ': ' . $this->getFieldValue();
+    }
+
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    public function toStringMultipleHeaders(array $headers)
+    {
+        $headerLine = $this->toString();
+        /* @var $header SetCookie */
+        foreach ($headers as $header) {
+            if (!$header instanceof Zend_Http_Header_SetCookie) {
+                throw new Zend_Http_Header_Exception_RuntimeException(
+                    'The SetCookie multiple header implementation can only accept an array of SetCookie headers'
+                );
+            }
+            $headerLine .= ', ' . $header->getFieldValue();
+        }
+        return $headerLine;
+    }
+
+
+}
diff --git a/lib/zend/Zend/Http/Response.php b/lib/zend/Zend/Http/Response.php
index 74e0be8ee0f..af3e2dbb192 100644
--- a/lib/zend/Zend/Http/Response.php
+++ b/lib/zend/Zend/Http/Response.php
@@ -17,10 +17,15 @@
  * @package    Zend_Http
  * @subpackage Response
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
+/**
+ * @see Zend_Http_Header_HeaderValue
+ */
+require_once 'Zend/Http/Header/HeaderValue.php';
+
 /**
  * Zend_Http_Response represents an HTTP 1.0 / 1.1 response message. It
  * includes easy access to all the response's different elemts, as well as some
@@ -28,7 +33,7 @@
  *
  * @package    Zend_Http
  * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Response
@@ -141,14 +146,14 @@ class Zend_Http_Response
      *
      * If no message is passed, the message will be guessed according to the response code.
      *
-     * @param int $code Response code (200, 404, ...)
-     * @param array $headers Headers array
+     * @param int    $code Response code (200, 404, ...)
+     * @param array  $headers Headers array
      * @param string $body Response body
      * @param string $version HTTP version
      * @param string $message Response code as text
      * @throws Zend_Http_Exception
      */
-    public function __construct($code, $headers, $body = null, $version = '1.1', $message = null)
+    public function __construct($code, array $headers, $body = null, $version = '1.1', $message = null)
     {
         // Make sure the response code is valid and set it
         if (self::responseCodeAsText($code) === null) {
@@ -158,15 +163,17 @@ class Zend_Http_Response
 
         $this->code = $code;
 
-        // Make sure we got valid headers and set them
-        if (! is_array($headers)) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('No valid headers were passed');
-    }
-
         foreach ($headers as $name => $value) {
-            if (is_int($name))
-                list($name, $value) = explode(": ", $value, 1);
+            if (is_int($name)) {
+                $header = explode(":", $value, 2);
+                if (count($header) != 2) {
+                    require_once 'Zend/Http/Exception.php';
+                    throw new Zend_Http_Exception("'{$value}' is not a valid HTTP header");
+                }
+
+                $name  = trim($header[0]);
+                $value = trim($header[1]);
+            }
 
             $this->headers[ucwords(strtolower($name))] = $value;
         }
@@ -392,7 +399,7 @@ class Zend_Http_Response
      * @param string $br Line breaks (eg. "\n", "\r\n", "<br />")
      * @return string
      */
-    public function asString($br = "\n")
+    public function asString($br = "\r\n")
     {
         return $this->getHeadersAsString(true, $br) . $br . $this->getRawBody();
     }
@@ -487,50 +494,82 @@ class Zend_Http_Response
     /**
      * Extract the headers from a response string
      *
-     * @param string $response_str
-     * @return array
+     * @param   string $response_str
+     * @return  array
      */
     public static function extractHeaders($response_str)
     {
         $headers = array();
 
-        // First, split body and headers
-        $parts = preg_split('|(?:\r?\n){2}|m', $response_str, 2);
-        if (! $parts[0]) return $headers;
+        // First, split body and headers. Headers are separated from the
+        // message at exactly the sequence "\r\n\r\n"
+        $parts = preg_split('|(?:\r\n){2}|m', $response_str, 2);
+        if (! $parts[0]) {
+            return $headers;
+        }
 
-        // Split headers part to lines
-        $lines = explode("\n", $parts[0]);
+        // Split headers part to lines; "\r\n" is the only valid line separator.
+        $lines = explode("\r\n", $parts[0]);
         unset($parts);
         $last_header = null;
 
-        foreach($lines as $line) {
-            $line = trim($line, "\r\n");
-            if ($line == "") break;
+        foreach($lines as $index => $line) {
+            if ($index === 0 && preg_match('#^HTTP/\d+(?:\.\d+) [1-5]\d+#', $line)) {
+                // Status line; ignore
+                continue;
+            }
 
-            if (preg_match("|^([\w-]+):\s+(.+)|", $line, $m)) {
+            if ($line == "") {
+                // Done processing headers
+                break;
+            }
+
+            // Locate headers like 'Location: ...' and 'Location:...' (note the missing space)
+            if (preg_match("|^([a-zA-Z0-9\'`#$%&*+.^_\|\~!-]+):\s*(.*)|s", $line, $m)) {
                 unset($last_header);
-                $h_name = strtolower($m[1]);
+                $h_name  = strtolower($m[1]);
                 $h_value = $m[2];
+                Zend_Http_Header_HeaderValue::assertValid($h_value);
 
                 if (isset($headers[$h_name])) {
                     if (! is_array($headers[$h_name])) {
                         $headers[$h_name] = array($headers[$h_name]);
                     }
 
-                    $headers[$h_name][] = $h_value;
-                } else {
-                    $headers[$h_name] = $h_value;
+                    $headers[$h_name][] = ltrim($h_value);
+                    $last_header = $h_name;
+                    continue;
                 }
+
+                $headers[$h_name] = ltrim($h_value);
                 $last_header = $h_name;
-            } elseif (preg_match("|^\s+(.+)$|", $line, $m) && $last_header !== null) {
+                continue;
+            }
+
+            // Identify header continuations
+            if (preg_match("|^[ \t](.+)$|s", $line, $m) && $last_header !== null) {
+                $h_value = trim($m[1]);
                 if (is_array($headers[$last_header])) {
                     end($headers[$last_header]);
                     $last_header_key = key($headers[$last_header]);
-                    $headers[$last_header][$last_header_key] .= $m[1];
-                } else {
-                    $headers[$last_header] .= $m[1];
+
+                    $h_value = $headers[$last_header][$last_header_key] . $h_value;
+                    Zend_Http_Header_HeaderValue::assertValid($h_value);
+
+                    $headers[$last_header][$last_header_key] = $h_value;
+                    continue;
                 }
+
+                $h_value = $headers[$last_header] . $h_value;
+                Zend_Http_Header_HeaderValue::assertValid($h_value);
+
+                $headers[$last_header] = $h_value;
+                continue;
             }
+
+            // Anything else is an error condition
+            require_once 'Zend/Http/Exception.php';
+            throw new Zend_Http_Exception('Invalid header line detected');
         }
 
         return $headers;
@@ -544,7 +583,7 @@ class Zend_Http_Response
      */
     public static function extractBody($response_str)
     {
-        $parts = preg_split('|(?:\r?\n){2}|m', $response_str, 2);
+        $parts = preg_split('|(?:\r\n){2}|m', $response_str, 2);
         if (isset($parts[1])) {
             return $parts[1];
         }
@@ -638,7 +677,7 @@ class Zend_Http_Response
          * @link http://framework.zend.com/issues/browse/ZF-6040
          */
         $zlibHeader = unpack('n', substr($body, 0, 2));
-        if ($zlibHeader[1] % 31 == 0) {
+        if ($zlibHeader[1] % 31 == 0 && ord($body[0]) == 0x78 && in_array(ord($body[1]), array(0x01, 0x5e, 0x9c, 0xda))) {
             return gzuncompress($body);
         } else {
             return gzinflate($body);
diff --git a/lib/zend/Zend/Http/Response/Stream.php b/lib/zend/Zend/Http/Response/Stream.php
old mode 100644
new mode 100755
index cc4dec5ed38..0a154c4ee43
--- a/lib/zend/Zend/Http/Response/Stream.php
+++ b/lib/zend/Zend/Http/Response/Stream.php
@@ -17,7 +17,7 @@
  * @package    Zend_Http
  * @subpackage Response
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,7 +28,7 @@
  *
  * @package    Zend_Http
  * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Http_Response_Stream extends Zend_Http_Response
@@ -90,7 +90,7 @@ class Zend_Http_Response_Stream extends Zend_Http_Response
     /**
      * Set the cleanup trigger
      *
-     * @param $cleanup Set cleanup trigger
+     * @param bool $cleanup Set cleanup trigger
      */
     public function setCleanup($cleanup = true) {
         $this->_cleanup = $cleanup;
diff --git a/lib/zend/Zend/Http/UserAgent.php b/lib/zend/Zend/Http/UserAgent.php
new file mode 100644
index 00000000000..5f7226fd9d0
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent.php
@@ -0,0 +1,853 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http_UserAgent
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * Lists of User Agent chains for testing :
+ *
+ * - http://www.useragentstring.com/layout/useragentstring.php
+ * - http://user-agent-string.info/list-of-ua
+ * - http://www.user-agents.org/allagents.xml
+ * - http://en.wikipedia.org/wiki/List_of_user_agents_for_mobile_phones
+ * - http://www.mobilemultimedia.be/fr/
+ *
+ * @category   Zend
+ * @package    Zend_Http_UserAgent
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent implements Serializable
+{
+    /**
+     * 'desktop' by default if the sequence return false for each item or is empty
+     */
+    const DEFAULT_IDENTIFICATION_SEQUENCE = 'mobile,desktop';
+
+    /**
+     * Default persitent storage adapter : Session or NonPersitent
+     */
+    const DEFAULT_PERSISTENT_STORAGE_ADAPTER = 'Session';
+
+    /**
+     * 'desktop' by default if the sequence return false for each item
+     */
+    const DEFAULT_BROWSER_TYPE = 'desktop';
+
+    /**
+     * Default User Agent chain to prevent empty value
+     */
+    const DEFAULT_HTTP_USER_AGENT = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)';
+
+    /**
+     * Default Http Accept param to prevent empty value
+     */
+    const DEFAULT_HTTP_ACCEPT = "application/xhtml+xml";
+
+    /**
+     * Default markup language
+     */
+    const DEFAULT_MARKUP_LANGUAGE = "xhtml";
+
+    /**
+     * Browser type
+     *
+     * @var string
+     */
+    protected $_browserType;
+
+    /**
+     * Browser type class
+     *
+     * Map of browser types to classes.
+     *
+     * @var array
+     */
+    protected $_browserTypeClass = array();
+
+    /**
+     * Array to store config
+     *
+     * Default values are provided to ensure specific keys are present at
+     * instantiation.
+     *
+     * @var array
+     */
+    protected $_config = array(
+        'identification_sequence' => self::DEFAULT_IDENTIFICATION_SEQUENCE,
+        'storage'                 => array(
+            'adapter'             => self::DEFAULT_PERSISTENT_STORAGE_ADAPTER,
+        ),
+    );
+
+    /**
+     * Identified device
+     *
+     * @var Zend_Http_UserAgent_Device
+     */
+    protected $_device;
+
+    /**
+     * Whether or not this instance is immutable.
+     *
+     * If true, none of the following may be modified:
+     * - $_server
+     * - $_browserType
+     * - User-Agent (defined in $_server)
+     * - HTTP Accept value (defined in $_server)
+     * - $_storage
+     *
+     * @var bool
+     */
+    protected $_immutable = false;
+
+    /**
+     * Plugin loaders
+     * @var array
+     */
+    protected $_loaders = array();
+
+    /**
+     * Valid plugin loader types
+     * @var array
+     */
+    protected $_loaderTypes = array('storage', 'device');
+
+    /**
+     * Trace of items matched to identify the browser type
+     *
+     * @var array
+     */
+    protected $_matchLog = array();
+
+    /**
+     * Server variable
+     *
+     * @var array
+     */
+    protected $_server;
+
+    /**
+     * Persistent storage handler
+     *
+     * @var Zend_Http_UserAgent_Storage
+     */
+    protected $_storage;
+
+    /**
+     * Constructor
+     *
+     * @param  null|array|Zend_Config|ArrayAccess $options
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        if (null !== $options) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * Serialized representation of the object
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        $device = $this->getDevice();
+        $spec = array(
+            'browser_type' => $this->_browserType,
+            'config'       => $this->_config,
+            'device_class' => get_class($device),
+            'device'       => $device->serialize(),
+            'user_agent'   => $this->getServerValue('http_user_agent'),
+            'http_accept'  => $this->getServerValue('http_accept'),
+        );
+        return serialize($spec);
+    }
+
+    /**
+     * Unserialize a previous representation of the object
+     *
+     * @param  string $serialized
+     * @return void
+     */
+    public function unserialize($serialized)
+    {
+        $spec = unserialize($serialized);
+
+        $this->setOptions($spec);
+
+        // Determine device class and ensure the class is loaded
+        $deviceClass          = $spec['device_class'];
+        if (!class_exists($deviceClass)) {
+            $this->_getUserAgentDevice($this->getBrowserType());
+        }
+
+        // Get device specification and instantiate
+        $deviceSpec            = unserialize($spec['device']);
+        $deviceSpec['_config'] = $this->getConfig();
+        $deviceSpec['_server'] = $this->getServer();
+        $this->_device = new $deviceClass($deviceSpec);
+    }
+
+    /**
+     * Configure instance
+     *
+     * @param  array|Zend_Config|ArrayAccess $options
+     * @return Zend_Http_UserAgent
+     */
+    public function setOptions($options)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+
+        if (!is_array($options)
+            && !$options instanceof ArrayAccess
+            && !$options instanceof Traversable
+        ) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(sprintf(
+                'Invalid argument; expected array, Zend_Config object, or object implementing ArrayAccess and Traversable; received %s',
+                (is_object($options) ? get_class($options) : gettype($options))
+            ));
+        }
+
+        // Set $_SERVER first
+        if (isset($options['server'])) {
+            $this->setServer($options['server']);
+            unset($options['server']);
+        }
+
+        // Get plugin loaders sorted
+        if (isset($options['plugin_loader'])) {
+            $plConfig = $options['plugin_loader'];
+            if (is_array($plConfig) || $plConfig instanceof Traversable) {
+                foreach ($plConfig as $type => $class) {
+                    $this->setPluginLoader($type, $class);
+                }
+            }
+            unset($plConfig, $options['plugin_loader']);
+        }
+
+        // And then loop through the remaining options
+        $config = array();
+        foreach ($options as $key => $value) {
+            switch (strtolower($key)) {
+                case 'browser_type':
+                    $this->setBrowserType($value);
+                    break;
+                case 'http_accept':
+                    $this->setHttpAccept($value);
+                    break;
+                case 'user_agent':
+                    $this->setUserAgent($value);
+                    break;
+                default:
+                    // Cache remaining options for $_config
+                    $config[$key] = $value;
+                    break;
+            }
+        }
+        $this->setConfig($config);
+
+        return $this;
+    }
+
+    /**
+     * Comparison of the UserAgent chain and browser signatures.
+     *
+     * The comparison is case-insensitive : the browser signatures must be in lower
+     * case
+     *
+     * @param  string $deviceClass Name of class against which a match will be attempted
+     * @return bool
+     */
+    protected function _match($deviceClass)
+    {
+        // Validate device class
+        $r = new ReflectionClass($deviceClass);
+        if (!$r->implementsInterface('Zend_Http_UserAgent_Device')) {
+            throw new Zend_Http_UserAgent_Exception(sprintf(
+                'Invalid device class provided ("%s"); must implement Zend_Http_UserAgent_Device',
+                $deviceClass
+            ));
+        }
+
+        $userAgent = $this->getUserAgent();
+
+        // Call match method on device class
+        return call_user_func(
+            array($deviceClass, 'match'),
+            $userAgent,
+            $this->getServer()
+        );
+    }
+
+    /**
+     * Loads class for a user agent device
+     *
+     * @param  string $browserType Browser type
+     * @return string
+     * @throws Zend_Loader_PluginLoader_Exception if unable to load UA device
+     */
+    protected function _getUserAgentDevice($browserType)
+    {
+        $browserType = strtolower($browserType);
+        if (isset($this->_browserTypeClass[$browserType])) {
+            return $this->_browserTypeClass[$browserType];
+        }
+
+        if (isset($this->_config[$browserType])
+            && isset($this->_config[$browserType]['device'])
+        ) {
+            $deviceConfig = $this->_config[$browserType]['device'];
+            if (is_array($deviceConfig) && isset($deviceConfig['classname'])) {
+                $device = (string) $deviceConfig['classname'];
+                if (!class_exists($device)) {
+                    require_once 'Zend/Http/UserAgent/Exception.php';
+                    throw new Zend_Http_UserAgent_Exception(sprintf(
+                        'Invalid classname "%s" provided in device configuration for browser type "%s"',
+                        $device,
+                        $browserType
+                    ));
+                }
+            } elseif (is_array($deviceConfig) && isset($deviceConfig['path'])) {
+                $loader = $this->getPluginLoader('device');
+                $path   = $deviceConfig['path'];
+                $prefix = isset($deviceConfig['prefix']) ? $deviceConfig['prefix'] : 'Zend_Http_UserAgent';
+                $loader->addPrefixPath($prefix, $path);
+
+                $device = $loader->load($browserType);
+            } else {
+                $loader = $this->getPluginLoader('device');
+                $device = $loader->load($browserType);
+            }
+        } else {
+            $loader = $this->getPluginLoader('device');
+            $device = $loader->load($browserType);
+        }
+
+        $this->_browserTypeClass[$browserType] = $device;
+
+        return $device;
+    }
+
+    /**
+     * Returns the User Agent value
+     *
+     * If $userAgent param is null, the value of $_server['HTTP_USER_AGENT'] is
+     * returned.
+     *
+     * @return string
+     */
+    public function getUserAgent()
+    {
+        if (null === ($ua = $this->getServerValue('http_user_agent'))) {
+            $ua = self::DEFAULT_HTTP_USER_AGENT;
+            $this->setUserAgent($ua);
+        }
+
+        return $ua;
+    }
+
+    /**
+     * Force or replace the UA chain in $_server variable
+     *
+     * @param  string $userAgent Forced UserAgent chain
+     * @return Zend_Http_UserAgent
+     */
+    public function setUserAgent($userAgent)
+    {
+        $this->setServerValue('http_user_agent', $userAgent);
+        return $this;
+    }
+
+    /**
+     * Returns the HTTP Accept server param
+     *
+     * @param  string $httpAccept (option) forced HTTP Accept chain
+     * @return string
+     */
+    public function getHttpAccept($httpAccept = null)
+    {
+        if (null === ($accept = $this->getServerValue('http_accept'))) {
+            $accept = self::DEFAULT_HTTP_ACCEPT;
+            $this->setHttpAccept($accept);
+        }
+        return $accept;
+    }
+
+    /**
+     * Force or replace the HTTP_ACCEPT chain in self::$_server variable
+     *
+     * @param  string $httpAccept Forced HTTP Accept chain
+     * @return Zend_Http_UserAgent
+     */
+    public function setHttpAccept($httpAccept)
+    {
+        $this->setServerValue('http_accept', $httpAccept);
+        return $this;
+    }
+
+    /**
+     * Returns the persistent storage handler
+     *
+     * Session storage is used by default unless a different storage adapter
+     * has been set via the "persistent_storage_adapter" key. That key should
+     * contain either a fully qualified class name, or a short name that
+     * resolves via the plugin loader.
+     *
+     * @param  string $browser Browser identifier (User Agent chain)
+     * @return Zend_Http_UserAgent_Storage
+     */
+    public function getStorage($browser = null)
+    {
+        if (null === $browser) {
+            $browser = $this->getUserAgent();
+        }
+        if (null === $this->_storage) {
+            $config  = $this->_config['storage'];
+            $adapter = $config['adapter'];
+            if (!class_exists($adapter)) {
+                $loader = $this->getPluginLoader('storage');
+                $adapter = $loader->load($adapter);
+                $loader = $this->getPluginLoader('storage');
+            }
+            $options = array('browser_type' => $browser);
+            if (isset($config['options'])) {
+                $options = array_merge($options, $config['options']);
+            }
+            $this->setStorage(new $adapter($options));
+        }
+        return $this->_storage;
+    }
+
+    /**
+     * Sets the persistent storage handler
+     *
+     * @param  Zend_Http_UserAgent_Storage $storage
+     * @return Zend_Http_UserAgent
+     */
+    public function setStorage(Zend_Http_UserAgent_Storage $storage)
+    {
+        if ($this->_immutable) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(
+                'The User-Agent device object has already been retrieved; the storage object is now immutable'
+            );
+        }
+
+        $this->_storage = $storage;
+        return $this;
+    }
+
+    /**
+     * Clean the persistent storage
+     *
+     * @param  string $browser Browser identifier (User Agent chain)
+     * @return void
+     */
+    public function clearStorage($browser = null)
+    {
+        $this->getStorage($browser)->clear();
+    }
+
+    /**
+     * Get user configuration
+     *
+     * @return array
+     */
+    public function getConfig()
+    {
+        return $this->_config;
+    }
+
+    /**
+     * Config parameters is an Array or a Zend_Config object
+     *
+     * The allowed parameters are :
+     * - the identification sequence (can be empty) => desktop browser type is the
+     * default browser type returned
+     * $config['identification_sequence'] : ',' separated browser types
+     * - the persistent storage adapter
+     * $config['persistent_storage_adapter'] = "Session" or "NonPersistent"
+     * - to add or replace a browser type device
+     * $config[(type)]['device']['path']
+     * $config[(type)]['device']['classname']
+     * - to add or replace a browser type features adapter
+     * $config[(type)]['features']['path']
+     * $config[(type)]['features']['classname']
+     *
+     * @param  mixed $config (option) Config array
+     * @return Zend_Http_UserAgent
+     */
+    public function setConfig($config = array())
+    {
+        if ($config instanceof Zend_Config) {
+            $config = $config->toArray();
+        }
+
+        // Verify that Config parameters are in an array.
+        if (!is_array($config) && !$config instanceof Traversable) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(sprintf(
+                'Config parameters must be in an array or a Traversable object; received "%s"',
+                (is_object($config) ? get_class($config) : gettype($config))
+            ));
+        }
+
+        if ($config instanceof Traversable) {
+            $tmp = array();
+            foreach ($config as $key => $value) {
+                $tmp[$key] = $value;
+            }
+            $config = $tmp;
+            unset($tmp);
+        }
+
+        $this->_config = array_merge($this->_config, $config);
+        return $this;
+    }
+
+    /**
+     * Returns the device object
+     *
+     * This is the object that will contain the various discovered device
+     * capabilities.
+     *
+     * @return Zend_Http_UserAgent_Device $device
+     */
+    public function getDevice()
+    {
+        if (null !== $this->_device) {
+            return $this->_device;
+        }
+
+        $userAgent = $this->getUserAgent();
+
+        // search an existing identification in the session
+        $storage = $this->getStorage($userAgent);
+
+        if (!$storage->isEmpty()) {
+            // If the user agent and features are already existing, the
+            // Zend_Http_UserAgent object is serialized in the session
+            $object = $storage->read();
+            $this->unserialize($object);
+        } else {
+            // Otherwise, the identification is made and stored in the session.
+            // Find the browser type:
+            $this->setBrowserType($this->_matchUserAgent());
+            $this->_createDevice();
+
+            // put the result in storage:
+            $this->getStorage($userAgent)
+                 ->write($this->serialize());
+        }
+
+        // Mark the object as immutable
+        $this->_immutable = true;
+
+        // Return the device instance
+        return $this->_device;
+    }
+
+    /**
+     * Retrieve the browser type
+     *
+     * @return string $browserType
+     */
+    public function getBrowserType()
+    {
+        return $this->_browserType;
+    }
+
+    /**
+     * Set the browser "type"
+     *
+     * @param string $browserType
+     * @return Zend_Http_UserAgent
+     */
+    public function setBrowserType($browserType)
+    {
+        if ($this->_immutable) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(
+                'The User-Agent device object has already been retrieved; the browser type is now immutable'
+            );
+        }
+
+        $this->_browserType = $browserType;
+        return $this;
+    }
+
+    /**
+     * Retrieve the "$_SERVER" array
+     *
+     * Basically, the $_SERVER array or an equivalent container storing the
+     * data that will be introspected.
+     *
+     * If the value has not been previously set, it sets itself from the
+     * $_SERVER superglobal.
+     *
+     * @return array
+     */
+    public function getServer()
+    {
+        if (null === $this->_server) {
+            $this->setServer($_SERVER);
+        }
+        return $this->_server;
+    }
+
+    /**
+     * Set the "$_SERVER" array
+     *
+     * Basically, the $_SERVER array or an equivalent container storing the
+     * data that will be introspected.
+     *
+     * @param  array|ArrayAccess $server
+     * @return void
+     * @throws Zend_Http_UserAgent_Exception on invalid parameter
+     */
+    public function setServer($server)
+    {
+        if ($this->_immutable) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(
+                'The User-Agent device object has already been retrieved; the server array is now immutable'
+            );
+        }
+
+        if (!is_array($server) && !$server instanceof Traversable) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(sprintf(
+                'Expected an array or object implementing Traversable; received %s',
+                (is_object($server) ? get_class($server) : gettype($server))
+            ));
+        }
+
+        // Get an array if we don't have one
+        if ($server instanceof ArrayObject) {
+            $server = $server->getArrayCopy();
+        } elseif ($server instanceof Traversable) {
+            $tmp = array();
+            foreach ($server as $key => $value) {
+                $tmp[$key] = $value;
+            }
+            $server = $tmp;
+            unset($tmp);
+        }
+
+        // Normalize key case
+        $server = array_change_key_case($server, CASE_LOWER);
+
+        $this->_server = $server;
+        return $this;
+    }
+
+    /**
+     * Retrieve a server value
+     *
+     * @param  string $key
+     * @return mixed
+     */
+    public function getServerValue($key)
+    {
+        $key    = strtolower($key);
+        $server = $this->getServer();
+        $return = null;
+        if (isset($server[$key])) {
+            $return = $server[$key];
+        }
+        unset($server);
+        return $return;
+    }
+
+    /**
+     * Set a server value
+     *
+     * @param  string|int|float $key
+     * @param  mixed $value
+     * @return void
+     */
+    public function setServerValue($key, $value)
+    {
+        if ($this->_immutable) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(
+                'The User-Agent device object has already been retrieved; the server array is now immutable'
+            );
+        }
+
+        $server = $this->getServer(); // ensure it's been initialized
+        $key    = strtolower($key);
+        $this->_server[$key] = $value;
+        return $this;
+    }
+
+    /**
+     * Set plugin loader
+     *
+     * @param  string $type Type of plugin loader; one of 'storage', (?)
+     * @param  string|Zend_Loader_PluginLoader $loader
+     * @return Zend_Http_UserAgent
+     */
+    public function setPluginLoader($type, $loader)
+    {
+        $type       = $this->_validateLoaderType($type);
+
+        if (is_string($loader)) {
+            if (!class_exists($loader)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($loader);
+            }
+            $loader = new $loader();
+        } elseif (!is_object($loader)) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(sprintf(
+                'Expected a plugin loader class or object; received %s',
+                gettype($loader)
+            ));
+        }
+        if (!$loader instanceof Zend_Loader_PluginLoader) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(sprintf(
+                'Expected an object extending Zend_Loader_PluginLoader; received %s',
+                get_class($loader)
+            ));
+        }
+
+        $basePrefix = 'Zend_Http_UserAgent_';
+        $basePath   = 'Zend/Http/UserAgent/';
+        switch ($type) {
+            case 'storage':
+                $prefix = $basePrefix . 'Storage';
+                $path   = $basePath   . 'Storage';
+                break;
+            case 'device':
+                $prefix = $basePrefix;
+                $path   = $basePath;
+                break;
+        }
+        $loader->addPrefixPath($prefix, $path);
+        $this->_loaders[$type] = $loader;
+        return $this;
+    }
+
+    /**
+     * Get a plugin loader
+     *
+     * @param  string $type A valid plugin loader type; see {@link $_loaderTypes}
+     * @return Zend_Loader_PluginLoader
+     */
+    public function getPluginLoader($type)
+    {
+        $type = $this->_validateLoaderType($type);
+        if (!isset($this->_loaders[$type])) {
+            require_once 'Zend/Loader/PluginLoader.php';
+            $this->setPluginLoader($type, new Zend_Loader_PluginLoader());
+        }
+        return $this->_loaders[$type];
+    }
+
+    /**
+     * Validate a plugin loader type
+     *
+     * Verifies that it is in {@link $_loaderTypes}, and returns a normalized
+     * version of the type.
+     *
+     * @param  string $type
+     * @return string
+     * @throws Zend_Http_UserAgent_Exception on invalid type
+     */
+    protected function _validateLoaderType($type)
+    {
+        $type = strtolower($type);
+        if (!in_array($type, $this->_loaderTypes)) {
+            $types = implode(', ', $this->_loaderTypes);
+
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception(sprintf(
+                'Expected one of "%s" for plugin loader type; received "%s"',
+                $types,
+                (string) $type
+            ));
+        }
+        return $type;
+    }
+
+    /**
+     * Run the identification sequence to match the right browser type according to the
+     * user agent
+     *
+     * @return Zend_Http_UserAgent_Result
+     */
+    protected function _matchUserAgent()
+    {
+        $type = self::DEFAULT_BROWSER_TYPE;
+
+        // If we have no identification sequence, just return the default type
+        if (empty($this->_config['identification_sequence'])) {
+            return $type;
+        }
+
+        // Get sequence against which to match
+        $sequence = explode(',', $this->_config['identification_sequence']);
+
+        // If a browser type is already configured, push that to the front of the list
+        if (null !== ($browserType = $this->getBrowserType())) {
+            array_unshift($sequence, $browserType);
+        }
+
+        // Append the default browser type to the list if not alread in the list
+        if (!in_array($type, $sequence)) {
+            $sequence[] = $type;
+        }
+
+        // Test each type until we find a match
+        foreach ($sequence as $browserType) {
+            $browserType = trim($browserType);
+            $className   = $this->_getUserAgentDevice($browserType);
+
+            // Attempt to match this device class
+            if ($this->_match($className)) {
+                $type = $browserType;
+                $this->_browserTypeClass[$type] = $className;
+                break;
+            }
+        }
+
+        return $type;
+    }
+
+    /**
+     * Creates device object instance
+     *
+     * @return void
+     */
+    protected function _createDevice()
+    {
+        $browserType = $this->getBrowserType();
+        $classname   = $this->_getUserAgentDevice($browserType);
+        $this->_device = new $classname($this->getUserAgent(), $this->getServer(), $this->getConfig());
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/AbstractDevice.php b/lib/zend/Zend/Http/UserAgent/AbstractDevice.php
new file mode 100644
index 00000000000..75d057f1cf8
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/AbstractDevice.php
@@ -0,0 +1,997 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/Device.php';
+
+/**
+ * Abstract Class to define a browser device.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Http_UserAgent_AbstractDevice
+    implements Zend_Http_UserAgent_Device
+{
+    /**
+     * Browser signature
+     *
+     * @var string
+     */
+    protected $_browser = '';
+
+    /**
+     * Browser version
+     *
+     * @var string
+     */
+    protected $_browserVersion = '';
+
+    /**
+     * Configuration
+     *
+     * @var array
+     */
+    protected $_config;
+
+    /**
+     * User Agent chain
+     *
+     * @var string
+     */
+    protected $_userAgent;
+
+    /**
+     * Server variable
+     *
+     * @var array
+     */
+    protected $_server;
+
+    /**
+     * Image types
+     *
+     * @var array
+     */
+    protected $_images = array(
+        'jpeg',
+        'gif',
+        'png',
+        'pjpeg',
+        'x-png',
+        'bmp',
+    );
+
+    /**
+     * Browser/Device features
+     *
+     * @var array
+     */
+    protected $_aFeatures = array();
+
+    /**
+     * Browser/Device features groups
+     *
+     * @var array
+     */
+    protected $_aGroup = array();
+
+    /**
+     * Constructor
+     *
+     * @param  null|string|array $userAgent If array, restores from serialized version
+     * @param  array $server
+     * @param  array $config
+     * @return void
+     */
+    public function __construct($userAgent = null, array $server = array(), array $config = array())
+    {
+        if (is_array($userAgent)) {
+            // Restoring from serialized array
+            $this->_restoreFromArray($userAgent);
+        } else {
+            // Constructing new object
+            $this->setUserAgent($userAgent);
+            $this->_server    = $server;
+            $this->_config    = $config;
+            $this->_getDefaultFeatures();
+            $this->_defineFeatures();
+        }
+    }
+
+    /**
+     * Serialize object
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        $spec = array(
+            '_aFeatures'      => $this->_aFeatures,
+            '_aGroup'         => $this->_aGroup,
+            '_browser'        => $this->_browser,
+            '_browserVersion' => $this->_browserVersion,
+            '_userAgent'      => $this->_userAgent,
+            '_images'         => $this->_images,
+        );
+        return serialize($spec);
+    }
+
+    /**
+     * Unserialize
+     *
+     * @param  string $serialized
+     * @return void
+     */
+    public function unserialize($serialized)
+    {
+        $spec = unserialize($serialized);
+        $this->_restoreFromArray($spec);
+    }
+
+    /**
+     * Restore object state from array
+     *
+     * @param  array $spec
+     * @return void
+     */
+    protected function _restoreFromArray(array $spec)
+    {
+        foreach ($spec as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->{$key} = $value;
+            }
+        }
+    }
+
+    /**
+     * Look for features
+     *
+     * @return array|null
+     */
+    protected function _defineFeatures()
+    {
+        $features = $this->_loadFeaturesAdapter();
+
+        if (is_array($features)) {
+            $this->_aFeatures = array_merge($this->_aFeatures, $features);
+        }
+
+        return $this->_aFeatures;
+    }
+
+    /**
+     * Gets the browser type identifier
+     *
+     * @return string
+     */
+    abstract public function getType();
+
+    /**
+     * Check a feature for the current browser/device.
+     *
+     * @param  string $feature The feature to check.
+     * @return bool
+     */
+    public function hasFeature($feature)
+    {
+        return (isset($this->_aFeatures[$feature]) && !is_null($this->_aFeatures[$feature]));
+    }
+
+    /**
+     * Gets the value of the current browser/device feature
+     *
+     * @param  string $feature Feature to search
+     * @return string|null
+     */
+    public function getFeature($feature)
+    {
+        if ($this->hasFeature($feature)) {
+            return $this->_aFeatures[$feature];
+        }
+    }
+
+    /**
+     * Set a feature for the current browser/device.
+     *
+     * @param  string $feature The feature to set.
+     * @param  string $value (option) feature value.
+     * @param  string $group (option) Group to associate with the feature
+     * @return Zend_Http_UserAgent_AbstractDevice
+     */
+    public function setFeature($feature, $value = false, $group = '')
+    {
+        $this->_aFeatures[$feature] = $value;
+        if (!empty($group)) {
+            $this->setGroup($group, $feature);
+        }
+        return $this;
+    }
+
+    /**
+     * Affects a feature to a group
+     *
+     * @param  string $group Group name
+     * @param  string $feature Feature name
+     * @return Zend_Http_UserAgent_AbstractDevice
+     */
+    public function setGroup($group, $feature)
+    {
+        if (!isset($this->_aGroup[$group])) {
+            $this->_aGroup[$group] = array();
+        }
+        if (!in_array($feature, $this->_aGroup[$group])) {
+            $this->_aGroup[$group][] = $feature;
+        }
+        return $this;
+    }
+
+    /**
+     * Gets an array of features associated to a group
+     *
+     * @param  string $group Group param
+     * @return array
+     */
+    public function getGroup($group)
+    {
+        return $this->_aGroup[$group];
+    }
+
+    /**
+     * Gets all the browser/device features
+     *
+     * @return array
+     */
+    public function getAllFeatures()
+    {
+        return $this->_aFeatures;
+    }
+
+    /**
+     * Gets all the browser/device features' groups
+     *
+     * @return array
+     */
+    public function getAllGroups()
+    {
+        return $this->_aGroup;
+    }
+
+    /**
+     * Sets all the standard features extracted from the User Agent chain and $this->_server
+     * vars
+     *
+     * @return void
+     */
+    protected function _getDefaultFeatures()
+    {
+        $server = array();
+
+        // gets info from user agent chain
+        $uaExtract = $this->extractFromUserAgent($this->getUserAgent());
+
+        if (is_array($uaExtract)) {
+            foreach ($uaExtract as $key => $info) {
+                $this->setFeature($key, $info, 'product_info');
+            }
+        }
+
+        if (isset($uaExtract['browser_name'])) {
+            $this->_browser = $uaExtract['browser_name'];
+        }
+        if (isset($uaExtract['browser_version'])) {
+            $this->_browserVersion = $uaExtract['browser_version'];
+        }
+        if (isset($uaExtract['device_os'])) {
+            $this->device_os = $uaExtract['device_os_name'];
+        }
+
+        /* browser & device info */
+        $this->setFeature('is_wireless_device', false, 'product_info');
+        $this->setFeature('is_mobile', false, 'product_info');
+        $this->setFeature('is_desktop', false, 'product_info');
+        $this->setFeature('is_tablet', false, 'product_info');
+        $this->setFeature('is_bot', false, 'product_info');
+        $this->setFeature('is_email', false, 'product_info');
+        $this->setFeature('is_text', false, 'product_info');
+        $this->setFeature('device_claims_web_support', false, 'product_info');
+
+        $this->setFeature('is_' . strtolower($this->getType()), true, 'product_info');
+
+        /* sets the browser name */
+        if (isset($this->list) && empty($this->_browser)) {
+            $lowerUserAgent = strtolower($this->getUserAgent());
+            foreach ($this->list as $browser_signature) {
+                if (strpos($lowerUserAgent, $browser_signature) !== false) {
+                    $this->_browser = strtolower($browser_signature);
+                    $this->setFeature('browser_name', $this->_browser, 'product_info');
+                }
+            }
+        }
+
+        /* sets the client IP */
+        if (isset($this->_server['remote_addr'])) {
+            $this->setFeature('client_ip', $this->_server['remote_addr'], 'product_info');
+        } elseif (isset($this->_server['http_x_forwarded_for'])) {
+            $this->setFeature('client_ip', $this->_server['http_x_forwarded_for'], 'product_info');
+        } elseif (isset($this->_server['http_client_ip'])) {
+            $this->setFeature('client_ip', $this->_server['http_client_ip'], 'product_info');
+        }
+
+        /* sets the server infos */
+        if (isset($this->_server['server_software'])) {
+            if (strpos($this->_server['server_software'], 'Apache') !== false || strpos($this->_server['server_software'], 'LiteSpeed') !== false) {
+                $server['version'] = 1;
+                if (strpos($this->_server['server_software'], 'Apache/2') !== false) {
+                    $server['version'] = 2;
+                }
+                $server['server'] = 'apache';
+            }
+
+            if (strpos($this->_server['server_software'], 'Microsoft-IIS') !== false) {
+                $server['server'] = 'iis';
+            }
+
+            if (strpos($this->_server['server_software'], 'Unix') !== false) {
+                $server['os'] = 'unix';
+                if (isset($_ENV['MACHTYPE'])) {
+                    if (strpos($_ENV['MACHTYPE'], 'linux') !== false) {
+                        $server['os'] = 'linux';
+                    }
+                }
+            } elseif (strpos($this->_server['server_software'], 'Win') !== false) {
+                $server['os'] = 'windows';
+            }
+
+            if (preg_match('/Apache\/([0-9\.]*)/', $this->_server['server_software'], $arr)) {
+                if ($arr[1]) {
+                    $server['version'] = $arr[1];
+                    $server['server']  = 'apache';
+                }
+            }
+        }
+
+        $this->setFeature('php_version', phpversion(), 'server_info');
+        if (isset($server['server'])) {
+            $this->setFeature('server_os', $server['server'], 'server_info');
+        }
+        if (isset($server['version'])) {
+            $this->setFeature('server_os_version', $server['version'], 'server_info');
+        }
+        if (isset($this->_server['http_accept'])) {
+            $this->setFeature('server_http_accept', $this->_server['http_accept'], 'server_info');
+        }
+        if (isset($this->_server['http_accept_language'])) {
+            $this->setFeature('server_http_accept_language', $this->_server['http_accept_language'], 'server_info');
+        }
+        if (isset($this->_server['server_addr'])) {
+            $this->setFeature('server_ip', $this->_server['server_addr'], 'server_info');
+        }
+        if (isset($this->_server['server_name'])) {
+            $this->setFeature('server_name', $this->_server['server_name'], 'server_info');
+        }
+    }
+
+    /**
+     * Extract and sets informations from the User Agent chain
+     *
+     * @param  string $userAgent User Agent chain
+     * @return array
+     */
+    public static function extractFromUserAgent($userAgent)
+    {
+        $userAgent = trim($userAgent);
+
+        /**
+         * @see http://www.texsoft.it/index.php?c=software&m=sw.php.useragent&l=it
+         */
+        $pattern =  "(([^/\s]*)(/(\S*))?)(\s*\[[a-zA-Z][a-zA-Z]\])?\s*(\\((([^()]|(\\([^()]*\\)))*)\\))?\s*";
+        preg_match("#^$pattern#", $userAgent, $match);
+
+        $comment = array();
+        if (isset($match[7])) {
+            $comment = explode(';', $match[7]);
+        }
+
+        // second part if exists
+        $end = substr($userAgent, strlen($match[0]));
+        if (!empty($end)) {
+            $result['others']['full'] = $end;
+        }
+
+        $match2 = array();
+        if (isset($result['others'])) {
+            preg_match_all('/(([^\/\s]*)(\/)?([^\/\(\)\s]*)?)(\s\((([^\)]*)*)\))?/i', $result['others']['full'], $match2);
+        }
+        $result['user_agent']   = trim($match[1]);
+        $result['product_name'] = isset($match[2]) ? trim($match[2]) : '';
+        $result['browser_name'] = $result['product_name'];
+        if (isset($match[4]) && trim($match[4])) {
+            $result['product_version'] = trim($match[4]);
+            $result['browser_version'] = trim($match[4]);
+        }
+        if (count($comment) && !empty($comment[0])) {
+            $result['comment']['full']     = trim($match[7]);
+            $result['comment']['detail']   = $comment;
+            $result['compatibility_flag']  = trim($comment[0]);
+            if (isset($comment[1])) {
+                $result['browser_token']   = trim($comment[1]);
+            }
+            if (isset($comment[2])) {
+                $result['device_os_token'] = trim($comment[2]);
+            }
+        }
+        if (empty($result['device_os_token']) && !empty($result['compatibility_flag'])) {
+            // some browsers do not have a platform token
+            $result['device_os_token'] = $result['compatibility_flag'];
+        }
+        if ($match2) {
+            $i = 0;
+            $max = count($match2[0]);
+            for ($i = 0; $i < $max; $i ++) {
+                if (!empty($match2[0][$i])) {
+                    $result['others']['detail'][] = array(
+                        $match2[0][$i],
+                        $match2[2][$i],
+                        $match2[4][$i],
+                    );
+                }
+            }
+        }
+
+        /** Security level */
+        $security = array(
+            'N' => 'no security',
+            'U' => 'strong security',
+            'I' => 'weak security',
+        );
+        if (!empty($result['browser_token'])) {
+            if (isset($security[$result['browser_token']])) {
+                $result['security_level'] = $security[$result['browser_token']];
+                unset($result['browser_token']);
+            }
+        }
+
+        $product = strtolower($result['browser_name']);
+
+        // Mozilla : true && false
+        $compatibleOrIe = false;
+        if (isset($result['compatibility_flag']) && isset($result['comment'])) {
+            $compatibleOrIe = ($result['compatibility_flag'] == 'compatible' || strpos($result['comment']['full'], "MSIE") !== false);
+        }
+        if ($product == 'mozilla' && $compatibleOrIe) {
+            if (!empty($result['browser_token'])) {
+                // Classic Mozilla chain
+                preg_match_all('/([^\/\s].*)(\/|\s)(.*)/i', $result['browser_token'], $real);
+            } else {
+                // MSIE specific chain with 'Windows' compatibility flag
+                foreach ($result['comment']['detail'] as $v) {
+                    if (strpos($v, 'MSIE') !== false) {
+                        $real[0][1]               = trim($v);
+                        $result['browser_engine'] = "MSIE";
+                        $real[1][0]               = "Internet Explorer";
+                        $temp                     = explode(' ', trim($v));
+                        $real[3][0]               = $temp[1];
+
+                    }
+                    if (strpos($v, 'Win') !== false) {
+                        $result['device_os_token'] = trim($v);
+                    }
+                }
+            }
+
+            if (!empty($real[0])) {
+                $result['browser_name']    = $real[1][0];
+                $result['browser_version'] = $real[3][0];
+            } else {
+                if(isset($result['browser_token'])) {
+                    $result['browser_name']    = $result['browser_token'];
+                }
+                $result['browser_version'] = '??';
+            }
+        } elseif ($product == 'mozilla' && isset($result['browser_version'])
+                  && $result['browser_version'] < 5.0
+        ) {
+            // handles the real Mozilla (or old Netscape if version < 5.0)
+            $result['browser_name'] = 'Netscape';
+        }
+
+        /** windows */
+        if ($result['browser_name'] == 'MSIE') {
+            $result['browser_engine'] = 'MSIE';
+            $result['browser_name']   = 'Internet Explorer';
+        }
+        if (isset($result['device_os_token'])) {
+            if (strpos($result['device_os_token'], 'Win') !== false) {
+
+                $windows = array(
+                    'Windows NT 6.1'          => 'Windows 7',
+                    'Windows NT 6.0'          => 'Windows Vista',
+                    'Windows NT 5.2'          => 'Windows Server 2003',
+                    'Windows NT 5.1'          => 'Windows XP',
+                    'Windows NT 5.01'         => 'Windows 2000 SP1',
+                    'Windows NT 5.0'          => 'Windows 2000',
+                    'Windows NT 4.0'          => 'Microsoft Windows NT 4.0',
+                    'WinNT'                   => 'Microsoft Windows NT 4.0',
+                    'Windows 98; Win 9x 4.90' => 'Windows Me',
+                    'Windows 98'              => 'Windows 98',
+                    'Win98'                   => 'Windows 98',
+                    'Windows 95'              => 'Windows 95',
+                    'Win95'                   => 'Windows 95',
+                    'Windows CE'              => 'Windows CE',
+                );
+                if (isset($windows[$result['device_os_token']])) {
+                    $result['device_os_name'] = $windows[$result['device_os_token']];
+                } else {
+                    $result['device_os_name'] = $result['device_os_token'];
+                }
+            }
+        }
+
+        // iphone
+        $apple_device = array(
+            'iPhone',
+            'iPod',
+            'iPad',
+        );
+        if (isset($result['compatibility_flag'])) {
+            if (in_array($result['compatibility_flag'], $apple_device)) {
+                $result['device']           = strtolower($result['compatibility_flag']);
+                $result['device_os_token']  = 'iPhone OS';
+                if (isset($comment[3])) {
+                    $result['browser_language'] = trim($comment[3]);
+                }
+                if (isset($result['others']['detail'][1])) {
+                    $result['browser_version']  = $result['others']['detail'][1][2];
+                } elseif (isset($result['others']['detail']) && count($result['others']['detail'])) {
+                    $result['browser_version']  = $result['others']['detail'][0][2];
+                }
+                if (!empty($result['others']['detail'][2])) {
+                    $result['firmware'] = $result['others']['detail'][2][2];
+                }
+                if (!empty($result['others']['detail'][3])) {
+                    $result['browser_name']  = $result['others']['detail'][3][1];
+                    $result['browser_build'] = $result['others']['detail'][3][2];
+                }
+            }
+        }
+
+        // Safari
+        if (isset($result['others'])) {
+            if ($result['others']['detail'][0][1] == 'AppleWebKit') {
+                $result['browser_engine'] = 'AppleWebKit';
+                if (isset($result['others']['detail'][1]) && $result['others']['detail'][1][1] == 'Version') {
+                    $result['browser_version'] = $result['others']['detail'][1][2];
+                } else {
+                    $result['browser_version'] = $result['others']['detail'][count($result['others']['detail']) - 1][2];
+                }
+                if (isset($comment[3])) {
+                     $result['browser_language'] = trim($comment[3]);
+                }
+
+                $last = $result['others']['detail'][count($result['others']['detail']) - 1][1];
+
+                if (empty($result['others']['detail'][2][1]) || $result['others']['detail'][2][1] == 'Safari') {
+                    if (isset($result['others']['detail'][1])) {
+                        $result['browser_name']    = ($result['others']['detail'][1][1] && $result['others']['detail'][1][1] != 'Version' ? $result['others']['detail'][1][1] : 'Safari');
+                        $result['browser_version'] = ($result['others']['detail'][1][2] ? $result['others']['detail'][1][2] : $result['others']['detail'][0][2]);
+                    } else {
+                        $result['browser_name']    = ($result['others']['detail'][0][1] && $result['others']['detail'][0][1] != 'Version' ? $result['others']['detail'][0][1] : 'Safari');
+                        $result['browser_version'] = $result['others']['detail'][0][2];
+                    }
+                } else {
+                    $result['browser_name']    = $result['others']['detail'][2][1];
+                    $result['browser_version'] = $result['others']['detail'][2][2];
+
+                    // mobile version
+                    if ($result['browser_name'] == 'Mobile') {
+                        $result['browser_name'] = 'Safari ' . $result['browser_name'];
+                        if ($result['others']['detail'][1][1] == 'Version') {
+                            $result['browser_version'] = $result['others']['detail'][1][2];
+                        }
+                    }
+                }
+
+                // For Safari < 2.2, AppleWebKit version gives the Safari version
+                if (strpos($result['browser_version'], '.') > 2 || (int) $result['browser_version'] > 20) {
+                    $temp = explode('.', $result['browser_version']);
+                    $build = (int) $temp[0];
+                    $awkVersion = array(
+                        48  => '0.8',
+                        73  => '0.9',
+                        85  => '1.0',
+                        103 => '1.1',
+                        124 => '1.2',
+                        300 => '1.3',
+                        400 => '2.0',
+                    );
+                    foreach ($awkVersion as $k => $v) {
+                        if ($build >= $k) {
+                            $result['browser_version'] = $v;
+                        }
+                    }
+                }
+            }
+
+            // Gecko (Firefox or compatible)
+            if ($result['others']['detail'][0][1] == 'Gecko') {
+                $searchRV = true;
+                if (!empty($result['others']['detail'][1][1]) && !empty($result['others']['detail'][count($result['others']['detail']) - 1][2]) || strpos(strtolower($result['others']['full']), 'opera') !== false) {
+                    $searchRV = false;
+                    $result['browser_engine'] = $result['others']['detail'][0][1];
+
+                    // the name of the application is at the end indepenently
+                    // of quantity of information in $result['others']['detail']
+                    $last = count($result['others']['detail']) - 1;
+
+                    // exception : if the version of the last information is
+                    // empty we take the previous one
+                    if (empty($result['others']['detail'][$last][2])) {
+                        $last --;
+                    }
+
+                    // exception : if the last one is 'Red Hat' or 'Debian' =>
+                    // use rv: to find browser_version */
+                    if (in_array($result['others']['detail'][$last][1], array(
+                        'Debian',
+                        'Hat',
+                    ))) {
+                        $searchRV = true;
+                    }
+                    $result['browser_name']    = $result['others']['detail'][$last][1];
+                    $result['browser_version'] = $result['others']['detail'][$last][2];
+                    if (isset($comment[4])) {
+                        $result['browser_build'] = trim($comment[4]);
+                    }
+                    if (isset($comment[3])) {
+                        $result['browser_language'] = trim($comment[3]);
+                    }
+
+                    // Netscape
+                    if ($result['browser_name'] == 'Navigator' || $result['browser_name'] == 'Netscape6') {
+                        $result['browser_name'] = 'Netscape';
+                    }
+                }
+                if ($searchRV) {
+                    // Mozilla alone : the version is identified by rv:
+                    $result['browser_name'] = 'Mozilla';
+                    if (isset($result['comment']['detail'])) {
+                        foreach ($result['comment']['detail'] as $rv) {
+                            if (strpos($rv, 'rv:') !== false) {
+                                $result['browser_version'] = trim(str_replace('rv:', '', $rv));
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Netscape
+            if ($result['others']['detail'][0][1] == 'Netscape') {
+                $result['browser_name']    = 'Netscape';
+                $result['browser_version'] = $result['others']['detail'][0][2];
+            }
+
+            // Opera
+            // Opera: engine Presto
+            if ($result['others']['detail'][0][1] == 'Presto') {
+                $result['browser_engine'] = 'Presto';
+                if (!empty($result['others']['detail'][1][2])) {
+                    $result['browser_version'] = $result['others']['detail'][1][2];
+                }
+            }
+
+            // UA ends with 'Opera X.XX' or 'Opera/X.XX'
+            if ($result['others']['detail'][0][1] == 'Opera') {
+                $result['browser_name']    = $result['others']['detail'][0][1];
+                // Opera X.XX
+                if (isset($result['others']['detail'][1][1])) {
+                    $result['browser_version'] = $result['others']['detail'][1][1];
+                // Opera/X.XX
+                } elseif (isset($result['others']['detail'][0][2])) {
+                    $result['browser_version'] = $result['others']['detail'][0][2];
+                }
+            }
+
+            // Opera Mini
+            if (isset($result["browser_token"])) {
+                if (strpos($result["browser_token"], 'Opera Mini') !== false) {
+                    $result['browser_name'] = 'Opera Mini';
+                }
+            }
+
+            // Symbian
+            if ($result['others']['detail'][0][1] == 'SymbianOS') {
+                $result['device_os_token'] = 'SymbianOS';
+            }
+        }
+
+        // UA ends with 'Opera X.XX'
+        if (isset($result['browser_name']) && isset($result['browser_engine'])) {
+            if ($result['browser_name'] == 'Opera' && $result['browser_engine'] == 'Gecko' && empty($result['browser_version'])) {
+                $result['browser_version'] = $result['others']['detail'][count($result['others']['detail']) - 1][1];
+            }
+        }
+
+        // cleanup
+        if (isset($result['browser_version']) && isset($result['browser_build'])) {
+            if ($result['browser_version'] == $result['browser_build']) {
+                unset($result['browser_build']);
+            }
+        }
+
+        // compatibility
+        $compatibility['AppleWebKit'] = 'Safari';
+        $compatibility['Gecko']       = 'Firefox';
+        $compatibility['MSIE']        = 'Internet Explorer';
+        $compatibility['Presto']      = 'Opera';
+        if (!empty($result['browser_engine'])) {
+            if (isset($compatibility[$result['browser_engine']])) {
+                $result['browser_compatibility'] = $compatibility[$result['browser_engine']];
+            }
+        }
+
+        ksort($result);
+        return $result;
+    }
+
+    /**
+     * Loads the Features Adapter if it's defined in the $config array
+     * Otherwise, nothing is done
+     *
+     * @param  string $browserType Browser type
+     * @return array
+     */
+    protected function _loadFeaturesAdapter()
+    {
+        $config      = $this->_config;
+        $browserType = $this->getType();
+        if (!isset($config[$browserType]) || !isset($config[$browserType]['features'])) {
+            return array();
+        }
+        $config = $config[$browserType]['features'];
+
+        if (empty($config['classname'])) {
+            require_once 'Zend/Http/UserAgent/Exception.php';
+            throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter must have a "classname" config parameter defined');
+        }
+
+        $className = $config['classname'];
+        if (!class_exists($className)) {
+            if (isset($config['path'])) {
+                $path = $config['path'];
+            } else {
+                require_once 'Zend/Http/UserAgent/Exception.php';
+                throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter must have a "path" config parameter defined');
+            }
+
+            if (false === include_once ($path)) {
+                require_once 'Zend/Http/UserAgent/Exception.php';
+                throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter path that does not exist');
+            }
+        }
+
+        return call_user_func(array($className, 'getFromRequest'), $this->_server, $this->_config);
+    }
+
+    /**
+     * Retrieve image format support
+     *
+     * @return array
+     */
+    public function getImageFormatSupport()
+    {
+        return $this->_images;
+    }
+
+    /**
+     * Get maximum image height supported by this device
+     *
+     * @return int
+     */
+    public function getMaxImageHeight()
+    {
+        return null;
+    }
+
+    /**
+     * Get maximum image width supported by this device
+     *
+     * @return int
+     */
+    public function getMaxImageWidth()
+    {
+        return null;
+    }
+
+    /**
+     * Get physical screen height of this device
+     *
+     * @return int
+     */
+    public function getPhysicalScreenHeight()
+    {
+        return null;
+    }
+
+    /**
+     * Get physical screen width of this device
+     *
+     * @return int
+     */
+    public function getPhysicalScreenWidth()
+    {
+        return null;
+    }
+
+    /**
+     * Get preferred markup type
+     *
+     * @return string
+     */
+    public function getPreferredMarkup()
+    {
+        return 'xhtml';
+    }
+
+    /**
+     * Get supported X/HTML version
+     *
+     * @return int
+     */
+    public function getXhtmlSupportLevel()
+    {
+        return 4;
+    }
+
+    /**
+     * Does the device support Flash?
+     *
+     * @return bool
+     */
+    public function hasFlashSupport()
+    {
+        return true;
+    }
+
+    /**
+     * Does the device support PDF?
+     *
+     * @return bool
+     */
+    public function hasPdfSupport()
+    {
+        return true;
+    }
+
+    /**
+     * Does the device have a phone number associated with it?
+     *
+     * @return bool
+     */
+    public function hasPhoneNumber()
+    {
+        return false;
+    }
+
+    /**
+     * Does the device support HTTPS?
+     *
+     * @return bool
+     */
+    public function httpsSupport()
+    {
+        return true;
+    }
+
+    /**
+     * Get the browser type
+     *
+     * @return string
+     */
+    public function getBrowser()
+    {
+        return $this->_browser;
+    }
+
+    /**
+     * Get the browser version
+     *
+     * @return string
+     */
+    public function getBrowserVersion()
+    {
+        return $this->_browserVersion;
+    }
+
+    /**
+     * Get the user agent string
+     *
+     * @return string
+     */
+    public function getUserAgent()
+    {
+        return $this->_userAgent;
+    }
+
+    /**
+     * @return the $_images
+     */
+    public function getImages()
+    {
+        return $this->_images;
+    }
+
+    /**
+     * @param string $browser
+     */
+    public function setBrowser($browser)
+    {
+        $this->_browser = $browser;
+    }
+
+    /**
+     * @param string $browserVersion
+     */
+    public function setBrowserVersion($browserVersion)
+    {
+        $this->_browserVersion = $browserVersion;
+    }
+
+    /**
+     * @param string $userAgent
+     */
+    public function setUserAgent($userAgent)
+    {
+        $this->_userAgent = $userAgent;
+        return $this;
+    }
+
+    /**
+     * @param array $_images
+     */
+    public function setImages($_images)
+    {
+        $this->_images = $_images;
+    }
+
+    /**
+     * Match a user agent string against a list of signatures
+     *
+     * @param  string $userAgent
+     * @param  array $signatures
+     * @return bool
+     */
+    protected static function _matchAgentAgainstSignatures($userAgent, $signatures)
+    {
+        $userAgent = strtolower($userAgent);
+        foreach ($signatures as $signature) {
+            if (!empty($signature)) {
+                if (strpos($userAgent, $signature) !== false) {
+                    // Browser signature was found in user agent string
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Bot.php b/lib/zend/Zend/Http/UserAgent/Bot.php
new file mode 100644
index 00000000000..ad0c8dc1ed5
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Bot.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+require_once 'Zend/Http/UserAgent/AbstractDevice.php';
+
+/**
+ * Bot browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+class Zend_Http_UserAgent_Bot extends Zend_Http_UserAgent_AbstractDevice
+{
+
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        // The most common ones.
+        'googlebot',
+        'msnbot',
+        'slurp',
+        'yahoo',
+
+        // The rest, alphabetically.
+        'alexa',
+        'appie',
+        'archiver',
+        'ask jeeves',
+        'baiduspider',
+        'bot',
+        'crawl',
+        'crawler',
+        'curl',
+        'eventbox',
+        'facebookexternal',
+        'fast',
+        'feedfetcher-google',
+        'firefly',
+        'froogle',
+        'gigabot',
+        'girafabot',
+        'google',
+        'htdig',
+        'infoseek',
+        'inktomi',
+        'java',
+        'larbin',
+        'looksmart',
+        'mechanize',
+        'mediapartners-google',
+        'monitor',
+        'nambu',
+        'nationaldirectory',
+        'novarra',
+        'pear',
+        'perl',
+        'python',
+        'rabaz',
+        'radian',
+        'rankivabot',
+        'scooter',
+        'sogou web spider',
+        'spade',
+        'sphere',
+        'spider',
+        'technoratisnoop',
+        'tecnoseek',
+        'teoma',
+        'toolbar',
+        'transcoder',
+        'twitt',
+        'url_spider_sql',
+        'webalta crawler',
+        'webbug',
+        'webfindbot',
+        'wordpress',
+        'www.galaxy.com',
+        'yahoo! searchmonkey',
+        'yahoo! slurp',
+        'yandex',
+        'zyborg',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and browser signatures
+     *
+     * @param  string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'bot';
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Checker.php b/lib/zend/Zend/Http/UserAgent/Checker.php
new file mode 100644
index 00000000000..aba65d475bf
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Checker.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+require_once 'Zend/Http/UserAgent/Desktop.php';
+
+/**
+ * Checker browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+class Zend_Http_UserAgent_Checker extends Zend_Http_UserAgent_Desktop
+{
+
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        'abilogic',
+        'checklink',
+        'checker',
+        'linksmanager',
+        'mojoo',
+        'notifixious',
+        'ploetz',
+        'zeller',
+        'sitebar',
+        'xenu',
+        'sleuth',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'bot';
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Console.php b/lib/zend/Zend/Http/UserAgent/Console.php
new file mode 100644
index 00000000000..9ce93e66165
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Console.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/Desktop.php';
+
+/**
+ * Console browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Console extends Zend_Http_UserAgent_Desktop
+{
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        'playstation',
+        'wii',
+        'libnup',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'console';
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php b/lib/zend/Zend/Http/UserAgent/Desktop.php
similarity index 51%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php
rename to lib/zend/Zend/Http/UserAgent/Desktop.php
index 2648bef757f..363f351c1e4 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php
+++ b/lib/zend/Zend/Http/UserAgent/Desktop.php
@@ -13,43 +13,44 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
+require_once 'Zend/Http/UserAgent/AbstractDevice.php';
 
 /**
+ * Desktop browser type matcher
+ *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Browser
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
+class Zend_Http_UserAgent_Desktop extends Zend_Http_UserAgent_AbstractDevice
 {
-    /**
-     * the template Id
-     *
-     * @var string
-     */
-    public $templateId = null;
 
     /**
-     * return the template id
+     * Used by default : must be always true
+     *
+     * @param string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return true;
+    }
+
+    /**
+     * Gives the current browser type
      *
      * @return string
      */
-    public function getTemplateId()
+    public function getType()
     {
-        return $this->templateId;
+        return 'desktop';
     }
 }
diff --git a/lib/zend/Zend/Http/UserAgent/Device.php b/lib/zend/Zend/Http/UserAgent/Device.php
new file mode 100644
index 00000000000..5df661a6fc1
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Device.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * Interface defining a browser device type.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Http_UserAgent_Device extends Serializable
+{
+    /**
+     * Constructor
+     *
+     * Allows injecting user agent, server array, and/or config array. If an
+     * array is provided for the first argument, the assumption should be that
+     * the device object is being seeded with cached values from serialization.
+     *
+     * @param  null|string|array $userAgent
+     * @param  array $server
+     * @param  array $config
+     * @return void
+     */
+    public function __construct($userAgent = null, array $server = array(), array $config = array());
+
+    /**
+     * Attempt to match the user agent
+     *
+     * Return either an array of browser signature strings, or a boolean.
+     *
+     * @param  string $userAgent
+     * @param  array $server
+     * @return bool|array
+     */
+    public static function match($userAgent, $server);
+
+    /**
+     * Get all browser/device features
+     *
+     * @return array
+     */
+    public function getAllFeatures();
+
+    /**
+     * Get all of the browser/device's features' groups
+     *
+     * @return void
+     */
+    public function getAllGroups();
+
+    /**
+     * Whether or not the device has a given feature
+     *
+     * @param  string $feature
+     * @return bool
+     */
+    public function hasFeature($feature);
+
+    /**
+     * Get the value of a specific device feature
+     *
+     * @param  string $feature
+     * @return mixed
+     */
+    public function getFeature($feature);
+
+    /**
+     * Get the browser type
+     *
+     * @return string
+     */
+    public function getBrowser();
+
+    /**
+     * Retrurn the browser version
+     *
+     * @return string
+     */
+    public function getBrowserVersion();
+
+    /**
+     * Get an array of features associated with a group
+     *
+     * @param  string $group
+     * @return array
+     */
+    public function getGroup($group);
+
+    /**
+     * Retrieve image format support
+     *
+     * @return array
+     */
+    public function getImageFormatSupport();
+
+    /**
+     * Get image types
+     *
+     * @return array
+     */
+    public function getImages();
+
+    /**
+     * Get the maximum image height supported by this device
+     *
+     * @return int
+     */
+    public function getMaxImageHeight();
+
+    /**
+     * Get the maximum image width supported by this device
+     *
+     * @return int
+     */
+    public function getMaxImageWidth();
+
+    /**
+     * Get the physical screen height of this device
+     *
+     * @return int
+     */
+    public function getPhysicalScreenHeight();
+
+    /**
+     * Get the physical screen width of this device
+     *
+     * @return int
+     */
+    public function getPhysicalScreenWidth();
+
+    /**
+     * Get the preferred markup type
+     *
+     * @return string
+     */
+    public function getPreferredMarkup();
+
+    /**
+     * Get the user agent string
+     *
+     * @return string
+     */
+    public function getUserAgent();
+
+    /**
+     * Get supported X/HTML version
+     *
+     * @return int
+     */
+    public function getXhtmlSupportLevel();
+
+    /**
+     * Does the device support Flash?
+     *
+     * @return bool
+     */
+    public function hasFlashSupport();
+
+    /**
+     * Does the device support PDF?
+     *
+     * @return bool
+     */
+    public function hasPdfSupport();
+
+    /**
+     * Does the device have a phone number associated with it?
+     *
+     * @return bool
+     */
+    public function hasPhoneNumber();
+
+    /**
+     * Does the device support HTTPS?
+     *
+     * @return bool
+     */
+    public function httpsSupport();
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Email.php b/lib/zend/Zend/Http/UserAgent/Email.php
new file mode 100644
index 00000000000..34d1949535a
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Email.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/Desktop.php';
+
+/**
+ * Email browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Email extends Zend_Http_UserAgent_Desktop
+{
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        'thunderbird',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'email';
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Exception.php b/lib/zend/Zend/Http/UserAgent/Exception.php
new file mode 100644
index 00000000000..76276d19179
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Exception extends Zend_Exception
+{
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Features/Adapter.php b/lib/zend/Zend/Http/UserAgent/Features/Adapter.php
new file mode 100644
index 00000000000..57de4e4106c
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Features/Adapter.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * The interface required by all Zend_Browser_Features Adapter classes to implement.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Http_UserAgent_Features_Adapter
+{
+    /**
+     * Retrieve the browser's features from a given request object ($_SERVER)
+     *
+     * @return array
+     */
+    public static function getFromRequest($request, array $config);
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Features/Adapter/Browscap.php b/lib/zend/Zend/Http/UserAgent/Features/Adapter/Browscap.php
new file mode 100644
index 00000000000..a0459423979
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Features/Adapter/Browscap.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * Zend_Http_UserAgent_Features_Adapter_Interface
+ */
+require_once 'Zend/Http/UserAgent/Features/Adapter.php';
+
+/**
+ * Features adapter utilizing PHP's native browscap support
+ *
+ * Requires that you have a PHP-compatible version of the browscap.ini, per the
+ * instructions at http://php.net/get_browser
+ *
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Features_Adapter_Browscap
+    implements Zend_Http_UserAgent_Features_Adapter
+{
+    /**
+     * Constructor
+     *
+     * Validate that we have browscap support available.
+     *
+     * @throws Zend_Http_UserAgent_Features_Exception
+     */
+    public function __construct()
+    {
+        $browscap = ini_get('browscap');
+        if (empty($browscap) || !file_exists($browscap)) {
+            require_once 'Zend/Http/UserAgent/Features/Exception.php';
+            throw new Zend_Http_UserAgent_Features_Exception(sprintf(
+                '%s requires a browscap entry in php.ini pointing to a valid browscap.ini; none present',
+                __CLASS__
+            ));
+        }
+    }
+
+    /**
+     * Get features from request
+     *
+     * @param  array $request $_SERVER variable
+     * @param  array $config  ignored; included only to satisfy parent class
+     * @return array
+     */
+    public static function getFromRequest($request, array $config)
+    {
+        $browscap = get_browser($request['http_user_agent'], true);
+        $features = array();
+
+        if (is_array($browscap)) {
+            foreach ($browscap as $key => $value) {
+                // For a few keys, we need to munge a bit for the device object
+                switch ($key) {
+                    case 'browser':
+                        $features['mobile_browser'] = $value;
+                        break;
+
+                    case 'version':
+                        $features['mobile_browser_version'] = $value;
+                        break;
+
+                    case 'platform':
+                        $features['device_os'] = $value;
+                        break;
+
+                    default:
+                        $features[$key] = $value;
+                        break;
+                }
+            }
+        }
+
+        return $features;
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php b/lib/zend/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php
new file mode 100644
index 00000000000..26cb0e97e75
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * Zend_Http_UserAgent_Features_Adapter_Interface
+ */
+require_once 'Zend/Http/UserAgent/Features/Adapter.php';
+
+/**
+ * Features adapter build with the Tera Wurfl Api
+ * See installation instruction here : http://deviceatlas.com/licences
+ * Download : http://deviceatlas.com/getAPI/php
+ *
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Features_Adapter_DeviceAtlas implements Zend_Http_UserAgent_Features_Adapter
+{
+    /**
+     * Get features from request
+     *
+     * @param  array $request $_SERVER variable
+     * @return array
+     */
+    public static function getFromRequest($request, array $config)
+    {
+        if (!class_exists('Mobi_Mtld_DA_Api')) {
+            if (!isset($config['deviceatlas'])) {
+                require_once 'Zend/Http/UserAgent/Features/Exception.php';
+                throw new Zend_Http_UserAgent_Features_Exception('"DeviceAtlas" configuration is not defined');
+            }
+        }
+
+        $config = $config['deviceatlas'];
+
+        if (!class_exists('Mobi_Mtld_DA_Api')) {
+            if (empty($config['deviceatlas_lib_dir'])) {
+                require_once 'Zend/Http/UserAgent/Features/Exception.php';
+                throw new Zend_Http_UserAgent_Features_Exception('The "deviceatlas_lib_dir" parameter is not defined');
+            }
+
+            // Include the Device Atlas file from the specified lib_dir
+            require_once ($config['deviceatlas_lib_dir'] . '/Mobi/Mtld/DA/Api.php');
+        }
+
+        if (empty($config['deviceatlas_data'])) {
+            require_once 'Zend/Http/UserAgent/Features/Exception.php';
+            throw new Zend_Http_UserAgent_Features_Exception('The "deviceatlas_data" parameter is not defined');
+        }
+
+        //load the device data-tree : e.g. 'json/DeviceAtlas.json
+        $tree = Mobi_Mtld_DA_Api::getTreeFromFile($config['deviceatlas_data']);
+
+        $properties = Mobi_Mtld_DA_Api::getProperties($tree, $request['http_user_agent']);
+
+        return $properties;
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php b/lib/zend/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php
new file mode 100644
index 00000000000..b23dc29d71a
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * Zend_Http_UserAgent_Features_Adapter_Interface
+ */
+require_once 'Zend/Http/UserAgent/Features/Adapter.php';
+
+/**
+ * Features adapter build with the Tera Wurfl Api
+ * See installation instruction here : http://www.tera-wurfl.com/wiki/index.php/Installation
+ * Download : http://www.tera-wurfl.com/wiki/index.php/Downloads
+ *
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Features_Adapter_TeraWurfl implements Zend_Http_UserAgent_Features_Adapter
+{
+    /**
+     * Get features from request
+     *
+     * @param  array $request $_SERVER variable
+     * @return array
+     */
+    public static function getFromRequest($request, array $config)
+    {
+        if (!class_exists('TeraWurfl')) {
+            // If TeraWurfl class not found, see if we can load it from
+            // configuration
+            //
+            if (!isset($config['terawurfl'])) {
+                // No configuration
+                require_once 'Zend/Http/UserAgent/Features/Exception.php';
+                throw new Zend_Http_UserAgent_Features_Exception('"TeraWurfl" configuration is not defined');
+            }
+
+            $config = $config['terawurfl'];
+
+             if (empty($config['terawurfl_lib_dir'])) {
+                // No lib_dir given
+                require_once 'Zend/Http/UserAgent/Features/Exception.php';
+                throw new Zend_Http_UserAgent_Features_Exception('The "terawurfl_lib_dir" parameter is not defined');
+            }
+
+            // Include the Tera-WURFL file
+            require_once ($config['terawurfl_lib_dir'] . '/TeraWurfl.php');
+        }
+
+
+        // instantiate the Tera-WURFL object
+        $wurflObj = new TeraWurfl();
+
+        // Get the capabilities of the current client.
+        $matched = $wurflObj->getDeviceCapabilitiesFromRequest(array_change_key_case($request, CASE_UPPER));
+
+        return self::getAllCapabilities($wurflObj);
+    }
+
+    /***
+     * Builds an array with all capabilities
+     *
+     * @param TeraWurfl $wurflObj TeraWurfl object
+     */
+    public static function getAllCapabilities(TeraWurfl $wurflObj)
+    {
+
+        foreach ($wurflObj->capabilities as $group) {
+            if (!is_array($group)) {
+                continue;
+            }
+            while (list ($key, $value) = each($group)) {
+                if (is_bool($value)) {
+                    // to have the same type than the official WURFL API
+                    $features[$key] = ($value ? 'true' : 'false');
+                } else {
+                    $features[$key] = $value;
+                }
+            }
+        }
+        return $features;
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Features/Exception.php b/lib/zend/Zend/Http/UserAgent/Features/Exception.php
new file mode 100644
index 00000000000..0b47f1f0b71
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Features/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Browser_Exception
+ */
+require_once 'Zend/Http/UserAgent/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Features_Exception extends Zend_Http_UserAgent_Exception
+{
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Feed.php b/lib/zend/Zend/Http/UserAgent/Feed.php
new file mode 100644
index 00000000000..41d7c741f36
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Feed.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/AbstractDevice.php';
+
+/**
+ * Feed browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Feed extends Zend_Http_UserAgent_AbstractDevice
+{
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        'bloglines',
+        'everyfeed',
+        'feedfetcher',
+        'gregarius',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param  string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'feed';
+    }
+
+    /**
+     * Look for features
+     *
+     * @return string
+     */
+    protected function _defineFeatures()
+    {
+        $this->setFeature('iframes',    false, 'product_capability');
+        $this->setFeature('frames',     false, 'product_capability');
+        $this->setFeature('javascript', false, 'product_capability');
+        return parent::_defineFeatures();
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Mobile.php b/lib/zend/Zend/Http/UserAgent/Mobile.php
new file mode 100644
index 00000000000..3450552db26
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Mobile.php
@@ -0,0 +1,536 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/AbstractDevice.php';
+
+/**
+ * Mobile browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Mobile extends Zend_Http_UserAgent_AbstractDevice
+{
+
+    const DEFAULT_FEATURES_ADAPTER_CLASSNAME = 'Zend_Http_UserAgent_Features_Adapter_Browscap';
+
+    const DEFAULT_FEATURES_ADAPTER_PATH = 'Zend/Http/UserAgent/Features/Adapter/Browscap.php';
+
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        'iphone',
+        'ipod',
+        'ipad',
+        'android',
+        'blackberry',
+        'opera mini',
+        'opera mobi',
+        'palm',
+        'palmos',
+        'elaine',
+        'windows ce',
+        'icab',
+        '_mms',
+        'ahong',
+        'archos',
+        'armv',
+        'astel',
+        'avantgo',
+        'benq',
+        'blazer',
+        'brew',
+        'com2',
+        'compal',
+        'danger',
+        'pocket',
+        'docomo',
+        'epoc',
+        'ericsson',
+        'eudoraweb',
+        'hiptop',
+        'htc-',
+        'htc_',
+        'iemobile',
+        'iris',
+        'j-phone',
+        'kddi',
+        'kindle',
+        'lg ',
+        'lg-',
+        'lg/',
+        'lg;lx',
+        'lge vx',
+        'lge',
+        'lge-',
+        'lge-cx',
+        'lge-lx',
+        'lge-mx',
+        'linux armv',
+        'maemo',
+        'midp',
+        'mini 9.5',
+        'minimo',
+        'mob-x',
+        'mobi',
+        'mobile',
+        'mobilephone',
+        'mot 24',
+        'mot-',
+        'motorola',
+        'n410',
+        'netfront',
+        'nintendo wii',
+        'nintendo',
+        'nitro',
+        'nokia',
+        'novarra-vision',
+        'nuvifone',
+        'openweb',
+        'opwv',
+        'palmsource',
+        'pdxgw',
+        'phone',
+        'playstation',
+        'polaris',
+        'portalmmm',
+        'qt embedded',
+        'reqwirelessweb',
+        'sagem',
+        'sam-r',
+        'samsu',
+        'samsung',
+        'sec-',
+        'sec-sgh',
+        'semc-browser',
+        'series60',
+        'series70',
+        'series80',
+        'series90',
+        'sharp',
+        'sie-m',
+        'sie-s',
+        'smartphone',
+        'sony cmd',
+        'sonyericsson',
+        'sprint',
+        'spv',
+        'symbian os',
+        'symbian',
+        'symbianos',
+        'telco',
+        'teleca',
+        'treo',
+        'up.browser',
+        'up.link',
+        'vodafone',
+        'vodaphone',
+        'webos',
+        'wml',
+        'windows phone os 7',
+        'wireless',
+        'wm5 pie',
+        'wms pie',
+        'xiino',
+        'wap',
+        'up/',
+        'psion',
+        'j2me',
+        'klondike',
+        'kbrowser'
+    );
+
+    /**
+     * @var array
+     */
+    protected static $_haTerms = array(
+        'midp',
+        'wml',
+        'vnd.rim',
+        'vnd.wap',
+        'j2me',
+    );
+
+    /**
+     * first 4 letters of mobile User Agent chains
+     *
+     * @var array
+     */
+    protected static $_uaBegin = array(
+        'w3c ',
+        'acs-',
+        'alav',
+        'alca',
+        'amoi',
+        'audi',
+        'avan',
+        'benq',
+        'bird',
+        'blac',
+        'blaz',
+        'brew',
+        'cell',
+        'cldc',
+        'cmd-',
+        'dang',
+        'doco',
+        'eric',
+        'hipt',
+        'inno',
+        'ipaq',
+        'java',
+        'jigs',
+        'kddi',
+        'keji',
+        'leno',
+        'lg-c',
+        'lg-d',
+        'lg-g',
+        'lge-',
+        'maui',
+        'maxo',
+        'midp',
+        'mits',
+        'mmef',
+        'mobi',
+        'mot-',
+        'moto',
+        'mwbp',
+        'nec-',
+        'newt',
+        'noki',
+        'palm',
+        'pana',
+        'pant',
+        'phil',
+        'play',
+        'port',
+        'prox',
+        'qwap',
+        'sage',
+        'sams',
+        'sany',
+        'sch-',
+        'sec-',
+        'send',
+        'seri',
+        'sgh-',
+        'shar',
+        'sie-',
+        'siem',
+        'smal',
+        'smar',
+        'sony',
+        'sph-',
+        'symb',
+        't-mo',
+        'teli',
+        'tim-',
+        'tosh',
+        'tsm-',
+        'upg1',
+        'upsi',
+        'vk-v',
+        'voda',
+        'wap-',
+        'wapa',
+        'wapi',
+        'wapp',
+        'wapr',
+        'webc',
+        'winw',
+        'winw',
+        'xda',
+        'xda-',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param  string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        //  To have a quick identification, try light-weight tests first
+        if (isset($server['all_http'])) {
+            if (strpos(strtolower(str_replace(' ', '', $server['all_http'])), 'operam') !== false) {
+                // Opera Mini or Opera Mobi
+                return true;
+            }
+        }
+
+        if (isset($server['http_x_wap_profile']) || isset($server['http_profile'])) {
+            return true;
+        }
+
+        if (isset($server['http_accept'])) {
+            if (self::_matchAgentAgainstSignatures($server['http_accept'], self::$_haTerms)) {
+                return true;
+            }
+        }
+
+        if (self::userAgentStart($userAgent)) {
+            return true;
+        }
+
+        if (self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieve beginning clause of user agent
+     *
+     * @param  string $userAgent
+     * @return string
+     */
+    public static function userAgentStart($userAgent)
+    {
+
+        $mobile_ua = strtolower(substr($userAgent, 0, 4));
+
+        return (in_array($mobile_ua, self::$_uaBegin));
+    }
+
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct($userAgent = null, array $server = array(), array $config = array())
+    {
+        // For mobile detection, an adapter must be defined
+        if (empty($config['mobile']['features'])) {
+            $config['mobile']['features']['path']      = self::DEFAULT_FEATURES_ADAPTER_PATH;
+            $config['mobile']['features']['classname'] = self::DEFAULT_FEATURES_ADAPTER_CLASSNAME;
+        }
+        parent::__construct($userAgent, $server, $config);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'mobile';
+    }
+
+    /**
+     * Look for features
+     *
+     * @return string
+     */
+    protected function _defineFeatures()
+    {
+        $this->setFeature('is_wireless_device', false, 'product_info');
+
+        parent::_defineFeatures();
+
+        if (isset($this->_aFeatures["mobile_browser"])) {
+            $this->setFeature("browser_name", $this->_aFeatures["mobile_browser"]);
+            $this->_browser = $this->_aFeatures["mobile_browser"];
+        }
+        if (isset($this->_aFeatures["mobile_browser_version"])) {
+            $this->setFeature("browser_version", $this->_aFeatures["mobile_browser_version"]);
+            $this->_browserVersion = $this->_aFeatures["mobile_browser_version"];
+        }
+
+        // markup
+        if ($this->getFeature('device_os') == 'iPhone OS'
+            || $this->getFeature('device_os_token') == 'iPhone OS'
+        ) {
+            $this->setFeature('markup', 'iphone');
+        } else {
+            $this->setFeature('markup', $this->getMarkupLanguage($this->getFeature('preferred_markup')));
+        }
+
+        // image format
+        $this->_images = array();
+
+        if ($this->getFeature('png')) {
+            $this->_images[] = 'png';
+        }
+        if ($this->getFeature('jpg')) {
+            $this->_images[] = 'jpg';
+        }
+        if ($this->getFeature('gif')) {
+            $this->_images[] = 'gif';
+        }
+        if ($this->getFeature('wbmp')) {
+            $this->_images[] = 'wbmp';
+        }
+
+        return $this->_aFeatures;
+    }
+
+    /**
+     * Determine markup language expected
+     *
+     * @access public
+     * @return __TYPE__
+     */
+    public function getMarkupLanguage($preferredMarkup = null)
+    {
+        $return = '';
+        switch ($preferredMarkup) {
+            case 'wml_1_1':
+            case 'wml_1_2':
+            case 'wml_1_3':
+                $return = 'wml'; //text/vnd.wap.wml encoding="ISO-8859-15"
+            case 'html_wi_imode_compact_generic':
+            case 'html_wi_imode_html_1':
+            case 'html_wi_imode_html_2':
+            case 'html_wi_imode_html_3':
+            case 'html_wi_imode_html_4':
+            case 'html_wi_imode_html_5':
+                $return = 'chtml'; //text/html
+            case 'html_wi_oma_xhtmlmp_1_0': //application/vnd.wap.xhtml+xml
+            case 'html_wi_w3_xhtmlbasic': //application/xhtml+xml DTD XHTML Basic 1.0
+                $return = 'xhtml';
+            case 'html_web_3_2': //text/html DTD Html 3.2 Final
+            case 'html_web_4_0': //text/html DTD Html 4.01 Transitional
+                $return = '';
+        }
+        return $return;
+    }
+
+    /**
+     * Determine image format support
+     *
+     * @return array
+     */
+    public function getImageFormatSupport()
+    {
+        return $this->_images;
+    }
+
+    /**
+     * Determine maximum image height supported
+     *
+     * @return int
+     */
+    public function getMaxImageHeight()
+    {
+        return $this->getFeature('max_image_height');
+    }
+
+    /**
+     * Determine maximum image width supported
+     *
+     * @return int
+     */
+    public function getMaxImageWidth()
+    {
+        return $this->getFeature('max_image_width');
+    }
+
+    /**
+     * Determine physical screen height
+     *
+     * @return int
+     */
+    public function getPhysicalScreenHeight()
+    {
+        return $this->getFeature('physical_screen_height');
+    }
+
+    /**
+     * Determine physical screen width
+     *
+     * @return int
+     */
+    public function getPhysicalScreenWidth()
+    {
+        return $this->getFeature('physical_screen_width');
+    }
+
+    /**
+     * Determine preferred markup
+     *
+     * @return string
+     */
+    public function getPreferredMarkup()
+    {
+        return $this->getFeature("markup");
+    }
+
+    /**
+     * Determine X/HTML support level
+     *
+     * @return int
+     */
+    public function getXhtmlSupportLevel()
+    {
+        return $this->getFeature('xhtml_support_level');
+    }
+
+    /**
+     * Does the device support Flash?
+     *
+     * @return bool
+     */
+    public function hasFlashSupport()
+    {
+        return $this->getFeature('fl_browser');
+    }
+
+    /**
+     * Does the device support PDF?
+     *
+     * @return bool
+     */
+    public function hasPdfSupport()
+    {
+        return $this->getFeature('pdf_support');
+    }
+
+    /**
+     * Does the device have an associated phone number?
+     *
+     * @return bool
+     */
+    public function hasPhoneNumber()
+    {
+        return $this->getFeature('can_assign_phone_number');
+    }
+
+    /**
+     * Does the device support HTTPS?
+     *
+     * @return bool
+     */
+    public function httpsSupport()
+    {
+        return ($this->getFeature('https_support') == 'supported');
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Offline.php b/lib/zend/Zend/Http/UserAgent/Offline.php
new file mode 100644
index 00000000000..97eee11a93b
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Offline.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/Desktop.php';
+
+/**
+ * Offline browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Offline extends Zend_Http_UserAgent_Desktop
+{
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        'wget',
+        'webzip',
+        'webcopier',
+        'downloader',
+        'superbot',
+        'offline',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param  string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'offline';
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Probe.php b/lib/zend/Zend/Http/UserAgent/Probe.php
new file mode 100644
index 00000000000..9b83bc5e0f0
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Probe.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/AbstractDevice.php';
+
+/**
+ * Probe browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Probe extends Zend_Http_UserAgent_AbstractDevice
+{
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        'witbe',
+        'netvigie',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'probe';
+    }
+
+    /**
+     * Look for features
+     *
+     * @return string
+     */
+    protected function _defineFeatures()
+    {
+        $this->setFeature('images', false, 'product_capability');
+        $this->setFeature('iframes', false, 'product_capability');
+        $this->setFeature('frames', false, 'product_capability');
+        $this->setFeature('javascript', false, 'product_capability');
+        return parent::_defineFeatures();
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Spam.php b/lib/zend/Zend/Http/UserAgent/Spam.php
new file mode 100644
index 00000000000..5d29be54e8e
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Spam.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/AbstractDevice.php';
+
+/**
+ * Spam browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Spam extends Zend_Http_UserAgent_AbstractDevice
+{
+    /**
+     * @todo User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        '',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param  string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'spam';
+    }
+
+    /**
+     * Look for features
+     *
+     * @return string
+     */
+    protected function _defineFeatures()
+    {
+        $this->setFeature('images', false, 'product_capability');
+        $this->setFeature('iframes', false, 'product_capability');
+        $this->setFeature('frames', false, 'product_capability');
+        $this->setFeature('javascript', false, 'product_capability');
+        return parent::_defineFeatures();
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Storage.php b/lib/zend/Zend/Http/UserAgent/Storage.php
new file mode 100644
index 00000000000..d28211a9118
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Storage.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Http_UserAgent_Storage
+{
+    /**
+     * Returns true if and only if storage is empty
+     *
+     * @throws Zend_Http_UserAgent_Storage_Exception If it is impossible to determine whether storage is empty
+     * @return boolean
+     */
+    public function isEmpty();
+
+    /**
+     * Returns the contents of storage associated to the key parameter
+     *
+     * Behavior is undefined when storage is empty.
+     *
+     * @throws Zend_Http_UserAgent_Storage_Exception If reading contents from storage is impossible
+     * @return mixed
+     */
+    public function read();
+
+    /**
+     * Writes $contents associated to the key parameter to storage
+     *
+     * @param  mixed $contents
+     * @throws Zend_Http_UserAgent_Storage_Exception If writing $contents to storage is impossible
+     * @return void
+     */
+    public function write($contents);
+
+    /**
+     * Clears contents from storage
+     *
+     * @throws Zend_Http_UserAgent_Storage_Exception If clearing contents from storage is impossible
+     * @return void
+     */
+    public function clear();
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Storage/Exception.php b/lib/zend/Zend/Http/UserAgent/Storage/Exception.php
new file mode 100644
index 00000000000..484ea66f37b
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Storage/Exception.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+
+/**
+ * @see Zend_Http_UserAgent_Exception
+ */
+require_once 'Zend/Http/UserAgent/Exception.php';
+
+
+/**
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Storage_Exception extends Zend_Http_UserAgent_Exception
+{
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Storage/NonPersistent.php b/lib/zend/Zend/Http/UserAgent/Storage/NonPersistent.php
new file mode 100644
index 00000000000..5e02c5e206b
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Storage/NonPersistent.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: NonPersistent.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+
+/**
+ * @see Zend_Http_UserAgent_Storage_Interface
+ */
+require_once 'Zend/Http/UserAgent/Storage.php';
+
+
+/**
+ * Non-Persistent Browser Storage
+ *
+ * Since HTTP Browserentication happens again on each request, this will always be
+ * re-populated. So there's no need to use sessions, this simple value class
+ * will hold the data for rest of the current request.
+ *
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Storage_NonPersistent
+    implements Zend_Http_UserAgent_Storage
+{
+    /**
+     * Holds the actual Browser data
+     * @var mixed
+     */
+    protected $_data;
+
+    /**
+     * Returns true if and only if storage is empty
+     *
+     * @throws Zend_Http_UserAgent_Storage_Exception If it is impossible to determine whether storage is empty
+     * @return boolean
+     */
+    public function isEmpty()
+    {
+        return empty($this->_data);
+    }
+
+    /**
+     * Returns the contents of storage
+     *
+     * Behavior is undefined when storage is empty.
+     *
+     * @throws Zend_Http_UserAgent_Storage_Exception If reading contents from storage is impossible
+     * @return mixed
+     */
+    public function read()
+    {
+        return $this->_data;
+    }
+
+    /**
+     * Writes $contents to storage
+     *
+     * @param  mixed $contents
+     * @throws Zend_Http_UserAgent_Storage_Exception If writing $contents to storage is impossible
+     * @return void
+     */
+    public function write($contents)
+    {
+        $this->_data = $contents;
+    }
+
+    /**
+     * Clears contents from storage
+     *
+     * @throws Zend_Http_UserAgent_Storage_Exception If clearing contents from storage is impossible
+     * @return void
+     */
+    public function clear()
+    {
+        $this->_data = null;
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Storage/Session.php b/lib/zend/Zend/Http/UserAgent/Storage/Session.php
new file mode 100644
index 00000000000..9a26360831c
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Storage/Session.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Http_UserAgent_Storage
+ */
+require_once 'Zend/Http/UserAgent/Storage.php';
+
+/**
+ * @see Zend_Session_Namespace
+ */
+require_once 'Zend/Session/Namespace.php';
+
+/**
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Storage_Session implements Zend_Http_UserAgent_Storage
+{
+    /**
+     * Default session namespace
+     */
+    const NAMESPACE_DEFAULT = 'Zend_Http_UserAgent';
+
+    /**
+     * Default session object member name
+     */
+    const MEMBER_DEFAULT = 'storage';
+
+    /**
+     * Object to proxy $_SESSION storage
+     *
+     * @var Zend_Session_Namespace
+     */
+    protected $_session;
+
+    /**
+     * Session namespace
+     *
+     * @var mixed
+     */
+    protected $_namespace;
+
+    /**
+     * Session object member
+     *
+     * @var mixed
+     */
+    protected $_member;
+
+    /**
+     * Sets session storage options and initializes session namespace object
+     *
+     * Expects options to contain 0 or more of the following keys:
+     * - browser_type -- maps to "namespace" internally
+     * - member
+     *
+     * @param  null|array|object $options
+     * @return void
+     * @throws Zend_Http_UserAgent_Storage_Exception on invalid $options argument
+     */
+    public function __construct($options = null)
+    {
+        if (is_object($options) && method_exists($options, 'toArray')) {
+            $options = $options->toArray();
+        } elseif (is_object($options)) {
+            $options = (array) $options;
+        }
+        if (null !== $options && !is_array($options)) {
+            require_once 'Zend/Http/UserAgent/Storage/Exception.php';
+            throw new Zend_Http_UserAgent_Storage_Exception(sprintf(
+                'Expected array or object options; "%s" provided',
+                gettype($options)
+            ));
+        }
+
+        // add '.' to prevent the message ''Session namespace must not start with a number'
+        $this->_namespace = '.'
+                          . (isset($options['browser_type'])
+                             ? $options['browser_type']
+                             : self::NAMESPACE_DEFAULT);
+        $this->_member    = isset($options['member']) ? $options['member'] : self::MEMBER_DEFAULT;
+        $this->_session   = new Zend_Session_Namespace($this->_namespace);
+    }
+
+    /**
+     * Returns the session namespace name
+     *
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->_namespace;
+    }
+
+    /**
+     * Returns the name of the session object member
+     *
+     * @return string
+     */
+    public function getMember()
+    {
+        return $this->_member;
+    }
+
+    /**
+     * Defined by Zend_Http_UserAgent_Storage
+     *
+     * @return boolean
+     */
+    public function isEmpty()
+    {
+        return empty($this->_session->{$this->_member});
+    }
+
+    /**
+     * Defined by Zend_Http_UserAgent_Storage
+     *
+     * @return mixed
+     */
+    public function read()
+    {
+        return $this->_session->{$this->_member};
+    }
+
+    /**
+     * Defined by Zend_Http_UserAgent_Storage
+     *
+     * @param  mixed $contents
+     * @return void
+     */
+    public function write($content)
+    {
+        $this->_session->{$this->_member} = $content;
+    }
+
+    /**
+     * Defined by Zend_Http_UserAgent_Storage
+     *
+     * @return void
+     */
+    public function clear()
+    {
+        unset($this->_session->{$this->_member});
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Text.php b/lib/zend/Zend/Http/UserAgent/Text.php
new file mode 100644
index 00000000000..c308b25a6aa
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Text.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/AbstractDevice.php';
+
+/**
+ * Text browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Text extends Zend_Http_UserAgent_AbstractDevice
+{
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        'lynx',
+        'retawq',
+        'w3m',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'text';
+    }
+
+    /**
+     * Look for features
+     *
+     * @return string
+     */
+    protected function _defineFeatures()
+    {
+        $this->setFeature('images', false, 'product_capability');
+        $this->setFeature('iframes', false, 'product_capability');
+        $this->setFeature('frames', false, 'product_capability');
+        $this->setFeature('javascript', false, 'product_capability');
+        return parent::_defineFeatures();
+    }
+
+    /**
+     * Determine supported image formats
+     *
+     * @return null
+     */
+    public function getImageFormatSupport()
+    {
+        return null;
+    }
+
+    /**
+     * Get preferred markup format
+     *
+     * @return string
+     */
+    public function getPreferredMarkup()
+    {
+        return 'xhtml';
+    }
+
+    /**
+     * Get supported X/HTML markup level
+     *
+     * @return int
+     */
+    public function getXhtmlSupportLevel()
+    {
+        return 1;
+    }
+
+    /**
+     * Does the device support Flash?
+     *
+     * @return bool
+     */
+    public function hasFlashSupport()
+    {
+
+        return false;
+    }
+
+    /**
+     * Does the device support PDF?
+     *
+     * @return bool
+     */
+    public function hasPdfSupport()
+    {
+        return false;
+    }
+}
diff --git a/lib/zend/Zend/Http/UserAgent/Validator.php b/lib/zend/Zend/Http/UserAgent/Validator.php
new file mode 100644
index 00000000000..a75daccc636
--- /dev/null
+++ b/lib/zend/Zend/Http/UserAgent/Validator.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/UserAgent/Desktop.php';
+
+/**
+ * Validator browser type matcher
+ *
+ * @category   Zend
+ * @package    Zend_Http
+ * @subpackage UserAgent
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Http_UserAgent_Validator extends Zend_Http_UserAgent_Desktop
+{
+    /**
+     * User Agent Signatures
+     *
+     * @var array
+     */
+    protected static $_uaSignatures = array(
+        'htmlvalidator',
+        'csscheck',
+        'cynthia',
+        'htmlparser',
+        'validator',
+        'jfouffa',
+        'jigsaw',
+        'w3c_validator',
+        'wdg_validator',
+    );
+
+    /**
+     * Comparison of the UserAgent chain and User Agent signatures
+     *
+     * @param string $userAgent User Agent chain
+     * @param  array $server $_SERVER like param
+     * @return bool
+     */
+    public static function match($userAgent, $server)
+    {
+        return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures);
+    }
+
+    /**
+     * Gives the current browser type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'validator';
+    }
+}
diff --git a/lib/zend/Zend/Json.php b/lib/zend/Zend/Json.php
new file mode 100644
index 00000000000..ad72eb53035
--- /dev/null
+++ b/lib/zend/Zend/Json.php
@@ -0,0 +1,442 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Zend_Json_Expr.
+ *
+ * @see Zend_Json_Expr
+ */
+require_once 'Zend/Json/Expr.php';
+
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
+/**
+ * Class for encoding to and decoding from JSON.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @uses       Zend_Json_Expr
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json
+{
+    /**
+     * How objects should be encoded -- arrays or as StdClass. TYPE_ARRAY is 1
+     * so that it is a boolean true value, allowing it to be used with
+     * ext/json's functions.
+     */
+    const TYPE_ARRAY  = 1;
+    const TYPE_OBJECT = 0;
+
+     /**
+      * To check the allowed nesting depth of the XML tree during xml2json conversion.
+      *
+      * @var int
+      */
+    public static $maxRecursionDepthAllowed=25;
+
+    /**
+     * @var bool
+     */
+    public static $useBuiltinEncoderDecoder = false;
+
+    /**
+     * Decodes the given $encodedValue string which is
+     * encoded in the JSON format
+     *
+     * Uses ext/json's json_decode if available.
+     *
+     * @param string $encodedValue Encoded in JSON format
+     * @param int $objectDecodeType Optional; flag indicating how to decode
+     * objects. See {@link Zend_Json_Decoder::decode()} for details.
+     * @return mixed
+     */
+    public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
+    {
+        $encodedValue = (string) $encodedValue;
+        if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) {
+            $decode = json_decode($encodedValue, $objectDecodeType);
+
+            // php < 5.3
+            if (!function_exists('json_last_error')) {
+                if (strtolower($encodedValue) === 'null') {
+                    return null;
+                } elseif ($decode === null) {
+                    require_once 'Zend/Json/Exception.php';
+                    throw new Zend_Json_Exception('Decoding failed');
+                }
+            // php >= 5.3
+            } elseif (($jsonLastErr = json_last_error()) != JSON_ERROR_NONE) {
+                require_once 'Zend/Json/Exception.php';
+                switch ($jsonLastErr) {
+                    case JSON_ERROR_DEPTH:
+                        throw new Zend_Json_Exception('Decoding failed: Maximum stack depth exceeded');
+                    case JSON_ERROR_CTRL_CHAR:
+                        throw new Zend_Json_Exception('Decoding failed: Unexpected control character found');
+                    case JSON_ERROR_SYNTAX:
+                        throw new Zend_Json_Exception('Decoding failed: Syntax error');
+                    default:
+                        throw new Zend_Json_Exception('Decoding failed');
+                }
+            }
+
+            return $decode;
+        }
+
+        require_once 'Zend/Json/Decoder.php';
+        return Zend_Json_Decoder::decode($encodedValue, $objectDecodeType);
+    }
+
+    /**
+     * Encode the mixed $valueToEncode into the JSON format
+     *
+     * Encodes using ext/json's json_encode() if available.
+     *
+     * NOTE: Object should not contain cycles; the JSON format
+     * does not allow object reference.
+     *
+     * NOTE: Only public variables will be encoded
+     *
+     * NOTE: Encoding native javascript expressions are possible using Zend_Json_Expr.
+     *       You can enable this by setting $options['enableJsonExprFinder'] = true
+     *
+     * @see Zend_Json_Expr
+     *
+     * @param  mixed $valueToEncode
+     * @param  boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
+     * @param  array $options Additional options used during encoding
+     * @return string JSON encoded object
+     */
+    public static function encode($valueToEncode, $cycleCheck = false, $options = array())
+    {
+        if (is_object($valueToEncode)) {
+            if (method_exists($valueToEncode, 'toJson')) {
+                return $valueToEncode->toJson();
+            } elseif (method_exists($valueToEncode, 'toArray')) {
+                return self::encode($valueToEncode->toArray(), $cycleCheck, $options);
+            }
+        }
+
+        // Pre-encoding look for Zend_Json_Expr objects and replacing by tmp ids
+        $javascriptExpressions = array();
+        if(isset($options['enableJsonExprFinder'])
+           && ($options['enableJsonExprFinder'] == true)
+        ) {
+            /**
+             * @see Zend_Json_Encoder
+             */
+            require_once "Zend/Json/Encoder.php";
+            $valueToEncode = self::_recursiveJsonExprFinder($valueToEncode, $javascriptExpressions);
+        }
+
+        // Encoding
+        if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) {
+            $encodedResult = json_encode($valueToEncode);
+        } else {
+            require_once 'Zend/Json/Encoder.php';
+            $encodedResult = Zend_Json_Encoder::encode($valueToEncode, $cycleCheck, $options);
+        }
+
+        //only do post-proccessing to revert back the Zend_Json_Expr if any.
+        if (count($javascriptExpressions) > 0) {
+            $count = count($javascriptExpressions);
+            for($i = 0; $i < $count; $i++) {
+                $magicKey = $javascriptExpressions[$i]['magicKey'];
+                $value    = $javascriptExpressions[$i]['value'];
+
+                $encodedResult = str_replace(
+                    //instead of replacing "key:magicKey", we replace directly magicKey by value because "key" never changes.
+                    '"' . $magicKey . '"',
+                    $value,
+                    $encodedResult
+                );
+            }
+        }
+
+         return $encodedResult;
+    }
+
+    /**
+     * Check & Replace Zend_Json_Expr for tmp ids in the valueToEncode
+     *
+     * Check if the value is a Zend_Json_Expr, and if replace its value
+     * with a magic key and save the javascript expression in an array.
+     *
+     * NOTE this method is recursive.
+     *
+     * NOTE: This method is used internally by the encode method.
+     *
+     * @see encode
+     * @param array|object|Zend_Json_Expr $value a string - object property to be encoded
+     * @param array $javascriptExpressions
+     * @param null $currentKey
+     *
+     * @internal param mixed $valueToCheck
+     * @return void
+     */
+    protected static function _recursiveJsonExprFinder(&$value, array &$javascriptExpressions, $currentKey = null)
+    {
+         if ($value instanceof Zend_Json_Expr) {
+            // TODO: Optimize with ascii keys, if performance is bad
+            $magicKey = "____" . $currentKey . "_" . (count($javascriptExpressions));
+            $javascriptExpressions[] = array(
+
+                //if currentKey is integer, encodeUnicodeString call is not required.
+                "magicKey" => (is_int($currentKey)) ? $magicKey : Zend_Json_Encoder::encodeUnicodeString($magicKey),
+                "value"    => $value->__toString(),
+            );
+            $value = $magicKey;
+        } elseif (is_array($value)) {
+            foreach ($value as $k => $v) {
+                $value[$k] = self::_recursiveJsonExprFinder($value[$k], $javascriptExpressions, $k);
+            }
+        } elseif (is_object($value)) {
+            foreach ($value as $k => $v) {
+                $value->$k = self::_recursiveJsonExprFinder($value->$k, $javascriptExpressions, $k);
+            }
+        }
+        return $value;
+    }
+
+    /**
+     * Return the value of an XML attribute text or the text between
+     * the XML tags
+     *
+     * In order to allow Zend_Json_Expr from xml, we check if the node
+     * matchs the pattern that try to detect if it is a new Zend_Json_Expr
+     * if it matches, we return a new Zend_Json_Expr instead of a text node
+     *
+     * @param SimpleXMLElement $simpleXmlElementObject
+     * @return Zend_Json_Expr|string
+     */
+    protected static function _getXmlValue($simpleXmlElementObject) {
+        $pattern = '/^[\s]*new Zend_Json_Expr[\s]*\([\s]*[\"\']{1}(.*)[\"\']{1}[\s]*\)[\s]*$/';
+        $matchings = array();
+        $match = preg_match ($pattern, $simpleXmlElementObject, $matchings);
+        if ($match) {
+            return new Zend_Json_Expr($matchings[1]);
+        } else {
+            return (trim(strval($simpleXmlElementObject)));
+        }
+    }
+    /**
+     * _processXml - Contains the logic for xml2json
+     *
+     * The logic in this function is a recursive one.
+     *
+     * The main caller of this function (i.e. fromXml) needs to provide
+     * only the first two parameters i.e. the SimpleXMLElement object and
+     * the flag for ignoring or not ignoring XML attributes. The third parameter
+     * will be used internally within this function during the recursive calls.
+     *
+     * This function converts the SimpleXMLElement object into a PHP array by
+     * calling a recursive (protected static) function in this class. Once all
+     * the XML elements are stored in the PHP array, it is returned to the caller.
+     *
+     * Throws a Zend_Json_Exception if the XML tree is deeper than the allowed limit.
+     *
+     * @param SimpleXMLElement $simpleXmlElementObject
+     * @param boolean $ignoreXmlAttributes
+     * @param integer $recursionDepth
+     * @return array
+     */
+    protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttributes, $recursionDepth=0)
+    {
+        // Keep an eye on how deeply we are involved in recursion.
+        if ($recursionDepth > self::$maxRecursionDepthAllowed) {
+            // XML tree is too deep. Exit now by throwing an exception.
+            require_once 'Zend/Json/Exception.php';
+            throw new Zend_Json_Exception(
+                "Function _processXml exceeded the allowed recursion depth of " .
+                self::$maxRecursionDepthAllowed);
+        } // End of if ($recursionDepth > self::$maxRecursionDepthAllowed)
+
+        $children = $simpleXmlElementObject->children();
+        $name = $simpleXmlElementObject->getName();
+        $value = self::_getXmlValue($simpleXmlElementObject);
+        $attributes = (array) $simpleXmlElementObject->attributes();
+
+        if (count($children) == 0) {
+            if (!empty($attributes) && !$ignoreXmlAttributes) {
+                foreach ($attributes['@attributes'] as $k => $v) {
+                    $attributes['@attributes'][$k]= self::_getXmlValue($v);
+                }
+                if (!empty($value)) {
+                    $attributes['@text'] = $value;
+                } 
+                return array($name => $attributes);
+            } else {
+               return array($name => $value);
+            }
+        } else {
+            $childArray= array();
+            foreach ($children as $child) {
+                $childname = $child->getName();
+                $element = self::_processXml($child,$ignoreXmlAttributes,$recursionDepth+1);
+                if (array_key_exists($childname, $childArray)) {
+                    if (empty($subChild[$childname])) {
+                        $childArray[$childname] = array($childArray[$childname]);
+                        $subChild[$childname] = true;
+                    }
+                    $childArray[$childname][] = $element[$childname];
+                } else {
+                    $childArray[$childname] = $element[$childname];
+                }
+            }
+            if (!empty($attributes) && !$ignoreXmlAttributes) {
+                foreach ($attributes['@attributes'] as $k => $v) {
+                    $attributes['@attributes'][$k] = self::_getXmlValue($v);
+                }
+                $childArray['@attributes'] = $attributes['@attributes'];
+            }
+            if (!empty($value)) {
+                $childArray['@text'] = $value;
+            }
+            return array($name => $childArray);
+        }
+    }
+
+    /**
+     * fromXml - Converts XML to JSON
+     *
+     * Converts a XML formatted string into a JSON formatted string.
+     * The value returned will be a string in JSON format.
+     *
+     * The caller of this function needs to provide only the first parameter,
+     * which is an XML formatted String. The second parameter is optional, which
+     * lets the user to select if the XML attributes in the input XML string
+     * should be included or ignored in xml2json conversion.
+     *
+     * This function converts the XML formatted string into a PHP array by
+     * calling a recursive (protected static) function in this class. Then, it
+     * converts that PHP array into JSON by calling the "encode" static funcion.
+     *
+     * Throws a Zend_Json_Exception if the input not a XML formatted string.
+     * NOTE: Encoding native javascript expressions via Zend_Json_Expr is not possible.
+     *
+     * @static
+     * @access public
+     * @param string $xmlStringContents XML String to be converted
+     * @param boolean $ignoreXmlAttributes Include or exclude XML attributes in
+     * the xml2json conversion process.
+     * @return mixed - JSON formatted string on success
+     * @throws Zend_Json_Exception
+     */
+    public static function fromXml($xmlStringContents, $ignoreXmlAttributes=true)
+    {
+        // Load the XML formatted string into a Simple XML Element object.
+        $simpleXmlElementObject = Zend_Xml_Security::scan($xmlStringContents);
+
+        // If it is not a valid XML content, throw an exception.
+        if ($simpleXmlElementObject == null) {
+            require_once 'Zend/Json/Exception.php';
+            throw new Zend_Json_Exception('Function fromXml was called with an invalid XML formatted string.');
+        } // End of if ($simpleXmlElementObject == null)
+
+        $resultArray = null;
+
+        // Call the recursive function to convert the XML into a PHP array.
+        $resultArray = self::_processXml($simpleXmlElementObject, $ignoreXmlAttributes);
+
+        // Convert the PHP array to JSON using Zend_Json encode method.
+        // It is just that simple.
+        $jsonStringOutput = self::encode($resultArray);
+        return($jsonStringOutput);
+    }
+
+    
+
+    /**
+     * Pretty-print JSON string
+     *
+     * Use 'format' option to select output format - currently html and txt supported, txt is default
+     * Use 'indent' option to override the indentation string set in the format - by default for the 'txt' format it's a tab
+     *
+     * @param string $json Original JSON string
+     * @param array $options Encoding options
+     * @return string
+     */
+    public static function prettyPrint($json, $options = array())
+    {
+        $tokens = preg_split('|([\{\}\]\[,])|', $json, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $result = '';
+        $indent = 0;
+
+        $format= 'txt';
+
+        $ind = "\t";
+
+        if (isset($options['format'])) {
+            $format = $options['format'];
+        }
+
+        switch ($format) {
+            case 'html':
+                $lineBreak = '<br />';
+                $ind = '&nbsp;&nbsp;&nbsp;&nbsp;';
+                break;
+            default:
+            case 'txt':
+                $lineBreak = "\n";
+                $ind = "\t";
+                break;
+        }
+
+        // override the defined indent setting with the supplied option
+        if (isset($options['indent'])) {
+            $ind = $options['indent'];
+        }
+
+        $inLiteral = false;
+        foreach($tokens as $token) {
+            if($token == '') {
+                continue;
+            }
+
+            $prefix = str_repeat($ind, $indent);
+            if (!$inLiteral && ($token == '{' || $token == '[')) {
+                $indent++;
+                if (($result != '') && ($result[(strlen($result)-1)] == $lineBreak)) {
+                    $result .= $prefix;
+                }
+                $result .= $token . $lineBreak;
+            } elseif (!$inLiteral && ($token == '}' || $token == ']')) {
+                $indent--;
+                $prefix = str_repeat($ind, $indent);
+                $result .= $lineBreak . $prefix . $token;
+            } elseif (!$inLiteral && $token == ',') {
+                $result .= $token . $lineBreak;
+            } else {
+                $result .= ( $inLiteral ? '' : $prefix ) . $token;
+                
+                // Count # of unescaped double-quotes in token, subtract # of
+                // escaped double-quotes and if the result is odd then we are 
+                // inside a string literal
+                if ((substr_count($token, "\"")-substr_count($token, "\\\"")) % 2 != 0) {
+                    $inLiteral = !$inLiteral;
+                }
+            }
+        }
+        return $result;
+   }
+}
diff --git a/lib/zend/Zend/Json/Decoder.php b/lib/zend/Zend/Json/Decoder.php
new file mode 100644
index 00000000000..8a79f0cdd2c
--- /dev/null
+++ b/lib/zend/Zend/Json/Decoder.php
@@ -0,0 +1,581 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Json
+ */
+require_once 'Zend/Json.php';
+
+/**
+ * Decode JSON encoded string to PHP variable constructs
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Decoder
+{
+    /**
+     * Parse tokens used to decode the JSON object. These are not
+     * for public consumption, they are just used internally to the
+     * class.
+     */
+    const EOF         = 0;
+    const DATUM        = 1;
+    const LBRACE    = 2;
+    const LBRACKET    = 3;
+    const RBRACE     = 4;
+    const RBRACKET    = 5;
+    const COMMA       = 6;
+    const COLON        = 7;
+
+    /**
+     * Use to maintain a "pointer" to the source being decoded
+     *
+     * @var string
+     */
+    protected $_source;
+
+    /**
+     * Caches the source length
+     *
+     * @var int
+     */
+    protected $_sourceLength;
+
+    /**
+     * The offset within the souce being decoded
+     *
+     * @var int
+     *
+     */
+    protected $_offset;
+
+    /**
+     * The current token being considered in the parser cycle
+     *
+     * @var int
+     */
+    protected $_token;
+
+    /**
+     * Flag indicating how objects should be decoded
+     *
+     * @var int
+     * @access protected
+     */
+    protected $_decodeType;
+
+    /**
+     * Constructor
+     *
+     * @param string $source String source to decode
+     * @param int $decodeType How objects should be decoded -- see
+     * {@link Zend_Json::TYPE_ARRAY} and {@link Zend_Json::TYPE_OBJECT} for
+     * valid values
+     * @return void
+     */
+    protected function __construct($source, $decodeType)
+    {
+        // Set defaults
+        $this->_source       = self::decodeUnicodeString($source);
+        $this->_sourceLength = strlen($this->_source);
+        $this->_token        = self::EOF;
+        $this->_offset       = 0;
+
+        // Normalize and set $decodeType
+        if (!in_array($decodeType, array(Zend_Json::TYPE_ARRAY, Zend_Json::TYPE_OBJECT)))
+        {
+            $decodeType = Zend_Json::TYPE_ARRAY;
+        }
+        $this->_decodeType   = $decodeType;
+
+        // Set pointer at first token
+        $this->_getNextToken();
+    }
+
+    /**
+     * Decode a JSON source string
+     *
+     * Decodes a JSON encoded string. The value returned will be one of the
+     * following:
+     *        - integer
+     *        - float
+     *        - boolean
+     *        - null
+     *      - StdClass
+     *      - array
+     *         - array of one or more of the above types
+     *
+     * By default, decoded objects will be returned as associative arrays; to
+     * return a StdClass object instead, pass {@link Zend_Json::TYPE_OBJECT} to
+     * the $objectDecodeType parameter.
+     *
+     * Throws a Zend_Json_Exception if the source string is null.
+     *
+     * @static
+     * @access public
+     * @param string $source String to be decoded
+     * @param int $objectDecodeType How objects should be decoded; should be
+     * either or {@link Zend_Json::TYPE_ARRAY} or
+     * {@link Zend_Json::TYPE_OBJECT}; defaults to TYPE_ARRAY
+     * @return mixed
+     * @throws Zend_Json_Exception
+     */
+    public static function decode($source = null, $objectDecodeType = Zend_Json::TYPE_ARRAY)
+    {
+        if (null === $source) {
+            require_once 'Zend/Json/Exception.php';
+            throw new Zend_Json_Exception('Must specify JSON encoded source for decoding');
+        } elseif (!is_string($source)) {
+            require_once 'Zend/Json/Exception.php';
+            throw new Zend_Json_Exception('Can only decode JSON encoded strings');
+        }
+
+        $decoder = new self($source, $objectDecodeType);
+
+        return $decoder->_decodeValue();
+    }
+
+
+    /**
+     * Recursive driving rountine for supported toplevel tops
+     *
+     * @return mixed
+     */
+    protected function _decodeValue()
+    {
+        switch ($this->_token) {
+            case self::DATUM:
+                $result  = $this->_tokenValue;
+                $this->_getNextToken();
+                return($result);
+                break;
+            case self::LBRACE:
+                return($this->_decodeObject());
+                break;
+            case self::LBRACKET:
+                return($this->_decodeArray());
+                break;
+            default:
+                return null;
+                break;
+        }
+    }
+
+    /**
+     * Decodes an object of the form:
+     *  { "attribute: value, "attribute2" : value,...}
+     *
+     * If Zend_Json_Encoder was used to encode the original object then
+     * a special attribute called __className which specifies a class
+     * name that should wrap the data contained within the encoded source.
+     *
+     * Decodes to either an array or StdClass object, based on the value of
+     * {@link $_decodeType}. If invalid $_decodeType present, returns as an
+     * array.
+     *
+     * @return array|StdClass
+     */
+    protected function _decodeObject()
+    {
+        $members = array();
+        $tok = $this->_getNextToken();
+
+        while ($tok && $tok != self::RBRACE) {
+            if ($tok != self::DATUM || ! is_string($this->_tokenValue)) {
+                require_once 'Zend/Json/Exception.php';
+                throw new Zend_Json_Exception('Missing key in object encoding: ' . $this->_source);
+            }
+
+            $key = $this->_tokenValue;
+            $tok = $this->_getNextToken();
+
+            if ($tok != self::COLON) {
+                require_once 'Zend/Json/Exception.php';
+                throw new Zend_Json_Exception('Missing ":" in object encoding: ' . $this->_source);
+            }
+
+            $tok = $this->_getNextToken();
+            $members[$key] = $this->_decodeValue();
+            $tok = $this->_token;
+
+            if ($tok == self::RBRACE) {
+                break;
+            }
+
+            if ($tok != self::COMMA) {
+                require_once 'Zend/Json/Exception.php';
+                throw new Zend_Json_Exception('Missing "," in object encoding: ' . $this->_source);
+            }
+
+            $tok = $this->_getNextToken();
+        }
+
+        switch ($this->_decodeType) {
+            case Zend_Json::TYPE_OBJECT:
+                // Create new StdClass and populate with $members
+                $result = new StdClass();
+                foreach ($members as $key => $value) {
+                    if ($key === '') {
+                        $key = '_empty_';
+                    }
+                    $result->$key = $value;
+                }
+                break;
+            case Zend_Json::TYPE_ARRAY:
+            default:
+                $result = $members;
+                break;
+        }
+
+        $this->_getNextToken();
+        return $result;
+    }
+
+    /**
+     * Decodes a JSON array format:
+     *    [element, element2,...,elementN]
+     *
+     * @return array
+     */
+    protected function _decodeArray()
+    {
+        $result = array();
+        $starttok = $tok = $this->_getNextToken(); // Move past the '['
+        $index  = 0;
+
+        while ($tok && $tok != self::RBRACKET) {
+            $result[$index++] = $this->_decodeValue();
+
+            $tok = $this->_token;
+
+            if ($tok == self::RBRACKET || !$tok) {
+                break;
+            }
+
+            if ($tok != self::COMMA) {
+                require_once 'Zend/Json/Exception.php';
+                throw new Zend_Json_Exception('Missing "," in array encoding: ' . $this->_source);
+            }
+
+            $tok = $this->_getNextToken();
+        }
+
+        $this->_getNextToken();
+        return($result);
+    }
+
+
+    /**
+     * Removes whitepsace characters from the source input
+     */
+    protected function _eatWhitespace()
+    {
+        if (preg_match(
+                '/([\t\b\f\n\r ])*/s',
+                $this->_source,
+                $matches,
+                PREG_OFFSET_CAPTURE,
+                $this->_offset)
+            && $matches[0][1] == $this->_offset)
+        {
+            $this->_offset += strlen($matches[0][0]);
+        }
+    }
+
+
+    /**
+     * Retrieves the next token from the source stream
+     *
+     * @return int Token constant value specified in class definition
+     */
+    protected function _getNextToken()
+    {
+        $this->_token      = self::EOF;
+        $this->_tokenValue = null;
+        $this->_eatWhitespace();
+
+        if ($this->_offset >= $this->_sourceLength) {
+            return(self::EOF);
+        }
+
+        $str        = $this->_source;
+        $str_length = $this->_sourceLength;
+        $i          = $this->_offset;
+        $start      = $i;
+
+        switch ($str{$i}) {
+            case '{':
+               $this->_token = self::LBRACE;
+               break;
+            case '}':
+                $this->_token = self::RBRACE;
+                break;
+            case '[':
+                $this->_token = self::LBRACKET;
+                break;
+            case ']':
+                $this->_token = self::RBRACKET;
+                break;
+            case ',':
+                $this->_token = self::COMMA;
+                break;
+            case ':':
+                $this->_token = self::COLON;
+                break;
+            case  '"':
+                $result = '';
+                do {
+                    $i++;
+                    if ($i >= $str_length) {
+                        break;
+                    }
+
+                    $chr = $str{$i};
+
+                    if ($chr == '\\') {
+                        $i++;
+                        if ($i >= $str_length) {
+                            break;
+                        }
+                        $chr = $str{$i};
+                        switch ($chr) {
+                            case '"' :
+                                $result .= '"';
+                                break;
+                            case '\\':
+                                $result .= '\\';
+                                break;
+                            case '/' :
+                                $result .= '/';
+                                break;
+                            case 'b' :
+                                $result .= "\x08";
+                                break;
+                            case 'f' :
+                                $result .= "\x0c";
+                                break;
+                            case 'n' :
+                                $result .= "\x0a";
+                                break;
+                            case 'r' :
+                                $result .= "\x0d";
+                                break;
+                            case 't' :
+                                $result .= "\x09";
+                                break;
+                            case '\'' :
+                                $result .= '\'';
+                                break;
+                            default:
+                                require_once 'Zend/Json/Exception.php';
+                                throw new Zend_Json_Exception("Illegal escape "
+                                    .  "sequence '" . $chr . "'");
+                        }
+                    } elseif($chr == '"') {
+                        break;
+                    } else {
+                        $result .= $chr;
+                    }
+                } while ($i < $str_length);
+
+                $this->_token = self::DATUM;
+                //$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
+                $this->_tokenValue = $result;
+                break;
+            case 't':
+                if (($i+ 3) < $str_length && substr($str, $start, 4) == "true") {
+                    $this->_token = self::DATUM;
+                }
+                $this->_tokenValue = true;
+                $i += 3;
+                break;
+            case 'f':
+                if (($i+ 4) < $str_length && substr($str, $start, 5) == "false") {
+                    $this->_token = self::DATUM;
+                }
+                $this->_tokenValue = false;
+                $i += 4;
+                break;
+            case 'n':
+                if (($i+ 3) < $str_length && substr($str, $start, 4) == "null") {
+                    $this->_token = self::DATUM;
+                }
+                $this->_tokenValue = NULL;
+                $i += 3;
+                break;
+        }
+
+        if ($this->_token != self::EOF) {
+            $this->_offset = $i + 1; // Consume the last token character
+            return($this->_token);
+        }
+
+        $chr = $str{$i};
+        if ($chr == '-' || $chr == '.' || ($chr >= '0' && $chr <= '9')) {
+            if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s',
+                $str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
+
+                $datum = $matches[0][0];
+
+                if (is_numeric($datum)) {
+                    if (preg_match('/^0\d+$/', $datum)) {
+                        require_once 'Zend/Json/Exception.php';
+                        throw new Zend_Json_Exception("Octal notation not supported by JSON (value: $datum)");
+                    } else {
+                        $val  = intval($datum);
+                        $fVal = floatval($datum);
+                        $this->_tokenValue = ($val == $fVal ? $val : $fVal);
+                    }
+                } else {
+                    require_once 'Zend/Json/Exception.php';
+                    throw new Zend_Json_Exception("Illegal number format: $datum");
+                }
+
+                $this->_token = self::DATUM;
+                $this->_offset = $start + strlen($datum);
+            }
+        } else {
+            require_once 'Zend/Json/Exception.php';
+            throw new Zend_Json_Exception('Illegal Token');
+        }
+
+        return($this->_token);
+    }
+
+    /**
+     * Decode Unicode Characters from \u0000 ASCII syntax.
+     *
+     * This algorithm was originally developed for the
+     * Solar Framework by Paul M. Jones
+     *
+     * @link   http://solarphp.com/
+     * @link   http://svn.solarphp.com/core/trunk/Solar/Json.php
+     * @param  string $value
+     * @return string
+     */
+    public static function decodeUnicodeString($chrs)
+    {
+        $delim       = substr($chrs, 0, 1);
+        $utf8        = '';
+        $strlen_chrs = strlen($chrs);
+
+        for($i = 0; $i < $strlen_chrs; $i++) {
+
+            $substr_chrs_c_2 = substr($chrs, $i, 2);
+            $ord_chrs_c = ord($chrs[$i]);
+
+            switch (true) {
+                case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $i, 6)):
+                    // single, escaped unicode character
+                    $utf16 = chr(hexdec(substr($chrs, ($i + 2), 2)))
+                           . chr(hexdec(substr($chrs, ($i + 4), 2)));
+                    $utf8 .= self::_utf162utf8($utf16);
+                    $i += 5;
+                    break;
+                case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+                    $utf8 .= $chrs{$i};
+                    break;
+                case ($ord_chrs_c & 0xE0) == 0xC0:
+                    // characters U-00000080 - U-000007FF, mask 110XXXXX
+                    //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $utf8 .= substr($chrs, $i, 2);
+                    ++$i;
+                    break;
+                case ($ord_chrs_c & 0xF0) == 0xE0:
+                    // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $utf8 .= substr($chrs, $i, 3);
+                    $i += 2;
+                    break;
+                case ($ord_chrs_c & 0xF8) == 0xF0:
+                    // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $utf8 .= substr($chrs, $i, 4);
+                    $i += 3;
+                    break;
+                case ($ord_chrs_c & 0xFC) == 0xF8:
+                    // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $utf8 .= substr($chrs, $i, 5);
+                    $i += 4;
+                    break;
+                case ($ord_chrs_c & 0xFE) == 0xFC:
+                    // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $utf8 .= substr($chrs, $i, 6);
+                    $i += 5;
+                    break;
+            }
+        }
+
+        return $utf8;
+    }
+
+    /**
+     * Convert a string from one UTF-16 char to one UTF-8 char.
+     *
+     * Normally should be handled by mb_convert_encoding, but
+     * provides a slower PHP-only method for installations
+     * that lack the multibye string extension.
+     *
+     * This method is from the Solar Framework by Paul M. Jones
+     *
+     * @link   http://solarphp.com
+     * @param  string $utf16 UTF-16 character
+     * @return string UTF-8 character
+     */
+    protected static function _utf162utf8($utf16)
+    {
+        // Check for mb extension otherwise do by hand.
+        if( function_exists('mb_convert_encoding') ) {
+            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+        }
+
+        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+
+        switch (true) {
+            case ((0x7F & $bytes) == $bytes):
+                // this case should never be reached, because we are in ASCII range
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0x7F & $bytes);
+
+            case (0x07FF & $bytes) == $bytes:
+                // return a 2-byte UTF-8 character
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0xC0 | (($bytes >> 6) & 0x1F))
+                     . chr(0x80 | ($bytes & 0x3F));
+
+            case (0xFFFF & $bytes) == $bytes:
+                // return a 3-byte UTF-8 character
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0xE0 | (($bytes >> 12) & 0x0F))
+                     . chr(0x80 | (($bytes >> 6) & 0x3F))
+                     . chr(0x80 | ($bytes & 0x3F));
+        }
+
+        // ignoring UTF-32 for now, sorry
+        return '';
+    }
+}
+
diff --git a/lib/zend/Zend/Json/Encoder.php b/lib/zend/Zend/Json/Encoder.php
new file mode 100644
index 00000000000..fbf5b53ccab
--- /dev/null
+++ b/lib/zend/Zend/Json/Encoder.php
@@ -0,0 +1,578 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Encode PHP constructs to JSON
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Encoder
+{
+    /**
+     * Whether or not to check for possible cycling
+     *
+     * @var boolean
+     */
+    protected $_cycleCheck;
+
+    /**
+     * Additional options used during encoding
+     *
+     * @var array
+     */
+    protected $_options = array();
+
+    /**
+     * Array of visited objects; used to prevent cycling.
+     *
+     * @var array
+     */
+    protected $_visited = array();
+
+    /**
+     * Constructor
+     *
+     * @param boolean $cycleCheck Whether or not to check for recursion when encoding
+     * @param array $options Additional options used during encoding
+     * @return void
+     */
+    protected function __construct($cycleCheck = false, $options = array())
+    {
+        $this->_cycleCheck = $cycleCheck;
+        $this->_options = $options;
+    }
+
+    /**
+     * Use the JSON encoding scheme for the value specified
+     *
+     * @param mixed $value The value to be encoded
+     * @param boolean $cycleCheck Whether or not to check for possible object recursion when encoding
+     * @param array $options Additional options used during encoding
+     * @return string  The encoded value
+     */
+    public static function encode($value, $cycleCheck = false, $options = array())
+    {
+        $encoder = new self(($cycleCheck) ? true : false, $options);
+        return $encoder->_encodeValue($value);
+    }
+
+    /**
+     * Recursive driver which determines the type of value to be encoded
+     * and then dispatches to the appropriate method. $values are either
+     *    - objects (returns from {@link _encodeObject()})
+     *    - arrays (returns from {@link _encodeArray()})
+     *    - basic datums (e.g. numbers or strings) (returns from {@link _encodeDatum()})
+     *
+     * @param mixed $value The value to be encoded
+     * @return string Encoded value
+     */
+    protected function _encodeValue(&$value)
+    {
+        if (is_object($value)) {
+            return $this->_encodeObject($value);
+        } else if (is_array($value)) {
+            return $this->_encodeArray($value);
+        }
+
+        return $this->_encodeDatum($value);
+    }
+
+
+
+    /**
+     * Encode an object to JSON by encoding each of the public properties
+     *
+     * A special property is added to the JSON object called '__className'
+     * that contains the name of the class of $value. This is used to decode
+     * the object on the client into a specific class.
+     *
+     * @param object $value
+     * @return string
+     * @throws Zend_Json_Exception If recursive checks are enabled and the object has been serialized previously
+     */
+    protected function _encodeObject(&$value)
+    {
+        if ($this->_cycleCheck) {
+            if ($this->_wasVisited($value)) {
+
+                if (isset($this->_options['silenceCyclicalExceptions'])
+                    && $this->_options['silenceCyclicalExceptions']===true) {
+
+                    return '"* RECURSION (' . get_class($value) . ') *"';
+
+                } else {
+                    require_once 'Zend/Json/Exception.php';
+                    throw new Zend_Json_Exception(
+                        'Cycles not supported in JSON encoding, cycle introduced by '
+                        . 'class "' . get_class($value) . '"'
+                    );
+                }
+            }
+
+            $this->_visited[] = $value;
+        }
+
+        $props = '';
+        if (method_exists($value, 'toJson')) {
+            $props =',' . preg_replace("/^\{(.*)\}$/","\\1",$value->toJson());
+        } else {
+            if ($value instanceof IteratorAggregate) {
+                $propCollection = $value->getIterator();
+            } elseif ($value instanceof Iterator) {
+                $propCollection = $value;
+            } else {
+                $propCollection = get_object_vars($value);
+            }
+
+            foreach ($propCollection as $name => $propValue) {
+                if (isset($propValue)) {
+                    $props .= ','
+                            . $this->_encodeString($name)
+                            . ':'
+                            . $this->_encodeValue($propValue);
+                }
+            }
+        }
+        $className = get_class($value);
+        return '{"__className":' . $this->_encodeString($className)
+                . $props . '}';
+    }
+
+
+    /**
+     * Determine if an object has been serialized already
+     *
+     * @param mixed $value
+     * @return boolean
+     */
+    protected function _wasVisited(&$value)
+    {
+        if (in_array($value, $this->_visited, true)) {
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * JSON encode an array value
+     *
+     * Recursively encodes each value of an array and returns a JSON encoded
+     * array string.
+     *
+     * Arrays are defined as integer-indexed arrays starting at index 0, where
+     * the last index is (count($array) -1); any deviation from that is
+     * considered an associative array, and will be encoded as such.
+     *
+     * @param array& $array
+     * @return string
+     */
+    protected function _encodeArray(&$array)
+    {
+        $tmpArray = array();
+
+        // Check for associative array
+        if (!empty($array) && (array_keys($array) !== range(0, count($array) - 1))) {
+            // Associative array
+            $result = '{';
+            foreach ($array as $key => $value) {
+                $key = (string) $key;
+                $tmpArray[] = $this->_encodeString($key)
+                            . ':'
+                            . $this->_encodeValue($value);
+            }
+            $result .= implode(',', $tmpArray);
+            $result .= '}';
+        } else {
+            // Indexed array
+            $result = '[';
+            $length = count($array);
+            for ($i = 0; $i < $length; $i++) {
+                $tmpArray[] = $this->_encodeValue($array[$i]);
+            }
+            $result .= implode(',', $tmpArray);
+            $result .= ']';
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * JSON encode a basic data type (string, number, boolean, null)
+     *
+     * If value type is not a string, number, boolean, or null, the string
+     * 'null' is returned.
+     *
+     * @param mixed& $value
+     * @return string
+     */
+    protected function _encodeDatum(&$value)
+    {
+        $result = 'null';
+
+        if (is_int($value) || is_float($value)) {
+            $result = (string) $value;
+            $result = str_replace(",", ".", $result);
+        } elseif (is_string($value)) {
+            $result = $this->_encodeString($value);
+        } elseif (is_bool($value)) {
+            $result = $value ? 'true' : 'false';
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * JSON encode a string value by escaping characters as necessary
+     *
+     * @param string& $value
+     * @return string
+     */
+    protected function _encodeString(&$string)
+    {
+        // Escape these characters with a backslash:
+        // " \ / \n \r \t \b \f
+        $search  = array('\\', "\n", "\t", "\r", "\b", "\f", '"', '/');
+        $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\"', '\\/');
+        $string  = str_replace($search, $replace, $string);
+
+        // Escape certain ASCII characters:
+        // 0x08 => \b
+        // 0x0c => \f
+        $string = str_replace(array(chr(0x08), chr(0x0C)), array('\b', '\f'), $string);
+        $string = self::encodeUnicodeString($string);
+
+        return '"' . $string . '"';
+    }
+
+
+    /**
+     * Encode the constants associated with the ReflectionClass
+     * parameter. The encoding format is based on the class2 format
+     *
+     * @param ReflectionClass $cls
+     * @return string Encoded constant block in class2 format
+     */
+    private static function _encodeConstants(ReflectionClass $cls)
+    {
+        $result    = "constants : {";
+        $constants = $cls->getConstants();
+
+        $tmpArray = array();
+        if (!empty($constants)) {
+            foreach ($constants as $key => $value) {
+                $tmpArray[] = "$key: " . self::encode($value);
+            }
+
+            $result .= implode(', ', $tmpArray);
+        }
+
+        return $result . "}";
+    }
+
+
+    /**
+     * Encode the public methods of the ReflectionClass in the
+     * class2 format
+     *
+     * @param ReflectionClass $cls
+     * @return string Encoded method fragment
+     *
+     */
+    private static function _encodeMethods(ReflectionClass $cls)
+    {
+        $methods = $cls->getMethods();
+        $result = 'methods:{';
+
+        $started = false;
+        foreach ($methods as $method) {
+            if (! $method->isPublic() || !$method->isUserDefined()) {
+                continue;
+            }
+
+            if ($started) {
+                $result .= ',';
+            }
+            $started = true;
+
+            $result .= '' . $method->getName(). ':function(';
+
+            if ('__construct' != $method->getName()) {
+                $parameters  = $method->getParameters();
+                $paramCount  = count($parameters);
+                $argsStarted = false;
+
+                $argNames = "var argNames=[";
+                foreach ($parameters as $param) {
+                    if ($argsStarted) {
+                        $result .= ',';
+                    }
+
+                    $result .= $param->getName();
+
+                    if ($argsStarted) {
+                        $argNames .= ',';
+                    }
+
+                    $argNames .= '"' . $param->getName() . '"';
+
+                    $argsStarted = true;
+                }
+                $argNames .= "];";
+
+                $result .= "){"
+                         . $argNames
+                         . 'var result = ZAjaxEngine.invokeRemoteMethod('
+                         . "this, '" . $method->getName()
+                         . "',argNames,arguments);"
+                         . 'return(result);}';
+            } else {
+                $result .= "){}";
+            }
+        }
+
+        return $result . "}";
+    }
+
+
+    /**
+     * Encode the public properties of the ReflectionClass in the class2
+     * format.
+     *
+     * @param ReflectionClass $cls
+     * @return string Encode properties list
+     *
+     */
+    private static function _encodeVariables(ReflectionClass $cls)
+    {
+        $properties = $cls->getProperties();
+        $propValues = get_class_vars($cls->getName());
+        $result = "variables:{";
+        $cnt = 0;
+
+        $tmpArray = array();
+        foreach ($properties as $prop) {
+            if (! $prop->isPublic()) {
+                continue;
+            }
+
+            $tmpArray[] = $prop->getName()
+                        . ':'
+                        . self::encode($propValues[$prop->getName()]);
+        }
+        $result .= implode(',', $tmpArray);
+
+        return $result . "}";
+    }
+
+    /**
+     * Encodes the given $className into the class2 model of encoding PHP
+     * classes into JavaScript class2 classes.
+     * NOTE: Currently only public methods and variables are proxied onto
+     * the client machine
+     *
+     * @param string $className The name of the class, the class must be
+     *  instantiable using a null constructor
+     * @param string $package Optional package name appended to JavaScript
+     *  proxy class name
+     * @return string The class2 (JavaScript) encoding of the class
+     * @throws Zend_Json_Exception
+     */
+    public static function encodeClass($className, $package = '')
+    {
+        $cls = new ReflectionClass($className);
+        if (! $cls->isInstantiable()) {
+            require_once 'Zend/Json/Exception.php';
+            throw new Zend_Json_Exception("$className must be instantiable");
+        }
+
+        return "Class.create('$package$className',{"
+                . self::_encodeConstants($cls)    .","
+                . self::_encodeMethods($cls)      .","
+                . self::_encodeVariables($cls)    .'});';
+    }
+
+
+    /**
+     * Encode several classes at once
+     *
+     * Returns JSON encoded classes, using {@link encodeClass()}.
+     *
+     * @param array $classNames
+     * @param string $package
+     * @return string
+     */
+    public static function encodeClasses(array $classNames, $package = '')
+    {
+        $result = '';
+        foreach ($classNames as $className) {
+            $result .= self::encodeClass($className, $package);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Encode Unicode Characters to \u0000 ASCII syntax.
+     *
+     * This algorithm was originally developed for the
+     * Solar Framework by Paul M. Jones
+     *
+     * @link   http://solarphp.com/
+     * @link   http://svn.solarphp.com/core/trunk/Solar/Json.php
+     * @param  string $value
+     * @return string
+     */
+    public static function encodeUnicodeString($value)
+    {
+        $strlen_var = strlen($value);
+        $ascii = "";
+
+        /**
+         * Iterate over every character in the string,
+         * escaping with a slash or encoding to UTF-8 where necessary
+         */
+        for($i = 0; $i < $strlen_var; $i++) {
+            $ord_var_c = ord($value[$i]);
+
+            switch (true) {
+                case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                    // characters U-00000000 - U-0000007F (same as ASCII)
+                    $ascii .= $value[$i];
+                    break;
+
+                case (($ord_var_c & 0xE0) == 0xC0):
+                    // characters U-00000080 - U-000007FF, mask 110XXXXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($value[$i + 1]));
+                    $i += 1;
+                    $utf16 = self::_utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xF0) == 0xE0):
+                    // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c,
+                                 ord($value[$i + 1]),
+                                 ord($value[$i + 2]));
+                    $i += 2;
+                    $utf16 = self::_utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xF8) == 0xF0):
+                    // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c,
+                                 ord($value[$i + 1]),
+                                 ord($value[$i + 2]),
+                                 ord($value[$i + 3]));
+                    $i += 3;
+                    $utf16 = self::_utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xFC) == 0xF8):
+                    // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c,
+                                 ord($value[$i + 1]),
+                                 ord($value[$i + 2]),
+                                 ord($value[$i + 3]),
+                                 ord($value[$i + 4]));
+                    $i += 4;
+                    $utf16 = self::_utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xFE) == 0xFC):
+                    // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c,
+                                 ord($value[$i + 1]),
+                                 ord($value[$i + 2]),
+                                 ord($value[$i + 3]),
+                                 ord($value[$i + 4]),
+                                 ord($value[$i + 5]));
+                    $i += 5;
+                    $utf16 = self::_utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+            }
+        }
+
+        return $ascii;
+     }
+
+    /**
+     * Convert a string from one UTF-8 char to one UTF-16 char.
+     *
+     * Normally should be handled by mb_convert_encoding, but
+     * provides a slower PHP-only method for installations
+     * that lack the multibye string extension.
+     *
+     * This method is from the Solar Framework by Paul M. Jones
+     *
+     * @link   http://solarphp.com
+     * @param string $utf8 UTF-8 character
+     * @return string UTF-16 character
+     */
+    protected static function _utf82utf16($utf8)
+    {
+        // Check for mb extension otherwise do by hand.
+        if( function_exists('mb_convert_encoding') ) {
+            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+        }
+
+        switch (strlen($utf8)) {
+            case 1:
+                // this case should never be reached, because we are in ASCII range
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return $utf8;
+
+            case 2:
+                // return a UTF-16 character from a 2-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0x07 & (ord($utf8{0}) >> 2))
+                     . chr((0xC0 & (ord($utf8{0}) << 6))
+                         | (0x3F & ord($utf8{1})));
+
+            case 3:
+                // return a UTF-16 character from a 3-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr((0xF0 & (ord($utf8{0}) << 4))
+                         | (0x0F & (ord($utf8{1}) >> 2)))
+                     . chr((0xC0 & (ord($utf8{1}) << 6))
+                         | (0x7F & ord($utf8{2})));
+        }
+
+        // ignoring UTF-32 for now, sorry
+        return '';
+    }
+}
+
diff --git a/lib/zend/Zend/Mime/Exception.php b/lib/zend/Zend/Json/Exception.php
similarity index 78%
rename from lib/zend/Zend/Mime/Exception.php
rename to lib/zend/Zend/Json/Exception.php
index 5c875ed5b4b..03c60e310aa 100644
--- a/lib/zend/Zend/Mime/Exception.php
+++ b/lib/zend/Zend/Json/Exception.php
@@ -13,8 +13,8 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,10 +28,10 @@ require_once 'Zend/Exception.php';
 
 /**
  * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Mime_Exception extends Zend_Exception
+class Zend_Json_Exception extends Zend_Exception
 {}
 
diff --git a/lib/zend/Zend/Json/Expr.php b/lib/zend/Zend/Json/Expr.php
new file mode 100644
index 00000000000..1fd5f23ffae
--- /dev/null
+++ b/lib/zend/Zend/Json/Expr.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Expr
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Class for Zend_Json encode method.
+ *
+ * This class simply holds a string with a native Javascript Expression,
+ * so objects | arrays to be encoded with Zend_Json can contain native
+ * Javascript Expressions.
+ *
+ * Example:
+ * <code>
+ * $foo = array(
+ *     'integer'  =>9,
+ *     'string'   =>'test string',
+ *     'function' => Zend_Json_Expr(
+ *         'function(){ window.alert("javascript function encoded by Zend_Json") }'
+ *     ),
+ * );
+ *
+ * Zend_Json::encode($foo, false, array('enableJsonExprFinder' => true));
+ * // it will returns json encoded string:
+ * // {"integer":9,"string":"test string","function":function(){window.alert("javascript function encoded by Zend_Json")}}
+ * </code>
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Expr
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Expr
+{
+    /**
+     * Storage for javascript expression.
+     *
+     * @var string
+     */
+    protected $_expression;
+
+    /**
+     * Constructor
+     *
+     * @param  string $expression the expression to hold.
+     * @return void
+     */
+    public function __construct($expression)
+    {
+        $this->_expression = (string) $expression;
+    }
+
+    /**
+     * Cast to string
+     *
+     * @return string holded javascript expression.
+     */
+    public function __toString()
+    {
+        return $this->_expression;
+    }
+}
diff --git a/lib/zend/Zend/Json/Server.php b/lib/zend/Zend/Json/Server.php
new file mode 100644
index 00000000000..589eb5d7079
--- /dev/null
+++ b/lib/zend/Zend/Json/Server.php
@@ -0,0 +1,568 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Server_Abstract
+ */
+require_once 'Zend/Server/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Server extends Zend_Server_Abstract
+{
+    /**#@+
+     * Version Constants
+     */
+    const VERSION_1 = '1.0';
+    const VERSION_2 = '2.0';
+    /**#@-*/
+
+    /**
+     * Flag: whether or not to auto-emit the response
+     * @var bool
+     */
+    protected $_autoEmitResponse = true;
+
+    /**
+     * @var bool Flag; allow overwriting existing methods when creating server definition
+     */
+    protected $_overwriteExistingMethods = true;
+
+    /**
+     * Request object
+     * @var Zend_Json_Server_Request
+     */
+    protected $_request;
+
+    /**
+     * Response object
+     * @var Zend_Json_Server_Response
+     */
+    protected $_response;
+
+    /**
+     * SMD object
+     * @var Zend_Json_Server_Smd
+     */
+    protected $_serviceMap;
+
+    /**
+     * SMD class accessors
+     * @var array
+     */
+    protected $_smdMethods;
+
+    /**
+     * @var Zend_Server_Description
+     */
+    protected $_table;
+
+    /**
+     * Attach a function or callback to the server
+     *
+     * @param  string|array $function Valid PHP callback
+     * @param  string $namespace  Ignored
+     * @return Zend_Json_Server
+     */
+    public function addFunction($function, $namespace = '')
+    {
+        if (!is_string($function) && (!is_array($function) || (2 > count($function)))) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Unable to attach function; invalid');
+        }
+
+        if (!is_callable($function)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Unable to attach function; does not exist');
+        }
+
+        $argv = null;
+        if (2 < func_num_args()) {
+            $argv = func_get_args();
+            $argv = array_slice($argv, 2);
+        }
+
+        require_once 'Zend/Server/Reflection.php';
+        if (is_string($function)) {
+            $method = Zend_Server_Reflection::reflectFunction($function, $argv, $namespace);
+        } else {
+            $class  = array_shift($function);
+            $action = array_shift($function);
+            $reflection = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
+            $methods = $reflection->getMethods();
+            $found   = false;
+            foreach ($methods as $method) {
+                if ($action == $method->getName()) {
+                    $found = true;
+                    break;
+                }
+            }
+            if (!$found) {
+                $this->fault('Method not found', -32601);
+                return $this;
+            }
+        }
+
+        $definition = $this->_buildSignature($method);
+        $this->_addMethodServiceMap($definition);
+
+        return $this;
+    }
+
+    /**
+     * Register a class with the server
+     *
+     * @param  string $class
+     * @param  string $namespace Ignored
+     * @param  mixed $argv Ignored
+     * @return Zend_Json_Server
+     */
+    public function setClass($class, $namespace = '', $argv = null)
+    {
+        $argv = null;
+        if (3 < func_num_args()) {
+            $argv = func_get_args();
+            $argv = array_slice($argv, 3);
+        }
+
+        require_once 'Zend/Server/Reflection.php';
+        $reflection = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
+
+        foreach ($reflection->getMethods() as $method) {
+            $definition = $this->_buildSignature($method, $class);
+            $this->_addMethodServiceMap($definition);
+        }
+        return $this;
+    }
+
+    /**
+     * Indicate fault response
+     *
+     * @param  string $fault
+     * @param  int $code
+     * @return false
+     */
+    public function fault($fault = null, $code = 404, $data = null)
+    {
+        require_once 'Zend/Json/Server/Error.php';
+        $error = new Zend_Json_Server_Error($fault, $code, $data);
+        $this->getResponse()->setError($error);
+        return $error;
+    }
+
+    /**
+     * Handle request
+     *
+     * @param  Zend_Json_Server_Request $request
+     * @return null|Zend_Json_Server_Response
+     */
+    public function handle($request = false)
+    {
+        if ((false !== $request) && (!$request instanceof Zend_Json_Server_Request)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Invalid request type provided; cannot handle');
+        } elseif ($request) {
+            $this->setRequest($request);
+        }
+
+        // Handle request
+        $this->_handle();
+
+        // Get response
+        $response = $this->_getReadyResponse();
+
+        // Emit response?
+        if ($this->autoEmitResponse()) {
+            echo $response;
+            return;
+        }
+
+        // or return it?
+        return $response;
+    }
+
+    /**
+     * Load function definitions
+     *
+     * @param  array|Zend_Server_Definition $definition
+     * @return void
+     */
+    public function loadFunctions($definition)
+    {
+        if (!is_array($definition) && (!$definition instanceof Zend_Server_Definition)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Invalid definition provided to loadFunctions()');
+        }
+
+        foreach ($definition as $key => $method) {
+            $this->_table->addMethod($method, $key);
+            $this->_addMethodServiceMap($method);
+        }
+    }
+
+    public function setPersistence($mode)
+    {
+    }
+
+    /**
+     * Set request object
+     *
+     * @param  Zend_Json_Server_Request $request
+     * @return Zend_Json_Server
+     */
+    public function setRequest(Zend_Json_Server_Request $request)
+    {
+        $this->_request = $request;
+        return $this;
+    }
+
+    /**
+     * Get JSON-RPC request object
+     *
+     * @return Zend_Json_Server_Request
+     */
+    public function getRequest()
+    {
+        if (null === ($request = $this->_request)) {
+            require_once 'Zend/Json/Server/Request/Http.php';
+            $this->setRequest(new Zend_Json_Server_Request_Http());
+        }
+        return $this->_request;
+    }
+
+    /**
+     * Set response object
+     *
+     * @param  Zend_Json_Server_Response $response
+     * @return Zend_Json_Server
+     */
+    public function setResponse(Zend_Json_Server_Response $response)
+    {
+        $this->_response = $response;
+        return $this;
+    }
+
+    /**
+     * Get response object
+     *
+     * @return Zend_Json_Server_Response
+     */
+    public function getResponse()
+    {
+        if (null === ($response = $this->_response)) {
+            require_once 'Zend/Json/Server/Response/Http.php';
+            $this->setResponse(new Zend_Json_Server_Response_Http());
+        }
+        return $this->_response;
+    }
+
+    /**
+     * Set flag indicating whether or not to auto-emit response
+     *
+     * @param  bool $flag
+     * @return Zend_Json_Server
+     */
+    public function setAutoEmitResponse($flag)
+    {
+        $this->_autoEmitResponse = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Will we auto-emit the response?
+     *
+     * @return bool
+     */
+    public function autoEmitResponse()
+    {
+        return $this->_autoEmitResponse;
+    }
+
+    // overloading for SMD metadata
+    /**
+     * Overload to accessors of SMD object
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return mixed
+     */
+    public function __call($method, $args)
+    {
+        if (preg_match('/^(set|get)/', $method, $matches)) {
+            if (in_array($method, $this->_getSmdMethods())) {
+                if ('set' == $matches[1]) {
+                    $value = array_shift($args);
+                    $this->getServiceMap()->$method($value);
+                    return $this;
+                } else {
+                    return $this->getServiceMap()->$method();
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Retrieve SMD object
+     *
+     * @return Zend_Json_Server_Smd
+     */
+    public function getServiceMap()
+    {
+        if (null === $this->_serviceMap) {
+            require_once 'Zend/Json/Server/Smd.php';
+            $this->_serviceMap = new Zend_Json_Server_Smd();
+        }
+        return $this->_serviceMap;
+    }
+
+    /**
+     * Add service method to service map
+     *
+     * @param  Zend_Server_Reflection_Function $method
+     * @return void
+     */
+    protected function _addMethodServiceMap(Zend_Server_Method_Definition $method)
+    {
+        $serviceInfo = array(
+            'name'   => $method->getName(),
+            'return' => $this->_getReturnType($method),
+        );
+        $params = $this->_getParams($method);
+        $serviceInfo['params'] = $params;
+        $serviceMap = $this->getServiceMap();
+        if (false !== $serviceMap->getService($serviceInfo['name'])) {
+            $serviceMap->removeService($serviceInfo['name']);
+        }
+        $serviceMap->addService($serviceInfo);
+    }
+
+    /**
+     * Translate PHP type to JSON type
+     *
+     * @param  string $type
+     * @return string
+     */
+    protected function _fixType($type)
+    {
+        return $type;
+    }
+
+    /**
+     * Get default params from signature
+     *
+     * @param  array $args
+     * @param  array $params
+     * @return array
+     */
+    protected function _getDefaultParams(array $args, array $params)
+    {
+        $defaultParams = array_slice($params, count($args));
+        foreach ($defaultParams as $param) {
+            $value = null;
+            if (array_key_exists('default', $param)) {
+                $value = $param['default'];
+            }
+            array_push($args, $value);
+        }
+        return $args;
+    }
+
+    /**
+     * Get method param type
+     *
+     * @param  Zend_Server_Reflection_Function_Abstract $method
+     * @return string|array
+     */
+    protected function _getParams(Zend_Server_Method_Definition $method)
+    {
+        $params = array();
+        foreach ($method->getPrototypes() as $prototype) {
+            foreach ($prototype->getParameterObjects() as $key => $parameter) {
+                if (!isset($params[$key])) {
+                    $params[$key] = array(
+                        'type'     => $parameter->getType(),
+                        'name'     => $parameter->getName(),
+                        'optional' => $parameter->isOptional(),
+                    );
+                    if (null !== ($default = $parameter->getDefaultValue())) {
+                        $params[$key]['default'] = $default;
+                    }
+                    $description = $parameter->getDescription();
+                    if (!empty($description)) {
+                        $params[$key]['description'] = $description;
+                    }
+                    continue;
+                }
+                $newType = $parameter->getType();
+                if (!is_array($params[$key]['type'])) {
+                    if ($params[$key]['type'] == $newType) {
+                        continue;
+                    }
+                    $params[$key]['type'] = (array) $params[$key]['type'];
+                } elseif (in_array($newType, $params[$key]['type'])) {
+                    continue;
+                }
+                array_push($params[$key]['type'], $parameter->getType());
+            }
+        }
+        return $params;
+    }
+
+    /**
+     * Set response state
+     *
+     * @return Zend_Json_Server_Response
+     */
+    protected function _getReadyResponse()
+    {
+        $request  = $this->getRequest();
+        $response = $this->getResponse();
+
+        $response->setServiceMap($this->getServiceMap());
+        if (null !== ($id = $request->getId())) {
+            $response->setId($id);
+        }
+        if (null !== ($version = $request->getVersion())) {
+            $response->setVersion($version);
+        }
+
+        return $response;
+    }
+
+    /**
+     * Get method return type
+     *
+     * @param  Zend_Server_Reflection_Function_Abstract $method
+     * @return string|array
+     */
+    protected function _getReturnType(Zend_Server_Method_Definition $method)
+    {
+        $return = array();
+        foreach ($method->getPrototypes() as $prototype) {
+            $return[] = $prototype->getReturnType();
+        }
+        if (1 == count($return)) {
+            return $return[0];
+        }
+        return $return;
+    }
+
+    /**
+     * Retrieve list of allowed SMD methods for proxying
+     *
+     * @return array
+     */
+    protected function _getSmdMethods()
+    {
+        if (null === $this->_smdMethods) {
+            $this->_smdMethods = array();
+            require_once 'Zend/Json/Server/Smd.php';
+            $methods = get_class_methods('Zend_Json_Server_Smd');
+            foreach ($methods as $key => $method) {
+                if (!preg_match('/^(set|get)/', $method)) {
+                    continue;
+                }
+                if (strstr($method, 'Service')) {
+                    continue;
+                }
+                $this->_smdMethods[] = $method;
+            }
+        }
+        return $this->_smdMethods;
+    }
+
+    /**
+     * Internal method for handling request
+     *
+     * @return void
+     */
+    protected function _handle()
+    {
+        $request = $this->getRequest();
+
+        if (!$request->isMethodError() && (null === $request->getMethod())) {
+            return $this->fault('Invalid Request', -32600);
+        }
+
+        if ($request->isMethodError()) {
+            return $this->fault('Invalid Request', -32600);
+        }
+
+        $method = $request->getMethod();
+        if (!$this->_table->hasMethod($method)) {
+            return $this->fault('Method not found', -32601);
+        }
+
+        $params        = $request->getParams();
+        $invocable     = $this->_table->getMethod($method);
+        $serviceMap    = $this->getServiceMap();
+        $service       = $serviceMap->getService($method);
+        $serviceParams = $service->getParams();
+
+        if (count($params) < count($serviceParams)) {
+            $params = $this->_getDefaultParams($params, $serviceParams);
+        }
+
+        //Make sure named parameters are passed in correct order
+        if ( is_string( key( $params ) ) ) {
+
+            $callback = $invocable->getCallback();
+            if ('function' == $callback->getType()) {
+                $reflection = new ReflectionFunction( $callback->getFunction() );
+                $refParams  = $reflection->getParameters();
+            } else {
+
+                $reflection = new ReflectionMethod(
+                    $callback->getClass(),
+                    $callback->getMethod()
+                );
+                $refParams = $reflection->getParameters();
+            }
+
+            $orderedParams = array();
+            foreach( $reflection->getParameters() as $refParam ) {
+                if( isset( $params[ $refParam->getName() ] ) ) {
+                    $orderedParams[ $refParam->getName() ] = $params[ $refParam->getName() ];
+                } elseif( $refParam->isOptional() ) {
+                    $orderedParams[ $refParam->getName() ] = $refParam->getDefaultValue();
+                } else {
+                    throw new Zend_Server_Exception(
+                        'Method ' . $request->getMethod() .  ' is missing required parameter: ' . $refParam->getName()
+                    );
+                }
+            }
+            $params = $orderedParams;
+        }
+
+        try {
+            $result = $this->_dispatch($invocable, $params);
+        } catch (Exception $e) {
+            return $this->fault($e->getMessage(), $e->getCode(), $e);
+        }
+
+        $this->getResponse()->setResult($result);
+    }
+}
diff --git a/lib/zend/Zend/Json/Server/Cache.php b/lib/zend/Zend/Json/Server/Cache.php
new file mode 100644
index 00000000000..bb86870a4e1
--- /dev/null
+++ b/lib/zend/Zend/Json/Server/Cache.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Server
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Server_Cache */
+require_once 'Zend/Server/Cache.php';
+
+/**
+ * Zend_Json_Server_Cache: cache Zend_Json_Server server definition and SMD
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Server
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Server_Cache extends Zend_Server_Cache
+{
+    /**
+     * Cache a service map description (SMD) to a file
+     *
+     * Returns true on success, false on failure
+     *
+     * @param  string $filename
+     * @param  Zend_Json_Server $server
+     * @return boolean
+     */
+    public static function saveSmd($filename, Zend_Json_Server $server)
+    {
+        if (!is_string($filename)
+            || (!file_exists($filename) && !is_writable(dirname($filename))))
+        {
+            return false;
+        }
+
+        if (0 === @file_put_contents($filename, $server->getServiceMap()->toJson())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Retrieve a cached SMD
+     *
+     * On success, returns the cached SMD (a JSON string); an failure, returns
+     * boolean false.
+     *
+     * @param  string $filename
+     * @return string|false
+     */
+    public static function getSmd($filename)
+    {
+        if (!is_string($filename)
+            || !file_exists($filename)
+            || !is_readable($filename))
+        {
+            return false;
+        }
+
+
+        if (false === ($smd = @file_get_contents($filename))) {
+            return false;
+        }
+
+        return $smd;
+    }
+
+    /**
+     * Delete a file containing a cached SMD
+     *
+     * @param  string $filename
+     * @return bool
+     */
+    public static function deleteSmd($filename)
+    {
+        if (is_string($filename) && file_exists($filename)) {
+            unlink($filename);
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/lib/zend/Zend/Json/Server/Error.php b/lib/zend/Zend/Json/Server/Error.php
new file mode 100644
index 00000000000..838e56a20fa
--- /dev/null
+++ b/lib/zend/Zend/Json/Server/Error.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Server_Error
+{
+    const ERROR_PARSE           = -32768;
+    const ERROR_INVALID_REQUEST = -32600;
+    const ERROR_INVALID_METHOD  = -32601;
+    const ERROR_INVALID_PARAMS  = -32602;
+    const ERROR_INTERNAL        = -32603;
+    const ERROR_OTHER           = -32000;
+
+    /**
+     * Allowed error codes
+     * @var array
+     */
+    protected $_allowedCodes = array(
+        self::ERROR_PARSE,
+        self::ERROR_INVALID_REQUEST,
+        self::ERROR_INVALID_METHOD,
+        self::ERROR_INVALID_PARAMS,
+        self::ERROR_INTERNAL,
+        self::ERROR_OTHER,
+    );
+
+    /**
+     * Current code
+     * @var int
+     */
+    protected $_code = -32000;
+
+    /**
+     * Error data
+     * @var mixed
+     */
+    protected $_data;
+
+    /**
+     * Error message
+     * @var string
+     */
+    protected $_message;
+
+    /**
+     * Constructor
+     *
+     * @param  string $message
+     * @param  int $code
+     * @param  mixed $data
+     * @return void
+     */
+    public function __construct($message = null, $code = -32000, $data = null)
+    {
+        $this->setMessage($message)
+             ->setCode($code)
+             ->setData($data);
+    }
+
+    /**
+     * Set error code
+     *
+     * @param  int $code
+     * @return Zend_Json_Server_Error
+     */
+    public function setCode($code)
+    {
+        if (!is_scalar($code)) {
+            return $this;
+        }
+
+        $code = (int) $code;
+        if (in_array($code, $this->_allowedCodes)) {
+            $this->_code = $code;
+        } elseif (in_array($code, range(-32099, -32000))) {
+            $this->_code = $code;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get error code
+     *
+     * @return int|null
+     */
+    public function getCode()
+    {
+        return $this->_code;
+    }
+
+    /**
+     * Set error message
+     *
+     * @param  string $message
+     * @return Zend_Json_Server_Error
+     */
+    public function setMessage($message)
+    {
+        if (!is_scalar($message)) {
+            return $this;
+        }
+
+        $this->_message = (string) $message;
+        return $this;
+    }
+
+    /**
+     * Get error message
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->_message;
+    }
+
+    /**
+     * Set error data
+     *
+     * @param  mixed $data
+     * @return Zend_Json_Server_Error
+     */
+    public function setData($data)
+    {
+        $this->_data = $data;
+        return $this;
+    }
+
+    /**
+     * Get error data
+     *
+     * @return mixed
+     */
+    public function getData()
+    {
+        return $this->_data;
+    }
+
+    /**
+     * Cast error to array
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return array(
+            'code'    => $this->getCode(),
+            'message' => $this->getMessage(),
+            'data'    => $this->getData(),
+        );
+    }
+
+    /**
+     * Cast error to JSON
+     *
+     * @return string
+     */
+    public function toJson()
+    {
+        require_once 'Zend/Json.php';
+        return Zend_Json::encode($this->toArray());
+    }
+
+    /**
+     * Cast to string (JSON)
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toJson();
+    }
+}
+
diff --git a/lib/zend/Zend/Json/Server/Exception.php b/lib/zend/Zend/Json/Server/Exception.php
new file mode 100644
index 00000000000..b847e50146c
--- /dev/null
+++ b/lib/zend/Zend/Json/Server/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Json_Exception */
+require_once 'Zend/Json/Exception.php';
+
+/**
+ * Zend_Json_Server exceptions
+ *
+ * @uses       Zend_Json_Exception
+ * @package    Zend_Json
+ * @subpackage Server
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Server_Exception extends Zend_Json_Exception
+{
+}
diff --git a/lib/zend/Zend/Json/Server/Request.php b/lib/zend/Zend/Json/Server/Request.php
new file mode 100644
index 00000000000..72983e48978
--- /dev/null
+++ b/lib/zend/Zend/Json/Server/Request.php
@@ -0,0 +1,289 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Server
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Server
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Server_Request
+{
+    /**
+     * Request ID
+     * @var mixed
+     */
+    protected $_id;
+
+    /**
+     * Flag
+     * @var bool
+     */
+    protected $_isMethodError = false;
+
+    /**
+     * Requested method
+     * @var string
+     */
+    protected $_method;
+
+    /**
+     * Regex for method
+     * @var string
+     */
+    protected $_methodRegex = '/^[a-z][a-z0-9_.]*$/i';
+
+    /**
+     * Request parameters
+     * @var array
+     */
+    protected $_params = array();
+
+    /**
+     * JSON-RPC version of request
+     * @var string
+     */
+    protected $_version = '1.0';
+
+    /**
+     * Set request state
+     *
+     * @param  array $options
+     * @return Zend_Json_Server_Request
+     */
+    public function setOptions(array $options)
+    {
+        $methods = get_class_methods($this);
+        foreach ($options as $key => $value) {
+            $method = 'set' . ucfirst($key);
+            if (in_array($method, $methods)) {
+                $this->$method($value);
+            } elseif ($key == 'jsonrpc') {
+                $this->setVersion($value);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Add a parameter to the request
+     *
+     * @param  mixed $value
+     * @param  string $key
+     * @return Zend_Json_Server_Request
+     */
+    public function addParam($value, $key = null)
+    {
+        if ((null === $key) || !is_string($key)) {
+            $index = count($this->_params);
+            $this->_params[$index] = $value;
+        } else {
+            $this->_params[$key] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add many params
+     *
+     * @param  array $params
+     * @return Zend_Json_Server_Request
+     */
+    public function addParams(array $params)
+    {
+        foreach ($params as $key => $value) {
+            $this->addParam($value, $key);
+        }
+        return $this;
+    }
+
+    /**
+     * Overwrite params
+     *
+     * @param  array $params
+     * @return Zend_Json_Server_Request
+     */
+    public function setParams(array $params)
+    {
+        $this->_params = array();
+        return $this->addParams($params);
+    }
+
+    /**
+     * Retrieve param by index or key
+     *
+     * @param  int|string $index
+     * @return mixed|null Null when not found
+     */
+    public function getParam($index)
+    {
+        if (array_key_exists($index, $this->_params)) {
+            return $this->_params[$index];
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieve parameters
+     *
+     * @return array
+     */
+    public function getParams()
+    {
+        return $this->_params;
+    }
+
+    /**
+     * Set request method
+     *
+     * @param  string $name
+     * @return Zend_Json_Server_Request
+     */
+    public function setMethod($name)
+    {
+        if (!preg_match($this->_methodRegex, $name)) {
+            $this->_isMethodError = true;
+        } else {
+            $this->_method = $name;
+        }
+        return $this;
+    }
+
+    /**
+     * Get request method name
+     *
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->_method;
+    }
+
+    /**
+     * Was a bad method provided?
+     *
+     * @return bool
+     */
+    public function isMethodError()
+    {
+        return $this->_isMethodError;
+    }
+
+    /**
+     * Set request identifier
+     *
+     * @param  mixed $name
+     * @return Zend_Json_Server_Request
+     */
+    public function setId($name)
+    {
+        $this->_id = (string) $name;
+        return $this;
+    }
+
+    /**
+     * Retrieve request identifier
+     *
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->_id;
+    }
+
+    /**
+     * Set JSON-RPC version
+     *
+     * @param  string $version
+     * @return Zend_Json_Server_Request
+     */
+    public function setVersion($version)
+    {
+        if ('2.0' == $version) {
+            $this->_version = '2.0';
+        } else {
+            $this->_version = '1.0';
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve JSON-RPC version
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return $this->_version;
+    }
+
+    /**
+     * Set request state based on JSON
+     *
+     * @param  string $json
+     * @return void
+     */
+    public function loadJson($json)
+    {
+        require_once 'Zend/Json.php';
+        $options = Zend_Json::decode($json);
+        $this->setOptions($options);
+    }
+
+    /**
+     * Cast request to JSON
+     *
+     * @return string
+     */
+    public function toJson()
+    {
+        $jsonArray = array(
+            'method' => $this->getMethod()
+        );
+        if (null !== ($id = $this->getId())) {
+            $jsonArray['id'] = $id;
+        }
+        $params = $this->getParams();
+        if (!empty($params)) {
+            $jsonArray['params'] = $params;
+        }
+        if ('2.0' == $this->getVersion()) {
+            $jsonArray['jsonrpc'] = '2.0';
+        }
+
+        require_once 'Zend/Json.php';
+        return Zend_Json::encode($jsonArray);
+    }
+
+    /**
+     * Cast request to string (JSON)
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toJson();
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php b/lib/zend/Zend/Json/Server/Request/Http.php
similarity index 51%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php
rename to lib/zend/Zend/Json/Server/Request/Http.php
index 780be1e4628..c817ea818f9 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php
+++ b/lib/zend/Zend/Json/Server/Request/Http.php
@@ -13,52 +13,54 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/**
+ * @see Zend_Json_Server_Request
+ */
+require_once 'Zend/Json/Server/Request.php';
+
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber
+class Zend_Json_Server_Request_Http extends Zend_Json_Server_Request
 {
     /**
-     * the number
+     * Raw JSON pulled from POST body
      * @var string
      */
-    public $number = null;
+    protected $_rawJson;
 
     /**
-     * is valid until this date
-     * @var string
-     */
-    public $validUntil = null;
-
-    /**
-     * returns the number
+     * Constructor
      *
-     * @return number
+     * Pull JSON request from raw POST body and use to populate request.
+     *
+     * @return void
      */
-    public function getNumber()
+    public function __construct()
     {
-        return $this->number;
+        $json = file_get_contents('php://input');
+        $this->_rawJson = $json;
+        if (!empty($json)) {
+            $this->loadJson($json);
+        }
     }
 
     /**
-     * returns the valid until date
+     * Get JSON from raw POST body
      *
      * @return string
      */
-    public function getValidUntil()
+    public function getRawJson()
     {
-        return $this->validUntil;
+        return $this->_rawJson;
     }
 }
diff --git a/lib/zend/Zend/Json/Server/Response.php b/lib/zend/Zend/Json/Server/Response.php
new file mode 100644
index 00000000000..c5c6c7e36c9
--- /dev/null
+++ b/lib/zend/Zend/Json/Server/Response.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Server
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Server
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Server_Response
+{
+    /**
+     * Response error
+     * @var null|Zend_Json_Server_Error
+     */
+    protected $_error;
+
+    /**
+     * Request ID
+     * @var mixed
+     */
+    protected $_id;
+
+    /**
+     * Result
+     * @var mixed
+     */
+    protected $_result;
+
+    /**
+     * Service map
+     * @var Zend_Json_Server_Smd
+     */
+    protected $_serviceMap;
+
+    /**
+     * JSON-RPC version
+     * @var string
+     */
+    protected $_version;
+
+    /**
+     * Set result
+     *
+     * @param  mixed $value
+     * @return Zend_Json_Server_Response
+     */
+    public function setResult($value)
+    {
+        $this->_result = $value;
+        return $this;
+    }
+
+    /**
+     * Get result
+     *
+     * @return mixed
+     */
+    public function getResult()
+    {
+        return $this->_result;
+    }
+
+    // RPC error, if response results in fault
+    /**
+     * Set result error
+     *
+     * @param  Zend_Json_Server_Error $error
+     * @return Zend_Json_Server_Response
+     */
+    public function setError(Zend_Json_Server_Error $error)
+    {
+        $this->_error = $error;
+        return $this;
+    }
+
+    /**
+     * Get response error
+     *
+     * @return null|Zend_Json_Server_Error
+     */
+    public function getError()
+    {
+        return $this->_error;
+    }
+
+    /**
+     * Is the response an error?
+     *
+     * @return bool
+     */
+    public function isError()
+    {
+        return $this->getError() instanceof Zend_Json_Server_Error;
+    }
+
+    /**
+     * Set request ID
+     *
+     * @param  mixed $name
+     * @return Zend_Json_Server_Response
+     */
+    public function setId($name)
+    {
+        $this->_id = $name;
+        return $this;
+    }
+
+    /**
+     * Get request ID
+     *
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->_id;
+    }
+
+    /**
+     * Set JSON-RPC version
+     *
+     * @param  string $version
+     * @return Zend_Json_Server_Response
+     */
+    public function setVersion($version)
+    {
+        $version = is_array($version)
+            ? implode(' ', $version)
+            : $version;
+        if ((string)$version == '2.0') {
+            $this->_version = '2.0';
+        } else {
+            $this->_version = null;
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve JSON-RPC version
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return $this->_version;
+    }
+
+    /**
+     * Cast to JSON
+     *
+     * @return string
+     */
+    public function toJson()
+    {
+        if ($this->isError()) {
+            $response = array(
+                'error'  => $this->getError()->toArray(),
+                'id'     => $this->getId(),
+            );
+        } else {
+            $response = array(
+                'result' => $this->getResult(),
+                'id'     => $this->getId(),
+            );
+        }
+
+        if (null !== ($version = $this->getVersion())) {
+            $response['jsonrpc'] = $version;
+        }
+
+        require_once 'Zend/Json.php';
+        return Zend_Json::encode($response);
+    }
+
+    /**
+     * Retrieve args
+     *
+     * @return mixed
+     */
+    public function getArgs()
+    {
+        return $this->_args;
+    }
+
+    /**
+     * Set args
+     *
+     * @param mixed $args
+     * @return self
+     */
+    public function setArgs($args)
+    {
+        $this->_args = $args;
+        return $this;
+    }
+
+    /**
+     * Set service map object
+     *
+     * @param  Zend_Json_Server_Smd $serviceMap
+     * @return Zend_Json_Server_Response
+     */
+    public function setServiceMap($serviceMap)
+    {
+        $this->_serviceMap = $serviceMap;
+        return $this;
+    }
+
+    /**
+     * Retrieve service map
+     *
+     * @return Zend_Json_Server_Smd|null
+     */
+    public function getServiceMap()
+    {
+        return $this->_serviceMap;
+    }
+
+    /**
+     * Cast to string (JSON)
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toJson();
+    }
+}
+
diff --git a/lib/zend/Zend/Json/Server/Response/Http.php b/lib/zend/Zend/Json/Server/Response/Http.php
new file mode 100644
index 00000000000..6f38cd5f936
--- /dev/null
+++ b/lib/zend/Zend/Json/Server/Response/Http.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Json_Server_Response
+ */
+require_once 'Zend/Json/Server/Response.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Server_Response_Http extends Zend_Json_Server_Response
+{
+    /**
+     * Emit JSON
+     *
+     * Send appropriate HTTP headers. If no Id, then return an empty string.
+     *
+     * @return string
+     */
+    public function toJson()
+    {
+        $this->sendHeaders();
+        if (!$this->isError() && null === $this->getId()) {
+            return '';
+        }
+
+        return parent::toJson();
+    }
+
+    /**
+     * Send headers
+     *
+     * If headers are already sent, do nothing. If null ID, send HTTP 204
+     * header. Otherwise, send content type header based on content type of
+     * service map.
+     *
+     * @return void
+     */
+    public function sendHeaders()
+    {
+        if (headers_sent()) {
+            return;
+        }
+
+        if (!$this->isError() && (null === $this->getId())) {
+            header('HTTP/1.1 204 No Content');
+            return;
+        }
+
+        if (null === ($smd = $this->getServiceMap())) {
+            return;
+        }
+
+        $contentType = $smd->getContentType();
+        if (!empty($contentType)) {
+            header('Content-Type: ' . $contentType);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Json/Server/Smd.php b/lib/zend/Zend/Json/Server/Smd.php
new file mode 100644
index 00000000000..ba650af2242
--- /dev/null
+++ b/lib/zend/Zend/Json/Server/Smd.php
@@ -0,0 +1,480 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Server
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Server
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Server_Smd
+{
+    const ENV_JSONRPC_1 = 'JSON-RPC-1.0';
+    const ENV_JSONRPC_2 = 'JSON-RPC-2.0';
+    const SMD_VERSION   = '2.0';
+
+    /**
+     * Content type
+     * @var string
+     */
+    protected $_contentType = 'application/json';
+
+    /**
+     * Content type regex
+     * @var string
+     */
+    protected $_contentTypeRegex = '#[a-z]+/[a-z][a-z-]+#i';
+
+    /**
+     * Service description
+     * @var string
+     */
+    protected $_description;
+
+    /**
+     * Generate Dojo-compatible SMD
+     * @var bool
+     */
+    protected $_dojoCompatible = false;
+
+    /**
+     * Current envelope
+     * @var string
+     */
+    protected $_envelope = self::ENV_JSONRPC_1;
+
+    /**
+     * Allowed envelope types
+     * @var array
+     */
+    protected $_envelopeTypes = array(
+        self::ENV_JSONRPC_1,
+        self::ENV_JSONRPC_2,
+    );
+
+    /**
+     * Service id
+     * @var string
+     */
+    protected $_id;
+
+    /**
+     * Services offerred
+     * @var array
+     */
+    protected $_services = array();
+
+    /**
+     * Service target
+     * @var string
+     */
+    protected $_target;
+
+    /**
+     * Global transport
+     * @var string
+     */
+    protected $_transport = 'POST';
+
+    /**
+     * Allowed transport types
+     * @var array
+     */
+    protected $_transportTypes = array('POST');
+
+    /**
+     * Set object state via options
+     *
+     * @param  array $options
+     * @return Zend_Json_Server_Smd
+     */
+    public function setOptions(array $options)
+    {
+        $methods = get_class_methods($this);
+        foreach ($options as $key => $value) {
+            $method = 'set' . ucfirst($key);
+            if (in_array($method, $methods)) {
+                $this->$method($value);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Set transport
+     *
+     * @param  string $transport
+     * @return Zend_Json_Server_Smd
+     */
+    public function setTransport($transport)
+    {
+        if (!in_array($transport, $this->_transportTypes)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception(sprintf('Invalid transport "%s" specified', $transport));
+        }
+        $this->_transport = $transport;
+        return $this;
+    }
+
+    /**
+     * Get transport
+     *
+     * @return string
+     */
+    public function getTransport()
+    {
+        return $this->_transport;
+    }
+
+    /**
+     * Set envelope
+     *
+     * @param  string $envelopeType
+     * @return Zend_Json_Server_Smd
+     */
+    public function setEnvelope($envelopeType)
+    {
+        if (!in_array($envelopeType, $this->_envelopeTypes)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception(sprintf('Invalid envelope type "%s"', $envelopeType));
+        }
+        $this->_envelope = $envelopeType;
+        return $this;
+    }
+
+    /**
+     * Retrieve envelope
+     *
+     * @return string
+     */
+    public function getEnvelope()
+    {
+        return $this->_envelope;
+    }
+
+    // Content-Type of response; default to application/json
+    /**
+     * Set content type
+     *
+     * @param  string $type
+     * @return Zend_Json_Server_Smd
+     */
+    public function setContentType($type)
+    {
+        if (!preg_match($this->_contentTypeRegex, $type)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception(sprintf('Invalid content type "%s" specified', $type));
+        }
+        $this->_contentType = $type;
+        return $this;
+    }
+
+    /**
+     * Retrieve content type
+     *
+     * @return string
+     */
+    public function getContentType()
+    {
+        return $this->_contentType;
+    }
+
+    /**
+     * Set service target
+     *
+     * @param  string $target
+     * @return Zend_Json_Server_Smd
+     */
+    public function setTarget($target)
+    {
+        $this->_target = (string) $target;
+        return $this;
+    }
+
+    /**
+     * Retrieve service target
+     *
+     * @return string
+     */
+    public function getTarget()
+    {
+        return $this->_target;
+    }
+
+    /**
+     * Set service ID
+     *
+     * @param  string $Id
+     * @return Zend_Json_Server_Smd
+     */
+    public function setId($id)
+    {
+        $this->_id = (string) $id;
+        return $this->_id;
+    }
+
+    /**
+     * Get service id
+     *
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->_id;
+    }
+
+    /**
+     * Set service description
+     *
+     * @param  string $description
+     * @return Zend_Json_Server_Smd
+     */
+    public function setDescription($description)
+    {
+        $this->_description = (string) $description;
+        return $this->_description;
+    }
+
+    /**
+     * Get service description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->_description;
+    }
+
+    /**
+     * Indicate whether or not to generate Dojo-compatible SMD
+     *
+     * @param  bool $flag
+     * @return Zend_Json_Server_Smd
+     */
+    public function setDojoCompatible($flag)
+    {
+        $this->_dojoCompatible = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Is this a Dojo compatible SMD?
+     *
+     * @return bool
+     */
+    public function isDojoCompatible()
+    {
+        return $this->_dojoCompatible;
+    }
+
+    /**
+     * Add Service
+     *
+     * @param Zend_Json_Server_Smd_Service|array $service
+     * @return void
+     */
+    public function addService($service)
+    {
+        require_once 'Zend/Json/Server/Smd/Service.php';
+
+        if ($service instanceof Zend_Json_Server_Smd_Service) {
+            $name = $service->getName();
+        } elseif (is_array($service)) {
+            $service = new Zend_Json_Server_Smd_Service($service);
+            $name = $service->getName();
+        } else {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Invalid service passed to addService()');
+        }
+
+        if (array_key_exists($name, $this->_services)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Attempt to register a service already registered detected');
+        }
+        $this->_services[$name] = $service;
+        return $this;
+    }
+
+    /**
+     * Add many services
+     *
+     * @param  array $services
+     * @return Zend_Json_Server_Smd
+     */
+    public function addServices(array $services)
+    {
+        foreach ($services as $service) {
+            $this->addService($service);
+        }
+        return $this;
+    }
+
+    /**
+     * Overwrite existing services with new ones
+     *
+     * @param  array $services
+     * @return Zend_Json_Server_Smd
+     */
+    public function setServices(array $services)
+    {
+        $this->_services = array();
+        return $this->addServices($services);
+    }
+
+    /**
+     * Get service object
+     *
+     * @param  string $name
+     * @return false|Zend_Json_Server_Smd_Service
+     */
+    public function getService($name)
+    {
+        if (array_key_exists($name, $this->_services)) {
+            return $this->_services[$name];
+        }
+        return false;
+    }
+
+    /**
+     * Return services
+     *
+     * @return array
+     */
+    public function getServices()
+    {
+        return $this->_services;
+    }
+
+    /**
+     * Remove service
+     *
+     * @param  string $name
+     * @return boolean
+     */
+    public function removeService($name)
+    {
+        if (array_key_exists($name, $this->_services)) {
+            unset($this->_services[$name]);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Cast to array
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        if ($this->isDojoCompatible()) {
+            return $this->toDojoArray();
+        }
+
+        $transport   = $this->getTransport();
+        $envelope    = $this->getEnvelope();
+        $contentType = $this->getContentType();
+        $SMDVersion  = self::SMD_VERSION;
+        $service = compact('transport', 'envelope', 'contentType', 'SMDVersion');
+
+        if (null !== ($target = $this->getTarget())) {
+            $service['target']     = $target;
+        }
+        if (null !== ($id = $this->getId())) {
+            $service['id'] = $id;
+        }
+
+        $services = $this->getServices();
+        if (!empty($services)) {
+            $service['services'] = array();
+            foreach ($services as $name => $svc) {
+                $svc->setEnvelope($envelope);
+                $service['services'][$name] = $svc->toArray();
+            }
+            $service['methods'] = $service['services'];
+        }
+
+        return $service;
+    }
+
+    /**
+     * Export to DOJO-compatible SMD array
+     *
+     * @return array
+     */
+    public function toDojoArray()
+    {
+        $SMDVersion  = '.1';
+        $serviceType = 'JSON-RPC';
+        $service = compact('SMDVersion', 'serviceType');
+
+        $target = $this->getTarget();
+
+        $services = $this->getServices();
+        if (!empty($services)) {
+            $service['methods'] = array();
+            foreach ($services as $name => $svc) {
+                $method = array(
+                    'name'       => $name,
+                    'serviceURL' => $target,
+                );
+                $params = array();
+                foreach ($svc->getParams() as $param) {
+                    $paramName = array_key_exists('name', $param) ? $param['name'] : $param['type'];
+                    $params[] = array(
+                        'name' => $paramName,
+                        'type' => $param['type'],
+                    );
+                }
+                if (!empty($params)) {
+                    $method['parameters'] = $params;
+                }
+                $service['methods'][] = $method;
+            }
+        }
+
+        return $service;
+    }
+
+    /**
+     * Cast to JSON
+     *
+     * @return string
+     */
+    public function toJson()
+    {
+        require_once 'Zend/Json.php';
+        return Zend_Json::encode($this->toArray());
+    }
+
+    /**
+     * Cast to string (JSON)
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toJson();
+    }
+}
+
diff --git a/lib/zend/Zend/Json/Server/Smd/Service.php b/lib/zend/Zend/Json/Server/Smd/Service.php
new file mode 100644
index 00000000000..64c31463a15
--- /dev/null
+++ b/lib/zend/Zend/Json/Server/Smd/Service.php
@@ -0,0 +1,473 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Json_Server_Smd
+ */
+require_once 'Zend/Json/Server/Smd.php';
+
+/**
+ * Create Service Mapping Description for a method
+ *
+ * @package    Zend_Json
+ * @subpackage Server
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Json_Server_Smd_Service
+{
+    /**#@+
+     * Service metadata
+     * @var string
+     */
+    protected $_envelope  = Zend_Json_Server_Smd::ENV_JSONRPC_1;
+    protected $_name;
+    protected $_return;
+    protected $_target;
+    protected $_transport = 'POST';
+    /**#@-*/
+
+    /**
+     * Allowed envelope types
+     * @var array
+     */
+    protected $_envelopeTypes = array(
+        Zend_Json_Server_Smd::ENV_JSONRPC_1,
+        Zend_Json_Server_Smd::ENV_JSONRPC_2,
+    );
+
+    /**
+     * Regex for names
+     * @var string
+     */
+    protected $_nameRegex = '/^[a-z][a-z0-9._]+$/i';
+
+    /**
+     * Parameter option types
+     * @var array
+     */
+    protected $_paramOptionTypes = array(
+        'name'        => 'is_string',
+        'optional'    => 'is_bool',
+        'default'     => null,
+        'description' => 'is_string',
+    );
+
+    /**
+     * Service params
+     * @var array
+     */
+    protected $_params = array();
+
+    /**
+     * Mapping of parameter types to JSON-RPC types
+     * @var array
+     */
+    protected $_paramMap = array(
+        'any'     => 'any',
+        'arr'     => 'array',
+        'array'   => 'array',
+        'assoc'   => 'object',
+        'bool'    => 'boolean',
+        'boolean' => 'boolean',
+        'dbl'     => 'float',
+        'double'  => 'float',
+        'false'   => 'boolean',
+        'float'   => 'float',
+        'hash'    => 'object',
+        'integer' => 'integer',
+        'int'     => 'integer',
+        'mixed'   => 'any',
+        'nil'     => 'null',
+        'null'    => 'null',
+        'object'  => 'object',
+        'string'  => 'string',
+        'str'     => 'string',
+        'struct'  => 'object',
+        'true'    => 'boolean',
+        'void'    => 'null',
+    );
+
+    /**
+     * Allowed transport types
+     * @var array
+     */
+    protected $_transportTypes = array(
+        'POST',
+    );
+
+    /**
+     * Constructor
+     *
+     * @param  string|array $spec
+     * @return void
+     * @throws Zend_Json_Server_Exception if no name provided
+     */
+    public function __construct($spec)
+    {
+        if (is_string($spec)) {
+            $this->setName($spec);
+        } elseif (is_array($spec)) {
+            $this->setOptions($spec);
+        }
+
+        if (null == $this->getName()) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('SMD service description requires a name; none provided');
+        }
+    }
+
+    /**
+     * Set object state
+     *
+     * @param  array $options
+     * @return Zend_Json_Server_Smd_Service
+     */
+    public function setOptions(array $options)
+    {
+        $methods = get_class_methods($this);
+        foreach ($options as $key => $value) {
+            if ('options' == strtolower($key)) {
+                continue;
+            }
+            $method = 'set' . ucfirst($key);
+            if (in_array($method, $methods)) {
+                $this->$method($value);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Set service name
+     *
+     * @param  string $name
+     * @return Zend_Json_Server_Smd_Service
+     * @throws Zend_Json_Server_Exception
+     */
+    public function setName($name)
+    {
+        $name = (string) $name;
+        if (!preg_match($this->_nameRegex, $name)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception(sprintf('Invalid name "%s" provided for service; must follow PHP method naming conventions', $name));
+        }
+        $this->_name = $name;
+        return $this;
+    }
+
+    /**
+     * Retrieve name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Set Transport
+     *
+     * Currently limited to POST
+     *
+     * @param  string $transport
+     * @return Zend_Json_Server_Smd_Service
+     */
+    public function setTransport($transport)
+    {
+        if (!in_array($transport, $this->_transportTypes)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception(sprintf('Invalid transport "%s"; please select one of (%s)', $transport, implode(', ', $this->_transportTypes)));
+        }
+
+        $this->_transport = $transport;
+        return $this;
+    }
+
+    /**
+     * Get transport
+     *
+     * @return string
+     */
+    public function getTransport()
+    {
+        return $this->_transport;
+    }
+
+    /**
+     * Set service target
+     *
+     * @param  string $target
+     * @return Zend_Json_Server_Smd_Service
+     */
+    public function setTarget($target)
+    {
+        $this->_target = (string) $target;
+        return $this;
+    }
+
+    /**
+     * Get service target
+     *
+     * @return string
+     */
+    public function getTarget()
+    {
+        return $this->_target;
+    }
+
+    /**
+     * Set envelope type
+     *
+     * @param  string $envelopeType
+     * @return Zend_Json_Server_Smd_Service
+     */
+    public function setEnvelope($envelopeType)
+    {
+        if (!in_array($envelopeType, $this->_envelopeTypes)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception(sprintf('Invalid envelope type "%s"; please specify one of (%s)', $envelopeType, implode(', ', $this->_envelopeTypes)));
+        }
+
+        $this->_envelope = $envelopeType;
+        return $this;
+    }
+
+    /**
+     * Get envelope type
+     *
+     * @return string
+     */
+    public function getEnvelope()
+    {
+        return $this->_envelope;
+    }
+
+    /**
+     * Add a parameter to the service
+     *
+     * @param  string|array $type
+     * @param  array $options
+     * @param  int|null $order
+     * @return Zend_Json_Server_Smd_Service
+     */
+    public function addParam($type, array $options = array(), $order = null)
+    {
+        if (is_string($type)) {
+            $type = $this->_validateParamType($type);
+        } elseif (is_array($type)) {
+            foreach ($type as $key => $paramType) {
+                $type[$key] = $this->_validateParamType($paramType);
+            }
+        } else {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Invalid param type provided');
+        }
+
+        $paramOptions = array(
+            'type' => $type,
+        );
+        foreach ($options as $key => $value) {
+            if (in_array($key, array_keys($this->_paramOptionTypes))) {
+                if (null !== ($callback = $this->_paramOptionTypes[$key])) {
+                    if (!$callback($value)) {
+                        continue;
+                    }
+                }
+                $paramOptions[$key] = $value;
+            }
+        }
+
+        $this->_params[] = array(
+            'param' => $paramOptions,
+            'order' => $order,
+        );
+
+        return $this;
+    }
+
+    /**
+     * Add params
+     *
+     * Each param should be an array, and should include the key 'type'.
+     *
+     * @param  array $params
+     * @return Zend_Json_Server_Smd_Service
+     */
+    public function addParams(array $params)
+    {
+        ksort($params);
+        foreach ($params as $options) {
+            if (!is_array($options)) {
+                continue;
+            }
+            if (!array_key_exists('type', $options)) {
+                continue;
+            }
+            $type  = $options['type'];
+            $order = (array_key_exists('order', $options)) ? $options['order'] : null;
+            $this->addParam($type, $options, $order);
+        }
+        return $this;
+    }
+
+    /**
+     * Overwrite all parameters
+     *
+     * @param  array $params
+     * @return Zend_Json_Server_Smd_Service
+     */
+    public function setParams(array $params)
+    {
+        $this->_params = array();
+        return $this->addParams($params);
+    }
+
+    /**
+     * Get all parameters
+     *
+     * Returns all params in specified order.
+     *
+     * @return array
+     */
+    public function getParams()
+    {
+        $params = array();
+        $index  = 0;
+        foreach ($this->_params as $param) {
+            if (null === $param['order']) {
+                if (array_search($index, array_keys($params), true)) {
+                    ++$index;
+                }
+                $params[$index] = $param['param'];
+                ++$index;
+            } else {
+                $params[$param['order']] = $param['param'];
+            }
+        }
+        ksort($params);
+        return $params;
+    }
+
+    /**
+     * Set return type
+     *
+     * @param  string|array $type
+     * @return Zend_Json_Server_Smd_Service
+     */
+    public function setReturn($type)
+    {
+        if (is_string($type)) {
+            $type = $this->_validateParamType($type, true);
+        } elseif (is_array($type)) {
+            foreach ($type as $key => $returnType) {
+                $type[$key] = $this->_validateParamType($returnType, true);
+            }
+        } else {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Invalid param type provided ("' . gettype($type) .'")');
+        }
+        $this->_return = $type;
+        return $this;
+    }
+
+    /**
+     * Get return type
+     *
+     * @return string|array
+     */
+    public function getReturn()
+    {
+        return $this->_return;
+    }
+
+    /**
+     * Cast service description to array
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $name       = $this->getName();
+        $envelope   = $this->getEnvelope();
+        $target     = $this->getTarget();
+        $transport  = $this->getTransport();
+        $parameters = $this->getParams();
+        $returns    = $this->getReturn();
+
+        if (empty($target)) {
+            return compact('envelope', 'transport', 'parameters', 'returns');
+        }
+
+        return $paramInfo = compact('envelope', 'target', 'transport', 'parameters', 'returns');
+    }
+
+    /**
+     * Return JSON encoding of service
+     *
+     * @return string
+     */
+    public function toJson()
+    {
+        $service = array($this->getName() => $this->toArray());
+
+        require_once 'Zend/Json.php';
+        return Zend_Json::encode($service);
+    }
+
+    /**
+     * Cast to string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toJson();
+    }
+
+    /**
+     * Validate parameter type
+     *
+     * @param  string $type
+     * @return true
+     * @throws Zend_Json_Server_Exception
+     */
+    protected function _validateParamType($type, $isReturn = false)
+    {
+        if (!is_string($type)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Invalid param type provided ("' . $type .'")');
+        }
+
+        if (!array_key_exists($type, $this->_paramMap)) {
+            $type = 'object';
+        }
+
+        $paramType = $this->_paramMap[$type];
+        if (!$isReturn && ('null' == $paramType)) {
+            require_once 'Zend/Json/Server/Exception.php';
+            throw new Zend_Json_Server_Exception('Invalid param type provided ("' . $type . '")');
+        }
+
+        return $paramType;
+    }
+}
diff --git a/lib/zend/Zend/Layout.php b/lib/zend/Zend/Layout.php
new file mode 100644
index 00000000000..fa8ab81a6e7
--- /dev/null
+++ b/lib/zend/Zend/Layout.php
@@ -0,0 +1,798 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Layout
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Provide Layout support for MVC applications
+ *
+ * @category   Zend
+ * @package    Zend_Layout
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Layout
+{
+    /**
+     * Placeholder container for layout variables
+     * @var Zend_View_Helper_Placeholder_Container
+     */
+    protected $_container;
+
+    /**
+     * Key used to store content from 'default' named response segment
+     * @var string
+     */
+    protected $_contentKey = 'content';
+
+    /**
+     * Are layouts enabled?
+     * @var bool
+     */
+    protected $_enabled = true;
+
+    /**
+     * Helper class
+     * @var string
+     */
+    protected $_helperClass = 'Zend_Layout_Controller_Action_Helper_Layout';
+
+    /**
+     * Inflector used to resolve layout script
+     * @var Zend_Filter_Inflector
+     */
+    protected $_inflector;
+
+    /**
+     * Flag: is inflector enabled?
+     * @var bool
+     */
+    protected $_inflectorEnabled = true;
+
+    /**
+     * Inflector target
+     * @var string
+     */
+    protected $_inflectorTarget = ':script.:suffix';
+
+    /**
+     * Layout view
+     * @var string
+     */
+    protected $_layout = 'layout';
+
+    /**
+     * Layout view script path
+     * @var string
+     */
+    protected $_viewScriptPath = null;
+
+    protected $_viewBasePath = null;
+    protected $_viewBasePrefix = 'Layout_View';
+
+    /**
+     * Flag: is MVC integration enabled?
+     * @var bool
+     */
+    protected $_mvcEnabled = true;
+
+    /**
+     * Instance registered with MVC, if any
+     * @var Zend_Layout
+     */
+    protected static $_mvcInstance;
+
+    /**
+     * Flag: is MVC successful action only flag set?
+     * @var bool
+     */
+    protected $_mvcSuccessfulActionOnly = true;
+
+    /**
+     * Plugin class
+     * @var string
+     */
+    protected $_pluginClass = 'Zend_Layout_Controller_Plugin_Layout';
+
+    /**
+     * @var Zend_View_Interface
+     */
+    protected $_view;
+
+    /**
+     * View script suffix for layout script
+     * @var string
+     */
+    protected $_viewSuffix = 'phtml';
+
+    /**
+     * Constructor
+     *
+     * Accepts either:
+     * - A string path to layouts
+     * - An array of options
+     * - A Zend_Config object with options
+     *
+     * Layout script path, either as argument or as key in options, is
+     * required.
+     *
+     * If mvcEnabled flag is false from options, simply sets layout script path.
+     * Otherwise, also instantiates and registers action helper and controller
+     * plugin.
+     *
+     * @param  string|array|Zend_Config $options
+     * @return void
+     */
+    public function __construct($options = null, $initMvc = false)
+    {
+        if (null !== $options) {
+            if (is_string($options)) {
+                $this->setLayoutPath($options);
+            } elseif (is_array($options)) {
+                $this->setOptions($options);
+            } elseif ($options instanceof Zend_Config) {
+                $this->setConfig($options);
+            } else {
+                require_once 'Zend/Layout/Exception.php';
+                throw new Zend_Layout_Exception('Invalid option provided to constructor');
+            }
+        }
+
+        $this->_initVarContainer();
+
+        if ($initMvc) {
+            $this->_setMvcEnabled(true);
+            $this->_initMvc();
+        } else {
+            $this->_setMvcEnabled(false);
+        }
+    }
+
+    /**
+     * Static method for initialization with MVC support
+     *
+     * @param  string|array|Zend_Config $options
+     * @return Zend_Layout
+     */
+    public static function startMvc($options = null)
+    {
+        if (null === self::$_mvcInstance) {
+            self::$_mvcInstance = new self($options, true);
+        } else {
+            if (is_string($options)) {
+                self::$_mvcInstance->setLayoutPath($options);
+            } elseif (is_array($options) || $options instanceof Zend_Config) {
+                self::$_mvcInstance->setOptions($options);
+            }
+        }
+
+        return self::$_mvcInstance;
+    }
+
+    /**
+     * Retrieve MVC instance of Zend_Layout object
+     *
+     * @return Zend_Layout|null
+     */
+    public static function getMvcInstance()
+    {
+        return self::$_mvcInstance;
+    }
+
+    /**
+     * Reset MVC instance
+     *
+     * Unregisters plugins and helpers, and destroys MVC layout instance.
+     *
+     * @return void
+     */
+    public static function resetMvcInstance()
+    {
+        if (null !== self::$_mvcInstance) {
+            $layout = self::$_mvcInstance;
+            $pluginClass = $layout->getPluginClass();
+            $front = Zend_Controller_Front::getInstance();
+            if ($front->hasPlugin($pluginClass)) {
+                $front->unregisterPlugin($pluginClass);
+            }
+
+            if (Zend_Controller_Action_HelperBroker::hasHelper('layout')) {
+                Zend_Controller_Action_HelperBroker::removeHelper('layout');
+            }
+
+            unset($layout);
+            self::$_mvcInstance = null;
+        }
+    }
+
+    /**
+     * Set options en masse
+     *
+     * @param  array|Zend_Config $options
+     * @return void
+     */
+    public function setOptions($options)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } elseif (!is_array($options)) {
+            require_once 'Zend/Layout/Exception.php';
+            throw new Zend_Layout_Exception('setOptions() expects either an array or a Zend_Config object');
+        }
+
+        foreach ($options as $key => $value) {
+            $method = 'set' . ucfirst($key);
+            if (method_exists($this, $method)) {
+                $this->$method($value);
+            }
+        }
+    }
+
+    /**
+     * Initialize MVC integration
+     *
+     * @return void
+     */
+    protected function _initMvc()
+    {
+        $this->_initPlugin();
+        $this->_initHelper();
+    }
+
+    /**
+     * Initialize front controller plugin
+     *
+     * @return void
+     */
+    protected function _initPlugin()
+    {
+        $pluginClass = $this->getPluginClass();
+        require_once 'Zend/Controller/Front.php';
+        $front = Zend_Controller_Front::getInstance();
+        if (!$front->hasPlugin($pluginClass)) {
+            if (!class_exists($pluginClass)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($pluginClass);
+            }
+            $front->registerPlugin(
+                // register to run last | BUT before the ErrorHandler (if its available)
+                new $pluginClass($this),
+                99
+            );
+        }
+    }
+
+    /**
+     * Initialize action helper
+     *
+     * @return void
+     */
+    protected function _initHelper()
+    {
+        $helperClass = $this->getHelperClass();
+        require_once 'Zend/Controller/Action/HelperBroker.php';
+        if (!Zend_Controller_Action_HelperBroker::hasHelper('layout')) {
+            if (!class_exists($helperClass)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($helperClass);
+            }
+            Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-90, new $helperClass($this));
+        }
+    }
+
+    /**
+     * Set options from a config object
+     *
+     * @param  Zend_Config $config
+     * @return Zend_Layout
+     */
+    public function setConfig(Zend_Config $config)
+    {
+        $this->setOptions($config->toArray());
+        return $this;
+    }
+
+    /**
+     * Initialize placeholder container for layout vars
+     *
+     * @return Zend_View_Helper_Placeholder_Container
+     */
+    protected function _initVarContainer()
+    {
+        if (null === $this->_container) {
+            require_once 'Zend/View/Helper/Placeholder/Registry.php';
+            $this->_container = Zend_View_Helper_Placeholder_Registry::getRegistry()->getContainer(__CLASS__);
+        }
+
+        return $this->_container;
+    }
+
+    /**
+     * Set layout script to use
+     *
+     * Note: enables layout by default, can be disabled
+     *
+     * @param  string $name
+     * @param  boolean $enabled
+     * @return Zend_Layout
+     */
+    public function setLayout($name, $enabled = true)
+    {
+        $this->_layout = (string) $name;
+        if ($enabled) {
+            $this->enableLayout();
+        }
+        return $this;
+    }
+
+    /**
+     * Get current layout script
+     *
+     * @return string
+     */
+    public function getLayout()
+    {
+        return $this->_layout;
+    }
+
+    /**
+     * Disable layout
+     *
+     * @return Zend_Layout
+     */
+    public function disableLayout()
+    {
+        $this->_enabled = false;
+        return $this;
+    }
+
+    /**
+     * Enable layout
+     *
+     * @return Zend_Layout
+     */
+    public function enableLayout()
+    {
+        $this->_enabled = true;
+        return $this;
+    }
+
+    /**
+     * Is layout enabled?
+     *
+     * @return bool
+     */
+    public function isEnabled()
+    {
+        return $this->_enabled;
+    }
+
+
+    public function setViewBasePath($path, $prefix = 'Layout_View')
+    {
+        $this->_viewBasePath = $path;
+        $this->_viewBasePrefix = $prefix;
+        return $this;
+    }
+
+    public function getViewBasePath()
+    {
+        return $this->_viewBasePath;
+    }
+
+    public function setViewScriptPath($path)
+    {
+        $this->_viewScriptPath = $path;
+        return $this;
+    }
+
+    public function getViewScriptPath()
+    {
+        return $this->_viewScriptPath;
+    }
+
+    /**
+     * Set layout script path
+     *
+     * @param  string $path
+     * @return Zend_Layout
+     */
+    public function setLayoutPath($path)
+    {
+        return $this->setViewScriptPath($path);
+    }
+
+    /**
+     * Get current layout script path
+     *
+     * @return string
+     */
+    public function getLayoutPath()
+    {
+        return $this->getViewScriptPath();
+    }
+
+    /**
+     * Set content key
+     *
+     * Key in namespace container denoting default content
+     *
+     * @param  string $contentKey
+     * @return Zend_Layout
+     */
+    public function setContentKey($contentKey)
+    {
+        $this->_contentKey = (string) $contentKey;
+        return $this;
+    }
+
+    /**
+     * Retrieve content key
+     *
+     * @return string
+     */
+    public function getContentKey()
+    {
+        return $this->_contentKey;
+    }
+
+    /**
+     * Set MVC enabled flag
+     *
+     * @param  bool $mvcEnabled
+     * @return Zend_Layout
+     */
+    protected function _setMvcEnabled($mvcEnabled)
+    {
+        $this->_mvcEnabled = ($mvcEnabled) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Retrieve MVC enabled flag
+     *
+     * @return bool
+     */
+    public function getMvcEnabled()
+    {
+        return $this->_mvcEnabled;
+    }
+
+    /**
+     * Set MVC Successful Action Only flag
+     *
+     * @param bool $successfulActionOnly
+     * @return Zend_Layout
+     */
+    public function setMvcSuccessfulActionOnly($successfulActionOnly)
+    {
+        $this->_mvcSuccessfulActionOnly = ($successfulActionOnly) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Get MVC Successful Action Only Flag
+     *
+     * @return bool
+     */
+    public function getMvcSuccessfulActionOnly()
+    {
+        return $this->_mvcSuccessfulActionOnly;
+    }
+
+    /**
+     * Set view object
+     *
+     * @param  Zend_View_Interface $view
+     * @return Zend_Layout
+     */
+    public function setView(Zend_View_Interface $view)
+    {
+        $this->_view = $view;
+        return $this;
+    }
+
+    /**
+     * Retrieve helper class
+     *
+     * @return string
+     */
+    public function getHelperClass()
+    {
+        return $this->_helperClass;
+    }
+
+    /**
+     * Set helper class
+     *
+     * @param  string $helperClass
+     * @return Zend_Layout
+     */
+    public function setHelperClass($helperClass)
+    {
+        $this->_helperClass = (string) $helperClass;
+        return $this;
+    }
+
+    /**
+     * Retrieve plugin class
+     *
+     * @return string
+     */
+    public function getPluginClass()
+    {
+        return $this->_pluginClass;
+    }
+
+    /**
+     * Set plugin class
+     *
+     * @param  string $pluginClass
+     * @return Zend_Layout
+     */
+    public function setPluginClass($pluginClass)
+    {
+        $this->_pluginClass = (string) $pluginClass;
+        return $this;
+    }
+
+    /**
+     * Get current view object
+     *
+     * If no view object currently set, retrieves it from the ViewRenderer.
+     *
+     * @todo Set inflector from view renderer at same time
+     * @return Zend_View_Interface
+     */
+    public function getView()
+    {
+        if (null === $this->_view) {
+            require_once 'Zend/Controller/Action/HelperBroker.php';
+            $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
+            if (null === $viewRenderer->view) {
+                $viewRenderer->initView();
+            }
+            $this->setView($viewRenderer->view);
+        }
+        return $this->_view;
+    }
+
+    /**
+     * Set layout view script suffix
+     *
+     * @param  string $viewSuffix
+     * @return Zend_Layout
+     */
+    public function setViewSuffix($viewSuffix)
+    {
+        $this->_viewSuffix = (string) $viewSuffix;
+        return $this;
+    }
+
+    /**
+     * Retrieve layout view script suffix
+     *
+     * @return string
+     */
+    public function getViewSuffix()
+    {
+        return $this->_viewSuffix;
+    }
+
+    /**
+     * Retrieve inflector target
+     *
+     * @return string
+     */
+    public function getInflectorTarget()
+    {
+        return $this->_inflectorTarget;
+    }
+
+    /**
+     * Set inflector target
+     *
+     * @param  string $inflectorTarget
+     * @return Zend_Layout
+     */
+    public function setInflectorTarget($inflectorTarget)
+    {
+        $this->_inflectorTarget = (string) $inflectorTarget;
+        return $this;
+    }
+
+    /**
+     * Set inflector to use when resolving layout names
+     *
+     * @param  Zend_Filter_Inflector $inflector
+     * @return Zend_Layout
+     */
+    public function setInflector(Zend_Filter_Inflector $inflector)
+    {
+        $this->_inflector = $inflector;
+        return $this;
+    }
+
+    /**
+     * Retrieve inflector
+     *
+     * @return Zend_Filter_Inflector
+     */
+    public function getInflector()
+    {
+        if (null === $this->_inflector) {
+            require_once 'Zend/Filter/Inflector.php';
+            $inflector = new Zend_Filter_Inflector();
+            $inflector->setTargetReference($this->_inflectorTarget)
+                      ->addRules(array(':script' => array('Word_CamelCaseToDash', 'StringToLower')))
+                      ->setStaticRuleReference('suffix', $this->_viewSuffix);
+            $this->setInflector($inflector);
+        }
+
+        return $this->_inflector;
+    }
+
+    /**
+     * Enable inflector
+     *
+     * @return Zend_Layout
+     */
+    public function enableInflector()
+    {
+        $this->_inflectorEnabled = true;
+        return $this;
+    }
+
+    /**
+     * Disable inflector
+     *
+     * @return Zend_Layout
+     */
+    public function disableInflector()
+    {
+        $this->_inflectorEnabled = false;
+        return $this;
+    }
+
+    /**
+     * Return status of inflector enabled flag
+     *
+     * @return bool
+     */
+    public function inflectorEnabled()
+    {
+        return $this->_inflectorEnabled;
+    }
+
+    /**
+     * Set layout variable
+     *
+     * @param  string $key
+     * @param  mixed $value
+     * @return void
+     */
+    public function __set($key, $value)
+    {
+        $this->_container[$key] = $value;
+    }
+
+    /**
+     * Get layout variable
+     *
+     * @param  string $key
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        if (isset($this->_container[$key])) {
+            return $this->_container[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Is a layout variable set?
+     *
+     * @param  string $key
+     * @return bool
+     */
+    public function __isset($key)
+    {
+        return (isset($this->_container[$key]));
+    }
+
+    /**
+     * Unset a layout variable?
+     *
+     * @param  string $key
+     * @return void
+     */
+    public function __unset($key)
+    {
+        if (isset($this->_container[$key])) {
+            unset($this->_container[$key]);
+        }
+    }
+
+    /**
+     * Assign one or more layout variables
+     *
+     * @param  mixed $spec Assoc array or string key; if assoc array, sets each
+     * key as a layout variable
+     * @param  mixed $value Value if $spec is a key
+     * @return Zend_Layout
+     * @throws Zend_Layout_Exception if non-array/string value passed to $spec
+     */
+    public function assign($spec, $value = null)
+    {
+        if (is_array($spec)) {
+            $orig = $this->_container->getArrayCopy();
+            $merged = array_merge($orig, $spec);
+            $this->_container->exchangeArray($merged);
+            return $this;
+        }
+
+        if (is_string($spec)) {
+            $this->_container[$spec] = $value;
+            return $this;
+        }
+
+        require_once 'Zend/Layout/Exception.php';
+        throw new Zend_Layout_Exception('Invalid values passed to assign()');
+    }
+
+    /**
+     * Render layout
+     *
+     * Sets internal script path as last path on script path stack, assigns
+     * layout variables to view, determines layout name using inflector, and
+     * renders layout view script.
+     *
+     * $name will be passed to the inflector as the key 'script'.
+     *
+     * @param  mixed $name
+     * @return mixed
+     */
+    public function render($name = null)
+    {
+        if (null === $name) {
+            $name = $this->getLayout();
+        }
+
+        if ($this->inflectorEnabled() && (null !== ($inflector = $this->getInflector())))
+        {
+            $name = $this->_inflector->filter(array('script' => $name));
+        }
+
+        $view = $this->getView();
+
+        if (null !== ($path = $this->getViewScriptPath())) {
+            if (method_exists($view, 'addScriptPath')) {
+                $view->addScriptPath($path);
+            } else {
+                $view->setScriptPath($path);
+            }
+        } elseif (null !== ($path = $this->getViewBasePath())) {
+            $view->addBasePath($path, $this->_viewBasePrefix);
+        }
+
+        return $view->render($name);
+    }
+}
diff --git a/lib/zend/Zend/Layout/Controller/Action/Helper/Layout.php b/lib/zend/Zend/Layout/Controller/Action/Helper/Layout.php
new file mode 100644
index 00000000000..b0b70f1913c
--- /dev/null
+++ b/lib/zend/Zend/Layout/Controller/Action/Helper/Layout.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Action_Helper_Abstract */
+require_once 'Zend/Controller/Action/Helper/Abstract.php';
+
+/**
+ * Helper for interacting with Zend_Layout objects
+ *
+ * @uses       Zend_Controller_Action_Helper_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Zend_Controller_Action
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Layout_Controller_Action_Helper_Layout extends Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * @var Zend_Controller_Front
+     */
+    protected $_frontController;
+
+    /**
+     * @var Zend_Layout
+     */
+    protected $_layout;
+
+    /**
+     * @var bool
+     */
+    protected $_isActionControllerSuccessful = false;
+
+    /**
+     * Constructor
+     *
+     * @param  Zend_Layout $layout
+     * @return void
+     */
+    public function __construct(Zend_Layout $layout = null)
+    {
+        if (null !== $layout) {
+            $this->setLayoutInstance($layout);
+        } else {
+            /**
+             * @see Zend_Layout
+             */
+            require_once 'Zend/Layout.php';
+            $layout = Zend_Layout::getMvcInstance();
+        }
+
+        if (null !== $layout) {
+            $pluginClass = $layout->getPluginClass();
+            $front = $this->getFrontController();
+            if ($front->hasPlugin($pluginClass)) {
+                $plugin = $front->getPlugin($pluginClass);
+                $plugin->setLayoutActionHelper($this);
+            }
+        }
+    }
+
+    public function init()
+    {
+        $this->_isActionControllerSuccessful = false;
+    }
+
+    /**
+     * Get front controller instance
+     *
+     * @return Zend_Controller_Front
+     */
+    public function getFrontController()
+    {
+        if (null === $this->_frontController) {
+            /**
+             * @see Zend_Controller_Front
+             */
+            require_once 'Zend/Controller/Front.php';
+            $this->_frontController = Zend_Controller_Front::getInstance();
+        }
+
+        return $this->_frontController;
+    }
+
+    /**
+     * Get layout object
+     *
+     * @return Zend_Layout
+     */
+    public function getLayoutInstance()
+    {
+        if (null === $this->_layout) {
+            /**
+             * @see Zend_Layout
+             */
+            require_once 'Zend/Layout.php';
+            if (null === ($this->_layout = Zend_Layout::getMvcInstance())) {
+                $this->_layout = new Zend_Layout();
+            }
+        }
+
+        return $this->_layout;
+    }
+
+    /**
+     * Set layout object
+     *
+     * @param  Zend_Layout $layout
+     * @return Zend_Layout_Controller_Action_Helper_Layout
+     */
+    public function setLayoutInstance(Zend_Layout $layout)
+    {
+        $this->_layout = $layout;
+        return $this;
+    }
+
+    /**
+     * Mark Action Controller (according to this plugin) as Running successfully
+     *
+     * @return Zend_Layout_Controller_Action_Helper_Layout
+     */
+    public function postDispatch()
+    {
+        $this->_isActionControllerSuccessful = true;
+        return $this;
+    }
+
+    /**
+     * Did the previous action successfully complete?
+     *
+     * @return bool
+     */
+    public function isActionControllerSuccessful()
+    {
+        return $this->_isActionControllerSuccessful;
+    }
+
+    /**
+     * Strategy pattern; call object as method
+     *
+     * Returns layout object
+     *
+     * @return Zend_Layout
+     */
+    public function direct()
+    {
+        return $this->getLayoutInstance();
+    }
+
+    /**
+     * Proxy method calls to layout object
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return mixed
+     */
+    public function __call($method, $args)
+    {
+        $layout = $this->getLayoutInstance();
+        if (method_exists($layout, $method)) {
+            return call_user_func_array(array($layout, $method), $args);
+        }
+
+        require_once 'Zend/Layout/Exception.php';
+        throw new Zend_Layout_Exception(sprintf("Invalid method '%s' called on layout action helper", $method));
+    }
+}
diff --git a/lib/zend/Zend/Layout/Controller/Plugin/Layout.php b/lib/zend/Zend/Layout/Controller/Plugin/Layout.php
new file mode 100644
index 00000000000..a8bd274951f
--- /dev/null
+++ b/lib/zend/Zend/Layout/Controller/Plugin/Layout.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Controller_Plugin_Abstract */
+require_once 'Zend/Controller/Plugin/Abstract.php';
+
+/**
+ * Render layouts
+ *
+ * @uses       Zend_Controller_Plugin_Abstract
+ * @category   Zend
+ * @package    Zend_Controller
+ * @subpackage Plugins
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Layout_Controller_Plugin_Layout extends Zend_Controller_Plugin_Abstract
+{
+    protected $_layoutActionHelper = null;
+
+    /**
+     * @var Zend_Layout
+     */
+    protected $_layout;
+
+    /**
+     * Constructor
+     *
+     * @param  Zend_Layout $layout
+     * @return void
+     */
+    public function __construct(Zend_Layout $layout = null)
+    {
+        if (null !== $layout) {
+            $this->setLayout($layout);
+        }
+    }
+
+    /**
+     * Retrieve layout object
+     *
+     * @return Zend_Layout
+     */
+    public function getLayout()
+    {
+        return $this->_layout;
+    }
+
+    /**
+     * Set layout object
+     *
+     * @param  Zend_Layout $layout
+     * @return Zend_Layout_Controller_Plugin_Layout
+     */
+    public function setLayout(Zend_Layout $layout)
+    {
+        $this->_layout = $layout;
+        return $this;
+    }
+
+    /**
+     * Set layout action helper
+     *
+     * @param  Zend_Layout_Controller_Action_Helper_Layout $layoutActionHelper
+     * @return Zend_Layout_Controller_Plugin_Layout
+     */
+    public function setLayoutActionHelper(Zend_Layout_Controller_Action_Helper_Layout $layoutActionHelper)
+    {
+        $this->_layoutActionHelper = $layoutActionHelper;
+        return $this;
+    }
+
+    /**
+     * Retrieve layout action helper
+     *
+     * @return Zend_Layout_Controller_Action_Helper_Layout
+     */
+    public function getLayoutActionHelper()
+    {
+        return $this->_layoutActionHelper;
+    }
+
+    /**
+     * postDispatch() plugin hook -- render layout
+     *
+     * @param  Zend_Controller_Request_Abstract $request
+     * @return void
+     */
+    public function postDispatch(Zend_Controller_Request_Abstract $request)
+    {
+        $layout = $this->getLayout();
+        $helper = $this->getLayoutActionHelper();
+
+        // Return early if forward detected
+        if (!$request->isDispatched()
+            || $this->getResponse()->isRedirect()
+            || ($layout->getMvcSuccessfulActionOnly()
+                && (!empty($helper) && !$helper->isActionControllerSuccessful())))
+        {
+            return;
+        }
+
+        // Return early if layout has been disabled
+        if (!$layout->isEnabled()) {
+            return;
+        }
+
+        $response   = $this->getResponse();
+        $content    = $response->getBody(true);
+        $contentKey = $layout->getContentKey();
+
+        if (isset($content['default'])) {
+            $content[$contentKey] = $content['default'];
+        }
+        if ('default' != $contentKey) {
+            unset($content['default']);
+        }
+
+        $layout->assign($content);
+
+        $fullContent = null;
+        $obStartLevel = ob_get_level();
+        try {
+            $fullContent = $layout->render();
+            $response->setBody($fullContent);
+        } catch (Exception $e) {
+            while (ob_get_level() > $obStartLevel) {
+                $fullContent .= ob_get_clean();
+            }
+            $request->setParam('layoutFullContent', $fullContent);
+            $request->setParam('layoutContent', $layout->content);
+            $response->setBody(null);
+            throw $e;
+        }
+
+    }
+}
diff --git a/lib/zend/Zend/Layout/Exception.php b/lib/zend/Zend/Layout/Exception.php
new file mode 100644
index 00000000000..aa2418168c5
--- /dev/null
+++ b/lib/zend/Zend/Layout/Exception.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Layout
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** Zend_Exception */
+require_once 'Zend/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Layout
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Layout_Exception extends Zend_Exception
+{}
+
diff --git a/lib/zend/Zend/Loader.php b/lib/zend/Zend/Loader.php
index d69af1235c3..40da3bfaa2a 100644
--- a/lib/zend/Zend/Loader.php
+++ b/lib/zend/Zend/Loader.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Loader
@@ -60,19 +60,7 @@ class Zend_Loader
             throw new Zend_Exception('Directory argument must be a string or an array');
         }
 
-        // Autodiscover the path from the class name
-        // Implementation is PHP namespace-aware, and based on 
-        // Framework Interop Group reference implementation:
-        // http://groups.google.com/group/php-standards/web/psr-0-final-proposal
-        $className = ltrim($class, '\\');
-        $file      = '';
-        $namespace = '';
-        if ($lastNsPos = strripos($className, '\\')) {
-            $namespace = substr($className, 0, $lastNsPos);
-            $className = substr($className, $lastNsPos + 1);
-            $file      = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
-        }
-        $file .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+        $file = self::standardiseFile($class);
 
         if (!empty($dirs)) {
             // use the autodiscovered path
@@ -174,7 +162,7 @@ class Zend_Loader
     public static function isReadable($filename)
     {
         if (is_readable($filename)) {
-            // Return early if the filename is readable without needing the 
+            // Return early if the filename is readable without needing the
             // include_path
             return true;
         }
@@ -182,7 +170,7 @@ class Zend_Loader
         if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'
             && preg_match('/^[a-z]:/i', $filename)
         ) {
-            // If on windows, and path provided is clearly an absolute path, 
+            // If on windows, and path provided is clearly an absolute path,
             // return false immediately
             return false;
         }
@@ -207,8 +195,8 @@ class Zend_Loader
      *
      * If no path provided, uses current include_path. Works around issues that
      * occur when the path includes stream schemas.
-     * 
-     * @param  string|null $path 
+     *
+     * @param  string|null $path
      * @return array
      */
     public static function explodeIncludePath($path = null)
@@ -218,7 +206,7 @@ class Zend_Loader
         }
 
         if (PATH_SEPARATOR == ':') {
-            // On *nix systems, include_paths which include paths with a stream 
+            // On *nix systems, include_paths which include paths with a stream
             // schema cannot be safely explode'd, so we have to be a bit more
             // intelligent in the approach.
             $paths = preg_split('#:(?!//)#', $path);
@@ -326,4 +314,30 @@ class Zend_Loader
             return include $filespec ;
         }
     }
+
+    /**
+     * Standardise the filename.
+     *
+     * Convert the supplied filename into the namespace-aware standard,
+     * based on the Framework Interop Group reference implementation:
+     * http://groups.google.com/group/php-standards/web/psr-0-final-proposal
+     *
+     * The filename must be formatted as "$file.php".
+     *
+     * @param string $file - The file name to be loaded.
+     * @return string
+     */
+    public static function standardiseFile($file)
+    {
+        $fileName = ltrim($file, '\\');
+        $file      = '';
+        $namespace = '';
+        if ($lastNsPos = strripos($fileName, '\\')) {
+            $namespace = substr($fileName, 0, $lastNsPos);
+            $fileName = substr($fileName, $lastNsPos + 1);
+            $file      = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+        }
+        $file .= str_replace('_', DIRECTORY_SEPARATOR, $fileName) . '.php';
+        return $file;    
+    }
 }
diff --git a/lib/zend/Zend/Loader/Autoloader.php b/lib/zend/Zend/Loader/Autoloader.php
index 98e262aade2..06e70232fd5 100644
--- a/lib/zend/Zend/Loader/Autoloader.php
+++ b/lib/zend/Zend/Loader/Autoloader.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Loader.php';
  * @uses       Zend_Loader_Autoloader
  * @package    Zend_Loader
  * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Loader_Autoloader
@@ -335,9 +335,10 @@ class Zend_Loader_Autoloader
                 continue;
             }
             if (0 === strpos($class, $ns)) {
-                $namespace   = $ns;
-                $autoloaders = $autoloaders + $this->getNamespaceAutoloaders($ns);
-                break;
+                if ((false === $namespace) || (strlen($ns) > strlen($namespace))) {
+                    $namespace = $ns;
+                    $autoloaders = $this->getNamespaceAutoloaders($ns);
+                }
             }
         }
 
@@ -351,7 +352,13 @@ class Zend_Loader_Autoloader
         }
 
         // Add non-namespaced autoloaders
-        $autoloaders = $autoloaders + $this->getNamespaceAutoloaders('');
+        $autoloadersNonNamespace = $this->getNamespaceAutoloaders('');
+        if (count($autoloadersNonNamespace)) {
+            foreach ($autoloadersNonNamespace as $ns) {
+                $autoloaders[] = $ns;
+            }
+            unset($autoloadersNonNamespace);
+        }
 
         // Add fallback autoloader
         if (!$namespace && $this->isFallbackAutoloader()) {
@@ -560,7 +567,7 @@ class Zend_Loader_Autoloader
         $versionLen = strlen($version);
         $versions   = array();
         $dirs       = glob("$path/*", GLOB_ONLYDIR);
-        foreach ($dirs as $dir) {
+        foreach ((array) $dirs as $dir) {
             $dirName = substr($dir, strlen($path) + 1);
             if (!preg_match('/^(?:ZendFramework-)?(\d+\.\d+\.\d+((a|b|pl|pr|p|rc)\d+)?)(?:-minimal)?$/i', $dirName, $matches)) {
                 continue;
diff --git a/lib/zend/Zend/Loader/Autoloader/Interface.php b/lib/zend/Zend/Loader/Autoloader/Interface.php
index 1b0bbff725f..64985e26e90 100644
--- a/lib/zend/Zend/Loader/Autoloader/Interface.php
+++ b/lib/zend/Zend/Loader/Autoloader/Interface.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
@@ -25,10 +25,19 @@
  *
  * @package    Zend_Loader
  * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Zend_Loader_Autoloader_Interface
 {
+    /**
+     * Autoload a class
+     *
+     * @abstract
+     * @param   string $class
+     * @return  mixed
+     *          False [if unable to load $class]
+     *          get_class($class) [if $class is successfully loaded]
+     */
     public function autoload($class);
 }
diff --git a/lib/zend/Zend/Loader/Autoloader/Resource.php b/lib/zend/Zend/Loader/Autoloader/Resource.php
index fe847a3ea2b..b9279c257ca 100644
--- a/lib/zend/Zend/Loader/Autoloader/Resource.php
+++ b/lib/zend/Zend/Loader/Autoloader/Resource.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @version    $Id$
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Loader/Autoloader/Interface.php';
  * @uses       Zend_Loader_Autoloader_Interface
  * @package    Zend_Loader
  * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interface
@@ -88,6 +88,7 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac
         if (!empty($namespace)) {
             $namespace .= '_';
         }
+        require_once 'Zend/Loader/Autoloader.php';
         Zend_Loader_Autoloader::getInstance()->unshiftAutoloader($this, $namespace);
     }
 
@@ -144,7 +145,12 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac
         $namespace         = '';
 
         if (!empty($namespaceTopLevel)) {
-            $namespace = array_shift($segments);
+            $namespace = array();
+            $topLevelSegments = count(explode('_', $namespaceTopLevel));
+            for ($i = 0; $i < $topLevelSegments; $i++) {
+                $namespace[] = array_shift($segments);
+            }
+            $namespace = implode('_', $namespace);
             if ($namespace != $namespaceTopLevel) {
                 // wrong prefix? we're done
                 return false;
@@ -205,6 +211,12 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac
      */
     public function setOptions(array $options)
     {
+        // Set namespace first, see ZF-10836
+        if (isset($options['namespace'])) {
+            $this->setNamespace($options['namespace']);
+            unset($options['namespace']);
+        }
+
         $methods = get_class_methods($this);
         foreach ($options as $key => $value) {
             $method = 'set' . ucfirst($key);
diff --git a/lib/zend/Zend/Loader/AutoloaderFactory.php b/lib/zend/Zend/Loader/AutoloaderFactory.php
new file mode 100644
index 00000000000..9fc28365253
--- /dev/null
+++ b/lib/zend/Zend/Loader/AutoloaderFactory.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Loader
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once dirname(__FILE__) . '/SplAutoloader.php';
+
+if (class_exists('Zend_Loader_AutoloaderFactory')) return;
+
+/**
+ * @package    Zend_Loader
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Loader_AutoloaderFactory
+{
+    const STANDARD_AUTOLOADER  = 'Zend_Loader_StandardAutoloader';
+    const CLASS_MAP_AUTOLOADER = 'Zend_Loader_ClassMapAutoloader';
+
+    /**
+     * @var array All autoloaders registered using the factory
+     */
+    protected static $loaders = array();
+
+    /**
+     * @var Zend_Loader_StandardAutoloader StandardAutoloader instance for resolving 
+     * autoloader classes via the include_path
+     */
+    protected static $standardAutoloader;
+
+    /**
+     * Factory for autoloaders
+     *
+     * Options should be an array or Traversable object of the following structure:
+     * <code>
+     * array(
+     *     '<autoloader class name>' => $autoloaderOptions,
+     * )
+     * </code>
+     *
+     * The factory will then loop through and instantiate each autoloader with
+     * the specified options, and register each with the spl_autoloader.
+     *
+     * You may retrieve the concrete autoloader instances later using
+     * {@link getRegisteredAutoloaders()}.
+     *
+     * Note that the class names must be resolvable on the include_path or via
+     * the Zend library, using PSR-0 rules (unless the class has already been
+     * loaded).
+     *
+     * @param  array|Traversable $options (optional) options to use. Defaults to Zend_Loader_StandardAutoloader
+     * @return void
+     * @throws Zend_Loader_Exception_InvalidArgumentException for invalid options
+     * @throws Zend_Loader_Exception_InvalidArgumentException for unloadable autoloader classes
+     */
+    public static function factory($options = null)
+    {
+        if (null === $options) {
+            if (!isset(self::$loaders[self::STANDARD_AUTOLOADER])) {
+                $autoloader = self::getStandardAutoloader();
+                $autoloader->register();
+                self::$loaders[self::STANDARD_AUTOLOADER] = $autoloader;
+            }
+
+            // Return so we don't hit the next check's exception (we're done here anyway)
+            return;
+        }
+
+        if (!is_array($options) && !($options instanceof Traversable)) {
+            require_once 'Exception/InvalidArgumentException.php';
+            throw new Zend_Loader_Exception_InvalidArgumentException(
+                'Options provided must be an array or Traversable'
+            );
+        }
+
+        foreach ($options as $class => $options) {
+            if (!isset(self::$loaders[$class])) {
+                // Check class map autoloader
+                if ($class == self::CLASS_MAP_AUTOLOADER) {
+                    if (!class_exists(self::CLASS_MAP_AUTOLOADER)) {
+                        // Extract the filename from the classname
+                        $classMapLoader = substr(
+                            strrchr(self::CLASS_MAP_AUTOLOADER, '_'), 1
+                        );
+
+                        require_once dirname(__FILE__) . "/$classMapLoader.php";
+                    }
+                }
+
+                // Autoload with standard autoloader
+                $autoloader = self::getStandardAutoloader();
+                if (!class_exists($class) && !$autoloader->autoload($class)) {
+                    require_once 'Exception/InvalidArgumentException.php';
+                    throw new Zend_Loader_Exception_InvalidArgumentException(sprintf(
+                        'Autoloader class "%s" not loaded', 
+                        $class
+                    ));
+                }
+
+                // unfortunately is_subclass_of is broken on some 5.3 versions
+                // additionally instanceof is also broken for this use case
+                if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
+                        if (!is_subclass_of($class, 'Zend_Loader_SplAutoloader')) {
+                        require_once 'Exception/InvalidArgumentException.php';
+                        throw new Zend_Loader_Exception_InvalidArgumentException(sprintf(
+                            'Autoloader class %s must implement Zend\\Loader\\SplAutoloader', 
+                            $class
+                        ));
+                    }
+                }
+
+                if ($class === self::STANDARD_AUTOLOADER) {
+                    $autoloader->setOptions($options);
+                } else {
+                    $autoloader = new $class($options);
+                }
+                $autoloader->register();
+                self::$loaders[$class] = $autoloader;
+            } else {
+                self::$loaders[$class]->setOptions($options);
+            }
+        }
+    }
+
+    /**
+     * Get an list of all autoloaders registered with the factory
+     *
+     * Returns an array of autoloader instances.
+     *
+     * @return array
+     */
+    public static function getRegisteredAutoloaders()
+    {
+        return self::$loaders;
+    }
+
+    /**
+     * Retrieves an autoloader by class name
+     *
+     * @param string $class
+     * @return Zend_Loader_SplAutoloader
+     * @throws Zend_Loader_Exception_InvalidArgumentException for non-registered class
+     */
+    public static function getRegisteredAutoloader($class)
+    {
+        if (!isset(self::$loaders[$class])) {
+            require_once 'Exception/InvalidArgumentException.php';
+            throw new Zend_Loader_Exception_InvalidArgumentException(sprintf('Autoloader class "%s" not loaded', $class));
+        }
+        return self::$loaders[$class];
+    }
+
+    /**
+     * Unregisters all autoloaders that have been registered via the factory.
+     * This will NOT unregister autoloaders registered outside of the fctory.
+     *
+     * @return void
+     */
+    public static function unregisterAutoloaders()
+    {
+        foreach (self::getRegisteredAutoloaders() as $class => $autoloader) {
+            spl_autoload_unregister(array($autoloader, 'autoload'));
+            unset(self::$loaders[$class]);
+        }
+    }
+
+    /**
+     * Unregister a single autoloader by class name
+     *
+     * @param  string $autoloaderClass
+     * @return bool
+     */
+    public static function unregisterAutoloader($autoloaderClass)
+    {
+        if (!isset(self::$loaders[$autoloaderClass])) {
+            return false;
+        }
+
+        $autoloader = self::$loaders[$autoloaderClass];
+        spl_autoload_unregister(array($autoloader, 'autoload'));
+        unset(self::$loaders[$autoloaderClass]);
+        return true;
+    }
+
+    /**
+     * Get an instance of the standard autoloader
+     *
+     * Used to attempt to resolve autoloader classes, using the 
+     * StandardAutoloader. The instance is marked as a fallback autoloader, to 
+     * allow resolving autoloaders not under the "Zend" or "Zend" namespaces.
+     * 
+     * @return Zend_Loader_SplAutoloader
+     */
+    protected static function getStandardAutoloader()
+    {
+        if (null !== self::$standardAutoloader) {
+            return self::$standardAutoloader;
+        }
+
+        // Extract the filename from the classname
+        $stdAutoloader = substr(strrchr(self::STANDARD_AUTOLOADER, '_'), 1);
+
+        if (!class_exists(self::STANDARD_AUTOLOADER)) {
+            require_once dirname(__FILE__) . "/$stdAutoloader.php";
+        }
+        $loader = new Zend_Loader_StandardAutoloader();
+        self::$standardAutoloader = $loader;
+        return self::$standardAutoloader;
+    }
+}
diff --git a/lib/zend/Zend/Loader/ClassMapAutoloader.php b/lib/zend/Zend/Loader/ClassMapAutoloader.php
new file mode 100644
index 00000000000..177c2f5ad7f
--- /dev/null
+++ b/lib/zend/Zend/Loader/ClassMapAutoloader.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Loader
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+// Grab SplAutoloader interface
+require_once dirname(__FILE__) . '/SplAutoloader.php';
+
+/**
+ * Class-map autoloader
+ *
+ * Utilizes class-map files to lookup classfile locations.
+ * 
+ * @package    Zend_Loader
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
+ */
+class Zend_Loader_ClassMapAutoloader implements Zend_Loader_SplAutoloader
+{
+    /**
+     * Registry of map files that have already been loaded
+     * @var array
+     */
+    protected $mapsLoaded = array();
+
+    /**
+     * Class name/filename map
+     * @var array
+     */
+    protected $map = array();
+
+    /**
+     * Constructor
+     *
+     * Create a new instance, and optionally configure the autoloader.
+     * 
+     * @param  null|array|Traversable $options 
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        if (null !== $options) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * Configure the autoloader
+     *
+     * Proxies to {@link registerAutoloadMaps()}.
+     * 
+     * @param  array|Traversable $options 
+     * @return Zend_Loader_ClassMapAutoloader
+     */
+    public function setOptions($options)
+    {
+        $this->registerAutoloadMaps($options);
+        return $this;
+    }
+
+    /**
+     * Register an autoload map
+     *
+     * An autoload map may be either an associative array, or a file returning
+     * an associative array.
+     *
+     * An autoload map should be an associative array containing 
+     * classname/file pairs.
+     * 
+     * @param  string|array $location 
+     * @return Zend_Loader_ClassMapAutoloader
+     */
+    public function registerAutoloadMap($map)
+    {
+        if (is_string($map)) {
+            $location = $map;
+            if ($this === ($map = $this->loadMapFromFile($location))) {
+                return $this;
+            }
+        }
+
+        if (!is_array($map)) {
+            require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php';
+            throw new Zend_Loader_Exception_InvalidArgumentException('Map file provided does not return a map');
+        }
+
+        $this->map = array_merge($this->map, $map);
+
+        if (isset($location)) {
+            $this->mapsLoaded[] = $location;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Register many autoload maps at once
+     * 
+     * @param  array $locations 
+     * @return Zend_Loader_ClassMapAutoloader
+     */
+    public function registerAutoloadMaps($locations)
+    {
+        if (!is_array($locations) && !($locations instanceof Traversable)) {
+            require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php';
+            throw new Zend_Loader_Exception_InvalidArgumentException('Map list must be an array or implement Traversable');
+        }
+        foreach ($locations as $location) {
+            $this->registerAutoloadMap($location);
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve current autoload map
+     * 
+     * @return array
+     */
+    public function getAutoloadMap()
+    {
+        return $this->map;
+    }
+
+    /**
+     * Defined by Autoloadable
+     * 
+     * @param  string $class 
+     * @return void
+     */
+    public function autoload($class)
+    {
+        if (isset($this->map[$class])) {
+            require_once $this->map[$class];
+        }
+    }
+
+    /**
+     * Register the autoloader with spl_autoload registry
+     * 
+     * @return void
+     */
+    public function register()
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            spl_autoload_register(array($this, 'autoload'), true, true);
+        } else {
+            spl_autoload_register(array($this, 'autoload'), true);
+        }
+    }
+
+    /**
+     * Load a map from a file
+     *
+     * If the map has been previously loaded, returns the current instance;
+     * otherwise, returns whatever was returned by calling include() on the
+     * location.
+     * 
+     * @param  string $location 
+     * @return Zend_Loader_ClassMapAutoloader|mixed
+     * @throws Zend_Loader_Exception_InvalidArgumentException for nonexistent locations
+     */
+    protected function loadMapFromFile($location)
+    {
+        if (!file_exists($location)) {
+            require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php';
+            throw new Zend_Loader_Exception_InvalidArgumentException('Map file provided does not exist');
+        }
+
+        if (!$path = self::realPharPath($location)) {
+            $path = realpath($location);
+        }
+
+        if (in_array($path, $this->mapsLoaded)) {
+            // Already loaded this map
+            return $this;
+        }
+
+        $map = include $path;
+
+        return $map;
+    }
+
+    /**
+     * Resolve the real_path() to a file within a phar.
+     *
+     * @see    https://bugs.php.net/bug.php?id=52769 
+     * @param  string $path 
+     * @return string
+     */
+    public static function realPharPath($path)
+    {
+        if (strpos($path, 'phar:///') !== 0) {
+            return;
+        }
+        
+        $parts = explode('/', str_replace(array('/','\\'), '/', substr($path, 8)));
+        $parts = array_values(array_filter($parts, array(__CLASS__, 'concatPharParts')));
+
+        array_walk($parts, array(__CLASS__, 'resolvePharParentPath'), $parts);
+
+        if (file_exists($realPath = 'phar:///' . implode('/', $parts))) {
+            return $realPath;
+        }
+    }
+
+    /**
+     * Helper callback for filtering phar paths
+     * 
+     * @param  string $part 
+     * @return bool
+     */
+    public static function concatPharParts($part)
+    {
+        return ($part !== '' && $part !== '.');
+    }
+
+    /**
+     * Helper callback to resolve a parent path in a Phar archive
+     * 
+     * @param  string $value 
+     * @param  int $key 
+     * @param  array $parts 
+     * @return void
+     */
+    public static function resolvePharParentPath($value, $key, &$parts)
+    {
+        if ($value !== '...') {
+            return;
+        }
+        unset($parts[$key], $parts[$key-1]);
+        $parts = array_values($parts);
+    }
+}
diff --git a/lib/zend/Zend/Loader/Exception.php b/lib/zend/Zend/Loader/Exception.php
index 10416a8fb55..9b5c77f4897 100644
--- a/lib/zend/Zend/Loader/Exception.php
+++ b/lib/zend/Zend/Loader/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,8 +28,8 @@ require_once 'Zend/Exception.php';
  * @category   Zend
  * @package    Zend_Loader
  * @uses       Zend_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Loader_Exception extends Zend_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/zend/Zend/Loader/Exception/InvalidArgumentException.php b/lib/zend/Zend/Loader/Exception/InvalidArgumentException.php
new file mode 100644
index 00000000000..6cfc2219571
--- /dev/null
+++ b/lib/zend/Zend/Loader/Exception/InvalidArgumentException.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Loader
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once dirname(__FILE__) . '/../Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Loader
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Loader_Exception_InvalidArgumentException
+    extends Zend_Loader_Exception
+{
+}
diff --git a/lib/zend/Zend/Loader/PluginLoader.php b/lib/zend/Zend/Loader/PluginLoader.php
index b78f9ba8ec7..118684302d8 100644
--- a/lib/zend/Zend/Loader/PluginLoader.php
+++ b/lib/zend/Zend/Loader/PluginLoader.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Loader.php';
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
@@ -43,6 +43,12 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
      */
     protected static $_includeFileCache;
 
+    /**
+     * Class map cache file handler
+     * @var resource
+     */
+    protected static $_includeFileCacheHandler;
+
     /**
      * Instance loaded plugin paths
      *
@@ -127,12 +133,14 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
             return $prefix;
         }
 
-        $last = strlen($prefix) - 1;
-        if ($prefix{$last} == '\\') {
-            return $prefix;
+        $nsSeparator = (false !== strpos($prefix, '\\'))?'\\':'_';
+        $prefix = rtrim($prefix, $nsSeparator) . $nsSeparator;
+        //if $nsSeprator == "\" and the prefix ends in "_\" remove trailing \
+        //https://github.com/zendframework/zf1/issues/152
+        if(($nsSeparator == "\\") && (substr($prefix,-2) == "_\\")) {
+            $prefix = substr($prefix, 0, -1);
         }
-
-        return rtrim($prefix, '_') . '_';
+        return $prefix;
     }
 
     /**
@@ -256,7 +264,7 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
 
         if ($path != null) {
             $pos = array_search($path, $registry[$prefix]);
-            if ($pos === null) {
+            if (false === $pos) {
                 require_once 'Zend/Loader/PluginLoader/Exception.php';
                 throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' / Path ' . $path . ' was not found in the PluginLoader.');
             }
@@ -372,7 +380,11 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
 
         $registry  = array_reverse($registry, true);
         $found     = false;
-        $classFile = str_replace('_', DIRECTORY_SEPARATOR, $name) . '.php';
+        if (false !== strpos($name, '\\')) {
+            $classFile = str_replace('\\', DIRECTORY_SEPARATOR, $name) . '.php';
+        } else {
+            $classFile = str_replace('_', DIRECTORY_SEPARATOR, $name) . '.php';
+        }
         $incFile   = self::getIncludeFileCache();
         foreach ($registry as $prefix => $paths) {
             $className = $prefix . $name;
@@ -432,6 +444,13 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
      */
     public static function setIncludeFileCache($file)
     {
+        if (!empty(self::$_includeFileCacheHandler)) {
+            flock(self::$_includeFileCacheHandler, LOCK_UN);
+            fclose(self::$_includeFileCacheHandler);
+        }
+
+        self::$_includeFileCacheHandler = null;
+
         if (null === $file) {
             self::$_includeFileCache = null;
             return;
@@ -471,14 +490,17 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
      */
     protected static function _appendIncFile($incFile)
     {
-        if (!file_exists(self::$_includeFileCache)) {
-            $file = '<?php';
-        } else {
-            $file = file_get_contents(self::$_includeFileCache);
+        if (!isset(self::$_includeFileCacheHandler)) {
+            self::$_includeFileCacheHandler = fopen(self::$_includeFileCache, 'ab');
+
+            if (!flock(self::$_includeFileCacheHandler, LOCK_EX | LOCK_NB, $wouldBlock) || $wouldBlock) {
+                self::$_includeFileCacheHandler = false;
+            }
         }
-        if (!strstr($file, $incFile)) {
-            $file .= "\ninclude_once '$incFile';";
-            file_put_contents(self::$_includeFileCache, $file);
+
+        if (false !== self::$_includeFileCacheHandler) {
+            $line = "<?php include_once '$incFile'?>\n";
+            fwrite(self::$_includeFileCacheHandler, $line, strlen($line));
         }
     }
 }
diff --git a/lib/zend/Zend/Loader/PluginLoader/Exception.php b/lib/zend/Zend/Loader/PluginLoader/Exception.php
index 4597acb5ef9..ea76629d59f 100644
--- a/lib/zend/Zend/Loader/PluginLoader/Exception.php
+++ b/lib/zend/Zend/Loader/PluginLoader/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Loader/Exception.php';
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Loader_PluginLoader_Exception extends Zend_Loader_Exception
diff --git a/lib/zend/Zend/Loader/PluginLoader/Interface.php b/lib/zend/Zend/Loader/PluginLoader/Interface.php
index 431700d5746..2733191bb8c 100644
--- a/lib/zend/Zend/Loader/PluginLoader/Interface.php
+++ b/lib/zend/Zend/Loader/PluginLoader/Interface.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Zend_Loader_PluginLoader_Interface
diff --git a/lib/zend/Zend/Loader/SplAutoloader.php b/lib/zend/Zend/Loader/SplAutoloader.php
new file mode 100644
index 00000000000..f502f8f035b
--- /dev/null
+++ b/lib/zend/Zend/Loader/SplAutoloader.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Loader
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+if (interface_exists('Zend_Loader_SplAutoloader')) return;
+
+/**
+ * Defines an interface for classes that may register with the spl_autoload 
+ * registry
+ *
+ * @package    Zend_Loader
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Loader_SplAutoloader
+{
+    /**
+     * Constructor
+     *
+     * Allow configuration of the autoloader via the constructor.
+     * 
+     * @param  null|array|Traversable $options 
+     * @return void
+     */
+    public function __construct($options = null);
+
+    /**
+     * Configure the autoloader
+     *
+     * In most cases, $options should be either an associative array or 
+     * Traversable object.
+     * 
+     * @param  array|Traversable $options 
+     * @return SplAutoloader
+     */
+    public function setOptions($options);
+
+    /**
+     * Autoload a class
+     *
+     * @param   $class
+     * @return  mixed
+     *          False [if unable to load $class]
+     *          get_class($class) [if $class is successfully loaded]
+     */
+    public function autoload($class);
+
+    /**
+     * Register the autoloader with spl_autoload registry
+     *
+     * Typically, the body of this will simply be:
+     * <code>
+     * spl_autoload_register(array($this, 'autoload'));
+     * </code>
+     * 
+     * @return void
+     */
+    public function register();
+}
diff --git a/lib/zend/Zend/Loader/StandardAutoloader.php b/lib/zend/Zend/Loader/StandardAutoloader.php
new file mode 100644
index 00000000000..867fbd92233
--- /dev/null
+++ b/lib/zend/Zend/Loader/StandardAutoloader.php
@@ -0,0 +1,368 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Loader
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+// Grab SplAutoloader interface
+require_once dirname(__FILE__) . '/SplAutoloader.php';
+
+/**
+ * PSR-0 compliant autoloader
+ *
+ * Allows autoloading both namespaced and vendor-prefixed classes. Class
+ * lookups are performed on the filesystem. If a class file for the referenced
+ * class is not found, a PHP warning will be raised by include().
+ *
+ * @package    Zend_Loader
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
+ */
+class Zend_Loader_StandardAutoloader implements Zend_Loader_SplAutoloader
+{
+    const NS_SEPARATOR     = '\\';
+    const PREFIX_SEPARATOR = '_';
+    const LOAD_NS          = 'namespaces';
+    const LOAD_PREFIX      = 'prefixes';
+    const ACT_AS_FALLBACK  = 'fallback_autoloader';
+    const AUTOREGISTER_ZF  = 'autoregister_zf';
+
+    /**
+     * @var array Namespace/directory pairs to search; ZF library added by default
+     */
+    protected $namespaces = array();
+
+    /**
+     * @var array Prefix/directory pairs to search
+     */
+    protected $prefixes = array();
+
+    /**
+     * @var bool Whether or not the autoloader should also act as a fallback autoloader
+     */
+    protected $fallbackAutoloaderFlag = false;
+
+    /**
+     * @var bool
+     */
+    protected $error;
+
+    /**
+     * Constructor
+     *
+     * @param  null|array|Traversable $options
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        if (null !== $options) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * Configure autoloader
+     *
+     * Allows specifying both "namespace" and "prefix" pairs, using the
+     * following structure:
+     * <code>
+     * array(
+     *     'namespaces' => array(
+     *         'Zend'     => '/path/to/Zend/library',
+     *         'Doctrine' => '/path/to/Doctrine/library',
+     *     ),
+     *     'prefixes' => array(
+     *         'Phly_'     => '/path/to/Phly/library',
+     *     ),
+     *     'fallback_autoloader' => true,
+     * )
+     * </code>
+     *
+     * @param  array|Traversable $options
+     * @return Zend_Loader_StandardAutoloader
+     */
+    public function setOptions($options)
+    {
+        if (!is_array($options) && !($options instanceof Traversable)) {
+            require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php';
+            throw new Zend_Loader_Exception_InvalidArgumentException('Options must be either an array or Traversable');
+        }
+
+        foreach ($options as $type => $pairs) {
+            switch ($type) {
+                case self::AUTOREGISTER_ZF:
+                    if ($pairs) {
+                        $this->registerPrefix('Zend', dirname(dirname(__FILE__)));
+                    }
+                    break;
+                case self::LOAD_NS:
+                    if (is_array($pairs) || $pairs instanceof Traversable) {
+                        $this->registerNamespaces($pairs);
+                    }
+                    break;
+                case self::LOAD_PREFIX:
+                    if (is_array($pairs) || $pairs instanceof Traversable) {
+                        $this->registerPrefixes($pairs);
+                    }
+                    break;
+                case self::ACT_AS_FALLBACK:
+                    $this->setFallbackAutoloader($pairs);
+                    break;
+                default:
+                    // ignore
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Set flag indicating fallback autoloader status
+     *
+     * @param  bool $flag
+     * @return Zend_Loader_StandardAutoloader
+     */
+    public function setFallbackAutoloader($flag)
+    {
+        $this->fallbackAutoloaderFlag = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Is this autoloader acting as a fallback autoloader?
+     *
+     * @return bool
+     */
+    public function isFallbackAutoloader()
+    {
+        return $this->fallbackAutoloaderFlag;
+    }
+
+    /**
+     * Register a namespace/directory pair
+     *
+     * @param  string $namespace
+     * @param  string $directory
+     * @return Zend_Loader_StandardAutoloader
+     */
+    public function registerNamespace($namespace, $directory)
+    {
+        $namespace = rtrim($namespace, self::NS_SEPARATOR). self::NS_SEPARATOR;
+        $this->namespaces[$namespace] = $this->normalizeDirectory($directory);
+        return $this;
+    }
+
+    /**
+     * Register many namespace/directory pairs at once
+     *
+     * @param  array $namespaces
+     * @return Zend_Loader_StandardAutoloader
+     */
+    public function registerNamespaces($namespaces)
+    {
+        if (!is_array($namespaces) && !$namespaces instanceof Traversable) {
+            require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php';
+            throw new Zend_Loader_Exception_InvalidArgumentException('Namespace pairs must be either an array or Traversable');
+        }
+
+        foreach ($namespaces as $namespace => $directory) {
+            $this->registerNamespace($namespace, $directory);
+        }
+        return $this;
+    }
+
+    /**
+     * Register a prefix/directory pair
+     *
+     * @param  string $prefix
+     * @param  string $directory
+     * @return Zend_Loader_StandardAutoloader
+     */
+    public function registerPrefix($prefix, $directory)
+    {
+        $prefix = rtrim($prefix, self::PREFIX_SEPARATOR). self::PREFIX_SEPARATOR;
+        $this->prefixes[$prefix] = $this->normalizeDirectory($directory);
+        return $this;
+    }
+
+    /**
+     * Register many namespace/directory pairs at once
+     *
+     * @param  array $prefixes
+     * @return Zend_Loader_StandardAutoloader
+     */
+    public function registerPrefixes($prefixes)
+    {
+        if (!is_array($prefixes) && !$prefixes instanceof Traversable) {
+            require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php';
+            throw new Zend_Loader_Exception_InvalidArgumentException('Prefix pairs must be either an array or Traversable');
+        }
+
+        foreach ($prefixes as $prefix => $directory) {
+            $this->registerPrefix($prefix, $directory);
+        }
+        return $this;
+    }
+
+    /**
+     * Defined by Autoloadable; autoload a class
+     *
+     * @param  string $class
+     * @return false|string
+     */
+    public function autoload($class)
+    {
+        $isFallback = $this->isFallbackAutoloader();
+        if (false !== strpos($class, self::NS_SEPARATOR)) {
+            if ($this->loadClass($class, self::LOAD_NS)) {
+                return $class;
+            } elseif ($isFallback) {
+                return $this->loadClass($class, self::ACT_AS_FALLBACK);
+            }
+            return false;
+        }
+        if (false !== strpos($class, self::PREFIX_SEPARATOR)) {
+            if ($this->loadClass($class, self::LOAD_PREFIX)) {
+                return $class;
+            } elseif ($isFallback) {
+                return $this->loadClass($class, self::ACT_AS_FALLBACK);
+            }
+            return false;
+        }
+        if ($isFallback) {
+            return $this->loadClass($class, self::ACT_AS_FALLBACK);
+        }
+        return false;
+    }
+
+    /**
+     * Register the autoloader with spl_autoload
+     *
+     * @return void
+     */
+    public function register()
+    {
+        spl_autoload_register(array($this, 'autoload'));
+    }
+
+    /**
+     * Error handler
+     *
+     * Used by {@link loadClass} during fallback autoloading in PHP versions
+     * prior to 5.3.0.
+     * 
+     * @param mixed $errno 
+     * @param mixed $errstr 
+     * @return void
+     */
+    public function handleError($errno, $errstr)
+    {
+        $this->error = true;
+    }
+
+    /**
+     * Transform the class name to a filename
+     *
+     * @param  string $class
+     * @param  string $directory
+     * @return string
+     */
+    protected function transformClassNameToFilename($class, $directory)
+    {
+        // $class may contain a namespace portion, in  which case we need
+        // to preserve any underscores in that portion.
+        $matches = array();
+        preg_match('/(?P<namespace>.+\\\)?(?P<class>[^\\\]+$)/', $class, $matches);
+
+        $class     = (isset($matches['class'])) ? $matches['class'] : '';
+        $namespace = (isset($matches['namespace'])) ? $matches['namespace'] : '';
+
+        return $directory
+             . str_replace(self::NS_SEPARATOR, '/', $namespace)
+             . str_replace(self::PREFIX_SEPARATOR, '/', $class)
+             . '.php';
+    }
+
+    /**
+     * Load a class, based on its type (namespaced or prefixed)
+     *
+     * @param  string $class
+     * @param  string $type
+     * @return void
+     */
+    protected function loadClass($class, $type)
+    {
+        if (!in_array($type, array(self::LOAD_NS, self::LOAD_PREFIX, self::ACT_AS_FALLBACK))) {
+            require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php';
+            throw new Zend_Loader_Exception_InvalidArgumentException();
+        }
+
+        // Fallback autoloading
+        if ($type === self::ACT_AS_FALLBACK) {
+            // create filename
+            $filename = $this->transformClassNameToFilename($class, '');
+            if (version_compare(PHP_VERSION, '5.3.2', '>=')) {
+                $resolvedName = stream_resolve_include_path($filename);
+                if ($resolvedName !== false) {
+                    return include $resolvedName;
+                }
+                return false;
+            }
+            $this->error = false;
+            set_error_handler(array($this, 'handleError'), E_WARNING);
+            include $filename;
+            restore_error_handler();
+            if ($this->error) {
+                return false;
+            }
+            return class_exists($class, false);
+        }
+
+        // Namespace and/or prefix autoloading
+        foreach ($this->$type as $leader => $path) {
+            if (0 === strpos($class, $leader)) {
+                // Trim off leader (namespace or prefix)
+                $trimmedClass = substr($class, strlen($leader));
+
+                // create filename
+                $filename = $this->transformClassNameToFilename($trimmedClass, $path);
+                if (file_exists($filename)) {
+                    return include $filename;
+                }
+                return false;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Normalize the directory to include a trailing directory separator
+     *
+     * @param  string $directory
+     * @return string
+     */
+    protected function normalizeDirectory($directory)
+    {
+        $last = $directory[strlen($directory) - 1];
+        if (in_array($last, array('/', '\\'))) {
+            $directory[strlen($directory) - 1] = DIRECTORY_SEPARATOR;
+            return $directory;
+        }
+        $directory .= DIRECTORY_SEPARATOR;
+        return $directory;
+    }
+
+}
diff --git a/lib/zend/Zend/Locale.php b/lib/zend/Zend/Locale.php
new file mode 100644
index 00000000000..f2618a779bd
--- /dev/null
+++ b/lib/zend/Zend/Locale.php
@@ -0,0 +1,2012 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version   $Id$
+ */
+
+/**
+ * Base class for localization
+ *
+ * @category  Zend
+ * @package   Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Locale
+{
+    /**
+     * List of locales that are no longer part of CLDR along with a
+     * mapping to an appropriate alternative.
+     *
+     * @var array
+     */
+    private static $_localeAliases = array(
+        'az_AZ'  => 'az_Latn_AZ',
+        'bs_BA'  => 'bs_Latn_BA',
+        'ha_GH'  => 'ha_Latn_GH',
+        'ha_NE'  => 'ha_Latn_NE',
+        'ha_NG'  => 'ha_Latn_NG',
+        'kk_KZ'  => 'kk_Cyrl_KZ',
+        'ks_IN'  => 'ks_Arab_IN',
+        'mn_MN'  => 'mn_Cyrl_MN',
+        'ms_BN'  => 'ms_Latn_BN',
+        'ms_MY'  => 'ms_Latn_MY',
+        'ms_SG'  => 'ms_Latn_SG',
+        'pa_IN'  => 'pa_Guru_IN',
+        'pa_PK'  => 'pa_Arab_PK',
+        'shi_MA' => 'shi_Latn_MA',
+        'sr_BA'  => 'sr_Latn_BA',
+        'sr_ME'  => 'sr_Latn_ME',
+        'sr_RS'  => 'sr_Latn_RS',
+        'sr_XK'  => 'sr_Latn_XK',
+        'tg_TJ'  => 'tg_Cyrl_TJ',
+        'tzm_MA' => 'tzm_Latn_MA',
+        'uz_AF'  => 'uz_Arab_AF',
+        'uz_UZ'  => 'uz_Latn_UZ',
+        'vai_LR' => 'vai_Latn_LR',
+        'zh_CN' => 'zh_Hans_CN',
+        'zh_HK' => 'zh_Hant_HK',
+        'zh_MO' => 'zh_Hans_MO',
+        'zh_SG' => 'zh_Hans_SG',
+        'zh_TW' => 'zh_Hant_TW',
+    );
+
+    /**
+     * Class wide Locale Constants
+     *
+     * @var array $_localeData
+     */
+    private static $_localeData = array(
+        'root'        => true,
+        'aa'          => true,
+        'aa_DJ'       => true,
+        'aa_ER'       => true,
+        'aa_ET'       => true,
+        'af'          => true,
+        'af_NA'       => true,
+        'af_ZA'       => true,
+        'agq'         => true,
+        'agq_CM'      => true,
+        'ak'          => true,
+        'ak_GH'       => true,
+        'am'          => true,
+        'am_ET'       => true,
+        'ar'          => true,
+        'ar_001'      => true,
+        'ar_AE'       => true,
+        'ar_BH'       => true,
+        'ar_DJ'       => true,
+        'ar_DZ'       => true,
+        'ar_EG'       => true,
+        'ar_EH'       => true,
+        'ar_ER'       => true,
+        'ar_IL'       => true,
+        'ar_IQ'       => true,
+        'ar_JO'       => true,
+        'ar_KM'       => true,
+        'ar_KW'       => true,
+        'ar_LB'       => true,
+        'ar_LY'       => true,
+        'ar_MA'       => true,
+        'ar_MR'       => true,
+        'ar_OM'       => true,
+        'ar_PS'       => true,
+        'ar_QA'       => true,
+        'ar_SA'       => true,
+        'ar_SD'       => true,
+        'ar_SO'       => true,
+        'ar_SS'       => true,
+        'ar_SY'       => true,
+        'ar_TD'       => true,
+        'ar_TN'       => true,
+        'ar_YE'       => true,
+        'as'          => true,
+        'as_IN'       => true,
+        'asa'         => true,
+        'asa_TZ'      => true,
+        'ast'         => true,
+        'ast_ES'      => true,
+        'az'          => true,
+        'az_Cyrl'     => true,
+        'az_Cyrl_AZ'  => true,
+        'az_Latn'     => true,
+        'az_Latn_AZ'  => true,
+        'bas'         => true,
+        'bas_CM'      => true,
+        'be'          => true,
+        'be_BY'       => true,
+        'bem'         => true,
+        'bem_ZM'      => true,
+        'bez'         => true,
+        'bez_TZ'      => true,
+        'bg'          => true,
+        'bg_BG'       => true,
+        'bm'          => true,
+        'bm_ML'       => true,
+        'bn'          => true,
+        'bn_BD'       => true,
+        'bn_IN'       => true,
+        'bo'          => true,
+        'bo_CN'       => true,
+        'bo_IN'       => true,
+        'br'          => true,
+        'br_FR'       => true,
+        'brx'         => true,
+        'brx_IN'      => true,
+        'bs'          => true,
+        'bs_Cyrl'     => true,
+        'bs_Cyrl_BA'  => true,
+        'bs_Latn'     => true,
+        'bs_Latn_BA'  => true,
+        'byn'         => true,
+        'byn_ER'      => true,
+        'ca'          => true,
+        'ca_AD'       => true,
+        'ca_ES'       => true,
+        'ca_ES_VALENCIA' => true,
+        'ca_FR'       => true,
+        'ca_IT'       => true,
+        'cgg'         => true,
+        'cgg_UG'      => true,
+        'chr'         => true,
+        'chr_US'      => true,
+        'cs'          => true,
+        'cs_CZ'       => true,
+        'cy'          => true,
+        'cy_GB'       => true,
+        'da'          => true,
+        'da_DK'       => true,
+        'da_GL'       => true,
+        'dav'         => true,
+        'dav_KE'      => true,
+        'de'          => true,
+        'de_AT'       => true,
+        'de_BE'       => true,
+        'de_CH'       => true,
+        'de_DE'       => true,
+        'de_LI'       => true,
+        'de_LU'       => true,
+        'dje'         => true,
+        'dje_NE'      => true,
+        'dua'         => true,
+        'dua_CM'      => true,
+        'dyo'         => true,
+        'dyo_SN'      => true,
+        'dz'          => true,
+        'dz_BT'       => true,
+        'ebu'         => true,
+        'ebu_KE'      => true,
+        'ee'          => true,
+        'ee_GH'       => true,
+        'ee_TG'       => true,
+        'el'          => true,
+        'el_CY'       => true,
+        'el_GR'       => true,
+        'en'          => true,
+        'en_001'      => true,
+        'en_150'      => true,
+        'en_AG'       => true,
+        'en_AI'       => true,
+        'en_AS'       => true,
+        'en_AU'       => true,
+        'en_BB'       => true,
+        'en_BE'       => true,
+        'en_BM'       => true,
+        'en_BS'       => true,
+        'en_BW'       => true,
+        'en_BZ'       => true,
+        'en_CA'       => true,
+        'en_CC'       => true,
+        'en_CK'       => true,
+        'en_CM'       => true,
+        'en_CX'       => true,
+        'en_DG'       => true,
+        'en_DM'       => true,
+        'en_Dsrt'     => true,
+        'en_Dsrt_US'  => true,
+        'en_ER'       => true,
+        'en_FJ'       => true,
+        'en_FK'       => true,
+        'en_FM'       => true,
+        'en_GB'       => true,
+        'en_GD'       => true,
+        'en_GG'       => true,
+        'en_GH'       => true,
+        'en_GI'       => true,
+        'en_GM'       => true,
+        'en_GU'       => true,
+        'en_GY'       => true,
+        'en_HK'       => true,
+        'en_IE'       => true,
+        'en_IM'       => true,
+        'en_IN'       => true,
+        'en_IO'       => true,
+        'en_JE'       => true,
+        'en_JM'       => true,
+        'en_KE'       => true,
+        'en_KI'       => true,
+        'en_KN'       => true,
+        'en_KY'       => true,
+        'en_LC'       => true,
+        'en_LR'       => true,
+        'en_LS'       => true,
+        'en_MG'       => true,
+        'en_MH'       => true,
+        'en_MO'       => true,
+        'en_MP'       => true,
+        'en_MS'       => true,
+        'en_MT'       => true,
+        'en_MU'       => true,
+        'en_MW'       => true,
+        'en_NA'       => true,
+        'en_NF'       => true,
+        'en_NG'       => true,
+        'en_NR'       => true,
+        'en_NU'       => true,
+        'en_NZ'       => true,
+        'en_PG'       => true,
+        'en_PH'       => true,
+        'en_PK'       => true,
+        'en_PN'       => true,
+        'en_PR'       => true,
+        'en_PW'       => true,
+        'en_RW'       => true,
+        'en_SB'       => true,
+        'en_SC'       => true,
+        'en_SD'       => true,
+        'en_SG'       => true,
+        'en_SH'       => true,
+        'en_SL'       => true,
+        'en_SS'       => true,
+        'en_SX'       => true,
+        'en_SZ'       => true,
+        'en_TC'       => true,
+        'en_TK'       => true,
+        'en_TO'       => true,
+        'en_TT'       => true,
+        'en_TV'       => true,
+        'en_TZ'       => true,
+        'en_UG'       => true,
+        'en_UM'       => true,
+        'en_US'       => true,
+        'en_US_POSIX' => true,
+        'en_VC'       => true,
+        'en_VG'       => true,
+        'en_VI'       => true,
+        'en_VU'       => true,
+        'en_WS'       => true,
+        'en_ZA'       => true,
+        'en_ZM'       => true,
+        'en_ZW'       => true,
+        'eo'          => true,
+        'eo_001'      => true,
+        'es'          => true,
+        'es_419'      => true,
+        'es_AR'       => true,
+        'es_BO'       => true,
+        'es_CL'       => true,
+        'es_CO'       => true,
+        'es_CR'       => true,
+        'es_CU'       => true,
+        'es_DO'       => true,
+        'es_EA'       => true,
+        'es_EC'       => true,
+        'es_ES'       => true,
+        'es_GQ'       => true,
+        'es_GT'       => true,
+        'es_HN'       => true,
+        'es_IC'       => true,
+        'es_MX'       => true,
+        'es_NI'       => true,
+        'es_PA'       => true,
+        'es_PE'       => true,
+        'es_PH'       => true,
+        'es_PR'       => true,
+        'es_PY'       => true,
+        'es_SV'       => true,
+        'es_US'       => true,
+        'es_UY'       => true,
+        'es_VE'       => true,
+        'et'          => true,
+        'et_EE'       => true,
+        'eu'          => true,
+        'eu_ES'       => true,
+        'ewo'         => true,
+        'ewo_CM'      => true,
+        'fa'          => true,
+        'fa_AF'       => true,
+        'fa_IR'       => true,
+        'ff'          => true,
+        'ff_CM'       => true,
+        'ff_GN'       => true,
+        'ff_MR'       => true,
+        'fr_PM'       => true,
+        'ff_SN'       => true,
+        'fr_WF'       => true,
+        'fi'          => true,
+        'fi_FI'       => true,
+        'fil'         => true,
+        'fil_PH'      => true,
+        'fo'          => true,
+        'fo_FO'       => true,
+        'fr'          => true,
+        'fr_BE'       => true,
+        'fr_BF'       => true,
+        'fr_BI'       => true,
+        'fr_BJ'       => true,
+        'fr_BL'       => true,
+        'fr_CA'       => true,
+        'fr_CD'       => true,
+        'fr_CF'       => true,
+        'fr_CG'       => true,
+        'fr_CH'       => true,
+        'fr_CI'       => true,
+        'fr_CM'       => true,
+        'fr_DJ'       => true,
+        'fr_DZ'       => true,
+        'fr_FR'       => true,
+        'fr_GA'       => true,
+        'fr_GF'       => true,
+        'fr_GN'       => true,
+        'fr_GP'       => true,
+        'fr_GQ'       => true,
+        'fr_HT'       => true,
+        'fr_KM'       => true,
+        'fr_LU'       => true,
+        'fr_MA'       => true,
+        'fr_MC'       => true,
+        'fr_MF'       => true,
+        'fr_MG'       => true,
+        'fr_ML'       => true,
+        'fr_MQ'       => true,
+        'fr_MR'       => true,
+        'fr_MU'       => true,
+        'fr_NC'       => true,
+        'fr_NE'       => true,
+        'fr_PF'       => true,
+        'fr_RE'       => true,
+        'fr_RW'       => true,
+        'fr_SC'       => true,
+        'fr_SN'       => true,
+        'fr_SY'       => true,
+        'fr_TD'       => true,
+        'fr_TG'       => true,
+        'fr_TN'       => true,
+        'fr_VU'       => true,
+        'fr_YT'       => true,
+        'fur'         => true,
+        'fur_IT'      => true,
+        'fy'          => true,
+        'fy_NL'       => true,
+        'ga'          => true,
+        'ga_IE'       => true,
+        'gd'          => true,
+        'gd_GB'       => true,
+        'gl'          => true,
+        'gl_ES'       => true,
+        'gsw'         => true,
+        'gsw_CH'      => true,
+        'gsw_LI'      => true,
+        'gu'          => true,
+        'gu_IN'       => true,
+        'guz'         => true,
+        'guz_KE'      => true,
+        'gv'          => true,
+        'gv_IM'       => true,
+        'ha'          => true,
+        'ha_Latn'     => true,
+        'ha_Latn_GH'  => true,
+        'ha_Latn_NE'  => true,
+        'ha_Latn_NG'  => true,
+        'haw'         => true,
+        'haw_US'      => true,
+        'he'          => true,
+        'he_IL'       => true,
+        'hi'          => true,
+        'hi_IN'       => true,
+        'hr'          => true,
+        'hr_BA'       => true,
+        'hr_HR'       => true,
+        'hu'          => true,
+        'hu_HU'       => true,
+        'hy'          => true,
+        'hy_AM'       => true,
+        'ia'          => true,
+        'ia_FR'       => true,
+        'id'          => true,
+        'id_ID'       => true,
+        'ig'          => true,
+        'ig_NG'       => true,
+        'ii'          => true,
+        'ii_CN'       => true,
+        'is'          => true,
+        'is_IS'       => true,
+        'it'          => true,
+        'it_CH'       => true,
+        'it_IT'       => true,
+        'it_SM'       => true,
+        'ja'          => true,
+        'ja_JP'       => true,
+        'jgo'         => true,
+        'jgo_CM'      => true,
+        'jmc'         => true,
+        'jmc_TZ'      => true,
+        'ka'          => true,
+        'ka_GE'       => true,
+        'kab'         => true,
+        'kab_DZ'      => true,
+        'kam'         => true,
+        'kam_KE'      => true,
+        'kde'         => true,
+        'kde_TZ'      => true,
+        'kea'         => true,
+        'kea_CV'      => true,
+        'khq'         => true,
+        'khq_ML'      => true,
+        'ki'          => true,
+        'ki_KE'       => true,
+        'kk'          => true,
+        'kk_Cyrl'     => true,
+        'kk_Cyrl_KZ'  => true,
+        'kkj'         => true,
+        'kkj_CM'      => true,
+        'kl'          => true,
+        'kl_GL'       => true,
+        'kln'         => true,
+        'kln_KE'      => true,
+        'km'          => true,
+        'km_KH'       => true,
+        'kn'          => true,
+        'kn_IN'       => true,
+        'ko'          => true,
+        'ko_KP'       => true,
+        'ko_KR'       => true,
+        'kok'         => true,
+        'kok_IN'      => true,
+        'ks'          => true,
+        'ks_Arab'     => true,
+        'ks_Arab_IN'  => true,
+        'ksb'         => true,
+        'ksb_TZ'      => true,
+        'ksf'         => true,
+        'ksf_CM'      => true,
+        'ksh'         => true,
+        'ksh_DE'      => true,
+        'kw'          => true,
+        'kw_GB'       => true,
+        'ky'          => true,
+        'ky_Cyrl'     => true,
+        'ky_Cyrl_KG'  => true,
+        'lag'         => true,
+        'lag_TZ'      => true,
+        'lg'          => true,
+        'lg_UG'       => true,
+        'lkt'         => true,
+        'lkt_US'      => true,
+        'ln'          => true,
+        'ln_AO'       => true,
+        'ln_CD'       => true,
+        'ln_CF'       => true,
+        'ln_CG'       => true,
+        'lo'          => true,
+        'lo_LA'       => true,
+        'lt'          => true,
+        'lt_LT'       => true,
+        'lu'          => true,
+        'lu_CD'       => true,
+        'luo'         => true,
+        'luo_KE'      => true,
+        'luy'         => true,
+        'luy_KE'      => true,
+        'lv'          => true,
+        'lv_LV'       => true,
+        'mas'         => true,
+        'mas_KE'      => true,
+        'mas_TZ'      => true,
+        'mer'         => true,
+        'mer_KE'      => true,
+        'mfe'         => true,
+        'mfe_MU'      => true,
+        'mg'          => true,
+        'mg_MG'       => true,
+        'mgh'         => true,
+        'mgh_MZ'      => true,
+        'mgo'         => true,
+        'mgo_CM'      => true,
+        'mk'          => true,
+        'mk_MK'       => true,
+        'ml'          => true,
+        'ml_IN'       => true,
+        'mn'          => true,
+        'mn_Cyrl'     => true,
+        'mn_Cyrl_MN'  => true,
+        'mr'          => true,
+        'mr_IN'       => true,
+        'ms'          => true,
+        'ms_Latn'     => true,
+        'ms_Latn_BN'  => true,
+        'ms_Latn_MY'  => true,
+        'ms_Latn_SG'  => true,
+        'mt'          => true,
+        'mt_MT'       => true,
+        'mua'         => true,
+        'mua_CM'      => true,
+        'my'          => true,
+        'my_MM'       => true,
+        'naq'         => true,
+        'naq_NA'      => true,
+        'nb'          => true,
+        'nb_NO'       => true,
+        'nb_SJ'       => true,
+        'nd'          => true,
+        'nd_ZW'       => true,
+        'ne'          => true,
+        'ne_IN'       => true,
+        'ne_NP'       => true,
+        'nl'          => true,
+        'nl_AW'       => true,
+        'nl_BE'       => true,
+        'nl_BQ'       => true,
+        'nl_CW'       => true,
+        'nl_NL'       => true,
+        'nl_SR'       => true,
+        'nl_SX'       => true,
+        'nmg'         => true,
+        'nmg_CM'      => true,
+        'nn'          => true,
+        'nn_NO'       => true,
+        'nnh'         => true,
+        'nnh_CM'      => true,
+        'nr'          => true,
+        'nr_ZA'       => true,
+        'nso'         => true,
+        'nso_ZA'      => true,
+        'nus'         => true,
+        'nus_SD'      => true,
+        'nyn'         => true,
+        'nyn_UG'      => true,
+        'om'          => true,
+        'om_ET'       => true,
+        'om_KE'       => true,
+        'or'          => true,
+        'or_IN'       => true,
+        'ordinals'    => true,
+        'os'          => true,
+        'os_GE'       => true,
+        'os_RU'       => true,
+        'pa'          => true,
+        'pa_Arab'     => true,
+        'pa_Arab_PK'  => true,
+        'pa_Guru'     => true,
+        'pa_Guru_IN'  => true,
+        'pl'          => true,
+        'pl_PL'       => true,
+        'plurals'     => true,
+        'ps'          => true,
+        'ps_AF'       => true,
+        'pt'          => true,
+        'pt_AO'       => true,
+        'pt_BR'       => true,
+        'pt_CV'       => true,
+        'pt_GW'       => true,
+        'pt_MO'       => true,
+        'pt_MZ'       => true,
+        'pt_PT'       => true,
+        'pt_ST'       => true,
+        'pt_TL'       => true,
+        'rm'          => true,
+        'rm_CH'       => true,
+        'rn'          => true,
+        'rn_BI'       => true,
+        'ro'          => true,
+        'ro_MD'       => true,
+        'ro_RO'       => true,
+        'rof'         => true,
+        'rof_TZ'      => true,
+        'ru'          => true,
+        'ru_BY'       => true,
+        'ru_KG'       => true,
+        'ru_KZ'       => true,
+        'ru_MD'       => true,
+        'ru_RU'       => true,
+        'ru_UA'       => true,
+        'rw'          => true,
+        'rw_RW'       => true,
+        'rwk'         => true,
+        'rwk_TZ'      => true,
+        'sah'         => true,
+        'sah_RU'      => true,
+        'saq'         => true,
+        'saq_KE'      => true,
+        'sbp'         => true,
+        'sbp_TZ'      => true,
+        'se'          => true,
+        'se_FI'       => true,
+        'se_NO'       => true,
+        'seh'         => true,
+        'seh_MZ'      => true,
+        'ses'         => true,
+        'ses_ML'      => true,
+        'sg'          => true,
+        'sg_CF'       => true,
+        'shi'         => true,
+        'shi_Latn'    => true,
+        'shi_Latn_MA' => true,
+        'shi_Tfng'    => true,
+        'shi_Tfng_MA' => true,
+        'si'          => true,
+        'si_LK'       => true,
+        'sk'          => true,
+        'sk_SK'       => true,
+        'sl'          => true,
+        'sl_SI'       => true,
+        'sn'          => true,
+        'sn_ZW'       => true,
+        'so'          => true,
+        'so_DJ'       => true,
+        'so_ET'       => true,
+        'so_KE'       => true,
+        'so_SO'       => true,
+        'sq'          => true,
+        'sq_AL'       => true,
+        'sq_MK'       => true,
+        'sq_XK'       => true,
+        'sr'          => true,
+        'sr_Cyrl'     => true,
+        'sr_Cyrl_BA'  => true,
+        'sr_Cyrl_ME'  => true,
+        'sr_Cyrl_RS'  => true,
+        'sr_Cyrl_XK'  => true,
+        'sr_Latn'     => true,
+        'sr_Latn_BA'  => true,
+        'sr_Latn_ME'  => true,
+        'sr_Latn_RS'  => true,
+        'sr_Latn_XK'  => true,
+        'ss'          => true,
+        'ss_SZ'       => true,
+        'ss_ZA'       => true,
+        'ssy'         => true,
+        'ssy_ER'      => true,
+        'st'          => true,
+        'st_LS'       => true,
+        'st_ZA'       => true,
+        'sv'          => true,
+        'sv_AX'       => true,
+        'sv_FI'       => true,
+        'sv_SE'       => true,
+        'sw'          => true,
+        'sw_KE'       => true,
+        'sw_TZ'       => true,
+        'sw_UG'       => true,
+        'swc'         => true,
+        'swc_CD'      => true,
+        'ta'          => true,
+        'ta_IN'       => true,
+        'ta_LK'       => true,
+        'ta_MY'       => true,
+        'ta_SG'       => true,
+        'te'          => true,
+        'te_IN'       => true,
+        'teo'         => true,
+        'teo_KE'      => true,
+        'teo_UG'      => true,
+        'tg'          => true,
+        'tg_Cyrl'     => true,
+        'tg_Cyrl_TJ'  => true,
+        'th'          => true,
+        'th_TH'       => true,
+        'ti'          => true,
+        'ti_ER'       => true,
+        'ti_ET'       => true,
+        'tig'         => true,
+        'tig_ER'      => true,
+        'tn'          => true,
+        'tn_BW'       => true,
+        'tn_ZA'       => true,
+        'to'          => true,
+        'to_TO'       => true,
+        'tr'          => true,
+        'tr_CY'       => true,
+        'tr_TR'       => true,
+        'ts'          => true,
+        'ts_ZA'       => true,
+        'twq'         => true,
+        'twq_NE'      => true,
+        'tzm'         => true,
+        'tzm_Latn'    => true,
+        'tzm_Latn_MA' => true,
+        'ug'          => true,
+        'ug_Arab'     => true,
+        'ug_Arab_CN'  => true,
+        'uk'          => true,
+        'uk_UA'       => true,
+        'ur'          => true,
+        'ur_IN'       => true,
+        'ur_PK'       => true,
+        'uz'          => true,
+        'uz_Arab'     => true,
+        'uz_Arab_AF'  => true,
+        'uz_Cyrl'     => true,
+        'uz_Cyrl_UZ'  => true,
+        'uz_Latn'     => true,
+        'uz_Latn_UZ'  => true,
+        'vai'         => true,
+        'vai_Latn'    => true,
+        'vai_Latn_LR' => true,
+        'vai_Vaii'    => true,
+        'vai_Vaii_LR' => true,
+        've'          => true,
+        've_ZA'       => true,
+        'vi'          => true,
+        'vi_VN'       => true,
+        'vo'          => true,
+        'vo_001'      => true,
+        'vun'         => true,
+        'vun_TZ'      => true,
+        'wae'         => true,
+        'wae_CH'      => true,
+        'wal'         => true,
+        'wal_ET'      => true,
+        'xh'          => true,
+        'xh_ZA'       => true,
+        'xog'         => true,
+        'xog_UG'      => true,
+        'yav'         => true,
+        'yav_CM'      => true,
+        'yo'          => true,
+        'yo_BJ'       => true,
+        'yo_NG'       => true,
+        'zgh'         => true,
+        'zgh_MA'      => true,
+        'zh'          => true,
+        'zh_Hans'     => true,
+        'zh_Hans_CN'  => true,
+        'zh_Hans_HK'  => true,
+        'zh_Hans_MO'  => true,
+        'zh_Hans_SG'  => true,
+        'zh_Hant'     => true,
+        'zh_Hant_HK'  => true,
+        'zh_Hant_MO'  => true,
+        'zh_Hant_TW'  => true,
+        'zu'          => true,
+        'zu_ZA'       => true,
+    );
+
+    /**
+     * Class wide Locale Constants
+     *
+     * @var array $_territoryData
+     */
+    private static $_territoryData = array(
+        'AD' => 'ca_AD',
+        'AE' => 'ar_AE',
+        'AF' => 'fa_AF',
+        'AG' => 'en_AG',
+        'AI' => 'en_AI',
+        'AL' => 'sq_AL',
+        'AM' => 'hy_AM',
+        'AN' => 'pap_AN',
+        'AO' => 'pt_AO',
+        'AQ' => 'und_AQ',
+        'AR' => 'es_AR',
+        'AS' => 'sm_AS',
+        'AT' => 'de_AT',
+        'AU' => 'en_AU',
+        'AW' => 'nl_AW',
+        'AX' => 'sv_AX',
+        'AZ' => 'az_Latn_AZ',
+        'BA' => 'bs_BA',
+        'BB' => 'en_BB',
+        'BD' => 'bn_BD',
+        'BE' => 'nl_BE',
+        'BF' => 'mos_BF',
+        'BG' => 'bg_BG',
+        'BH' => 'ar_BH',
+        'BI' => 'rn_BI',
+        'BJ' => 'fr_BJ',
+        'BL' => 'fr_BL',
+        'BM' => 'en_BM',
+        'BN' => 'ms_BN',
+        'BO' => 'es_BO',
+        'BR' => 'pt_BR',
+        'BS' => 'en_BS',
+        'BT' => 'dz_BT',
+        'BV' => 'und_BV',
+        'BW' => 'en_BW',
+        'BY' => 'be_BY',
+        'BZ' => 'en_BZ',
+        'CA' => 'en_CA',
+        'CC' => 'ms_CC',
+        'CD' => 'sw_CD',
+        'CF' => 'fr_CF',
+        'CG' => 'fr_CG',
+        'CH' => 'de_CH',
+        'CI' => 'fr_CI',
+        'CK' => 'en_CK',
+        'CL' => 'es_CL',
+        'CM' => 'fr_CM',
+        'CN' => 'zh_Hans_CN',
+        'CO' => 'es_CO',
+        'CR' => 'es_CR',
+        'CU' => 'es_CU',
+        'CV' => 'kea_CV',
+        'CX' => 'en_CX',
+        'CY' => 'el_CY',
+        'CZ' => 'cs_CZ',
+        'DE' => 'de_DE',
+        'DJ' => 'aa_DJ',
+        'DK' => 'da_DK',
+        'DM' => 'en_DM',
+        'DO' => 'es_DO',
+        'DZ' => 'ar_DZ',
+        'EC' => 'es_EC',
+        'EE' => 'et_EE',
+        'EG' => 'ar_EG',
+        'EH' => 'ar_EH',
+        'ER' => 'ti_ER',
+        'ES' => 'es_ES',
+        'ET' => 'en_ET',
+        'FI' => 'fi_FI',
+        'FJ' => 'hi_FJ',
+        'FK' => 'en_FK',
+        'FM' => 'chk_FM',
+        'FO' => 'fo_FO',
+        'FR' => 'fr_FR',
+        'GA' => 'fr_GA',
+        'GB' => 'en_GB',
+        'GD' => 'en_GD',
+        'GE' => 'ka_GE',
+        'GF' => 'fr_GF',
+        'GG' => 'en_GG',
+        'GH' => 'ak_GH',
+        'GI' => 'en_GI',
+        'GL' => 'iu_GL',
+        'GM' => 'en_GM',
+        'GN' => 'fr_GN',
+        'GP' => 'fr_GP',
+        'GQ' => 'fan_GQ',
+        'GR' => 'el_GR',
+        'GS' => 'und_GS',
+        'GT' => 'es_GT',
+        'GU' => 'en_GU',
+        'GW' => 'pt_GW',
+        'GY' => 'en_GY',
+        'HK' => 'zh_Hant_HK',
+        'HM' => 'und_HM',
+        'HN' => 'es_HN',
+        'HR' => 'hr_HR',
+        'HT' => 'ht_HT',
+        'HU' => 'hu_HU',
+        'ID' => 'id_ID',
+        'IE' => 'en_IE',
+        'IL' => 'he_IL',
+        'IM' => 'en_IM',
+        'IN' => 'hi_IN',
+        'IO' => 'und_IO',
+        'IQ' => 'ar_IQ',
+        'IR' => 'fa_IR',
+        'IS' => 'is_IS',
+        'IT' => 'it_IT',
+        'JE' => 'en_JE',
+        'JM' => 'en_JM',
+        'JO' => 'ar_JO',
+        'JP' => 'ja_JP',
+        'KE' => 'en_KE',
+        'KG' => 'ky_Cyrl_KG',
+        'KH' => 'km_KH',
+        'KI' => 'en_KI',
+        'KM' => 'ar_KM',
+        'KN' => 'en_KN',
+        'KP' => 'ko_KP',
+        'KR' => 'ko_KR',
+        'KW' => 'ar_KW',
+        'KY' => 'en_KY',
+        'KZ' => 'ru_KZ',
+        'LA' => 'lo_LA',
+        'LB' => 'ar_LB',
+        'LC' => 'en_LC',
+        'LI' => 'de_LI',
+        'LK' => 'si_LK',
+        'LR' => 'en_LR',
+        'LS' => 'st_LS',
+        'LT' => 'lt_LT',
+        'LU' => 'fr_LU',
+        'LV' => 'lv_LV',
+        'LY' => 'ar_LY',
+        'MA' => 'ar_MA',
+        'MC' => 'fr_MC',
+        'MD' => 'ro_MD',
+        'ME' => 'sr_Latn_ME',
+        'MF' => 'fr_MF',
+        'MG' => 'mg_MG',
+        'MH' => 'mh_MH',
+        'MK' => 'mk_MK',
+        'ML' => 'bm_ML',
+        'MM' => 'my_MM',
+        'MN' => 'mn_Cyrl_MN',
+        'MO' => 'zh_Hant_MO',
+        'MP' => 'en_MP',
+        'MQ' => 'fr_MQ',
+        'MR' => 'ar_MR',
+        'MS' => 'en_MS',
+        'MT' => 'mt_MT',
+        'MU' => 'mfe_MU',
+        'MV' => 'dv_MV',
+        'MW' => 'ny_MW',
+        'MX' => 'es_MX',
+        'MY' => 'ms_MY',
+        'MZ' => 'pt_MZ',
+        'NA' => 'kj_NA',
+        'NC' => 'fr_NC',
+        'NE' => 'ha_Latn_NE',
+        'NF' => 'en_NF',
+        'NG' => 'en_NG',
+        'NI' => 'es_NI',
+        'NL' => 'nl_NL',
+        'NO' => 'nb_NO',
+        'NP' => 'ne_NP',
+        'NR' => 'en_NR',
+        'NU' => 'niu_NU',
+        'NZ' => 'en_NZ',
+        'OM' => 'ar_OM',
+        'PA' => 'es_PA',
+        'PE' => 'es_PE',
+        'PF' => 'fr_PF',
+        'PG' => 'tpi_PG',
+        'PH' => 'fil_PH',
+        'PK' => 'ur_PK',
+        'PL' => 'pl_PL',
+        'PM' => 'fr_PM',
+        'PN' => 'en_PN',
+        'PR' => 'es_PR',
+        'PS' => 'ar_PS',
+        'PT' => 'pt_PT',
+        'PW' => 'pau_PW',
+        'PY' => 'gn_PY',
+        'QA' => 'ar_QA',
+        'RE' => 'fr_RE',
+        'RO' => 'ro_RO',
+        'RS' => 'sr_Cyrl_RS',
+        'RU' => 'ru_RU',
+        'RW' => 'rw_RW',
+        'SA' => 'ar_SA',
+        'SB' => 'en_SB',
+        'SC' => 'crs_SC',
+        'SD' => 'ar_SD',
+        'SE' => 'sv_SE',
+        'SG' => 'en_SG',
+        'SH' => 'en_SH',
+        'SI' => 'sl_SI',
+        'SJ' => 'nb_SJ',
+        'SK' => 'sk_SK',
+        'SL' => 'kri_SL',
+        'SM' => 'it_SM',
+        'SN' => 'fr_SN',
+        'SO' => 'sw_SO',
+        'SR' => 'srn_SR',
+        'ST' => 'pt_ST',
+        'SV' => 'es_SV',
+        'SY' => 'ar_SY',
+        'SZ' => 'en_SZ',
+        'TC' => 'en_TC',
+        'TD' => 'fr_TD',
+        'TF' => 'und_TF',
+        'TG' => 'fr_TG',
+        'TH' => 'th_TH',
+        'TJ' => 'tg_Cyrl_TJ',
+        'TK' => 'tkl_TK',
+        'TL' => 'pt_TL',
+        'TM' => 'tk_TM',
+        'TN' => 'ar_TN',
+        'TO' => 'to_TO',
+        'TR' => 'tr_TR',
+        'TT' => 'en_TT',
+        'TV' => 'tvl_TV',
+        'TW' => 'zh_Hant_TW',
+        'TZ' => 'sw_TZ',
+        'UA' => 'uk_UA',
+        'UG' => 'sw_UG',
+        'UM' => 'en_UM',
+        'US' => 'en_US',
+        'UY' => 'es_UY',
+        'UZ' => 'uz_Cyrl_UZ',
+        'VA' => 'it_VA',
+        'VC' => 'en_VC',
+        'VE' => 'es_VE',
+        'VG' => 'en_VG',
+        'VI' => 'en_VI',
+        'VN' => 'vi_VN',
+        'VU' => 'bi_VU',
+        'WF' => 'wls_WF',
+        'WS' => 'sm_WS',
+        'YE' => 'ar_YE',
+        'YT' => 'swb_YT',
+        'ZA' => 'en_ZA',
+        'ZM' => 'en_ZM',
+        'ZW' => 'sn_ZW'
+    );
+
+    /**
+     * Autosearch constants
+     */
+    const BROWSER     = 'browser';
+    const ENVIRONMENT = 'environment';
+    const ZFDEFAULT   = 'default';
+
+    /**
+     * Defines if old behaviour should be supported
+     * Old behaviour throws notices and will be deleted in future releases
+     *
+     * @var boolean
+     */
+    public static $compatibilityMode = false;
+
+    /**
+     * Internal variable
+     *
+     * @var boolean
+     */
+    private static $_breakChain = false;
+
+    /**
+     * Actual set locale
+     *
+     * @var string Locale
+     */
+    protected $_locale;
+
+    /**
+     * Automatic detected locale
+     *
+     * @var string Locales
+     */
+    protected static $_auto;
+
+    /**
+     * Browser detected locale
+     *
+     * @var string Locales
+     */
+    protected static $_browser;
+
+    /**
+     * Environment detected locale
+     *
+     * @var string Locales
+     */
+    protected static $_environment;
+
+    /**
+     * Default locale
+     *
+     * @var string Locales
+     */
+    protected static $_default = array('en' => true);
+
+    /**
+     * Generates a locale object
+     * If no locale is given a automatic search is done
+     * Then the most probable locale will be automatically set
+     * Search order is
+     *  1. Given Locale
+     *  2. HTTP Client
+     *  3. Server Environment
+     *  4. Framework Standard
+     *
+     * @param  string|Zend_Locale $locale (Optional) Locale for parsing input
+     * @throws Zend_Locale_Exception When autodetection has been failed
+     */
+    public function __construct($locale = null)
+    {
+        $this->setLocale($locale);
+    }
+
+    /**
+     * Serialization Interface
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        return serialize($this);
+    }
+
+    /**
+     * Returns a string representation of the object
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return (string) $this->_locale;
+    }
+
+    /**
+     * Returns a string representation of the object
+     * Alias for toString
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Return the default locale
+     *
+     * @return array Returns an array of all locale string
+     */
+    public static function getDefault()
+    {
+        if ((self::$compatibilityMode === true) or (func_num_args() > 0)) {
+            if (!self::$_breakChain) {
+                self::$_breakChain = true;
+                trigger_error('You are running Zend_Locale in compatibility mode... please migrate your scripts', E_USER_NOTICE);
+                $params = func_get_args();
+                $param = null;
+                if (isset($params[0])) {
+                    $param = $params[0];
+                }
+                return self::getOrder($param);
+            }
+
+            self::$_breakChain = false;
+        }
+
+        return self::$_default;
+    }
+
+    /**
+     * Sets a new default locale which will be used when no locale can be detected
+     * If provided you can set a quality between 0 and 1 (or 2 and 100)
+     * which represents the percent of quality the browser
+     * requested within HTTP
+     *
+     * @param  string|Zend_Locale $locale  Locale to set
+     * @param  float              $quality The quality to set from 0 to 1
+     * @throws Zend_Locale_Exception When a autolocale was given
+     * @throws Zend_Locale_Exception When a unknown locale was given
+     * @return void
+     */
+    public static function setDefault($locale, $quality = 1)
+    {
+        if (($locale === 'auto') or ($locale === 'root') or ($locale === 'default') or
+            ($locale === 'environment') or ($locale === 'browser')) {
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception('Only full qualified locales can be used as default!');
+        }
+
+        if (($quality < 0.1) or ($quality > 100)) {
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception("Quality must be between 0.1 and 100");
+        }
+
+        if ($quality > 1) {
+            $quality /= 100;
+        }
+
+        $locale = self::_prepareLocale($locale);
+        if (isset(self::$_localeData[(string) $locale]) === true) {
+            self::$_default = array((string) $locale => $quality);
+        } else {
+            $elocale = explode('_', (string) $locale);
+            if (isset(self::$_localeData[$elocale[0]]) === true) {
+                self::$_default = array($elocale[0] => $quality);
+            } else {
+                require_once 'Zend/Locale/Exception.php';
+                throw new Zend_Locale_Exception("Unknown locale '" . (string) $locale . "' can not be set as default!");
+            }
+        }
+
+        self::$_auto = self::getBrowser() + self::getEnvironment() + self::getDefault();
+    }
+
+    /**
+     * Expects the Systems standard locale
+     *
+     * For Windows:
+     * f.e.: LC_COLLATE=C;LC_CTYPE=German_Austria.1252;LC_MONETARY=C
+     * would be recognised as de_AT
+     *
+     * @return array
+     */
+    public static function getEnvironment()
+    {
+        if (self::$_environment !== null) {
+            return self::$_environment;
+        }
+
+        require_once 'Zend/Locale/Data/Translation.php';
+
+        $language      = setlocale(LC_ALL, 0);
+        $languages     = explode(';', $language);
+        $languagearray = array();
+
+        foreach ($languages as $locale) {
+            if (strpos($locale, '=') !== false) {
+                $language = substr($locale, strpos($locale, '='));
+                $language = substr($language, 1);
+            }
+
+            if ($language !== 'C') {
+                if (strpos($language, '.') !== false) {
+                    $language = substr($language, 0, strpos($language, '.'));
+                } else if (strpos($language, '@') !== false) {
+                    $language = substr($language, 0, strpos($language, '@'));
+                }
+
+                $language = str_ireplace(
+                    array_keys(Zend_Locale_Data_Translation::$languageTranslation),
+                    array_values(Zend_Locale_Data_Translation::$languageTranslation),
+                    (string) $language
+                );
+
+                $language = str_ireplace(
+                    array_keys(Zend_Locale_Data_Translation::$regionTranslation),
+                    array_values(Zend_Locale_Data_Translation::$regionTranslation),
+                    $language
+                );
+
+                if (isset(self::$_localeData[$language]) === true) {
+                    $languagearray[$language] = 1;
+                    if (strpos($language, '_') !== false) {
+                        $languagearray[substr($language, 0, strpos($language, '_'))] = 1;
+                    }
+                }
+            }
+        }
+
+        self::$_environment = $languagearray;
+        return $languagearray;
+    }
+
+    /**
+     * Return an array of all accepted languages of the client
+     * Expects RFC compilant Header !!
+     *
+     * The notation can be :
+     * de,en-UK-US;q=0.5,fr-FR;q=0.2
+     *
+     * @return array - list of accepted languages including quality
+     */
+    public static function getBrowser()
+    {
+        if (self::$_browser !== null) {
+            return self::$_browser;
+        }
+
+        $httplanguages = getenv('HTTP_ACCEPT_LANGUAGE');
+        if (empty($httplanguages) && array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
+            $httplanguages = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+        }
+
+        $languages     = array();
+        if (empty($httplanguages)) {
+            return $languages;
+        }
+
+        $accepted = preg_split('/,\s*/', $httplanguages);
+
+        foreach ($accepted as $accept) {
+            $match  = null;
+            $result = preg_match('/^([a-z]{1,8}(?:[-_][a-z]{1,8})*)(?:;\s*q=(0(?:\.[0-9]{1,3})?|1(?:\.0{1,3})?))?$/i',
+                                 $accept, $match);
+
+            if ($result < 1) {
+                continue;
+            }
+
+            if (isset($match[2]) === true) {
+                $quality = (float) $match[2];
+            } else {
+                $quality = 1.0;
+            }
+
+            $countrys = explode('-', $match[1]);
+            $region   = array_shift($countrys);
+
+            $country2 = explode('_', $region);
+            $region   = array_shift($country2);
+
+            foreach ($countrys as $country) {
+                $languages[$region . '_' . strtoupper($country)] = $quality;
+            }
+
+            foreach ($country2 as $country) {
+                $languages[$region . '_' . strtoupper($country)] = $quality;
+            }
+
+            if ((isset($languages[$region]) === false) || ($languages[$region] < $quality)) {
+                $languages[$region] = $quality;
+            }
+        }
+
+        self::$_browser = $languages;
+        return $languages;
+    }
+
+    /**
+     * Sets a new locale
+     *
+     * @param  string|Zend_Locale $locale (Optional) New locale to set
+     * @return void
+     */
+    public function setLocale($locale = null)
+    {
+        $locale = self::_prepareLocale($locale);
+
+        if (isset(self::$_localeData[(string) $locale]) === false) {
+            // Is it an alias? If so, we can use this locale
+            if (isset(self::$_localeAliases[$locale]) === true) {
+                $this->_locale = $locale;
+                return;
+            }
+
+            $region = substr((string) $locale, 0, 3);
+            if (isset($region[2]) === true) {
+                if (($region[2] === '_') or ($region[2] === '-')) {
+                    $region = substr($region, 0, 2);
+                }
+            }
+
+            if (isset(self::$_localeData[(string) $region]) === true) {
+                $this->_locale = $region;
+            } else {
+                $this->_locale = 'root';
+            }
+        } else {
+            $this->_locale = $locale;
+        }
+    }
+
+    /**
+     * Returns the language part of the locale
+     *
+     * @return string
+     */
+    public function getLanguage()
+    {
+        $locale = explode('_', $this->_locale);
+        return $locale[0];
+    }
+
+    /**
+     * Returns the region part of the locale if available
+     *
+     * @return string|false - Regionstring
+     */
+    public function getRegion()
+    {
+        $locale = explode('_', $this->_locale);
+        if (isset($locale[1]) === true) {
+            return $locale[1];
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the accepted charset of the client
+     *
+     * @return string
+     */
+    public static function getHttpCharset()
+    {
+        $httpcharsets = getenv('HTTP_ACCEPT_CHARSET');
+
+        $charsets = array();
+        if ($httpcharsets === false) {
+            return $charsets;
+        }
+
+        $accepted = preg_split('/,\s*/', $httpcharsets);
+        foreach ($accepted as $accept) {
+            if (empty($accept) === true) {
+                continue;
+            }
+
+            if (strpos($accept, ';') !== false) {
+                $quality        = (float) substr($accept, (strpos($accept, '=') + 1));
+                $pos            = substr($accept, 0, strpos($accept, ';'));
+                $charsets[$pos] = $quality;
+            } else {
+                $quality           = 1.0;
+                $charsets[$accept] = $quality;
+            }
+        }
+
+        return $charsets;
+    }
+
+    /**
+     * Returns true if both locales are equal
+     *
+     * @param  Zend_Locale $object Locale to check for equality
+     * @return boolean
+     */
+    public function equals(Zend_Locale $object)
+    {
+        if ($object->toString() === $this->toString()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns localized informations as array, supported are several
+     * types of informations.
+     * For detailed information about the types look into the documentation
+     *
+     * @param  string             $path   (Optional) Type of information to return
+     * @param  string|Zend_Locale $locale (Optional) Locale|Language for which this informations should be returned
+     * @param  string             $value  (Optional) Value for detail list
+     * @return array Array with the wished information in the given language
+     */
+    public static function getTranslationList($path = null, $locale = null, $value = null)
+    {
+        require_once 'Zend/Locale/Data.php';
+        $locale = self::findLocale($locale);
+        $result = Zend_Locale_Data::getList($locale, $path, $value);
+        if (empty($result) === true) {
+            return false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns an array with the name of all languages translated to the given language
+     *
+     * @param  string|Zend_Locale $locale (Optional) Locale for language translation
+     * @return array
+     * @deprecated
+     */
+    public static function getLanguageTranslationList($locale = null)
+    {
+        trigger_error("The method getLanguageTranslationList is deprecated. Use getTranslationList('language', $locale) instead", E_USER_NOTICE);
+        return self::getTranslationList('language', $locale);
+    }
+
+    /**
+     * Returns an array with the name of all scripts translated to the given language
+     *
+     * @param  string|Zend_Locale $locale (Optional) Locale for script translation
+     * @return array
+     * @deprecated
+     */
+    public static function getScriptTranslationList($locale = null)
+    {
+        trigger_error("The method getScriptTranslationList is deprecated. Use getTranslationList('script', $locale) instead", E_USER_NOTICE);
+        return self::getTranslationList('script', $locale);
+    }
+
+    /**
+     * Returns an array with the name of all countries translated to the given language
+     *
+     * @param  string|Zend_Locale $locale (Optional) Locale for country translation
+     * @return array
+     * @deprecated
+     */
+    public static function getCountryTranslationList($locale = null)
+    {
+        trigger_error("The method getCountryTranslationList is deprecated. Use getTranslationList('territory', $locale, 2) instead", E_USER_NOTICE);
+        return self::getTranslationList('territory', $locale, 2);
+    }
+
+    /**
+     * Returns an array with the name of all territories translated to the given language
+     * All territories contains other countries.
+     *
+     * @param  string|Zend_Locale $locale (Optional) Locale for territory translation
+     * @return array
+     * @deprecated
+     */
+    public static function getTerritoryTranslationList($locale = null)
+    {
+        trigger_error("The method getTerritoryTranslationList is deprecated. Use getTranslationList('territory', $locale, 1) instead", E_USER_NOTICE);
+        return self::getTranslationList('territory', $locale, 1);
+    }
+
+    /**
+     * Returns a localized information string, supported are several types of informations.
+     * For detailed information about the types look into the documentation
+     *
+     * @param  string             $value  Name to get detailed information about
+     * @param  string             $path   (Optional) Type of information to return
+     * @param  string|Zend_Locale $locale (Optional) Locale|Language for which this informations should be returned
+     * @return string|false The wished information in the given language
+     */
+    public static function getTranslation($value = null, $path = null, $locale = null)
+    {
+        require_once 'Zend/Locale/Data.php';
+        $locale = self::findLocale($locale);
+        $result = Zend_Locale_Data::getContent($locale, $path, $value);
+        if (empty($result) === true && '0' !== $result) {
+            return false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the localized language name
+     *
+     * @param  string $value  Name to get detailed information about
+     * @param  string $locale (Optional) Locale for language translation
+     * @return array
+     * @deprecated
+     */
+    public static function getLanguageTranslation($value, $locale = null)
+    {
+        trigger_error("The method getLanguageTranslation is deprecated. Use getTranslation($value, 'language', $locale) instead", E_USER_NOTICE);
+        return self::getTranslation($value, 'language', $locale);
+    }
+
+    /**
+     * Returns the localized script name
+     *
+     * @param  string $value  Name to get detailed information about
+     * @param  string $locale (Optional) locale for script translation
+     * @return array
+     * @deprecated
+     */
+    public static function getScriptTranslation($value, $locale = null)
+    {
+        trigger_error("The method getScriptTranslation is deprecated. Use getTranslation($value, 'script', $locale) instead", E_USER_NOTICE);
+        return self::getTranslation($value, 'script', $locale);
+    }
+
+    /**
+     * Returns the localized country name
+     *
+     * @param  string             $value  Name to get detailed information about
+     * @param  string|Zend_Locale $locale (Optional) Locale for country translation
+     * @return array
+     * @deprecated
+     */
+    public static function getCountryTranslation($value, $locale = null)
+    {
+        trigger_error("The method getCountryTranslation is deprecated. Use getTranslation($value, 'country', $locale) instead", E_USER_NOTICE);
+        return self::getTranslation($value, 'country', $locale);
+    }
+
+    /**
+     * Returns the localized territory name
+     * All territories contains other countries.
+     *
+     * @param  string             $value  Name to get detailed information about
+     * @param  string|Zend_Locale $locale (Optional) Locale for territory translation
+     * @return array
+     * @deprecated
+     */
+    public static function getTerritoryTranslation($value, $locale = null)
+    {
+        trigger_error("The method getTerritoryTranslation is deprecated. Use getTranslation($value, 'territory', $locale) instead", E_USER_NOTICE);
+        return self::getTranslation($value, 'territory', $locale);
+    }
+
+    /**
+     * Returns an array with translated yes strings
+     *
+     * @param  string|Zend_Locale $locale (Optional) Locale for language translation (defaults to $this locale)
+     * @return array
+     */
+    public static function getQuestion($locale = null)
+    {
+        require_once 'Zend/Locale/Data.php';
+        $locale            = self::findLocale($locale);
+        $quest             = Zend_Locale_Data::getList($locale, 'question');
+        $yes               = explode(':', $quest['yes']);
+        $no                = explode(':', $quest['no']);
+        $quest['yes']      = $yes[0];
+        $quest['yesarray'] = $yes;
+        $quest['no']       = $no[0];
+        $quest['noarray']  = $no;
+        $quest['yesexpr']  = self::_prepareQuestionString($yes);
+        $quest['noexpr']   = self::_prepareQuestionString($no);
+
+        return $quest;
+    }
+
+    /**
+     * Internal function for preparing the returned question regex string
+     *
+     * @param  string $input Regex to parse
+     * @return string
+     */
+    private static function _prepareQuestionString($input)
+    {
+        $regex = '';
+        if (is_array($input) === true) {
+            $regex = '^';
+            $start = true;
+            foreach ($input as $row) {
+                if ($start === false) {
+                    $regex .= '|';
+                }
+
+                $start  = false;
+                $regex .= '(';
+                $one    = null;
+                if (strlen($row) > 2) {
+                    $one = true;
+                }
+
+                foreach (str_split($row, 1) as $char) {
+                    $regex .= '[' . $char;
+                    $regex .= strtoupper($char) . ']';
+                    if ($one === true) {
+                        $one    = false;
+                        $regex .= '(';
+                    }
+                }
+
+                if ($one === false) {
+                    $regex .= ')';
+                }
+
+                $regex .= '?)';
+            }
+        }
+
+        return $regex;
+    }
+
+    /**
+     * Checks if a locale identifier is a real locale or not
+     * Examples:
+     * "en_XX" refers to "en", which returns true
+     * "XX_yy" refers to "root", which returns false
+     *
+     * @param  string|Zend_Locale $locale     Locale to check for
+     * @param  boolean            $strict     (Optional) If true, no rerouting will be done when checking
+     * @param  boolean            $compatible (DEPRECATED) Only for internal usage, brakes compatibility mode
+     * @return boolean If the locale is known dependend on the settings
+     */
+    public static function isLocale($locale, $strict = false, $compatible = true)
+    {
+        if (($locale instanceof Zend_Locale)
+            || (is_string($locale) && array_key_exists($locale, self::$_localeData))
+        ) {
+            return true;
+        }
+
+        // Is it an alias?
+        if (is_string($locale) && array_key_exists($locale, self::$_localeAliases)) {
+            return true;
+        }
+
+        if (($locale === null) || (!is_string($locale) and !is_array($locale))) {
+            return false;
+        }
+
+        try {
+            $locale = self::_prepareLocale($locale, $strict);
+        } catch (Zend_Locale_Exception $e) {
+            return false;
+        }
+
+        if (($compatible === true) and (self::$compatibilityMode === true)) {
+            trigger_error('You are running Zend_Locale in compatibility mode... please migrate your scripts', E_USER_NOTICE);
+            if (isset(self::$_localeData[$locale]) === true) {
+                return $locale;
+            } else if (!$strict) {
+                $locale = explode('_', $locale);
+                if (isset(self::$_localeData[$locale[0]]) === true) {
+                    return $locale[0];
+                }
+            }
+        } else {
+            if (isset(self::$_localeData[$locale]) === true) {
+                return true;
+            } else if (!$strict) {
+                $locale = explode('_', $locale);
+                if (isset(self::$_localeData[$locale[0]]) === true) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Finds the proper locale based on the input
+     * Checks if it exists, degrades it when necessary
+     * Detects registry locale and when all fails tries to detect a automatic locale
+     * Returns the found locale as string
+     *
+     * @param string $locale
+     * @throws Zend_Locale_Exception When the given locale is no locale or the autodetection fails
+     * @return string
+     */
+    public static function findLocale($locale = null)
+    {
+        if ($locale === null) {
+            require_once 'Zend/Registry.php';
+            if (Zend_Registry::isRegistered('Zend_Locale')) {
+                $locale = Zend_Registry::get('Zend_Locale');
+            }
+        }
+
+        if ($locale === null) {
+            $locale = new Zend_Locale();
+        }
+
+        if (!Zend_Locale::isLocale($locale, true, false)) {
+            if (!Zend_Locale::isLocale($locale, false, false)) {
+                $locale = Zend_Locale::getLocaleToTerritory($locale);
+
+                if (empty($locale)) {
+                    require_once 'Zend/Locale/Exception.php';
+                    throw new Zend_Locale_Exception("The locale '$locale' is no known locale");
+                }
+            } else {
+                $locale = new Zend_Locale($locale);
+            }
+        }
+
+        $locale = self::_prepareLocale($locale);
+        return $locale;
+    }
+
+    /**
+     * Returns the expected locale for a given territory
+     *
+     * @param string $territory Territory for which the locale is being searched
+     * @return string|null Locale string or null when no locale has been found
+     */
+    public static function getLocaleToTerritory($territory)
+    {
+        $territory = strtoupper($territory);
+        if (array_key_exists($territory, self::$_territoryData)) {
+            return self::$_territoryData[$territory];
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns a list of all known locales where the locale is the key
+     * Only real locales are returned, the internal locales 'root', 'auto', 'browser'
+     * and 'environment' are suppressed
+     *
+     * @return array List of all Locales
+     */
+    public static function getLocaleList()
+    {
+        $list = self::$_localeData;
+        unset($list['root']);
+        unset($list['auto']);
+        unset($list['browser']);
+        unset($list['environment']);
+        return $list;
+    }
+
+    /**
+     * Returns the set cache
+     *
+     * @return Zend_Cache_Core The set cache
+     */
+    public static function getCache()
+    {
+        require_once 'Zend/Locale/Data.php';
+        return Zend_Locale_Data::getCache();
+    }
+
+    /**
+     * Sets a cache
+     *
+     * @param  Zend_Cache_Core $cache Cache to set
+     * @return void
+     */
+    public static function setCache(Zend_Cache_Core $cache)
+    {
+        require_once 'Zend/Locale/Data.php';
+        Zend_Locale_Data::setCache($cache);
+    }
+
+    /**
+     * Returns true when a cache is set
+     *
+     * @return boolean
+     */
+    public static function hasCache()
+    {
+        require_once 'Zend/Locale/Data.php';
+        return Zend_Locale_Data::hasCache();
+    }
+
+    /**
+     * Removes any set cache
+     *
+     * @return void
+     */
+    public static function removeCache()
+    {
+        require_once 'Zend/Locale/Data.php';
+        Zend_Locale_Data::removeCache();
+    }
+
+    /**
+     * Clears all set cache data
+     *
+     * @param string $tag Tag to clear when the default tag name is not used
+     * @return void
+     */
+    public static function clearCache($tag = null)
+    {
+        require_once 'Zend/Locale/Data.php';
+        Zend_Locale_Data::clearCache($tag);
+    }
+
+    /**
+     * Disables the set cache
+     *
+     * @param  boolean $flag True disables any set cache, default is false
+     * @return void
+     */
+    public static function disableCache($flag)
+    {
+        require_once 'Zend/Locale/Data.php';
+        Zend_Locale_Data::disableCache($flag);
+    }
+
+    /**
+     * Internal function, returns a single locale on detection
+     *
+     * @param  string|Zend_Locale $locale (Optional) Locale to work on
+     * @param  boolean            $strict (Optional) Strict preparation
+     * @throws Zend_Locale_Exception When no locale is set which is only possible when the class was wrong extended
+     * @return string
+     */
+    private static function _prepareLocale($locale, $strict = false)
+    {
+        if ($locale instanceof Zend_Locale) {
+            $locale = $locale->toString();
+        }
+
+        if (is_array($locale)) {
+            return '';
+        }
+
+        if (empty(self::$_auto) === true) {
+            self::$_browser     = self::getBrowser();
+            self::$_environment = self::getEnvironment();
+            self::$_breakChain  = true;
+            self::$_auto        = self::getBrowser() + self::getEnvironment() + self::getDefault();
+        }
+
+        if (!$strict) {
+            if ($locale === 'browser') {
+                $locale = self::$_browser;
+            }
+
+            if ($locale === 'environment') {
+                $locale = self::$_environment;
+            }
+
+            if ($locale === 'default') {
+                $locale = self::$_default;
+            }
+
+            if (($locale === 'auto') or ($locale === null)) {
+                $locale = self::$_auto;
+            }
+
+            if (is_array($locale) === true) {
+                $locale = key($locale);
+            }
+        }
+
+        // This can only happen when someone extends Zend_Locale and erases the default
+        if ($locale === null) {
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception('Autodetection of Locale has been failed!');
+        }
+
+        if (strpos($locale, '-') !== false) {
+            $locale = strtr($locale, '-', '_');
+        }
+
+        $parts = explode('_', $locale);
+        if (!isset(self::$_localeData[$parts[0]])) {
+            if ((count($parts) == 1) && array_key_exists($parts[0], self::$_territoryData)) {
+                return self::$_territoryData[$parts[0]];
+            }
+
+            return '';
+        }
+
+        foreach($parts as $key => $value) {
+            if ((strlen($value) < 2) || (strlen($value) > 3)) {
+                unset($parts[$key]);
+            }
+        }
+
+        $locale = implode('_', $parts);
+        return (string) $locale;
+    }
+
+    /**
+     * Search the locale automatically and return all used locales
+     * ordered by quality
+     *
+     * Standard Searchorder is Browser, Environment, Default
+     *
+     * @param  string  $searchorder (Optional) Searchorder
+     * @return array Returns an array of all detected locales
+     */
+    public static function getOrder($order = null)
+    {
+        switch ($order) {
+            case self::ENVIRONMENT:
+                self::$_breakChain = true;
+                $languages         = self::getEnvironment() + self::getBrowser() + self::getDefault();
+                break;
+
+            case self::ZFDEFAULT:
+                self::$_breakChain = true;
+                $languages         = self::getDefault() + self::getEnvironment() + self::getBrowser();
+                break;
+
+            default:
+                self::$_breakChain = true;
+                $languages         = self::getBrowser() + self::getEnvironment() + self::getDefault();
+                break;
+        }
+
+        return $languages;
+    }
+
+    /**
+     * Is the given locale in the list of aliases?
+     *
+     * @param  string|Zend_Locale $locale Locale to work on
+     * @return boolean
+     */
+    public static function isAlias($locale)
+    {
+        if ($locale instanceof Zend_Locale) {
+            $locale = $locale->toString();
+        }
+
+        return isset(self::$_localeAliases[$locale]);
+    }
+
+    /**
+     * Return an alias' actual locale.
+     *
+     * @param  string|Zend_Locale $locale Locale to work on
+     * @return string
+     */
+    public static function getAlias($locale)
+    {
+        if ($locale instanceof Zend_Locale) {
+            $locale = $locale->toString();
+        }
+
+        if (isset(self::$_localeAliases[$locale]) === true) {
+            return self::$_localeAliases[$locale];
+        }
+
+        return (string) $locale;
+    }
+}
diff --git a/lib/zend/Zend/Locale/Data.php b/lib/zend/Zend/Locale/Data.php
new file mode 100644
index 00000000000..395f5d50135
--- /dev/null
+++ b/lib/zend/Zend/Locale/Data.php
@@ -0,0 +1,1617 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Locale
+ * @subpackage Data
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * include needed classes
+ */
+require_once 'Zend/Locale.php';
+
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
+/**
+ * Locale data reader, handles the CLDR
+ *
+ * @category   Zend
+ * @package    Zend_Locale
+ * @subpackage Data
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Locale_Data
+{
+    /**
+     * Locale files
+     *
+     * @var array
+     */
+    private static $_ldml = array();
+
+    /**
+     * List of values which are collected
+     *
+     * @var array
+     */
+    private static $_list = array();
+
+    /**
+     * Internal cache for ldml values
+     *
+     * @var Zend_Cache_Core
+     */
+    private static $_cache = null;
+
+    /**
+     * Internal value to remember if cache supports tags
+     *
+     * @var boolean
+     */
+    private static $_cacheTags = false;
+
+    /**
+     * Internal option, cache disabled
+     *
+     * @var boolean
+     */
+    private static $_cacheDisabled = false;
+
+    /**
+     * Read the content from locale
+     *
+     * Can be called like:
+     * <ldml>
+     *     <delimiter>test</delimiter>
+     *     <second type='myone'>content</second>
+     *     <second type='mysecond'>content2</second>
+     *     <third type='mythird' />
+     * </ldml>
+     *
+     * Case 1: _readFile('ar','/ldml/delimiter')             -> returns [] = test
+     * Case 1: _readFile('ar','/ldml/second[@type=myone]')   -> returns [] = content
+     * Case 2: _readFile('ar','/ldml/second','type')         -> returns [myone] = content; [mysecond] = content2
+     * Case 3: _readFile('ar','/ldml/delimiter',,'right')    -> returns [right] = test
+     * Case 4: _readFile('ar','/ldml/third','type','myone')  -> returns [myone] = mythird
+     *
+     * @param  string $locale
+     * @param  string $path
+     * @param  string $attribute
+     * @param  string $value
+     * @access private
+     * @return array
+     */
+    private static function _readFile($locale, $path, $attribute, $value, $temp)
+    {
+        // without attribute - read all values
+        // with attribute    - read only this value
+        if (!empty(self::$_ldml[(string) $locale])) {
+
+            $result = self::$_ldml[(string) $locale]->xpath($path);
+            if (!empty($result)) {
+                foreach ($result as &$found) {
+
+                    if (empty($value)) {
+
+                        if (empty($attribute)) {
+                            // Case 1
+                            $temp[] = (string) $found;
+                        } else if (empty($temp[(string) $found[$attribute]])){
+                            // Case 2
+                            $temp[(string) $found[$attribute]] = (string) $found;
+                        }
+
+                    } else if (empty ($temp[$value])) {
+
+                        if (empty($attribute)) {
+                            // Case 3
+                            $temp[$value] = (string) $found;
+                        } else {
+                            // Case 4
+                            $temp[$value] = (string) $found[$attribute];
+                        }
+
+                    }
+                }
+            }
+        }
+        return $temp;
+    }
+
+    /**
+     * Find possible routing to other path or locale
+     *
+     * @param  string $locale
+     * @param  string $path
+     * @param  string $attribute
+     * @param  string $value
+     * @param  array  $temp
+     * @return bool
+     * @throws Zend_Locale_Exception
+     */
+    private static function _findRoute($locale, $path, $attribute, $value, &$temp)
+    {
+        // load locale file if not already in cache
+        // needed for alias tag when referring to other locale
+        if (empty(self::$_ldml[(string) $locale])) {
+            $filename = dirname(__FILE__) . '/Data/' . $locale . '.xml';
+            if (!file_exists($filename)) {
+                require_once 'Zend/Locale/Exception.php';
+                throw new Zend_Locale_Exception("Missing locale file '$filename' for '$locale' locale.");
+            }
+
+            self::$_ldml[(string) $locale] = Zend_Xml_Security::scanFile($filename);
+        }
+
+        // search for 'alias' tag in the search path for redirection
+        $search = '';
+        $tok = strtok($path, '/');
+
+        // parse the complete path
+        if (!empty(self::$_ldml[(string) $locale])) {
+            while ($tok !== false) {
+                $search .=  '/' . $tok;
+                if (strpos($search, '[@') !== false) {
+                    while (strrpos($search, '[@') > strrpos($search, ']')) {
+                        $tok = strtok('/');
+                        if (empty($tok)) {
+                            $search .= '/';
+                        }
+                        $search = $search . '/' . $tok;
+                    }
+                }
+                $result = self::$_ldml[(string) $locale]->xpath($search . '/alias');
+
+                // alias found
+                if (!empty($result)) {
+
+                    $source = $result[0]['source'];
+                    $newpath = $result[0]['path'];
+
+                    // new path - path //ldml is to ignore
+                    if ($newpath != '//ldml') {
+                        // other path - parse to make real path
+
+                        while (substr($newpath,0,3) == '../') {
+                            $newpath = substr($newpath, 3);
+                            $search = substr($search, 0, strrpos($search, '/'));
+                        }
+
+                        // truncate ../ to realpath otherwise problems with alias
+                        $path = $search . '/' . $newpath;
+                        while (($tok = strtok('/'))!== false) {
+                            $path = $path . '/' . $tok;
+                        }
+                    }
+
+                    // reroute to other locale
+                    if ($source != 'locale') {
+                        $locale = $source;
+                    }
+
+                    $temp = self::_getFile($locale, $path, $attribute, $value, $temp);
+                    return false;
+                }
+
+                $tok = strtok('/');
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Read the right LDML file
+     *
+     * @param  string      $locale
+     * @param  string      $path
+     * @param  string|bool $attribute
+     * @param  string|bool $value
+     * @param  array       $temp
+     * @return array
+     * @throws Zend_Locale_Exception
+     */
+    private static function _getFile($locale, $path, $attribute = false, $value = false, $temp = array())
+    {
+        $result = self::_findRoute($locale, $path, $attribute, $value, $temp);
+        if ($result) {
+            $temp = self::_readFile($locale, $path, $attribute, $value, $temp);
+        }
+
+        // parse required locales reversive
+        // example: when given zh_Hans_CN
+        // 1. -> zh_Hans_CN
+        // 2. -> zh_Hans
+        // 3. -> zh
+        // 4. -> root
+        if (($locale != 'root') && ($result)) {
+            // Search for parent locale
+            if (false !== strpos($locale, '_')) {
+                $parentLocale = self::getContent($locale, 'parentlocale');
+                if ($parentLocale) {
+                    $temp = self::_getFile($parentLocale, $path, $attribute, $value, $temp);
+                }
+            }
+
+            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
+            if (!empty($locale)) {
+                $temp = self::_getFile($locale, $path, $attribute, $value, $temp);
+            } else {
+                $temp = self::_getFile('root', $path, $attribute, $value, $temp);
+            }
+        }
+        return $temp;
+    }
+
+    /**
+     * Find the details for supplemental calendar datas
+     *
+     * @param  string $locale Locale for Detaildata
+     * @param  array  $list   List to search
+     * @return string         Key for Detaildata
+     */
+    private static function _calendarDetail($locale, $list)
+    {
+        $ret = "001";
+        foreach ($list as $key => $value) {
+            if (strpos($locale, '_') !== false) {
+                $locale = substr($locale, strpos($locale, '_') + 1);
+            }
+            if (strpos($key, $locale) !== false) {
+                $ret = $key;
+                break;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Internal function for checking the locale
+     *
+     * @param  string|Zend_Locale $locale Locale to check
+     * @return string
+     * @throws Zend_Locale_Exception
+     */
+    private static function _checkLocale($locale)
+    {
+        if (empty($locale)) {
+            $locale = new Zend_Locale();
+        }
+
+        if (!(Zend_Locale::isLocale((string) $locale, null, false))) {
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception("Locale (" . (string) $locale . ") is a unknown locale");
+        }
+
+        if (Zend_Locale::isAlias($locale)) {
+            // Return a valid CLDR locale so that the XML file can be loaded.
+            return Zend_Locale::getAlias($locale);
+        }
+        return (string) $locale;
+    }
+
+    /**
+     * Read the LDML file, get a array of multipath defined value
+     *
+     * @param  string      $locale
+     * @param  string      $path
+     * @param  bool|string $value
+     * @return array
+     * @throws Zend_Locale_Exception
+     */
+    public static function getList($locale, $path, $value = false)
+    {
+        $locale = self::_checkLocale($locale);
+
+        if (!isset(self::$_cache) && !self::$_cacheDisabled) {
+            require_once 'Zend/Cache.php';
+            self::$_cache = Zend_Cache::factory(
+                'Core',
+                'File',
+                array('automatic_serialization' => true),
+                array());
+        }
+
+        $val = $value;
+        if (is_array($value)) {
+            $val = implode('_' , $value);
+        }
+
+        $val = urlencode($val);
+        $id  = self::_filterCacheId('Zend_LocaleL_' . $locale . '_' . $path . '_' . $val);
+        if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
+            return unserialize($result);
+        }
+
+        $temp = array();
+        switch(strtolower($path)) {
+            case 'language':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/languages/language', 'type');
+                break;
+
+            case 'script':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/scripts/script', 'type');
+                break;
+
+            case 'territory':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/territories/territory', 'type');
+                if ($value === 1) {
+                    foreach($temp as $key => $value) {
+                        if ((is_numeric($key) === false) and ($key != 'QO') and ($key != 'EU')) {
+                            unset($temp[$key]);
+                        }
+                    }
+                } else if ($value === 2) {
+                    foreach($temp as $key => $value) {
+                        if (is_numeric($key) or ($key == 'QO') or ($key == 'EU')) {
+                            unset($temp[$key]);
+                        }
+                    }
+                }
+                break;
+
+            case 'variant':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/variants/variant', 'type');
+                break;
+
+            case 'key':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/keys/key', 'type');
+                break;
+
+            case 'type':
+                if (empty($value)) {
+                    $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type', 'type');
+                } else {
+                    if (($value == 'calendar') or
+                        ($value == 'collation') or
+                        ($value == 'currency')) {
+                        $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type[@key=\'' . $value . '\']', 'type');
+                    } else {
+                        $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type[@type=\'' . $value . '\']', 'type');
+                    }
+                }
+                break;
+
+            case 'layout':
+                $temp  = self::_getFile($locale, '/ldml/layout/orientation/characterOrder', '', 'characterOrder');
+                $temp += self::_getFile($locale, '/ldml/layout/orientation/lineOrder', '', 'lineOrder');
+                break;
+
+            case 'contexttransform':
+                if (empty($value)) {
+                    $value = 'uiListOrMenu';
+                }
+                $temp = self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'languages\']/contextTransform[@type=\''.$value.'\']', '', 'languages');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'day-format-except-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'day-format-except-narrow');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'day-standalone-except-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'day-standalone-except-narrow');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'day-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'day-narrow');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'month-format-except-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'month-format-except-narrow');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'month-standalone-except-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'month-standalone-except-narrow');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'month-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'month-narrow');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'script\']/contextTransform[@type=\''.$value.'\']', '', 'script');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'territory\']/contextTransform[@type=\''.$value.'\']', '', 'territory');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'variant\']/contextTransform[@type=\''.$value.'\']', '', 'variant');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'key\']/contextTransform[@type=\''.$value.'\']', '', 'key');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'type\']/contextTransform[@type=\''.$value.'\']', '', 'type');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'era-name\']/contextTransform[@type=\''.$value.'\']', '', 'era-name');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'era-abbr\']/contextTransform[@type=\''.$value.'\']', '', 'era-abbr');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'era-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'era-narrow');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'quater-format-wide\']/contextTransform[@type=\''.$value.'\']', '', 'quater-format-wide');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'quater-standalone-wide\']/contextTransform[@type=\''.$value.'\']', '', 'quater-standalone-wide');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'quater-abbreviated\']/contextTransform[@type=\''.$value.'\']', '', 'quater-abbreviated');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'quater-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'quater-narrow');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'calendar-field\']/contextTransform[@type=\''.$value.'\']', '', 'calendar-field');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'symbol\']/contextTransform[@type=\''.$value.'\']', '', 'symbol');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'tense\']/contextTransform[@type=\''.$value.'\']', '', 'tense');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'zone-exemplarCity\']/contextTransform[@type=\''.$value.'\']', '', 'zone-exemplarCity');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'zone-long\']/contextTransform[@type=\''.$value.'\']', '', 'zone-long');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'zone-short\']/contextTransform[@type=\''.$value.'\']', '', 'zone-short');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'metazone-long\']/contextTransform[@type=\''.$value.'\']', '', 'metazone-long');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'metazone-short\']/contextTransform[@type=\''.$value.'\']', '', 'metazone-short');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'displayName-count\']/contextTransform[@type=\''.$value.'\']', '', 'displayName-count');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'displayName\']/contextTransform[@type=\''.$value.'\']', '', 'displayName');
+                $temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'unit-pattern\']/contextTransform[@type=\''.$value.'\']', '', 'unit-pattern');
+                break;
+
+            case 'characters':
+                $temp  = self::_getFile($locale, '/ldml/characters/exemplarCharacters',                           '', 'characters');
+                $temp += self::_getFile($locale, '/ldml/characters/exemplarCharacters[@type=\'auxiliary\']',      '', 'auxiliary');
+                // $temp += self::_getFile($locale, '/ldml/characters/exemplarCharacters[@type=\'currencySymbol\']', '', 'currencySymbol');
+                break;
+
+            case 'delimiters':
+                $temp  = self::_getFile($locale, '/ldml/delimiters/quotationStart',          '', 'quoteStart');
+                $temp += self::_getFile($locale, '/ldml/delimiters/quotationEnd',            '', 'quoteEnd');
+                $temp += self::_getFile($locale, '/ldml/delimiters/alternateQuotationStart', '', 'quoteStartAlt');
+                $temp += self::_getFile($locale, '/ldml/delimiters/alternateQuotationEnd',   '', 'quoteEndAlt');
+                break;
+
+            case 'measurement':
+                $temp  = self::_getFile('supplementalData', '/supplementalData/measurementData/measurementSystem[@type=\'metric\']', 'territories', 'metric');
+                $temp += self::_getFile('supplementalData', '/supplementalData/measurementData/measurementSystem[@type=\'US\']',     'territories', 'US');
+                $temp += self::_getFile('supplementalData', '/supplementalData/measurementData/paperSize[@type=\'A4\']',             'territories', 'A4');
+                $temp += self::_getFile('supplementalData', '/supplementalData/measurementData/paperSize[@type=\'US-Letter\']',      'territories', 'US-Letter');
+                break;
+
+            case 'months':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp['context'] = "format";
+                $temp['default'] = "wide";
+                $temp['format']['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/monthWidth[@type=\'abbreviated\']/month', 'type');
+                $temp['format']['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/monthWidth[@type=\'narrow\']/month', 'type');
+                $temp['format']['wide']        = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/monthWidth[@type=\'wide\']/month', 'type');
+                $temp['stand-alone']['abbreviated']  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'stand-alone\']/monthWidth[@type=\'abbreviated\']/month', 'type');
+                $temp['stand-alone']['narrow']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'stand-alone\']/monthWidth[@type=\'narrow\']/month', 'type');
+                $temp['stand-alone']['wide']         = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'stand-alone\']/monthWidth[@type=\'wide\']/month', 'type');
+                break;
+
+            case 'month':
+                if (empty($value)) {
+                    $value = array("gregorian", "format", "wide");
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/months/monthContext[@type=\'' . $value[1] . '\']/monthWidth[@type=\'' . $value[2] . '\']/month', 'type');
+                break;
+
+            case 'days':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp['context'] = "format";
+                $temp['default'] = "wide";
+                $temp['format']['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/dayWidth[@type=\'abbreviated\']/day', 'type');
+                $temp['format']['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/dayWidth[@type=\'narrow\']/day', 'type');
+                $temp['format']['wide']        = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/dayWidth[@type=\'wide\']/day', 'type');
+                $temp['stand-alone']['abbreviated']  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'stand-alone\']/dayWidth[@type=\'abbreviated\']/day', 'type');
+                $temp['stand-alone']['narrow']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'stand-alone\']/dayWidth[@type=\'narrow\']/day', 'type');
+                $temp['stand-alone']['wide']         = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'stand-alone\']/dayWidth[@type=\'wide\']/day', 'type');
+                break;
+
+            case 'day':
+                if (empty($value)) {
+                    $value = array("gregorian", "format", "wide");
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/days/dayContext[@type=\'' . $value[1] . '\']/dayWidth[@type=\'' . $value[2] . '\']/day', 'type');
+                break;
+
+            case 'week':
+                $minDays   = self::_calendarDetail($locale, self::_getFile('supplementalData', '/supplementalData/weekData/minDays', 'territories'));
+                $firstDay  = self::_calendarDetail($locale, self::_getFile('supplementalData', '/supplementalData/weekData/firstDay', 'territories'));
+                $weekStart = self::_calendarDetail($locale, self::_getFile('supplementalData', '/supplementalData/weekData/weekendStart', 'territories'));
+                $weekEnd   = self::_calendarDetail($locale, self::_getFile('supplementalData', '/supplementalData/weekData/weekendEnd', 'territories'));
+
+                $temp  = self::_getFile('supplementalData', "/supplementalData/weekData/minDays[@territories='" . $minDays . "']", 'count', 'minDays');
+                $temp += self::_getFile('supplementalData', "/supplementalData/weekData/firstDay[@territories='" . $firstDay . "']", 'day', 'firstDay');
+                $temp += self::_getFile('supplementalData', "/supplementalData/weekData/weekendStart[@territories='" . $weekStart . "']", 'day', 'weekendStart');
+                $temp += self::_getFile('supplementalData', "/supplementalData/weekData/weekendEnd[@territories='" . $weekEnd . "']", 'day', 'weekendEnd');
+                break;
+
+            case 'quarters':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp['format']['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'format\']/quarterWidth[@type=\'abbreviated\']/quarter', 'type');
+                $temp['format']['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'format\']/quarterWidth[@type=\'narrow\']/quarter', 'type');
+                $temp['format']['wide']        = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'format\']/quarterWidth[@type=\'wide\']/quarter', 'type');
+                $temp['stand-alone']['abbreviated']  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'stand-alone\']/quarterWidth[@type=\'abbreviated\']/quarter', 'type');
+                $temp['stand-alone']['narrow']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'stand-alone\']/quarterWidth[@type=\'narrow\']/quarter', 'type');
+                $temp['stand-alone']['wide']         = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'stand-alone\']/quarterWidth[@type=\'wide\']/quarter', 'type');
+                break;
+
+            case 'quarter':
+                if (empty($value)) {
+                    $value = array("gregorian", "format", "wide");
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/quarters/quarterContext[@type=\'' . $value[1] . '\']/quarterWidth[@type=\'' . $value[2] . '\']/quarter', 'type');
+                break;
+
+            case 'eras':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp['names']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/eras/eraNames/era', 'type');
+                $temp['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/eras/eraAbbr/era', 'type');
+                $temp['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/eras/eraNarrow/era', 'type');
+                break;
+
+            case 'era':
+                if (empty($value)) {
+                    $value = array("gregorian", "Abbr");
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/eras/era' . $value[1] . '/era', 'type');
+                break;
+
+            case 'date':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'full\']/dateFormat/pattern', '', 'full');
+                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'long\']/dateFormat/pattern', '', 'long');
+                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'medium\']/dateFormat/pattern', '', 'medium');
+                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'short\']/dateFormat/pattern', '', 'short');
+                break;
+
+            case 'time':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'full\']/timeFormat/pattern', '', 'full');
+                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'long\']/timeFormat/pattern', '', 'long');
+                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'medium\']/timeFormat/pattern', '', 'medium');
+                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'short\']/timeFormat/pattern', '', 'short');
+                break;
+
+            case 'datetime':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+
+                $timefull = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'full\']/timeFormat/pattern', '', 'full');
+                $timelong = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'long\']/timeFormat/pattern', '', 'long');
+                $timemedi = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'medium\']/timeFormat/pattern', '', 'medi');
+                $timeshor = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'short\']/timeFormat/pattern', '', 'shor');
+
+                $datefull = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'full\']/dateFormat/pattern', '', 'full');
+                $datelong = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'long\']/dateFormat/pattern', '', 'long');
+                $datemedi = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'medium\']/dateFormat/pattern', '', 'medi');
+                $dateshor = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'short\']/dateFormat/pattern', '', 'shor');
+
+                $full = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'full\']/dateTimeFormat/pattern', '', 'full');
+                $long = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'long\']/dateTimeFormat/pattern', '', 'long');
+                $medi = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'medium\']/dateTimeFormat/pattern', '', 'medi');
+                $shor = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'short\']/dateTimeFormat/pattern', '', 'shor');
+
+                $temp['full']   = str_replace(array('{0}', '{1}'), array($timefull['full'], $datefull['full']), $full['full']);
+                $temp['long']   = str_replace(array('{0}', '{1}'), array($timelong['long'], $datelong['long']), $long['long']);
+                $temp['medium'] = str_replace(array('{0}', '{1}'), array($timemedi['medi'], $datemedi['medi']), $medi['medi']);
+                $temp['short']  = str_replace(array('{0}', '{1}'), array($timeshor['shor'], $dateshor['shor']), $shor['shor']);
+                break;
+
+            case 'dateitem':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $_temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/availableFormats/dateFormatItem', 'id');
+                foreach($_temp as $key => $found) {
+                    $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/availableFormats/dateFormatItem[@id=\'' . $key . '\']', '', $key);
+                }
+                break;
+
+            case 'dateinterval':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $_temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/intervalFormats/intervalFormatItem', 'id');
+                foreach($_temp as $key => $found) {
+                    $temp[$key] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/intervalFormats/intervalFormatItem[@id=\'' . $key . '\']/greatestDifference', 'id');
+                }
+                break;
+
+            case 'field':
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp2 = self::_getFile($locale, '/ldml/dates/fields/field', 'type');
+                // $temp2 = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field', 'type');
+                foreach ($temp2 as $key => $keyvalue) {
+                    $temp += self::_getFile($locale, '/ldml/dates/fields/field[@type=\'' . $key . '\']/displayName', '', $key);
+                    // $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field[@type=\'' . $key . '\']/displayName', '', $key);
+                }
+                break;
+
+            case 'relative':
+                if (empty($value)) {
+                    $value = "day";
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/fields/field[@type=\'' . $value . '\']/relative', 'type');
+                break;
+
+            case 'symbols':
+                $temp  = self::_getFile($locale, '/ldml/numbers/symbols/decimal',         '', 'decimal');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/group',           '', 'group');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/list',            '', 'list');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/percentSign',     '', 'percent');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/nativeZeroDigit', '', 'zero');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/patternDigit',    '', 'pattern');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/plusSign',        '', 'plus');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/minusSign',       '', 'minus');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/exponential',     '', 'exponent');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/perMille',        '', 'mille');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/infinity',        '', 'infinity');
+                $temp += self::_getFile($locale, '/ldml/numbers/symbols/nan',             '', 'nan');
+                break;
+
+            case 'nametocurrency':
+                $_temp = self::_getFile($locale, '/ldml/numbers/currencies/currency', 'type');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $key . '\']/displayName', '', $key);
+                }
+                break;
+
+            case 'currencytoname':
+                $_temp = self::_getFile($locale, '/ldml/numbers/currencies/currency', 'type');
+                foreach ($_temp as $key => $keyvalue) {
+                    $val = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $key . '\']/displayName', '', $key);
+                    if (!isset($val[$key])) {
+                        continue;
+                    }
+                    if (!isset($temp[$val[$key]])) {
+                        $temp[$val[$key]] = $key;
+                    } else {
+                        $temp[$val[$key]] .= " " . $key;
+                    }
+                }
+                break;
+
+            case 'currencysymbol':
+                $_temp = self::_getFile($locale, '/ldml/numbers/currencies/currency', 'type');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $key . '\']/symbol', '', $key);
+                }
+                break;
+
+            case 'question':
+                $temp  = self::_getFile($locale, '/ldml/posix/messages/yesstr',  '', 'yes');
+                $temp += self::_getFile($locale, '/ldml/posix/messages/nostr',   '', 'no');
+                break;
+
+            case 'currencyfraction':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info', 'iso4217');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info[@iso4217=\'' . $key . '\']', 'digits', $key);
+                }
+                break;
+
+            case 'currencyrounding':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info', 'iso4217');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info[@iso4217=\'' . $key . '\']', 'rounding', $key);
+                }
+                break;
+
+            case 'currencytoregion':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/region', 'iso3166');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/currencyData/region[@iso3166=\'' . $key . '\']/currency', 'iso4217', $key);
+                }
+                break;
+
+            case 'regiontocurrency':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/region', 'iso3166');
+                foreach ($_temp as $key => $keyvalue) {
+                    $val = self::_getFile('supplementalData', '/supplementalData/currencyData/region[@iso3166=\'' . $key . '\']/currency', 'iso4217', $key);
+                    if (!isset($val[$key])) {
+                        continue;
+                    }
+                    if (!isset($temp[$val[$key]])) {
+                        $temp[$val[$key]] = $key;
+                    } else {
+                        $temp[$val[$key]] .= " " . $key;
+                    }
+                }
+                break;
+
+            case 'regiontoterritory':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/territoryContainment/group', 'type');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/territoryContainment/group[@type=\'' . $key . '\']', 'contains', $key);
+                }
+                break;
+
+            case 'territorytoregion':
+                $_temp2 = self::_getFile('supplementalData', '/supplementalData/territoryContainment/group', 'type');
+                $_temp = array();
+                foreach ($_temp2 as $key => $found) {
+                    $_temp += self::_getFile('supplementalData', '/supplementalData/territoryContainment/group[@type=\'' . $key . '\']', 'contains', $key);
+                }
+                foreach($_temp as $key => $found) {
+                    $_temp3 = explode(" ", $found);
+                    foreach($_temp3 as $found3) {
+                        if (!isset($temp[$found3])) {
+                            $temp[$found3] = (string) $key;
+                        } else {
+                            $temp[$found3] .= " " . $key;
+                        }
+                    }
+                }
+                break;
+
+            case 'scripttolanguage':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'scripts', $key);
+                    if (empty($temp[$key])) {
+                        unset($temp[$key]);
+                    }
+                }
+                break;
+
+            case 'languagetoscript':
+                $_temp2 = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
+                $_temp = array();
+                foreach ($_temp2 as $key => $found) {
+                    $_temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'scripts', $key);
+                }
+                foreach($_temp as $key => $found) {
+                    $_temp3 = explode(" ", $found);
+                    foreach($_temp3 as $found3) {
+                        if (empty($found3)) {
+                            continue;
+                        }
+                        if (!isset($temp[$found3])) {
+                            $temp[$found3] = (string) $key;
+                        } else {
+                            $temp[$found3] .= " " . $key;
+                        }
+                    }
+                }
+                break;
+
+            case 'territorytolanguage':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'territories', $key);
+                    if (empty($temp[$key])) {
+                        unset($temp[$key]);
+                    }
+                }
+                break;
+
+            case 'languagetoterritory':
+                $_temp2 = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
+                $_temp = array();
+                foreach ($_temp2 as $key => $found) {
+                    $_temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'territories', $key);
+                }
+                foreach($_temp as $key => $found) {
+                    $_temp3 = explode(" ", $found);
+                    foreach($_temp3 as $found3) {
+                        if (empty($found3)) {
+                            continue;
+                        }
+                        if (!isset($temp[$found3])) {
+                            $temp[$found3] = (string) $key;
+                        } else {
+                            $temp[$found3] .= " " . $key;
+                        }
+                    }
+                }
+                break;
+
+            case 'timezonetowindows':
+                $_temp = self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone', 'other');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone[@other=\'' . $key . '\']', 'type', $key);
+                }
+                break;
+
+            case 'windowstotimezone':
+                $_temp = self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone', 'type');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone[@type=\'' .$key . '\']', 'other', $key);
+                }
+                break;
+
+            case 'territorytotimezone':
+                $_temp = self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone', 'type');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone[@type=\'' . $key . '\']', 'territory', $key);
+                }
+                break;
+
+            case 'timezonetoterritory':
+                $_temp = self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone', 'territory');
+                foreach ($_temp as $key => $found) {
+                    $temp += self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone[@territory=\'' . $key . '\']', 'type', $key);
+                }
+                break;
+
+            case 'citytotimezone':
+                $_temp = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone', 'type');
+                foreach($_temp as $key => $found) {
+                    $temp += self::_getFile($locale, '/ldml/dates/timeZoneNames/zone[@type=\'' . $key . '\']/exemplarCity', '', $key);
+                }
+                break;
+
+            case 'timezonetocity':
+                $_temp  = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone', 'type');
+                $temp = array();
+                foreach($_temp as $key => $found) {
+                    $temp += self::_getFile($locale, '/ldml/dates/timeZoneNames/zone[@type=\'' . $key . '\']/exemplarCity', '', $key);
+                    if (!empty($temp[$key])) {
+                        $temp[$temp[$key]] = $key;
+                    }
+                    unset($temp[$key]);
+                }
+                break;
+
+            case 'phonetoterritory':
+                $_temp = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory', 'territory');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory[@territory=\'' . $key . '\']/telephoneCountryCode', 'code', $key);
+                }
+                break;
+
+            case 'territorytophone':
+                $_temp = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory', 'territory');
+                foreach ($_temp as $key => $keyvalue) {
+                    $val = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory[@territory=\'' . $key . '\']/telephoneCountryCode', 'code', $key);
+                    if (!isset($val[$key])) {
+                        continue;
+                    }
+                    if (!isset($temp[$val[$key]])) {
+                        $temp[$val[$key]] = $key;
+                    } else {
+                        $temp[$val[$key]] .= " " . $key;
+                    }
+                }
+                break;
+
+            case 'numerictoterritory':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes', 'type');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@type=\'' . $key . '\']', 'numeric', $key);
+                }
+                break;
+
+            case 'territorytonumeric':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes', 'numeric');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@numeric=\'' . $key . '\']', 'type', $key);
+                }
+                break;
+
+            case 'alpha3toterritory':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes', 'type');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@type=\'' . $key . '\']', 'alpha3', $key);
+                }
+                break;
+
+            case 'territorytoalpha3':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes', 'alpha3');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@alpha3=\'' . $key . '\']', 'type', $key);
+                }
+                break;
+
+            case 'postaltoterritory':
+                $_temp = self::_getFile('postalCodeData', '/supplementalData/postalCodeData/postCodeRegex', 'territoryId');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('postalCodeData', '/supplementalData/postalCodeData/postCodeRegex[@territoryId=\'' . $key . '\']', 'territoryId');
+                }
+                break;
+
+            case 'numberingsystem':
+                $_temp = self::_getFile('numberingSystems', '/supplementalData/numberingSystems/numberingSystem', 'id');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('numberingSystems', '/supplementalData/numberingSystems/numberingSystem[@id=\'' . $key . '\']', 'digits', $key);
+                    if (empty($temp[$key])) {
+                        unset($temp[$key]);
+                    }
+                }
+                break;
+
+            case 'chartofallback':
+                $_temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character', 'value');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp2 = self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $key . '\']/substitute', '', $key);
+                    $temp[current($temp2)] = $key;
+                }
+                break;
+
+            case 'fallbacktochar':
+                $_temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character', 'value');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $key . '\']/substitute', '', $key);
+                }
+                break;
+
+            case 'localeupgrade':
+                $_temp = self::_getFile('likelySubtags', '/supplementalData/likelySubtags/likelySubtag', 'from');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp += self::_getFile('likelySubtags', '/supplementalData/likelySubtags/likelySubtag[@from=\'' . $key . '\']', 'to', $key);
+                }
+                break;
+
+            case 'unit':
+                $_temp = self::_getFile($locale, '/ldml/units/unitLength/unit', 'type');
+                foreach($_temp as $key => $keyvalue) {
+                    $_temp2 = self::_getFile($locale, '/ldml/units/unitLength/unit[@type=\'' . $key . '\']/unitPattern', 'count');
+                    $temp[$key] = $_temp2;
+                }
+                break;
+
+            default :
+                require_once 'Zend/Locale/Exception.php';
+                throw new Zend_Locale_Exception("Unknown list ($path) for parsing locale data.");
+                break;
+        }
+
+        if (isset(self::$_cache)) {
+            if (self::$_cacheTags) {
+                self::$_cache->save( serialize($temp), $id, array('Zend_Locale'));
+            } else {
+                self::$_cache->save( serialize($temp), $id);
+            }
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Read the LDML file, get a single path defined value
+     *
+     * @param  string      $locale
+     * @param  string      $path
+     * @param  bool|string $value
+     * @return string
+     * @throws Zend_Locale_Exception
+     */
+    public static function getContent($locale, $path, $value = false)
+    {
+        $locale = self::_checkLocale($locale);
+
+        if (!isset(self::$_cache) && !self::$_cacheDisabled) {
+            require_once 'Zend/Cache.php';
+            self::$_cache = Zend_Cache::factory(
+                'Core',
+                'File',
+                array('automatic_serialization' => true),
+                array());
+        }
+
+        $val = $value;
+        if (is_array($value)) {
+            $val = implode('_' , $value);
+        }
+        $val = urlencode($val);
+        $id  = self::_filterCacheId('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val);
+        if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
+            return unserialize($result);
+        }
+
+        switch(strtolower($path)) {
+            case 'language':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/languages/language[@type=\'' . $value . '\']', 'type');
+                break;
+
+            case 'script':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/scripts/script[@type=\'' . $value . '\']', 'type');
+                break;
+
+            case 'country':
+            case 'territory':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/territories/territory[@type=\'' . $value . '\']', 'type');
+                break;
+
+            case 'variant':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/variants/variant[@type=\'' . $value . '\']', 'type');
+                break;
+
+            case 'key':
+                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/keys/key[@type=\'' . $value . '\']', 'type');
+                break;
+
+            case 'defaultcalendar':
+                $givenLocale = new Zend_Locale($locale);
+                $territory = $givenLocale->getRegion();
+                unset($givenLocale);
+                $temp = self::_getFile('supplementalData', '/supplementalData/calendarPreferenceData/calendarPreference[contains(@territories,\'' . $territory . '\')]', 'ordering', 'ordering');
+                if (isset($temp['ordering'])) {
+                    list($temp) = explode(' ', $temp['ordering']);
+                } else {
+                    $temp = 'gregorian';
+                }
+                break;
+
+            case 'monthcontext':
+                /* default context is always 'format'
+                if (empty ($value)) {
+                    $value = "gregorian";
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/default', 'choice', 'context');
+                */
+                $temp = 'format';
+                break;
+
+            case 'defaultmonth':
+                /* default width is always 'wide'
+                if (empty ($value)) {
+                    $value = "gregorian";
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/default', 'choice', 'default');
+                */
+                $temp = 'wide';
+                break;
+
+            case 'month':
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", "format", "wide", $temp);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/months/monthContext[@type=\'' . $value[1] . '\']/monthWidth[@type=\'' . $value[2] . '\']/month[@type=\'' . $value[3] . '\']', 'type');
+                break;
+
+            case 'daycontext':
+                /* default context is always 'format'
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/default', 'choice', 'context');
+                */
+                $temp = 'format';
+                break;
+
+            case 'defaultday':
+                /* default width is always 'wide'
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/default', 'choice', 'default');
+                */
+                $temp = 'wide';
+                break;
+
+            case 'day':
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", "format", "wide", $temp);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/days/dayContext[@type=\'' . $value[1] . '\']/dayWidth[@type=\'' . $value[2] . '\']/day[@type=\'' . $value[3] . '\']', 'type');
+                break;
+
+            case 'quarter':
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", "format", "wide", $temp);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/quarters/quarterContext[@type=\'' . $value[1] . '\']/quarterWidth[@type=\'' . $value[2] . '\']/quarter[@type=\'' . $value[3] . '\']', 'type');
+                break;
+
+            case 'am':
+                if (empty($value)) {
+                    $value = array("gregorian", "format", "wide");
+                }
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array($temp, "format", "wide");
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dayPeriods/dayPeriodContext[@type=\'' . $value[1] . '\']/dayPeriodWidth[@type=\'' . $value[2] . '\']/dayPeriod[@type=\'am\']', '', 'dayPeriod');
+                break;
+
+            case 'pm':
+                if (empty($value)) {
+                    $value = array("gregorian", "format", "wide");
+                }
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array($temp, "format", "wide");
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dayPeriods/dayPeriodContext[@type=\'' . $value[1] . '\']/dayPeriodWidth[@type=\'' . $value[2] . '\']/dayPeriod[@type=\'pm\']', '', 'dayPeriod');
+                break;
+
+            case 'era':
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", "Abbr", $temp);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/eras/era' . $value[1] . '/era[@type=\'' . $value[2] . '\']', 'type');
+                break;
+
+            case 'defaultdate':
+                /* default choice is deprecated in CDLR - should be always medium here
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/default', 'choice', 'default');
+                */
+                $temp = 'medium';
+                break;
+
+            case 'date':
+                if (empty($value)) {
+                    $value = array("gregorian", "medium");
+                }
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", $temp);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateFormats/dateFormatLength[@type=\'' . $value[1] . '\']/dateFormat/pattern', '', 'pattern');
+                break;
+
+            case 'defaulttime':
+                /* default choice is deprecated in CDLR - should be always medium here
+                if (empty($value)) {
+                    $value = "gregorian";
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/default', 'choice', 'default');
+                */
+                $temp = 'medium';
+                break;
+
+            case 'time':
+                if (empty($value)) {
+                    $value = array("gregorian", "medium");
+                }
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", $temp);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/timeFormats/timeFormatLength[@type=\'' . $value[1] . '\']/timeFormat/pattern', '', 'pattern');
+                break;
+
+            case 'datetime':
+                if (empty($value)) {
+                    $value = array("gregorian", "medium");
+                }
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", $temp);
+                }
+
+                $date     = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateFormats/dateFormatLength[@type=\'' . $value[1] . '\']/dateFormat/pattern', '', 'pattern');
+                $time     = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/timeFormats/timeFormatLength[@type=\'' . $value[1] . '\']/timeFormat/pattern', '', 'pattern');
+                $datetime = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'' . $value[1] . '\']/dateTimeFormat/pattern', '', 'pattern');
+                $temp = str_replace(array('{0}', '{1}'), array(current($time), current($date)), current($datetime));
+                break;
+
+            case 'dateitem':
+                if (empty($value)) {
+                    $value = array("gregorian", "yyMMdd");
+                }
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", $temp);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateTimeFormats/availableFormats/dateFormatItem[@id=\'' . $value[1] . '\']', '');
+                break;
+
+            case 'dateinterval':
+                if (empty($value)) {
+                    $value = array("gregorian", "yMd", "y");
+                }
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", $temp, $temp[0]);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateTimeFormats/intervalFormats/intervalFormatItem[@id=\'' . $value[1] . '\']/greatestDifference[@id=\'' . $value[2] . '\']', '');
+                break;
+
+            case 'field':
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", $temp);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/fields/field[@type=\'' . $value[1] . '\']/displayName', '', $value[1]);
+                break;
+
+            case 'relative':
+                if (!is_array($value)) {
+                    $temp = $value;
+                    $value = array("gregorian", $temp);
+                }
+                $temp = self::_getFile($locale, '/ldml/dates/fields/field[@type=\'day\']/relative[@type=\'' . $value[1] . '\']', '', $value[1]);
+                // $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/fields/field/relative[@type=\'' . $value[1] . '\']', '', $value[1]);
+                break;
+
+            case 'defaultnumberingsystem':
+                $temp = self::_getFile($locale, '/ldml/numbers/defaultNumberingSystem', '', 'default');
+                break;
+
+            case 'decimalnumber':
+                $temp = self::_getFile($locale, '/ldml/numbers/decimalFormats/decimalFormatLength/decimalFormat/pattern', '', 'default');
+                break;
+
+            case 'scientificnumber':
+                $temp = self::_getFile($locale, '/ldml/numbers/scientificFormats/scientificFormatLength/scientificFormat/pattern', '', 'default');
+                break;
+
+            case 'percentnumber':
+                $temp = self::_getFile($locale, '/ldml/numbers/percentFormats/percentFormatLength/percentFormat/pattern', '', 'default');
+                break;
+
+            case 'currencynumber':
+                $temp = self::_getFile($locale, '/ldml/numbers/currencyFormats/currencyFormatLength/currencyFormat/pattern', '', 'default');
+                break;
+
+            case 'nametocurrency':
+                $temp = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $value . '\']/displayName', '', $value);
+                break;
+
+            case 'currencytoname':
+                $temp = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $value . '\']/displayName', '', $value);
+                $_temp = self::_getFile($locale, '/ldml/numbers/currencies/currency', 'type');
+                $temp = array();
+                foreach ($_temp as $key => $keyvalue) {
+                    $val = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $key . '\']/displayName', '', $key);
+                    if (!isset($val[$key]) or ($val[$key] != $value)) {
+                        continue;
+                    }
+                    if (!isset($temp[$val[$key]])) {
+                        $temp[$val[$key]] = $key;
+                    } else {
+                        $temp[$val[$key]] .= " " . $key;
+                    }
+                }
+                break;
+
+            case 'currencysymbol':
+                $temp = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $value . '\']/symbol', '', $value);
+                break;
+
+            case 'question':
+                $temp = self::_getFile($locale, '/ldml/posix/messages/' . $value . 'str',  '', $value);
+                break;
+
+            case 'currencyfraction':
+                if (empty($value)) {
+                    $value = "DEFAULT";
+                }
+                $temp = self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info[@iso4217=\'' . $value . '\']', 'digits', 'digits');
+                break;
+
+            case 'currencyrounding':
+                if (empty($value)) {
+                    $value = "DEFAULT";
+                }
+                $temp = self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info[@iso4217=\'' . $value . '\']', 'rounding', 'rounding');
+                break;
+
+            case 'currencytoregion':
+                $temp = self::_getFile('supplementalData', '/supplementalData/currencyData/region[@iso3166=\'' . $value . '\']/currency', 'iso4217', $value);
+                break;
+
+            case 'regiontocurrency':
+                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/region', 'iso3166');
+                $temp = array();
+                foreach ($_temp as $key => $keyvalue) {
+                    $val = self::_getFile('supplementalData', '/supplementalData/currencyData/region[@iso3166=\'' . $key . '\']/currency', 'iso4217', $key);
+                    if (!isset($val[$key]) or ($val[$key] != $value)) {
+                        continue;
+                    }
+                    if (!isset($temp[$val[$key]])) {
+                        $temp[$val[$key]] = $key;
+                    } else {
+                        $temp[$val[$key]] .= " " . $key;
+                    }
+                }
+                break;
+
+            case 'regiontoterritory':
+                $temp = self::_getFile('supplementalData', '/supplementalData/territoryContainment/group[@type=\'' . $value . '\']', 'contains', $value);
+                break;
+
+            case 'territorytoregion':
+                $_temp2 = self::_getFile('supplementalData', '/supplementalData/territoryContainment/group', 'type');
+                $_temp = array();
+                foreach ($_temp2 as $key => $found) {
+                    $_temp += self::_getFile('supplementalData', '/supplementalData/territoryContainment/group[@type=\'' . $key . '\']', 'contains', $key);
+                }
+                $temp = array();
+                foreach($_temp as $key => $found) {
+                    $_temp3 = explode(" ", $found);
+                    foreach($_temp3 as $found3) {
+                        if ($found3 !== $value) {
+                            continue;
+                        }
+                        if (!isset($temp[$found3])) {
+                            $temp[$found3] = (string) $key;
+                        } else {
+                            $temp[$found3] .= " " . $key;
+                        }
+                    }
+                }
+                break;
+
+            case 'scripttolanguage':
+                $temp = self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $value . '\']', 'scripts', $value);
+                break;
+
+            case 'languagetoscript':
+                $_temp2 = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
+                $_temp = array();
+                foreach ($_temp2 as $key => $found) {
+                    $_temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'scripts', $key);
+                }
+                $temp = array();
+                foreach($_temp as $key => $found) {
+                    $_temp3 = explode(" ", $found);
+                    foreach($_temp3 as $found3) {
+                        if ($found3 !== $value) {
+                            continue;
+                        }
+                        if (!isset($temp[$found3])) {
+                            $temp[$found3] = (string) $key;
+                        } else {
+                            $temp[$found3] .= " " . $key;
+                        }
+                    }
+                }
+                break;
+
+            case 'territorytolanguage':
+                $temp = self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $value . '\']', 'territories', $value);
+                break;
+
+            case 'languagetoterritory':
+                $_temp2 = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
+                $_temp = array();
+                foreach ($_temp2 as $key => $found) {
+                    $_temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'territories', $key);
+                }
+                $temp = array();
+                foreach($_temp as $key => $found) {
+                    $_temp3 = explode(" ", $found);
+                    foreach($_temp3 as $found3) {
+                        if ($found3 !== $value) {
+                            continue;
+                        }
+                        if (!isset($temp[$found3])) {
+                            $temp[$found3] = (string) $key;
+                        } else {
+                            $temp[$found3] .= " " . $key;
+                        }
+                    }
+                }
+                break;
+
+            case 'timezonetowindows':
+                $temp = self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone[@other=\''.$value.'\']', 'type', $value);
+                break;
+
+            case 'windowstotimezone':
+                $temp = self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone[@type=\''.$value.'\']', 'other', $value);
+                break;
+
+            case 'territorytotimezone':
+                $temp = self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone[@type=\'' . $value . '\']', 'territory', $value);
+                break;
+
+            case 'timezonetoterritory':
+                $temp = self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone[@territory=\'' . $value . '\']', 'type', $value);
+                break;
+
+            case 'citytotimezone':
+                $temp = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone[@type=\'' . $value . '\']/exemplarCity', '', $value);
+                break;
+
+            case 'timezonetocity':
+                $_temp  = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone', 'type');
+                $temp = array();
+                foreach($_temp as $key => $found) {
+                    $temp += self::_getFile($locale, '/ldml/dates/timeZoneNames/zone[@type=\'' . $key . '\']/exemplarCity', '', $key);
+                    if (!empty($temp[$key])) {
+                        if ($temp[$key] == $value) {
+                            $temp[$temp[$key]] = $key;
+                        }
+                    }
+                    unset($temp[$key]);
+                }
+                break;
+
+            case 'phonetoterritory':
+                $temp = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory[@territory=\'' . $value . '\']/telephoneCountryCode', 'code', $value);
+                break;
+
+            case 'territorytophone':
+                $_temp2 = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory', 'territory');
+                $_temp = array();
+                foreach ($_temp2 as $key => $found) {
+                    $_temp += self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory[@territory=\'' . $key . '\']/telephoneCountryCode', 'code', $key);
+                }
+                $temp = array();
+                foreach($_temp as $key => $found) {
+                    $_temp3 = explode(" ", $found);
+                    foreach($_temp3 as $found3) {
+                        if ($found3 !== $value) {
+                            continue;
+                        }
+                        if (!isset($temp[$found3])) {
+                            $temp[$found3] = (string) $key;
+                        } else {
+                            $temp[$found3] .= " " . $key;
+                        }
+                    }
+                }
+                break;
+
+            case 'numerictoterritory':
+                $temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@type=\''.$value.'\']', 'numeric', $value);
+                break;
+
+            case 'territorytonumeric':
+                $temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@numeric=\''.$value.'\']', 'type', $value);
+                break;
+
+            case 'alpha3toterritory':
+                $temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@type=\''.$value.'\']', 'alpha3', $value);
+                break;
+
+            case 'territorytoalpha3':
+                $temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@alpha3=\''.$value.'\']', 'type', $value);
+                break;
+
+            case 'postaltoterritory':
+                $temp = self::_getFile('postalCodeData', '/supplementalData/postalCodeData/postCodeRegex[@territoryId=\'' . $value . '\']', 'territoryId');
+                break;
+
+            case 'numberingsystem':
+                $temp = self::_getFile('numberingSystems', '/supplementalData/numberingSystems/numberingSystem[@id=\'' . strtolower($value) . '\']', 'digits', $value);
+                break;
+
+            case 'chartofallback':
+                $_temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character', 'value');
+                foreach ($_temp as $key => $keyvalue) {
+                    $temp2 = self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $key . '\']/substitute', '', $key);
+                    if (current($temp2) == $value) {
+                        $temp = $key;
+                    }
+                }
+                break;
+
+                $temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $value . '\']/substitute', '', $value);
+                break;
+
+            case 'fallbacktochar':
+                $temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $value . '\']/substitute', '');
+                break;
+
+            case 'localeupgrade':
+                $temp = self::_getFile('likelySubtags', '/supplementalData/likelySubtags/likelySubtag[@from=\'' . $value . '\']', 'to', $value);
+                break;
+
+            case 'unit':
+                $temp = self::_getFile($locale, '/ldml/units/unitLength/unit[@type=\'' . $value[0] . '\']/unitPattern[@count=\'' . $value[1] . '\']', '');
+                break;
+
+            case 'parentlocale':
+                if (false === $value) {
+                    $value = $locale;
+                }
+                $temp = self::_getFile('supplementalData', "/supplementalData/parentLocales/parentLocale[contains(@locales, '" . $value . "')]", 'parent', 'parent');
+                break;
+
+            default :
+                require_once 'Zend/Locale/Exception.php';
+                throw new Zend_Locale_Exception("Unknown detail ($path) for parsing locale data.");
+                break;
+        }
+
+        if (is_array($temp)) {
+            $temp = current($temp);
+        }
+        if (isset(self::$_cache)) {
+            if (self::$_cacheTags) {
+                self::$_cache->save( serialize($temp), $id, array('Zend_Locale'));
+            } else {
+                self::$_cache->save( serialize($temp), $id);
+            }
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Returns the set cache
+     *
+     * @return Zend_Cache_Core The set cache
+     */
+    public static function getCache()
+    {
+        return self::$_cache;
+    }
+
+    /**
+     * Set a cache for Zend_Locale_Data
+     *
+     * @param Zend_Cache_Core $cache A cache frontend
+     */
+    public static function setCache(Zend_Cache_Core $cache)
+    {
+        self::$_cache = $cache;
+        self::_getTagSupportForCache();
+    }
+
+    /**
+     * Returns true when a cache is set
+     *
+     * @return boolean
+     */
+    public static function hasCache()
+    {
+        if (self::$_cache !== null) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes any set cache
+     *
+     * @return void
+     */
+    public static function removeCache()
+    {
+        self::$_cache = null;
+    }
+
+    /**
+     * Clears all set cache data
+     *
+     * @return void
+     */
+    public static function clearCache()
+    {
+        if (self::$_cacheTags) {
+            self::$_cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, array('Zend_Locale'));
+        } else {
+            self::$_cache->clean(Zend_Cache::CLEANING_MODE_ALL);
+        }
+    }
+
+    /**
+     * Disables the cache
+     *
+     * @param bool $flag
+     */
+    public static function disableCache($flag)
+    {
+        self::$_cacheDisabled = (boolean) $flag;
+    }
+
+    /**
+     * Internal method to check if the given cache supports tags
+     *
+     * @return bool
+     */
+    private static function _getTagSupportForCache()
+    {
+        $backend = self::$_cache->getBackend();
+        if ($backend instanceof Zend_Cache_Backend_ExtendedInterface) {
+            $cacheOptions = $backend->getCapabilities();
+            self::$_cacheTags = $cacheOptions['tags'];
+        } else {
+            self::$_cacheTags = false;
+        }
+
+        return self::$_cacheTags;
+    }
+
+    /**
+     * Filter an ID to only allow valid variable characters
+     *
+     * @param  string $value
+     * @return string
+     */
+    protected static function _filterCacheId($value)
+    {
+        return strtr(
+            $value,
+            array(
+                '-' => '_',
+                '%' => '_',
+                '+' => '_',
+                '.' => '_',
+            )
+        );
+    }
+}
diff --git a/lib/zend/Zend/Locale/Exception.php b/lib/zend/Zend/Locale/Exception.php
new file mode 100644
index 00000000000..a6e869aea67
--- /dev/null
+++ b/lib/zend/Zend/Locale/Exception.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+
+/**
+ * Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Locale_Exception extends Zend_Exception
+{
+}
diff --git a/lib/zend/Zend/Locale/Format.php b/lib/zend/Zend/Locale/Format.php
new file mode 100644
index 00000000000..517dcbb4157
--- /dev/null
+++ b/lib/zend/Zend/Locale/Format.php
@@ -0,0 +1,1342 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Locale
+ * @subpackage Format
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * include needed classes
+ */
+require_once 'Zend/Locale/Data.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Locale
+ * @subpackage Format
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Locale_Format
+{
+    const STANDARD   = 'auto';
+
+    private static $_options = array('date_format'   => null,
+                                     'number_format' => null,
+                                     'format_type'   => 'iso',
+                                     'fix_date'      => false,
+                                     'locale'        => null,
+                                     'cache'         => null,
+                                     'disableCache'  => null,
+                                     'precision'     => null);
+
+    /**
+     * Sets class wide options, if no option was given, the actual set options will be returned
+     * The 'precision' option of a value is used to truncate or stretch extra digits. -1 means not to touch the extra digits.
+     * The 'locale' option helps when parsing numbers and dates using separators and month names.
+     * The date format 'format_type' option selects between CLDR/ISO date format specifier tokens and PHP's date() tokens.
+     * The 'fix_date' option enables or disables heuristics that attempt to correct invalid dates.
+     * The 'number_format' option can be used to specify a default number format string
+     * The 'date_format' option can be used to specify a default date format string, but beware of using getDate(),
+     * checkDateFormat() and getTime() after using setOptions() with a 'format'.  To use these four methods
+     * with the default date format for a locale, use array('date_format' => null, 'locale' => $locale) for their options.
+     *
+     * @param  array  $options  Array of options, keyed by option name: format_type = 'iso' | 'php', fix_date = true | false,
+     *                          locale = Zend_Locale | locale string, precision = whole number between -1 and 30
+     * @throws Zend_Locale_Exception
+     * @return array if no option was given
+     */
+    public static function setOptions(array $options = array())
+    {
+        self::$_options = self::_checkOptions($options) + self::$_options;
+        return self::$_options;
+    }
+
+    /**
+     * Internal function for checking the options array of proper input values
+     * See {@link setOptions()} for details.
+     *
+     * @param  array  $options  Array of options, keyed by option name: format_type = 'iso' | 'php', fix_date = true | false,
+     *                          locale = Zend_Locale | locale string, precision = whole number between -1 and 30
+     * @throws Zend_Locale_Exception
+     * @return array if no option was given
+     */
+    private static function _checkOptions(array $options = array())
+    {
+        if (count($options) == 0) {
+            return self::$_options;
+        }
+        foreach ($options as $name => $value) {
+            $name  = strtolower($name);
+            if ($name !== 'locale') {
+                if (gettype($value) === 'string') {
+                    $value = strtolower($value);
+                }
+            }
+
+            switch($name) {
+                case 'number_format' :
+                    if ($value == Zend_Locale_Format::STANDARD) {
+                        $locale = self::$_options['locale'];
+                        if (isset($options['locale'])) {
+                            $locale = $options['locale'];
+                        }
+                        $options['number_format'] = Zend_Locale_Data::getContent($locale, 'decimalnumber');
+                    } else if ((gettype($value) !== 'string') and ($value !== NULL)) {
+                        require_once 'Zend/Locale/Exception.php';
+                        $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value);
+                        throw new Zend_Locale_Exception("Unknown number format type '" . gettype($value) . "'. "
+                            . "Format '$stringValue' must be a valid number format string.");
+                    }
+                    break;
+
+                case 'date_format' :
+                    if ($value == Zend_Locale_Format::STANDARD) {
+                        $locale = self::$_options['locale'];
+                        if (isset($options['locale'])) {
+                            $locale = $options['locale'];
+                        }
+                        $options['date_format'] = Zend_Locale_Format::getDateFormat($locale);
+                    } else if ((gettype($value) !== 'string') and ($value !== NULL)) {
+                        require_once 'Zend/Locale/Exception.php';
+                        $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value);
+                        throw new Zend_Locale_Exception("Unknown dateformat type '" . gettype($value) . "'. "
+                            . "Format '$stringValue' must be a valid ISO or PHP date format string.");
+                    } else {
+                        if (((isset($options['format_type']) === true) and ($options['format_type'] == 'php')) or
+                            ((isset($options['format_type']) === false) and (self::$_options['format_type'] == 'php'))) {
+                            $options['date_format'] = Zend_Locale_Format::convertPhpToIsoFormat($value);
+                        }
+                    }
+                    break;
+
+                case 'format_type' :
+                    if (($value != 'php') && ($value != 'iso')) {
+                        require_once 'Zend/Locale/Exception.php';
+                        throw new Zend_Locale_Exception("Unknown date format type '$value'. Only 'iso' and 'php'"
+                           . " are supported.");
+                    }
+                    break;
+
+                case 'fix_date' :
+                    if (($value !== true) && ($value !== false)) {
+                        require_once 'Zend/Locale/Exception.php';
+                        throw new Zend_Locale_Exception("Enabling correction of dates must be either true or false"
+                            . "(fix_date='$value').");
+                    }
+                    break;
+
+                case 'locale' :
+                    $options['locale'] = Zend_Locale::findLocale($value);
+                    break;
+
+                case 'cache' :
+                    if ($value instanceof Zend_Cache_Core) {
+                        Zend_Locale_Data::setCache($value);
+                    }
+                    break;
+
+                case 'disablecache' :
+                    if (null !== $value) {
+                        Zend_Locale_Data::disableCache($value);
+                    }
+                    break;
+
+                case 'precision' :
+                    if ($value === NULL) {
+                        $value = -1;
+                    }
+
+                    if (($value < -1) || ($value > 30)) {
+                        require_once 'Zend/Locale/Exception.php';
+                        throw new Zend_Locale_Exception("'$value' precision is not a whole number less than 30.");
+                    }
+                    break;
+
+                default:
+                    require_once 'Zend/Locale/Exception.php';
+                    throw new Zend_Locale_Exception("Unknown option: '$name' = '$value'");
+                    break;
+
+            }
+        }
+
+        return $options;
+    }
+
+    /**
+     * Changes the numbers/digits within a given string from one script to another
+     * 'Decimal' representated the stardard numbers 0-9, if a script does not exist
+     * an exception will be thrown.
+     *
+     * Examples for conversion from Arabic to Latin numerals:
+     *   convertNumerals('١١٠ Tests', 'Arab'); -> returns '100 Tests'
+     * Example for conversion from Latin to Arabic numerals:
+     *   convertNumerals('100 Tests', 'Latn', 'Arab'); -> returns '١١٠ Tests'
+     *
+     * @param  string  $input  String to convert
+     * @param  string  $from   Script to parse, see {@link Zend_Locale::getScriptList()} for details.
+     * @param  string  $to     OPTIONAL Script to convert to
+     * @return string  Returns the converted input
+     * @throws Zend_Locale_Exception
+     */
+    public static function convertNumerals($input, $from, $to = null)
+    {
+        if (!self::_getUniCodeSupport()) {
+            trigger_error("Sorry, your PCRE extension does not support UTF8 which is needed for the I18N core", E_USER_NOTICE);
+        }
+
+        $from   = strtolower($from);
+        $source = Zend_Locale_Data::getContent('en', 'numberingsystem', $from);
+        if (empty($source)) {
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception("Unknown script '$from'. Use 'Latn' for digits 0,1,2,3,4,5,6,7,8,9.");
+        }
+
+        if ($to !== null) {
+            $to     = strtolower($to);
+            $target = Zend_Locale_Data::getContent('en', 'numberingsystem', $to);
+            if (empty($target)) {
+                require_once 'Zend/Locale/Exception.php';
+                throw new Zend_Locale_Exception("Unknown script '$to'. Use 'Latn' for digits 0,1,2,3,4,5,6,7,8,9.");
+            }
+        } else {
+            $target = '0123456789';
+        }
+
+        for ($x = 0; $x < 10; ++$x) {
+            $asource[$x] = "/" . iconv_substr($source, $x, 1, 'UTF-8') . "/u";
+            $atarget[$x] = iconv_substr($target, $x, 1, 'UTF-8');
+        }
+
+        return preg_replace($asource, $atarget, $input);
+    }
+
+    /**
+     * Returns the normalized number from a localized one
+     * Parsing depends on given locale (grouping and decimal)
+     *
+     * Examples for input:
+     * '2345.4356,1234' = 23455456.1234
+     * '+23,3452.123' = 233452.123
+     * '12343 ' = 12343
+     * '-9456' = -9456
+     * '0' = 0
+     *
+     * @param  string $input    Input string to parse for numbers
+     * @param  array  $options  Options: locale, precision. See {@link setOptions()} for details.
+     * @return string Returns the extracted number
+     * @throws Zend_Locale_Exception
+     */
+    public static function getNumber($input, array $options = array())
+    {
+        $options = self::_checkOptions($options) + self::$_options;
+        if (!is_string($input)) {
+            return $input;
+        }
+
+        if (!self::isNumber($input, $options)) {
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception('No localized value in ' . $input . ' found, or the given number does not match the localized format');
+        }
+
+        // Get correct signs for this locale
+        $symbols = Zend_Locale_Data::getList($options['locale'],'symbols');
+        // Change locale input to be default number
+        if (($input[0] == $symbols['minus']) && ('-' != $input[0])) {
+            $input = '-' . substr($input, 1);
+        }
+
+        $input = str_replace($symbols['group'],'', $input);
+        if (strpos($input, $symbols['decimal']) !== false) {
+            if ($symbols['decimal'] != '.') {
+                $input = str_replace($symbols['decimal'], ".", $input);
+            }
+
+            $pre = substr($input, strpos($input, '.') + 1);
+            if ($options['precision'] === null) {
+                $options['precision'] = strlen($pre);
+            }
+
+            if (strlen($pre) >= $options['precision']) {
+                $input = substr($input, 0, strlen($input) - strlen($pre) + $options['precision']);
+            }
+
+            if (($options['precision'] == 0) && ($input[strlen($input) - 1] == '.')) {
+                $input = substr($input, 0, -1);
+            }
+        }
+
+        return $input;
+    }
+
+    /**
+     * Returns a locale formatted number depending on the given options.
+     * The seperation and fraction sign is used from the set locale.
+     * ##0.#  -> 12345.12345 -> 12345.12345
+     * ##0.00 -> 12345.12345 -> 12345.12
+     * ##,##0.00 -> 12345.12345 -> 12,345.12
+     *
+     * @param   string  $value    Localized number string
+     * @param   array   $options  Options: number_format, locale, precision. See {@link setOptions()} for details.
+     * @return  string  locale formatted number
+     * @throws Zend_Locale_Exception
+     */
+    public static function toNumber($value, array $options = array())
+    {
+        // load class within method for speed
+        require_once 'Zend/Locale/Math.php';
+
+        $value             = Zend_Locale_Math::floatalize($value);
+        $value             = Zend_Locale_Math::normalize($value);
+        $options           = self::_checkOptions($options) + self::$_options;
+        $options['locale'] = (string) $options['locale'];
+
+        // Get correct signs for this locale
+        $symbols = Zend_Locale_Data::getList($options['locale'], 'symbols');
+        $oenc = self::_getEncoding();
+        self::_setEncoding('UTF-8');
+        
+        // Get format
+        $format = $options['number_format'];
+        if ($format === null) {
+            $format  = Zend_Locale_Data::getContent($options['locale'], 'decimalnumber');
+            $format  = self::_seperateFormat($format, $value, $options['precision']);
+
+            if ($options['precision'] !== null) {
+                $value   = Zend_Locale_Math::normalize(Zend_Locale_Math::round($value, $options['precision']));
+            }
+        } else {
+            // seperate negative format pattern when available
+            $format  = self::_seperateFormat($format, $value, $options['precision']);
+            if (strpos($format, '.')) {
+                if (is_numeric($options['precision'])) {
+                    $value = Zend_Locale_Math::round($value, $options['precision']);
+                } else {
+                    if (substr($format, iconv_strpos($format, '.') + 1, 3) == '###') {
+                        $options['precision'] = null;
+                    } else {
+                        $options['precision'] = iconv_strlen(iconv_substr($format, iconv_strpos($format, '.') + 1,
+                                                             iconv_strrpos($format, '0') - iconv_strpos($format, '.')));
+                        $format = iconv_substr($format, 0, iconv_strpos($format, '.') + 1) . '###'
+                                . iconv_substr($format, iconv_strrpos($format, '0') + 1);
+                    }
+                }
+            } else {
+                $value = Zend_Locale_Math::round($value, 0);
+                $options['precision'] = 0;
+            }
+            $value = Zend_Locale_Math::normalize($value);
+        }
+
+        if (iconv_strpos($format, '0') === false) {
+            self::_setEncoding($oenc);
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception('Wrong format... missing 0');
+        }
+
+        // get number parts
+        $pos = iconv_strpos($value, '.');
+        if ($pos !== false) {
+            if ($options['precision'] === null) {
+                $precstr = iconv_substr($value, $pos + 1);
+            } else {
+                $precstr = iconv_substr($value, $pos + 1, $options['precision']);
+                if (iconv_strlen($precstr) < $options['precision']) {
+                    $precstr = $precstr . str_pad("0", ($options['precision'] - iconv_strlen($precstr)), "0");
+                }
+            }
+        } else {
+            if ($options['precision'] > 0) {
+                $precstr = str_pad("0", ($options['precision']), "0");
+            }
+        }
+
+        if ($options['precision'] === null) {
+            if (isset($precstr)) {
+                $options['precision'] = iconv_strlen($precstr);
+            } else {
+                $options['precision'] = 0;
+            }
+        }
+
+        // get fraction and format lengths
+        if (strpos($value, '.') !== false) {
+            $number = substr((string) $value, 0, strpos($value, '.'));
+        } else {
+            $number = $value;
+        }
+
+        $prec = call_user_func(Zend_Locale_Math::$sub, $value, $number, $options['precision']);
+        $prec = Zend_Locale_Math::floatalize($prec);
+        $prec = Zend_Locale_Math::normalize($prec);
+        if (iconv_strpos($prec, '-') !== false) {
+            $prec = iconv_substr($prec, 1);
+        }
+
+        if (($prec == 0) and ($options['precision'] > 0)) {
+            $prec = "0.0";
+        }
+
+        if (($options['precision'] + 2) > iconv_strlen($prec)) {
+            $prec = str_pad((string) $prec, $options['precision'] + 2, "0", STR_PAD_RIGHT);
+        }
+
+        if (iconv_strpos($number, '-') !== false) {
+            $number = iconv_substr($number, 1);
+        }
+        $group  = iconv_strrpos($format, ',');
+        $group2 = iconv_strpos ($format, ',');
+        $point  = iconv_strpos ($format, '0');
+        // Add fraction
+        $rest = "";
+        if (iconv_strpos($format, '.')) {
+            $rest   = iconv_substr($format, iconv_strpos($format, '.') + 1);
+            $length = iconv_strlen($rest);
+            for($x = 0; $x < $length; ++$x) {
+                if (($rest[0] == '0') || ($rest[0] == '#')) {
+                    $rest = iconv_substr($rest, 1);
+                }
+            }
+            $format = iconv_substr($format, 0, iconv_strlen($format) - iconv_strlen($rest));
+        }
+
+        if ($options['precision'] == '0') {
+            if (iconv_strrpos($format, '-') != 0) {
+                $format = iconv_substr($format, 0, $point)
+                        . iconv_substr($format, iconv_strrpos($format, '#') + 2);
+            } else {
+                $format = iconv_substr($format, 0, $point);
+            }
+        } else {
+            $format = iconv_substr($format, 0, $point) . $symbols['decimal']
+                               . iconv_substr($prec, 2);
+        }
+
+        $format .= $rest;
+        // Add seperation
+        if ($group == 0) {
+            // no seperation
+            $format = $number . iconv_substr($format, $point);
+        } else if ($group == $group2) {
+            // only 1 seperation
+            $seperation = ($point - $group);
+            for ($x = iconv_strlen($number); $x > $seperation; $x -= $seperation) {
+                if (iconv_substr($number, 0, $x - $seperation) !== "") {
+                    $number = iconv_substr($number, 0, $x - $seperation) . $symbols['group']
+                            . iconv_substr($number, $x - $seperation);
+                }
+            }
+            $format = iconv_substr($format, 0, iconv_strpos($format, '#')) . $number . iconv_substr($format, $point);
+        } else {
+
+            // 2 seperations
+            if (iconv_strlen($number) > ($point - $group)) {
+                $seperation = ($point - $group);
+                $number = iconv_substr($number, 0, iconv_strlen($number) - $seperation) . $symbols['group']
+                        . iconv_substr($number, iconv_strlen($number) - $seperation);
+
+                if ((iconv_strlen($number) - 1) > ($point - $group + 1)) {
+                    $seperation2 = ($group - $group2 - 1);
+                    for ($x = iconv_strlen($number) - $seperation2 - 2; $x > $seperation2; $x -= $seperation2) {
+                        $number = iconv_substr($number, 0, $x - $seperation2) . $symbols['group']
+                                . iconv_substr($number, $x - $seperation2);
+                    }
+                }
+
+            }
+            $format = iconv_substr($format, 0, iconv_strpos($format, '#')) . $number . iconv_substr($format, $point);
+        }
+        // set negative sign
+        if (call_user_func(Zend_Locale_Math::$comp, $value, 0, $options['precision']) < 0) {
+            if (iconv_strpos($format, '-') === false) {
+                $format = $symbols['minus'] . $format;
+            } else {
+                $format = str_replace('-', $symbols['minus'], $format);
+            }
+        }
+
+        self::_setEncoding($oenc);
+        return (string) $format;
+    }
+
+    /**
+     * @param string $format
+     * @param string $value
+     * @param int $precision
+     * @return string
+     */
+    private static function _seperateFormat($format, $value, $precision)
+    {
+        if (iconv_strpos($format, ';') !== false) {
+            if (call_user_func(Zend_Locale_Math::$comp, $value, 0, $precision) < 0) {
+                $tmpformat = iconv_substr($format, iconv_strpos($format, ';') + 1);
+                if ($tmpformat[0] == '(') {
+                    $format = iconv_substr($format, 0, iconv_strpos($format, ';'));
+                } else {
+                    $format = $tmpformat;
+                }
+            } else {
+                $format = iconv_substr($format, 0, iconv_strpos($format, ';'));
+            }
+        }
+
+        return $format;
+    }
+
+
+    /**
+     * Checks if the input contains a normalized or localized number
+     *
+     * @param   string  $input    Localized number string
+     * @param   array   $options  Options: locale. See {@link setOptions()} for details.
+     * @return  boolean           Returns true if a number was found
+     */
+    public static function isNumber($input, array $options = array())
+    {
+        if (!self::_getUniCodeSupport()) {
+            trigger_error("Sorry, your PCRE extension does not support UTF8 which is needed for the I18N core", E_USER_NOTICE);
+        }
+
+        $options = self::_checkOptions($options) + self::$_options;
+
+        // Get correct signs for this locale
+        $symbols = Zend_Locale_Data::getList($options['locale'],'symbols');
+
+        $regexs = Zend_Locale_Format::_getRegexForType('decimalnumber', $options);
+        $regexs = array_merge($regexs, Zend_Locale_Format::_getRegexForType('scientificnumber', $options));
+        if (!empty($input) && ($input[0] == $symbols['decimal'])) {
+            $input = 0 . $input;
+        }
+        foreach ($regexs as $regex) {
+            preg_match($regex, $input, $found);
+            if (isset($found[0])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Internal method to convert cldr number syntax into regex
+     *
+     * @param  string $type
+     * @param  array  $options Options: locale. See {@link setOptions()} for details.
+     * @return string
+     * @throws Zend_Locale_Exception
+     */
+    private static function _getRegexForType($type, $options)
+    {
+        $decimal  = Zend_Locale_Data::getContent($options['locale'], $type);
+        $decimal  = preg_replace('/[^#0,;\.\-Ee]/u', '',$decimal);
+        $patterns = explode(';', $decimal);
+
+        if (count($patterns) == 1) {
+            $patterns[1] = '-' . $patterns[0];
+        }
+
+        $symbols = Zend_Locale_Data::getList($options['locale'],'symbols');
+
+        foreach($patterns as $pkey => $pattern) {
+            $regex[$pkey]  = '/^';
+            $rest   = 0;
+            $end    = null;
+            if (strpos($pattern, '.') !== false) {
+                $end     = substr($pattern, strpos($pattern, '.') + 1);
+                $pattern = substr($pattern, 0, -strlen($end) - 1);
+            }
+
+            if (strpos($pattern, ',') !== false) {
+                $parts = explode(',', $pattern);
+                $count = count($parts);
+                foreach($parts as $key => $part) {
+                    switch ($part) {
+                        case '#':
+                        case '-#':
+                            if ($part[0] == '-') {
+                                $regex[$pkey] .= '[' . $symbols['minus'] . '-]{0,1}';
+                            } else {
+                                $regex[$pkey] .= '[' . $symbols['plus'] . '+]{0,1}';
+                            }
+
+                            if (($parts[$key + 1]) == '##0')  {
+                                $regex[$pkey] .= '[0-9]{1,3}';
+                            } else if (($parts[$key + 1]) == '##') {
+                                $regex[$pkey] .= '[0-9]{1,2}';
+                            } else {
+                                throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 1):"' . $pattern . '"');
+                            }
+                            break;
+                        case '##':
+                            if ($parts[$key + 1] == '##0') {
+                                $regex[$pkey] .=  '(\\' . $symbols['group'] . '{0,1}[0-9]{2})*';
+                            } else {
+                                throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 2):"' . $pattern . '"');
+                            }
+                            break;
+                        case '##0':
+                            if ($parts[$key - 1] == '##') {
+                                $regex[$pkey] .= '[0-9]';
+                            } else if (($parts[$key - 1] == '#') || ($parts[$key - 1] == '-#')) {
+                                $regex[$pkey] .= '(\\' . $symbols['group'] . '{0,1}[0-9]{3})*';
+                            } else {
+                                throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 3):"' . $pattern . '"');
+                            }
+                            break;
+                        case '#0':
+                            if ($key == 0) {
+                                $regex[$pkey] .= '[0-9]*';
+                            } else {
+                                throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 4):"' . $pattern . '"');
+                            }
+                            break;
+                    }
+                }
+            }
+
+            if (strpos($pattern, 'E') !== false) {
+                if (($pattern == '#E0') || ($pattern == '#E00')) {
+                    $regex[$pkey] .= '[' . $symbols['plus']. '+]{0,1}[0-9]{1,}(\\' . $symbols['decimal'] . '[0-9]{1,})*[eE][' . $symbols['plus']. '+]{0,1}[0-9]{1,}';
+                } else if (($pattern == '-#E0') || ($pattern == '-#E00')) {
+                    $regex[$pkey] .= '[' . $symbols['minus']. '-]{0,1}[0-9]{1,}(\\' . $symbols['decimal'] . '[0-9]{1,})*[eE][' . $symbols['minus']. '-]{0,1}[0-9]{1,}';
+                } else {
+                    throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 5):"' . $pattern . '"');
+                }
+            }
+
+            if (!empty($end)) {
+                if ($end == '###') {
+                    $regex[$pkey] .= '(\\' . $symbols['decimal'] . '{1}[0-9]{1,}){0,1}';
+                } else if ($end == '###-') {
+                    $regex[$pkey] .= '(\\' . $symbols['decimal'] . '{1}[0-9]{1,}){0,1}[' . $symbols['minus']. '-]';
+                } else {
+                    throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 6):"' . $pattern . '"');
+                }
+            }
+
+            $regex[$pkey] .= '$/u';
+        }
+
+        return $regex;
+    }
+
+    /**
+     * Alias for getNumber
+     *
+     * @param   string  $input    Number to localize
+     * @param   array   $options  Options: locale, precision. See {@link setOptions()} for details.
+     * @return  float
+     */
+    public static function getFloat($input, array $options = array())
+    {
+        return floatval(self::getNumber($input, $options));
+    }
+
+    /**
+     * Returns a locale formatted integer number
+     * Alias for toNumber()
+     *
+     * @param   string  $value    Number to normalize
+     * @param   array   $options  Options: locale, precision. See {@link setOptions()} for details.
+     * @return  string  Locale formatted number
+     */
+    public static function toFloat($value, array $options = array())
+    {
+        $options['number_format'] = Zend_Locale_Format::STANDARD;
+        return self::toNumber($value, $options);
+    }
+
+    /**
+     * Returns if a float was found
+     * Alias for isNumber()
+     *
+     * @param   string $value  Localized number string
+     * @param   array $options Options: locale. See {@link setOptions()} for details.
+     * @return  boolean        Returns true if a number was found
+     */
+    public static function isFloat($value, array $options = array())
+    {
+        return self::isNumber($value, $options);
+    }
+
+    /**
+     * Returns the first found integer from an string
+     * Parsing depends on given locale (grouping and decimal)
+     *
+     * Examples for input:
+     * '  2345.4356,1234' = 23455456
+     * '+23,3452.123' = 233452
+     * ' 12343 ' = 12343
+     * '-9456km' = -9456
+     * '0' = 0
+     * '(-){0,1}(\d+(\.){0,1})*(\,){0,1})\d+'
+     *
+     * @param   string   $input    Input string to parse for numbers
+     * @param   array    $options  Options: locale. See {@link setOptions()} for details.
+     * @return  integer            Returns the extracted number
+     */
+    public static function getInteger($input, array $options = array())
+    {
+        $options['precision'] = 0;
+        return intval(self::getFloat($input, $options));
+    }
+
+    /**
+     * Returns a localized number
+     *
+     * @param   string  $value    Number to normalize
+     * @param   array   $options  Options: locale. See {@link setOptions()} for details.
+     * @return  string            Locale formatted number
+     */
+    public static function toInteger($value, array $options = array())
+    {
+        $options['precision'] = 0;
+        $options['number_format'] = Zend_Locale_Format::STANDARD;
+        return self::toNumber($value, $options);
+    }
+
+    /**
+     * Returns if a integer was found
+     *
+     * @param  string $value Localized number string
+     * @param  array $options Options: locale. See {@link setOptions()} for details.
+     * @return boolean Returns true if a integer was found
+     */
+    public static function isInteger($value, array $options = array())
+    {
+        if (!self::isNumber($value, $options)) {
+            return false;
+        }
+
+        if (self::getInteger($value, $options) == self::getFloat($value, $options)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Converts a format string from PHP's date format to ISO format
+     * Remember that Zend Date always returns localized string, so a month name which returns the english
+     * month in php's date() will return the translated month name with this function... use 'en' as locale
+     * if you are in need of the original english names
+     *
+     * The conversion has the following restrictions:
+     * 'a', 'A' - Meridiem is not explicit upper/lowercase, you have to upper/lowercase the translated value yourself
+     *
+     * @param  string  $format  Format string in PHP's date format
+     * @return string           Format string in ISO format
+     */
+    public static function convertPhpToIsoFormat($format)
+    {
+        if ($format === null) {
+            return null;
+        }
+
+        $convert = array(
+            'd' => 'dd'  , 'D' => 'EE'  , 'j' => 'd'   , 'l' => 'EEEE',
+            'N' => 'eee' , 'S' => 'SS'  , 'w' => 'e'   , 'z' => 'D'   ,
+            'W' => 'ww'  , 'F' => 'MMMM', 'm' => 'MM'  , 'M' => 'MMM' ,
+            'n' => 'M'   , 't' => 'ddd' , 'L' => 'l'   , 'o' => 'YYYY',
+            'Y' => 'yyyy', 'y' => 'yy'  , 'a' => 'a'   , 'A' => 'a'   ,
+            'B' => 'B'   , 'g' => 'h'   , 'G' => 'H'   , 'h' => 'hh'  ,
+            'H' => 'HH'  , 'i' => 'mm'  , 's' => 'ss'  , 'e' => 'zzzz',
+            'I' => 'I'   , 'O' => 'Z'   , 'P' => 'ZZZZ', 'T' => 'z'   ,
+            'Z' => 'X'   , 'c' => 'yyyy-MM-ddTHH:mm:ssZZZZ', 'r' => 'r',
+            'U' => 'U',
+        );
+        $escaped = false;
+        $inEscapedString = false;
+        $converted = array();
+        foreach (str_split($format) as $char) {
+            if (!$escaped && $char == '\\') {
+                // Next char will be escaped: let's remember it
+                $escaped = true;
+            } elseif ($escaped) {
+                if (!$inEscapedString) {
+                    // First escaped string: start the quoted chunk
+                    $converted[] = "'";
+                    $inEscapedString = true;
+                }
+                // Since the previous char was a \ and we are in the quoted
+                // chunk, let's simply add $char as it is
+                $converted[] = $char;
+                $escaped = false;
+            } elseif ($char == "'") {
+                // Single quotes need to be escaped like this
+                $converted[] = "''";
+            } else {
+                if ($inEscapedString) {
+                    // Close the single-quoted chunk
+                    $converted[] = "'";
+                    $inEscapedString = false;
+                }
+                // Convert the unescaped char if needed
+                if (isset($convert[$char])) {
+                    $converted[] = $convert[$char];
+                } else {
+                    $converted[] = $char;
+                }
+            }
+        }
+
+        return implode($converted);
+    }
+
+    /**
+     * Parse date and split in named array fields
+     *
+     * @param  string $date    Date string to parse
+     * @param  array  $options Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
+     * @return array Possible array members: day, month, year, hour, minute, second, fixed, format
+     * @throws Zend_Locale_Exception
+     */
+    private static function _parseDate($date, $options)
+    {
+        if (!self::_getUniCodeSupport()) {
+            trigger_error("Sorry, your PCRE extension does not support UTF8 which is needed for the I18N core", E_USER_NOTICE);
+        }
+
+        $options = self::_checkOptions($options) + self::$_options;
+        $test = array('h', 'H', 'm', 's', 'y', 'Y', 'M', 'd', 'D', 'E', 'S', 'l', 'B', 'I',
+                       'X', 'r', 'U', 'G', 'w', 'e', 'a', 'A', 'Z', 'z', 'v');
+
+        $format = $options['date_format'];
+        $number = $date; // working copy
+        $result['date_format'] = $format; // save the format used to normalize $number (convenience)
+        $result['locale'] = $options['locale']; // save the locale used to normalize $number (convenience)
+
+        $oenc = self::_getEncoding();
+        self::_setEncoding('UTF-8');
+        $day   = iconv_strpos($format, 'd');
+        $month = iconv_strpos($format, 'M');
+        $year  = iconv_strpos($format, 'y');
+        $hour  = iconv_strpos($format, 'H');
+        $min   = iconv_strpos($format, 'm');
+        $sec   = iconv_strpos($format, 's');
+        $am    = null;
+        if ($hour === false) {
+            $hour = iconv_strpos($format, 'h');
+        }
+        if ($year === false) {
+            $year = iconv_strpos($format, 'Y');
+        }
+        if ($day === false) {
+            $day = iconv_strpos($format, 'E');
+            if ($day === false) {
+                $day = iconv_strpos($format, 'D');
+            }
+        }
+
+        if ($day !== false) {
+            $parse[$day]   = 'd';
+            if (!empty($options['locale']) && ($options['locale'] !== 'root') &&
+                (!is_object($options['locale']) || ((string) $options['locale'] !== 'root'))) {
+                // erase day string
+                    $daylist = Zend_Locale_Data::getList($options['locale'], 'day');
+                foreach($daylist as $key => $name) {
+                    if (iconv_strpos($number, $name) !== false) {
+                        $number = str_replace($name, "EEEE", $number);
+                        break;
+                    }
+                }
+            }
+        }
+        $position = false;
+
+        if ($month !== false) {
+            $parse[$month] = 'M';
+            if (!empty($options['locale']) && ($options['locale'] !== 'root') &&
+                (!is_object($options['locale']) || ((string) $options['locale'] !== 'root'))) {
+                    // prepare to convert month name to their numeric equivalents, if requested,
+                    // and we have a $options['locale']
+                    $position = self::_replaceMonth($number, Zend_Locale_Data::getList($options['locale'],
+                        'month'));
+                if ($position === false) {
+                    $position = self::_replaceMonth($number, Zend_Locale_Data::getList($options['locale'],
+                        'month', array('gregorian', 'format', 'abbreviated')));
+                }
+            }
+        }
+        if ($year !== false) {
+            $parse[$year]  = 'y';
+        }
+        if ($hour !== false) {
+            $parse[$hour] = 'H';
+        }
+        if ($min !== false) {
+            $parse[$min] = 'm';
+        }
+        if ($sec !== false) {
+            $parse[$sec] = 's';
+        }
+
+        if (empty($parse)) {
+            self::_setEncoding($oenc);
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception("Unknown date format, neither date nor time in '" . $format . "' found");
+        }
+        ksort($parse);
+
+        // get daytime
+        if (iconv_strpos($format, 'a') !== false) {
+            if (iconv_strpos(strtoupper($number), strtoupper(Zend_Locale_Data::getContent($options['locale'], 'am'))) !== false) {
+                $am = true;
+            } else if (iconv_strpos(strtoupper($number), strtoupper(Zend_Locale_Data::getContent($options['locale'], 'pm'))) !== false) {
+                $am = false;
+            }
+        }
+
+        // split number parts
+        $split = false;
+        preg_match_all('/\d+/u', $number, $splitted);
+
+        if (count($splitted[0]) == 0) {
+            self::_setEncoding($oenc);
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception("No date part in '$date' found.");
+        }
+        if (count($splitted[0]) == 1) {
+            $split = 0;
+        }
+        $cnt = 0;
+        foreach($parse as $key => $value) {
+
+            switch($value) {
+                case 'd':
+                    if ($split === false) {
+                        if (count($splitted[0]) > $cnt) {
+                            $result['day']    = $splitted[0][$cnt];
+                        }
+                    } else {
+                        $result['day'] = iconv_substr($splitted[0][0], $split, 2);
+                        $split += 2;
+                    }
+                    ++$cnt;
+                    break;
+                case 'M':
+                    if ($split === false) {
+                        if (count($splitted[0]) > $cnt) {
+                            $result['month']  = $splitted[0][$cnt];
+                        }
+                    } else {
+                        $result['month'] = iconv_substr($splitted[0][0], $split, 2);
+                        $split += 2;
+                    }
+                    ++$cnt;
+                    break;
+                case 'y':
+                    $length = 2;
+                    if ((iconv_substr($format, $year, 4) == 'yyyy')
+                     || (iconv_substr($format, $year, 4) == 'YYYY')) {
+                        $length = 4;
+                    }
+
+                    if ($split === false) {
+                        if (count($splitted[0]) > $cnt) {
+                            $result['year']   = $splitted[0][$cnt];
+                        }
+                    } else {
+                        $result['year']   = iconv_substr($splitted[0][0], $split, $length);
+                        $split += $length;
+                    }
+
+                    ++$cnt;
+                    break;
+                case 'H':
+                    if ($split === false) {
+                        if (count($splitted[0]) > $cnt) {
+                            $result['hour']   = $splitted[0][$cnt];
+                        }
+                    } else {
+                        $result['hour']   = iconv_substr($splitted[0][0], $split, 2);
+                        $split += 2;
+                    }
+                    ++$cnt;
+                    break;
+                case 'm':
+                    if ($split === false) {
+                        if (count($splitted[0]) > $cnt) {
+                            $result['minute'] = $splitted[0][$cnt];
+                        }
+                    } else {
+                        $result['minute'] = iconv_substr($splitted[0][0], $split, 2);
+                        $split += 2;
+                    }
+                    ++$cnt;
+                    break;
+                case 's':
+                    if ($split === false) {
+                        if (count($splitted[0]) > $cnt) {
+                            $result['second'] = $splitted[0][$cnt];
+                        }
+                    } else {
+                        $result['second'] = iconv_substr($splitted[0][0], $split, 2);
+                        $split += 2;
+                    }
+                    ++$cnt;
+                    break;
+            }
+        }
+
+        // AM/PM correction
+        if ($hour !== false) {
+            if (($am === true) and ($result['hour'] == 12)){
+                $result['hour'] = 0;
+            } else if (($am === false) and ($result['hour'] != 12)) {
+                $result['hour'] += 12;
+            }
+        }
+
+        if ($options['fix_date'] === true) {
+            $result['fixed'] = 0; // nothing has been "fixed" by swapping date parts around (yet)
+        }
+
+        if ($day !== false) {
+            // fix false month
+            if (isset($result['day']) and isset($result['month'])) {
+                if (($position !== false) and ((iconv_strpos($date, $result['day']) === false) or
+                                               (isset($result['year']) and (iconv_strpos($date, $result['year']) === false)))) {
+                    if ($options['fix_date'] !== true) {
+                        self::_setEncoding($oenc);
+                        require_once 'Zend/Locale/Exception.php';
+                        throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format
+                            . "' (false month, $position, $month)");
+                    }
+                    $temp = $result['day'];
+                    $result['day']   = $result['month'];
+                    $result['month'] = $temp;
+                    $result['fixed'] = 1;
+                }
+            }
+
+            // fix switched values d <> y
+            if (isset($result['day']) and isset($result['year'])) {
+                if ($result['day'] > 31) {
+                    if ($options['fix_date'] !== true) {
+                        self::_setEncoding($oenc);
+                        require_once 'Zend/Locale/Exception.php';
+                        throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
+                                                      . $format . "' (d <> y)");
+                    }
+                    $temp = $result['year'];
+                    $result['year'] = $result['day'];
+                    $result['day']  = $temp;
+                    $result['fixed'] = 2;
+                }
+            }
+
+            // fix switched values M <> y
+            if (isset($result['month']) and isset($result['year'])) {
+                if ($result['month'] > 31) {
+                    if ($options['fix_date'] !== true) {
+                        self::_setEncoding($oenc);
+                        require_once 'Zend/Locale/Exception.php';
+                        throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
+                                                      . $format . "' (M <> y)");
+                    }
+                    $temp = $result['year'];
+                    $result['year']  = $result['month'];
+                    $result['month'] = $temp;
+                    $result['fixed'] = 3;
+                }
+            }
+
+            // fix switched values M <> d
+            if (isset($result['month']) and isset($result['day'])) {
+                if ($result['month'] > 12) {
+                    if ($options['fix_date'] !== true || $result['month'] > 31) {
+                        self::_setEncoding($oenc);
+                        require_once 'Zend/Locale/Exception.php';
+                        throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
+                                                      . $format . "' (M <> d)");
+                    }
+                    $temp = $result['day'];
+                    $result['day']   = $result['month'];
+                    $result['month'] = $temp;
+                    $result['fixed'] = 4;
+                }
+            }
+        }
+
+        if (isset($result['year'])) {
+            if (((iconv_strlen($result['year']) == 2) && ($result['year'] < 10)) ||
+                (((iconv_strpos($format, 'yy') !== false) && (iconv_strpos($format, 'yyyy') === false)) ||
+                ((iconv_strpos($format, 'YY') !== false) && (iconv_strpos($format, 'YYYY') === false)))) {
+                if (($result['year'] >= 0) && ($result['year'] < 100)) {
+                    if ($result['year'] < 70) {
+                        $result['year'] = (int) $result['year'] + 100;
+                    }
+
+                    $result['year'] = (int) $result['year'] + 1900;
+                }
+            }
+        }
+
+        self::_setEncoding($oenc);
+        return $result;
+    }
+
+    /**
+     * Search $number for a month name found in $monthlist, and replace if found.
+     *
+     * @param  string  $number     Date string (modified)
+     * @param  array   $monthlist  List of month names
+     *
+     * @return int|false           Position of replaced string (false if nothing replaced)
+     */
+    protected static function _replaceMonth(&$number, $monthlist)
+    {
+        // If $locale was invalid, $monthlist will default to a "root" identity
+        // mapping for each month number from 1 to 12.
+        // If no $locale was given, or $locale was invalid, do not use this identity mapping to normalize.
+        // Otherwise, translate locale aware month names in $number to their numeric equivalents.
+        $position = false;
+        if ($monthlist && $monthlist[1] != 1) {
+            foreach($monthlist as $key => $name) {
+                if (($position = iconv_strpos($number, $name, 0, 'UTF-8')) !== false) {
+                    $number   = str_ireplace($name, $key, $number);
+                    return $position;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the default date format for $locale.
+     *
+     * @param  string|Zend_Locale  $locale  OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
+     * @return string  format
+     * @throws Zend_Locale_Exception  throws an exception when locale data is broken
+     */
+    public static function getDateFormat($locale = null)
+    {
+        $format = Zend_Locale_Data::getContent($locale, 'date');
+        if (empty($format)) {
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception("failed to receive data from locale $locale");
+        }
+
+        return $format;
+    }
+
+    /**
+     * Returns an array with the normalized date from an locale date
+     * a input of 10.01.2006 without a $locale would return:
+     * array ('day' => 10, 'month' => 1, 'year' => 2006)
+     * The 'locale' option is only used to convert human readable day
+     * and month names to their numeric equivalents.
+     * The 'format' option allows specification of self-defined date formats,
+     * when not using the default format for the 'locale'.
+     *
+     * @param   string  $date     Date string
+     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
+     * @return  array             Possible array members: day, month, year, hour, minute, second, fixed, format
+     */
+    public static function getDate($date, array $options = array())
+    {
+        $options = self::_checkOptions($options) + self::$_options;
+        if (empty($options['date_format'])) {
+            $options['format_type'] = 'iso';
+            $options['date_format'] = self::getDateFormat($options['locale']);
+        }
+
+        return self::_parseDate($date, $options);
+    }
+
+    /**
+     * Returns if the given datestring contains all date parts from the given format.
+     * If no format is given, the default date format from the locale is used
+     * If you want to check if the date is a proper date you should use Zend_Date::isDate()
+     *
+     * @param   string  $date     Date string
+     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
+     * @return  boolean
+     */
+    public static function checkDateFormat($date, array $options = array())
+    {
+        try {
+            $date = self::getDate($date, $options);
+        } catch (Exception $e) {
+            return false;
+        }
+
+        if (empty($options['date_format'])) {
+            $options['format_type'] = 'iso';
+            $options['date_format'] = self::getDateFormat(isset($options['locale']) ? $options['locale'] : null);
+        }
+        $options = self::_checkOptions($options) + self::$_options;
+
+        // day expected but not parsed
+        if ((iconv_strpos($options['date_format'], 'd', 0, 'UTF-8') !== false) and (!isset($date['day']) or ($date['day'] === ""))) {
+            return false;
+        }
+
+        // month expected but not parsed
+        if ((iconv_strpos($options['date_format'], 'M', 0, 'UTF-8') !== false) and (!isset($date['month']) or ($date['month'] === ""))) {
+            return false;
+        }
+
+        // year expected but not parsed
+        if (((iconv_strpos($options['date_format'], 'Y', 0, 'UTF-8') !== false) or
+             (iconv_strpos($options['date_format'], 'y', 0, 'UTF-8') !== false)) and (!isset($date['year']) or ($date['year'] === ""))) {
+            return false;
+        }
+
+        // second expected but not parsed
+        if ((iconv_strpos($options['date_format'], 's', 0, 'UTF-8') !== false) and (!isset($date['second']) or ($date['second'] === ""))) {
+            return false;
+        }
+
+        // minute expected but not parsed
+        if ((iconv_strpos($options['date_format'], 'm', 0, 'UTF-8') !== false) and (!isset($date['minute']) or ($date['minute'] === ""))) {
+            return false;
+        }
+
+        // hour expected but not parsed
+        if (((iconv_strpos($options['date_format'], 'H', 0, 'UTF-8') !== false) or
+             (iconv_strpos($options['date_format'], 'h', 0, 'UTF-8') !== false)) and (!isset($date['hour']) or ($date['hour'] === ""))) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the default time format for $locale.
+     *
+     * @param  string|Zend_Locale $locale OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
+     * @return string  format
+     * @throws Zend_Locale_Exception
+     */
+    public static function getTimeFormat($locale = null)
+    {
+        $format = Zend_Locale_Data::getContent($locale, 'time');
+        if (empty($format)) {
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception("failed to receive data from locale $locale");
+        }
+        return $format;
+    }
+
+    /**
+     * Returns an array with 'hour', 'minute', and 'second' elements extracted from $time
+     * according to the order described in $format.  For a format of 'H:i:s', and
+     * an input of 11:20:55, getTime() would return:
+     * array ('hour' => 11, 'minute' => 20, 'second' => 55)
+     * The optional $locale parameter may be used to help extract times from strings
+     * containing both a time and a day or month name.
+     *
+     * @param   string  $time     Time string
+     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
+     * @return  array             Possible array members: day, month, year, hour, minute, second, fixed, format
+     */
+    public static function getTime($time, array $options = array())
+    {
+        $options = self::_checkOptions($options) + self::$_options;
+        if (empty($options['date_format'])) {
+            $options['format_type'] = 'iso';
+            $options['date_format'] = self::getTimeFormat($options['locale']);
+        }
+        return self::_parseDate($time, $options);
+    }
+
+    /**
+     * Returns the default datetime format for $locale.
+     *
+     * @param  string|Zend_Locale $locale OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
+     * @return string  format
+     * @throws Zend_Locale_Exception
+     */
+    public static function getDateTimeFormat($locale = null)
+    {
+        $format = Zend_Locale_Data::getContent($locale, 'datetime');
+        if (empty($format)) {
+            require_once 'Zend/Locale/Exception.php';
+            throw new Zend_Locale_Exception("failed to receive data from locale $locale");
+        }
+        return $format;
+    }
+
+    /**
+     * Returns an array with 'year', 'month', 'day', 'hour', 'minute', and 'second' elements
+     * extracted from $datetime according to the order described in $format.  For a format of 'd.M.y H:i:s',
+     * and an input of 10.05.1985 11:20:55, getDateTime() would return:
+     * array ('year' => 1985, 'month' => 5, 'day' => 10, 'hour' => 11, 'minute' => 20, 'second' => 55)
+     * The optional $locale parameter may be used to help extract times from strings
+     * containing both a time and a day or month name.
+     *
+     * @param   string  $datetime DateTime string
+     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
+     * @return  array             Possible array members: day, month, year, hour, minute, second, fixed, format
+     */
+    public static function getDateTime($datetime, array $options = array())
+    {
+        $options = self::_checkOptions($options) + self::$_options;
+        if (empty($options['date_format'])) {
+            $options['format_type'] = 'iso';
+            $options['date_format'] = self::getDateTimeFormat($options['locale']);
+        }
+        return self::_parseDate($datetime, $options);
+    }
+
+    /**
+     * Internal method to detect of Unicode supports UTF8
+     * which should be enabled within vanilla php installations
+     *
+     * @return boolean
+     */
+    protected static function _getUniCodeSupport()
+    {
+        return (@preg_match('/\pL/u', 'a')) ? true : false;
+    }
+
+    /**
+     * Internal method to retrieve the current encoding via the ini setting
+     * default_charset for PHP >= 5.6 or iconv_get_encoding otherwise.
+     *
+     * @return string
+     */
+    protected static function _getEncoding()
+    {
+        $oenc = PHP_VERSION_ID < 50600
+            ? iconv_get_encoding('internal_encoding')
+            : ini_get('default_charset');
+
+        return $oenc;
+    }
+
+    /**
+     * Internal method to set the encoding via the ini setting
+     * default_charset for PHP >= 5.6 or iconv_set_encoding otherwise.
+     *
+     * @param string $encoding
+     * @return void
+     */
+    protected static function _setEncoding($encoding)
+    {
+        if (PHP_VERSION_ID < 50600) {
+            iconv_set_encoding('internal_encoding', $encoding);
+        } else {
+            ini_set('default_charset', $encoding);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Locale/Math.php b/lib/zend/Zend/Locale/Math.php
new file mode 100644
index 00000000000..91e1905d8a6
--- /dev/null
+++ b/lib/zend/Zend/Locale/Math.php
@@ -0,0 +1,355 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Utility class for proxying math function to bcmath functions, if present,
+ * otherwise to PHP builtin math operators, with limited detection of overflow conditions.
+ * Sampling of PHP environments and platforms suggests that at least 80% to 90% support bcmath.
+ * Thus, this file should be as light as possible.
+ *
+ * @category   Zend
+ * @package    Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+class Zend_Locale_Math
+{
+    // support unit testing without using bcmath functions
+    public static $_bcmathDisabled = false;
+
+    public static $add   = array('Zend_Locale_Math', 'Add');
+    public static $sub   = array('Zend_Locale_Math', 'Sub');
+    public static $pow   = array('Zend_Locale_Math', 'Pow');
+    public static $mul   = array('Zend_Locale_Math', 'Mul');
+    public static $div   = array('Zend_Locale_Math', 'Div');
+    public static $comp  = array('Zend_Locale_Math', 'Comp');
+    public static $sqrt  = array('Zend_Locale_Math', 'Sqrt');
+    public static $mod   = array('Zend_Locale_Math', 'Mod');
+    public static $scale = 'bcscale';
+
+    public static function isBcmathDisabled()
+    {
+        return self::$_bcmathDisabled;
+    }
+
+    /**
+     * Surprisingly, the results of this implementation of round()
+     * prove better than the native PHP round(). For example, try:
+     *   round(639.795, 2);
+     *   round(267.835, 2);
+     *   round(0.302515, 5);
+     *   round(0.36665, 4);
+     * then try:
+     *   Zend_Locale_Math::round('639.795', 2);
+     */
+    public static function round($op1, $precision = 0)
+    {
+        if (self::$_bcmathDisabled) {
+            $op1 = round($op1, $precision);
+            if (strpos((string) $op1, 'E') === false) {
+                return self::normalize(round($op1, $precision));
+            }
+        }
+
+        if (strpos($op1, 'E') !== false) {
+            $op1 = self::floatalize($op1);
+        }
+
+        $op1    = trim(self::normalize($op1));
+        $length = strlen($op1);
+        if (($decPos = strpos($op1, '.')) === false) {
+            $op1 .= '.0';
+            $decPos = $length;
+            $length += 2;
+        }
+        if ($precision < 0 && abs($precision) > $decPos) {
+            return '0';
+        }
+
+        $digitsBeforeDot = $length - ($decPos + 1);
+        if ($precision >= ($length - ($decPos + 1))) {
+            return $op1;
+        }
+
+        if ($precision === 0) {
+            $triggerPos = 1;
+            $roundPos   = -1;
+        } elseif ($precision > 0) {
+            $triggerPos = $precision + 1;
+            $roundPos   = $precision;
+        } else {
+            $triggerPos = $precision;
+            $roundPos   = $precision -1;
+        }
+
+        $triggerDigit = $op1[$triggerPos + $decPos];
+        if ($precision < 0) {
+            // zero fill digits to the left of the decimal place
+            $op1 = substr($op1, 0, $decPos + $precision) . str_pad('', abs($precision), '0');
+        }
+
+        if ($triggerDigit >= '5') {
+            if ($roundPos + $decPos == -1) {
+                return str_pad('1', $decPos + 1, '0');
+            }
+
+            $roundUp = str_pad('', $length, '0');
+            $roundUp[$decPos] = '.';
+            $roundUp[$roundPos + $decPos] = '1';
+
+            if ($op1 > 0) {
+                if (self::$_bcmathDisabled) {
+                    return Zend_Locale_Math_PhpMath::Add($op1, $roundUp, $precision);
+                }
+                return self::Add($op1, $roundUp, $precision);
+            } else {
+                if (self::$_bcmathDisabled) {
+                    return Zend_Locale_Math_PhpMath::Sub($op1, $roundUp, $precision);
+                }
+                return self::Sub($op1, $roundUp, $precision);
+            }
+        } elseif ($precision >= 0) {
+            return substr($op1, 0, $decPos + ($precision ? $precision + 1: 0));
+        }
+
+        return (string) $op1;
+    }
+
+    /**
+     * Convert a scientific notation to float
+     * Additionally fixed a problem with PHP <= 5.2.x with big integers
+     *
+     * @param string $value
+     */
+    public static function floatalize($value)
+    {
+        $value = strtoupper($value);
+        if (strpos($value, 'E') === false) {
+            return $value;
+        }
+
+        $number = substr($value, 0, strpos($value, 'E'));
+        if (strpos($number, '.') !== false) {
+            $post   = strlen(substr($number, strpos($number, '.') + 1));
+            $mantis = substr($value, strpos($value, 'E') + 1);
+            if ($mantis < 0) {
+                $post += abs((int) $mantis);
+            }
+
+            $value = number_format($value, $post, '.', '');
+        } else {
+            $value = number_format($value, 0, '.', '');
+        }
+
+        return $value;
+    }
+
+    /**
+     * Normalizes an input to standard english notation
+     * Fixes a problem of BCMath with setLocale which is PHP related
+     *
+     * @param   integer  $value  Value to normalize
+     * @return  string           Normalized string without BCMath problems
+     */
+    public static function normalize($value)
+    {
+        $convert = localeconv();
+        $value = str_replace($convert['thousands_sep'], "",(string) $value);
+        $value = str_replace($convert['positive_sign'], "", $value);
+        $value = str_replace($convert['decimal_point'], ".",$value);
+        if (!empty($convert['negative_sign']) and (strpos($value, $convert['negative_sign']))) {
+            $value = str_replace($convert['negative_sign'], "", $value);
+            $value = "-" . $value;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Localizes an input from standard english notation
+     * Fixes a problem of BCMath with setLocale which is PHP related
+     *
+     * @param   integer  $value  Value to normalize
+     * @return  string           Normalized string without BCMath problems
+     */
+    public static function localize($value)
+    {
+        $convert = localeconv();
+        $value = str_replace(".", $convert['decimal_point'], (string) $value);
+        if (!empty($convert['negative_sign']) and (strpos($value, "-"))) {
+            $value = str_replace("-", $convert['negative_sign'], $value);
+        }
+        return $value;
+    }
+
+    /**
+     * Changes exponential numbers to plain string numbers
+     * Fixes a problem of BCMath with numbers containing exponents
+     *
+     * @param integer $value Value to erase the exponent
+     * @param integer $scale (Optional) Scale to use
+     * @return string
+     */
+    public static function exponent($value, $scale = null)
+    {
+        if (!extension_loaded('bcmath')) {
+            return $value;
+        }
+
+        $split = explode('e', $value);
+        if (count($split) == 1) {
+            $split = explode('E', $value);
+        }
+
+        if (count($split) > 1) {
+            $value = bcmul($split[0], bcpow(10, $split[1], $scale), $scale);
+        }
+
+        return $value;
+    }
+
+    /**
+     * BCAdd - fixes a problem of BCMath and exponential numbers
+     *
+     * @param  string  $op1
+     * @param  string  $op2
+     * @param  integer $scale
+     * @return string
+     */
+    public static function Add($op1, $op2, $scale = null)
+    {
+        $op1 = self::exponent($op1, $scale);
+        $op2 = self::exponent($op2, $scale);
+
+        return bcadd($op1, $op2, $scale);
+    }
+
+    /**
+     * BCSub - fixes a problem of BCMath and exponential numbers
+     *
+     * @param  string  $op1
+     * @param  string  $op2
+     * @param  integer $scale
+     * @return string
+     */
+    public static function Sub($op1, $op2, $scale = null)
+    {
+        $op1 = self::exponent($op1, $scale);
+        $op2 = self::exponent($op2, $scale);
+        return bcsub($op1, $op2, $scale);
+    }
+
+    /**
+     * BCPow - fixes a problem of BCMath and exponential numbers
+     *
+     * @param  string  $op1
+     * @param  string  $op2
+     * @param  integer $scale
+     * @return string
+     */
+    public static function Pow($op1, $op2, $scale = null)
+    {
+        $op1 = self::exponent($op1, $scale);
+        $op2 = self::exponent($op2, $scale);
+        return bcpow($op1, $op2, $scale);
+    }
+
+    /**
+     * BCMul - fixes a problem of BCMath and exponential numbers
+     *
+     * @param  string  $op1
+     * @param  string  $op2
+     * @param  integer $scale
+     * @return string
+     */
+    public static function Mul($op1, $op2, $scale = null)
+    {
+        $op1 = self::exponent($op1, $scale);
+        $op2 = self::exponent($op2, $scale);
+        return bcmul($op1, $op2, $scale);
+    }
+
+    /**
+     * BCDiv - fixes a problem of BCMath and exponential numbers
+     *
+     * @param  string  $op1
+     * @param  string  $op2
+     * @param  integer $scale
+     * @return string
+     */
+    public static function Div($op1, $op2, $scale = null)
+    {
+        $op1 = self::exponent($op1, $scale);
+        $op2 = self::exponent($op2, $scale);
+        return bcdiv($op1, $op2, $scale);
+    }
+
+    /**
+     * BCSqrt - fixes a problem of BCMath and exponential numbers
+     *
+     * @param  string  $op1
+     * @param  integer $scale
+     * @return string
+     */
+    public static function Sqrt($op1, $scale = null)
+    {
+        $op1 = self::exponent($op1, $scale);
+        return bcsqrt($op1, $scale);
+    }
+
+    /**
+     * BCMod - fixes a problem of BCMath and exponential numbers
+     *
+     * @param  string  $op1
+     * @param  string  $op2
+     * @return string
+     */
+    public static function Mod($op1, $op2)
+    {
+        $op1 = self::exponent($op1);
+        $op2 = self::exponent($op2);
+        return bcmod($op1, $op2);
+    }
+
+    /**
+     * BCComp - fixes a problem of BCMath and exponential numbers
+     *
+     * @param  string  $op1
+     * @param  string  $op2
+     * @param  integer $scale
+     * @return string
+     */
+    public static function Comp($op1, $op2, $scale = null)
+    {
+        $op1 = self::exponent($op1, $scale);
+        $op2 = self::exponent($op2, $scale);
+        return bccomp($op1, $op2, $scale);
+    }
+}
+
+if (!extension_loaded('bcmath')
+    || (defined('TESTS_ZEND_LOCALE_BCMATH_ENABLED') && !TESTS_ZEND_LOCALE_BCMATH_ENABLED)
+) {
+    require_once 'Zend/Locale/Math/PhpMath.php';
+    Zend_Locale_Math_PhpMath::disable();
+}
diff --git a/lib/zend/Zend/Locale/Math/Exception.php b/lib/zend/Zend/Locale/Math/Exception.php
new file mode 100644
index 00000000000..e065b189623
--- /dev/null
+++ b/lib/zend/Zend/Locale/Math/Exception.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+
+/**
+ * Zend_Exception
+ */
+require_once 'Zend/Locale/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Locale_Math_Exception extends Zend_Locale_Exception
+{
+    protected $op1 = null;
+    protected $op2 = null;
+    protected $result = null;
+
+    public function __construct($message, $op1 = null, $op2 = null, $result = null)
+    {
+        $this->op1 = $op1;
+        $this->op2 = $op2;
+        $this->result = $result;
+        parent::__construct($message);
+    }
+
+    public function getResults()
+    {
+        return array($this->op1, $this->op2, $this->result);
+    }
+}
diff --git a/lib/zend/Zend/Locale/Math/PhpMath.php b/lib/zend/Zend/Locale/Math/PhpMath.php
new file mode 100644
index 00000000000..c06f20d1f79
--- /dev/null
+++ b/lib/zend/Zend/Locale/Math/PhpMath.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Utility class for proxying math function to bcmath functions, if present,
+ * otherwise to PHP builtin math operators, with limited detection of overflow conditions.
+ * Sampling of PHP environments and platforms suggests that at least 80% to 90% support bcmath.
+ * This file should only be loaded for the 10% to 20% lacking access to the bcmath extension.
+ *
+ * @category   Zend
+ * @package    Zend_Locale
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Locale_Math_PhpMath extends Zend_Locale_Math
+{
+    public static function disable()
+    {
+        self::$_bcmathDisabled = true;
+        self::$add   = array('Zend_Locale_Math_PhpMath', 'Add');
+        self::$sub   = array('Zend_Locale_Math_PhpMath', 'Sub');
+        self::$pow   = array('Zend_Locale_Math_PhpMath', 'Pow');
+        self::$mul   = array('Zend_Locale_Math_PhpMath', 'Mul');
+        self::$div   = array('Zend_Locale_Math_PhpMath', 'Div');
+        self::$comp  = array('Zend_Locale_Math_PhpMath', 'Comp');
+        self::$sqrt  = array('Zend_Locale_Math_PhpMath', 'Sqrt');
+        self::$mod   = array('Zend_Locale_Math_PhpMath', 'Mod');
+        self::$scale = array('Zend_Locale_Math_PhpMath', 'Scale');
+
+        self::$defaultScale     = 0;
+        self::$defaultPrecision = 1;
+    }
+
+    public static $defaultScale;
+    public static $defaultPrecision;
+
+
+    public static function Add($op1, $op2, $scale = null)
+    {
+        if ($scale === null) {
+            $scale     = Zend_Locale_Math_PhpMath::$defaultScale;
+            $precision = Zend_Locale_Math_PhpMath::$defaultPrecision;
+        } else {
+            $precision = pow(10, -$scale);
+        }
+
+        if (empty($op1)) {
+            $op1 = 0;
+        }
+        $op1 = self::normalize($op1);
+        $op2 = self::normalize($op2);
+        $result = $op1 + $op2;
+        if (is_infinite($result)  or  (abs($result - $op2 - $op1) > $precision)) {
+            require_once 'Zend/Locale/Math/Exception.php';
+            throw new Zend_Locale_Math_Exception("addition overflow: $op1 + $op2 != $result", $op1, $op2, $result);
+        }
+
+        return self::round(self::normalize($result), $scale);
+    }
+
+    public static function Sub($op1, $op2, $scale = null)
+    {
+        if ($scale === null) {
+            $scale     = Zend_Locale_Math_PhpMath::$defaultScale;
+            $precision = Zend_Locale_Math_PhpMath::$defaultPrecision;
+        } else {
+            $precision = pow(10, -$scale);
+        }
+
+        if (empty($op1)) {
+            $op1 = 0;
+        }
+        $op1  = self::normalize($op1);
+        $op2  = self::normalize($op2);
+        $result = $op1 - $op2;
+        if (is_infinite($result)  or  (abs($result + $op2 - $op1) > $precision)) {
+            require_once 'Zend/Locale/Math/Exception.php';
+            throw new Zend_Locale_Math_Exception("subtraction overflow: $op1 - $op2 != $result", $op1, $op2, $result);
+        }
+
+        return self::round(self::normalize($result), $scale);
+    }
+
+    public static function Pow($op1, $op2, $scale = null)
+    {
+        if ($scale === null) {
+            $scale = Zend_Locale_Math_PhpMath::$defaultScale;
+        }
+
+        $op1 = self::normalize($op1);
+        $op2 = self::normalize($op2);
+
+        // BCMath extension doesn't use decimal part of the power
+        // Provide the same behavior
+        $op2 = ($op2 > 0) ? floor($op2) : ceil($op2);
+
+        $result = pow($op1, $op2);
+        if (is_infinite($result)  or  is_nan($result)) {
+            require_once 'Zend/Locale/Math/Exception.php';
+            throw new Zend_Locale_Math_Exception("power overflow: $op1 ^ $op2", $op1, $op2, $result);
+        }
+
+        return self::round(self::normalize($result), $scale);
+    }
+
+    public static function Mul($op1, $op2, $scale = null)
+    {
+        if ($scale === null) {
+            $scale = Zend_Locale_Math_PhpMath::$defaultScale;
+        }
+
+        if (empty($op1)) {
+            $op1 = 0;
+        }
+        $op1 = self::normalize($op1);
+        $op2 = self::normalize($op2);
+        $result = $op1 * $op2;
+        if (is_infinite($result)  or  is_nan($result)) {
+            require_once 'Zend/Locale/Math/Exception.php';
+            throw new Zend_Locale_Math_Exception("multiplication overflow: $op1 * $op2 != $result", $op1, $op2, $result);
+        }
+
+        return self::round(self::normalize($result), $scale);
+    }
+
+    public static function Div($op1, $op2, $scale = null)
+    {
+        if ($scale === null) {
+            $scale = Zend_Locale_Math_PhpMath::$defaultScale;
+        }
+
+        if (empty($op2)) {
+            require_once 'Zend/Locale/Math/Exception.php';
+            throw new Zend_Locale_Math_Exception("can not divide by zero", $op1, $op2, null);
+        }
+        if (empty($op1)) {
+            $op1 = 0;
+        }
+        $op1 = self::normalize($op1);
+        $op2 = self::normalize($op2);
+        $result = $op1 / $op2;
+        if (is_infinite($result)  or  is_nan($result)) {
+            require_once 'Zend/Locale/Math/Exception.php';
+            throw new Zend_Locale_Math_Exception("division overflow: $op1 / $op2 != $result", $op1, $op2, $result);
+        }
+
+        return self::round(self::normalize($result), $scale);
+    }
+
+    public static function Sqrt($op1, $scale = null)
+    {
+        if ($scale === null) {
+            $scale = Zend_Locale_Math_PhpMath::$defaultScale;
+        }
+
+        if (empty($op1)) {
+            $op1 = 0;
+        }
+        $op1 = self::normalize($op1);
+        $result = sqrt($op1);
+        if (is_nan($result)) {
+            return NULL;
+        }
+
+        return self::round(self::normalize($result), $scale);
+    }
+
+    public static function Mod($op1, $op2)
+    {
+        if (empty($op1)) {
+            $op1 = 0;
+        }
+        if (empty($op2)) {
+            return NULL;
+        }
+        $op1 = self::normalize($op1);
+        $op2 = self::normalize($op2);
+        if ((int)$op2 == 0) {
+            return NULL;
+        }
+        $result = $op1 % $op2;
+        if (is_nan($result)  or  (($op1 - $result) % $op2 != 0)) {
+            require_once 'Zend/Locale/Math/Exception.php';
+            throw new Zend_Locale_Math_Exception("modulus calculation error: $op1 % $op2 != $result", $op1, $op2, $result);
+        }
+
+        return self::normalize($result);
+    }
+
+    public static function Comp($op1, $op2, $scale = null)
+    {
+        if ($scale === null) {
+            $scale     = Zend_Locale_Math_PhpMath::$defaultScale;
+        }
+
+        if (empty($op1)) {
+            $op1 = 0;
+        }
+        $op1 = self::normalize($op1);
+        $op2 = self::normalize($op2);
+        if ($scale <> 0) {
+            $op1 = self::round($op1, $scale);
+            $op2 = self::round($op2, $scale);
+        } else {
+            $op1 = ($op1 > 0) ? floor($op1) : ceil($op1);
+            $op2 = ($op2 > 0) ? floor($op2) : ceil($op2);
+        }
+        if ($op1 > $op2) {
+            return 1;
+        } else if ($op1 < $op2) {
+            return -1;
+        }
+        return 0;
+    }
+
+    public static function Scale($scale)
+    {
+        if ($scale > 9) {
+            require_once 'Zend/Locale/Math/Exception.php';
+            throw new Zend_Locale_Math_Exception("can not scale to precision $scale", $scale, null, null);
+        }
+        self::$defaultScale     = $scale;
+        self::$defaultPrecision = pow(10, -$scale);
+        return true;
+    }
+}
+
+Zend_Locale_Math_PhpMath::disable(); // disable use of bcmath functions
diff --git a/lib/zend/Zend/Log.php b/lib/zend/Zend/Log.php
new file mode 100644
index 00000000000..133feca9818
--- /dev/null
+++ b/lib/zend/Zend/Log.php
@@ -0,0 +1,662 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ *
+ * Convenience methods for log [@see Zend_Log::__call()]:
+ *
+ * @method emerg(string $message, $extras = null)
+ * @method alert(string $message, $extras = null)
+ * @method crit(string $message, $extras = null)
+ * @method err(string $message, $extras = null)
+ * @method warn(string $message, $extras = null)
+ * @method notice(string $message, $extras = null)
+ * @method info(string $message, $extras = null)
+ * @method debug(string $message, $extras = null)
+ */
+class Zend_Log
+{
+    const EMERG   = 0;  // Emergency: system is unusable
+    const ALERT   = 1;  // Alert: action must be taken immediately
+    const CRIT    = 2;  // Critical: critical conditions
+    const ERR     = 3;  // Error: error conditions
+    const WARN    = 4;  // Warning: warning conditions
+    const NOTICE  = 5;  // Notice: normal but significant condition
+    const INFO    = 6;  // Informational: informational messages
+    const DEBUG   = 7;  // Debug: debug messages
+
+    /**
+     * @var array of priorities where the keys are the
+     * priority numbers and the values are the priority names
+     */
+    protected $_priorities = array();
+
+    /**
+     * @var array of Zend_Log_Writer_Abstract
+     */
+    protected $_writers = array();
+
+    /**
+     * @var array of Zend_Log_Filter_Interface
+     */
+    protected $_filters = array();
+
+    /**
+     * @var array of extra log event
+     */
+    protected $_extras = array();
+
+    /**
+     *
+     * @var string
+     */
+    protected $_defaultWriterNamespace = 'Zend_Log_Writer';
+
+    /**
+     *
+     * @var string
+     */
+    protected $_defaultFilterNamespace = 'Zend_Log_Filter';
+
+    /**
+     *
+     * @var string
+     */
+    protected $_defaultFormatterNamespace = 'Zend_Log_Formatter';
+
+    /**
+     *
+     * @var callback
+     */
+    protected $_origErrorHandler       = null;
+
+    /**
+     *
+     * @var boolean
+     */
+    protected $_registeredErrorHandler = false;
+
+    /**
+     *
+     * @var array|boolean
+     */
+    protected $_errorHandlerMap        = false;
+
+    /**
+     *
+     * @var string
+     */
+    protected $_timestampFormat        = 'c';
+
+    /**
+     * Class constructor.  Create a new logger
+     *
+     * @param Zend_Log_Writer_Abstract|null  $writer  default writer
+     */
+    public function __construct(Zend_Log_Writer_Abstract $writer = null)
+    {
+        $r = new ReflectionClass($this);
+        $this->_priorities = array_flip($r->getConstants());
+
+        if ($writer !== null) {
+            $this->addWriter($writer);
+        }
+    }
+
+    /**
+     * Factory to construct the logger and one or more writers
+     * based on the configuration array
+     *
+     * @param  array|Zend_Config Array or instance of Zend_Config
+     * @return Zend_Log
+     * @throws Zend_Log_Exception
+     */
+    static public function factory($config = array())
+    {
+        if ($config instanceof Zend_Config) {
+            $config = $config->toArray();
+        }
+
+        if (!is_array($config) || empty($config)) {
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config');
+        }
+
+        if (array_key_exists('className', $config)) {
+            $class = $config['className'];
+            unset($config['className']);
+        } else {
+            $class = __CLASS__;
+        }
+
+        $log = new $class;
+
+        if (!$log instanceof Zend_Log) {
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Passed className does not belong to a descendant of Zend_Log');
+        }
+
+        if (array_key_exists('timestampFormat', $config)) {
+            if (null != $config['timestampFormat'] && '' != $config['timestampFormat']) {
+                $log->setTimestampFormat($config['timestampFormat']);
+            }
+            unset($config['timestampFormat']);
+        }
+
+        if (!is_array(current($config))) {
+            $log->addWriter(current($config));
+        } else {
+            foreach($config as $writer) {
+                $log->addWriter($writer);
+            }
+        }
+
+        return $log;
+    }
+
+
+    /**
+     * Construct a writer object based on a configuration array
+     *
+     * @param  array $config config array with writer spec
+     * @return Zend_Log_Writer_Abstract
+     * @throws Zend_Log_Exception
+     */
+    protected function _constructWriterFromConfig($config)
+    {
+        $writer = $this->_constructFromConfig('writer', $config, $this->_defaultWriterNamespace);
+
+        if (!$writer instanceof Zend_Log_Writer_Abstract) {
+            $writerName = is_object($writer)
+                        ? get_class($writer)
+                        : 'The specified writer';
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception("{$writerName} does not extend Zend_Log_Writer_Abstract!");
+        }
+
+        if (isset($config['filterName'])) {
+            $filter = $this->_constructFilterFromConfig($config);
+            $writer->addFilter($filter);
+        }
+
+        if (isset($config['formatterName'])) {
+            $formatter = $this->_constructFormatterFromConfig($config);
+            $writer->setFormatter($formatter);
+        }
+
+        return $writer;
+    }
+
+    /**
+     * Construct filter object from configuration array or Zend_Config object
+     *
+     * @param  array|Zend_Config $config Zend_Config or Array
+     * @return Zend_Log_Filter_Interface
+     * @throws Zend_Log_Exception
+     */
+    protected function _constructFilterFromConfig($config)
+    {
+        $filter = $this->_constructFromConfig('filter', $config, $this->_defaultFilterNamespace);
+
+        if (!$filter instanceof Zend_Log_Filter_Interface) {
+             $filterName = is_object($filter)
+                         ? get_class($filter)
+                         : 'The specified filter';
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception("{$filterName} does not implement Zend_Log_Filter_Interface");
+        }
+
+        return $filter;
+    }
+
+   /**
+    * Construct formatter object from configuration array or Zend_Config object
+    *
+    * @param  array|Zend_Config $config Zend_Config or Array
+    * @return Zend_Log_Formatter_Interface
+    * @throws Zend_Log_Exception
+    */
+    protected function _constructFormatterFromConfig($config)
+    {
+        $formatter = $this->_constructFromConfig('formatter', $config, $this->_defaultFormatterNamespace);
+
+        if (!$formatter instanceof Zend_Log_Formatter_Interface) {
+             $formatterName = is_object($formatter)
+                         ? get_class($formatter)
+                         : 'The specified formatter';
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception($formatterName . ' does not implement Zend_Log_Formatter_Interface');
+        }
+
+        return $formatter;
+    }
+
+    /**
+     * Construct a filter or writer from config
+     *
+     * @param string $type 'writer' of 'filter'
+     * @param mixed $config Zend_Config or Array
+     * @param string $namespace
+     * @return object
+     * @throws Zend_Log_Exception
+     */
+    protected function _constructFromConfig($type, $config, $namespace)
+    {
+        if ($config instanceof Zend_Config) {
+            $config = $config->toArray();
+        }
+
+        if (!is_array($config) || empty($config)) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception(
+                'Configuration must be an array or instance of Zend_Config'
+            );
+        }
+
+        $params    = isset($config[ $type .'Params' ]) ? $config[ $type .'Params' ] : array();
+        $className = $this->getClassName($config, $type, $namespace);
+        if (!class_exists($className)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($className);
+        }
+
+        $reflection = new ReflectionClass($className);
+        if (!$reflection->implementsInterface('Zend_Log_FactoryInterface')) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception(
+                $className . ' does not implement Zend_Log_FactoryInterface and can not be constructed from config.'
+            );
+        }
+
+        return call_user_func(array($className, 'factory'), $params);
+    }
+
+    /**
+     * Get the writer or filter full classname
+     *
+     * @param array $config
+     * @param string $type filter|writer
+     * @param string $defaultNamespace
+     * @return string full classname
+     * @throws Zend_Log_Exception
+     */
+    protected function getClassName($config, $type, $defaultNamespace)
+    {
+        if (!isset($config[$type . 'Name'])) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception("Specify {$type}Name in the configuration array");
+        }
+
+        $className = $config[$type . 'Name'];
+        $namespace = $defaultNamespace;
+
+        if (isset($config[$type . 'Namespace'])) {
+            $namespace = $config[$type . 'Namespace'];
+        }
+
+        // PHP >= 5.3.0 namespace given?
+        if (substr($namespace, -1) == '\\') {
+            return $namespace . $className;
+        }
+
+        // empty namespace given?
+        if (strlen($namespace) === 0) {
+            return $className;
+        }
+
+        return $namespace . '_' . $className;
+    }
+
+    /**
+     * Packs message and priority into Event array
+     *
+     * @param  string   $message   Message to log
+     * @param  integer  $priority  Priority of message
+     * @return array Event array
+     */
+    protected function _packEvent($message, $priority)
+    {
+        return array_merge(array(
+            'timestamp'    => date($this->_timestampFormat),
+            'message'      => $message,
+            'priority'     => $priority,
+            'priorityName' => $this->_priorities[$priority]
+            ),
+            $this->_extras
+        );
+    }
+
+    /**
+     * Class destructor.  Shutdown log writers
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        /** @var Zend_Log_Writer_Abstract $writer */
+        foreach($this->_writers as $writer) {
+            $writer->shutdown();
+        }
+    }
+
+    /**
+     * Undefined method handler allows a shortcut:
+     *   $log->priorityName('message')
+     *     instead of
+     *   $log->log('message', Zend_Log::PRIORITY_NAME)
+     *
+     * @param  string  $method  priority name
+     * @param  string  $params  message to log
+     * @return void
+     * @throws Zend_Log_Exception
+     */
+    public function __call($method, $params)
+    {
+        $priority = strtoupper($method);
+        if (($priority = array_search($priority, $this->_priorities)) !== false) {
+            switch (count($params)) {
+                case 0:
+                    /** @see Zend_Log_Exception */
+                    require_once 'Zend/Log/Exception.php';
+                    throw new Zend_Log_Exception('Missing log message');
+                case 1:
+                    $message = array_shift($params);
+                    $extras = null;
+                    break;
+                default:
+                    $message = array_shift($params);
+                    $extras  = array_shift($params);
+                    break;
+            }
+            $this->log($message, $priority, $extras);
+        } else {
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Bad log priority');
+        }
+    }
+
+    /**
+     * Log a message at a priority
+     *
+     * @param  string   $message   Message to log
+     * @param  integer  $priority  Priority of message
+     * @param  mixed    $extras    Extra information to log in event
+     * @return void
+     * @throws Zend_Log_Exception
+     */
+    public function log($message, $priority, $extras = null)
+    {
+        // sanity checks
+        if (empty($this->_writers)) {
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('No writers were added');
+        }
+
+        if (! isset($this->_priorities[$priority])) {
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Bad log priority');
+        }
+
+        // pack into event required by filters and writers
+        $event = $this->_packEvent($message, $priority);
+
+        // Check to see if any extra information was passed
+        if (!empty($extras)) {
+            $info = array();
+            if (is_array($extras)) {
+                foreach ($extras as $key => $value) {
+                    if (is_string($key)) {
+                        $event[$key] = $value;
+                    } else {
+                        $info[] = $value;
+                    }
+                }
+            } else {
+                $info = $extras;
+            }
+            if (!empty($info)) {
+                $event['info'] = $info;
+            }
+        }
+
+        // abort if rejected by the global filters
+        /** @var Zend_Log_Filter_Interface $filter */
+        foreach ($this->_filters as $filter) {
+            if (! $filter->accept($event)) {
+                return;
+            }
+        }
+
+        // send to each writer
+        /** @var Zend_Log_Writer_Abstract $writer */
+        foreach ($this->_writers as $writer) {
+            $writer->write($event);
+        }
+    }
+
+    /**
+     * Add a custom priority
+     *
+     * @param  string  $name     Name of priority
+     * @param  integer $priority Numeric priority
+     * @return $this
+     * @throws Zend_Log_Exception
+     */
+    public function addPriority($name, $priority)
+    {
+        // Priority names must be uppercase for predictability.
+        $name = strtoupper($name);
+
+        if (isset($this->_priorities[$priority])
+            || false !== array_search($name, $this->_priorities)) {
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Existing priorities cannot be overwritten');
+        }
+
+        $this->_priorities[$priority] = $name;
+        return $this;
+    }
+
+    /**
+     * Add a filter that will be applied before all log writers.
+     * Before a message will be received by any of the writers, it
+     * must be accepted by all filters added with this method.
+     *
+     * @param  int|Zend_Config|array|Zend_Log_Filter_Interface $filter
+     * @return $this
+     * @throws Zend_Log_Exception
+     */
+    public function addFilter($filter)
+    {
+        if (is_int($filter)) {
+            /** @see Zend_Log_Filter_Priority */
+            require_once 'Zend/Log/Filter/Priority.php';
+            $filter = new Zend_Log_Filter_Priority($filter);
+
+        } elseif ($filter instanceof Zend_Config || is_array($filter)) {
+            $filter = $this->_constructFilterFromConfig($filter);
+
+        } elseif(! $filter instanceof Zend_Log_Filter_Interface) {
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Invalid filter provided');
+        }
+
+        $this->_filters[] = $filter;
+        return $this;
+    }
+
+    /**
+     * Add a writer.  A writer is responsible for taking a log
+     * message and writing it out to storage.
+     *
+     * @param  mixed $writer Zend_Log_Writer_Abstract or Config array
+     * @return Zend_Log
+     * @throws Zend_Log_Exception
+     */
+    public function addWriter($writer)
+    {
+        if (is_array($writer) || $writer instanceof  Zend_Config) {
+            $writer = $this->_constructWriterFromConfig($writer);
+        }
+
+        if (!$writer instanceof Zend_Log_Writer_Abstract) {
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception(
+                'Writer must be an instance of Zend_Log_Writer_Abstract'
+                . ' or you should pass a configuration array'
+            );
+        }
+
+        $this->_writers[] = $writer;
+        return $this;
+    }
+
+    /**
+     * Set an extra item to pass to the log writers.
+     *
+     * @param  string $name    Name of the field
+     * @param  string $value   Value of the field
+     * @return Zend_Log
+     */
+    public function setEventItem($name, $value)
+    {
+        $this->_extras = array_merge($this->_extras, array($name => $value));
+        return $this;
+    }
+
+    /**
+     * Register Logging system as an error handler to log php errors
+     * Note: it still calls the original error handler if set_error_handler is able to return it.
+     *
+     * Errors will be mapped as:
+     *   E_NOTICE, E_USER_NOTICE => NOTICE
+     *   E_WARNING, E_CORE_WARNING, E_USER_WARNING => WARN
+     *   E_ERROR, E_USER_ERROR, E_CORE_ERROR, E_RECOVERABLE_ERROR => ERR
+     *   E_DEPRECATED, E_STRICT, E_USER_DEPRECATED => DEBUG
+     *   (unknown/other) => INFO
+     *
+     * @link http://www.php.net/manual/en/function.set-error-handler.php Custom error handler
+     *
+     * @return Zend_Log
+     */
+    public function registerErrorHandler()
+    {
+        // Only register once.  Avoids loop issues if it gets registered twice.
+        if ($this->_registeredErrorHandler) {
+            return $this;
+        }
+
+        $this->_origErrorHandler = set_error_handler(array($this, 'errorHandler'));
+
+        // Contruct a default map of phpErrors to Zend_Log priorities.
+        // Some of the errors are uncatchable, but are included for completeness
+        $this->_errorHandlerMap = array(
+            E_NOTICE            => Zend_Log::NOTICE,
+            E_USER_NOTICE       => Zend_Log::NOTICE,
+            E_WARNING           => Zend_Log::WARN,
+            E_CORE_WARNING      => Zend_Log::WARN,
+            E_USER_WARNING      => Zend_Log::WARN,
+            E_ERROR             => Zend_Log::ERR,
+            E_USER_ERROR        => Zend_Log::ERR,
+            E_CORE_ERROR        => Zend_Log::ERR,
+            E_RECOVERABLE_ERROR => Zend_Log::ERR,
+            E_STRICT            => Zend_Log::DEBUG,
+        );
+        // PHP 5.3.0+
+        if (defined('E_DEPRECATED')) {
+            $this->_errorHandlerMap['E_DEPRECATED'] = Zend_Log::DEBUG;
+        }
+        if (defined('E_USER_DEPRECATED')) {
+            $this->_errorHandlerMap['E_USER_DEPRECATED'] = Zend_Log::DEBUG;
+        }
+
+        $this->_registeredErrorHandler = true;
+        return $this;
+    }
+
+    /**
+     * Error Handler will convert error into log message, and then call the original error handler
+     *
+     * @link http://www.php.net/manual/en/function.set-error-handler.php Custom error handler
+     * @param int $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param int $errline
+     * @param array $errcontext
+     * @return boolean
+     */
+    public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+    {
+        $errorLevel = error_reporting();
+
+        if ($errorLevel & $errno) {
+            if (isset($this->_errorHandlerMap[$errno])) {
+                $priority = $this->_errorHandlerMap[$errno];
+            } else {
+                $priority = Zend_Log::INFO;
+            }
+            $this->log($errstr, $priority, array('errno'=>$errno, 'file'=>$errfile, 'line'=>$errline, 'context'=>$errcontext));
+        }
+
+        if ($this->_origErrorHandler !== null) {
+            return call_user_func($this->_origErrorHandler, $errno, $errstr, $errfile, $errline, $errcontext);
+        }
+        return false;
+    }
+
+    /**
+     * Set timestamp format for log entries.
+     *
+     * @param string $format
+     * @return Zend_Log
+     */
+    public function setTimestampFormat($format)
+    {
+        $this->_timestampFormat = $format;
+        return $this;
+    }
+
+    /**
+     * Get timestamp format used for log entries.
+     *
+     * @return string
+     */
+    public function getTimestampFormat()
+    {
+        return $this->_timestampFormat;
+    }
+}
diff --git a/lib/zend/Zend/Log/Exception.php b/lib/zend/Zend/Log/Exception.php
new file mode 100644
index 00000000000..d52a501c1c9
--- /dev/null
+++ b/lib/zend/Zend/Log/Exception.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Exception */
+require_once 'Zend/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Exception extends Zend_Exception
+{}
diff --git a/lib/zend/Zend/Log/FactoryInterface.php b/lib/zend/Zend/Log/FactoryInterface.php
new file mode 100644
index 00000000000..eb67e2c21e7
--- /dev/null
+++ b/lib/zend/Zend/Log/FactoryInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+interface Zend_Log_FactoryInterface
+{
+    /**
+     * Construct a Zend_Log driver
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_FactoryInterface
+     */
+    static public function factory($config);
+}
diff --git a/lib/zend/Zend/Log/Filter/Abstract.php b/lib/zend/Zend/Log/Filter/Abstract.php
new file mode 100644
index 00000000000..dafd731d8bd
--- /dev/null
+++ b/lib/zend/Zend/Log/Filter/Abstract.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** @see Zend_Log_Filter_Interface */
+require_once 'Zend/Log/Filter/Interface.php';
+
+/** @see Zend_Log_FactoryInterface */
+require_once 'Zend/Log/FactoryInterface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+abstract class Zend_Log_Filter_Abstract
+    implements Zend_Log_Filter_Interface, Zend_Log_FactoryInterface
+{
+    /**
+     * Validate and optionally convert the config to array
+     *
+     * @param  array|Zend_Config $config Zend_Config or Array
+     * @return array
+     * @throws Zend_Log_Exception
+     */
+    static protected function _parseConfig($config)
+    {
+        if ($config instanceof Zend_Config) {
+            $config = $config->toArray();
+        }
+
+        if (!is_array($config)) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config');
+        }
+
+        return $config;
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Client/Exception.php b/lib/zend/Zend/Log/Filter/Interface.php
similarity index 60%
rename from lib/zend/Zend/Service/DeveloperGarden/Client/Exception.php
rename to lib/zend/Zend/Log/Filter/Interface.php
index 18c8d9650cb..dc0cbad9a90 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Client/Exception.php
+++ b/lib/zend/Zend/Log/Filter/Interface.php
@@ -13,26 +13,28 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Log
+ * @subpackage Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
-/**
- * Zend_Service_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
-
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Log
+ * @subpackage Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
  */
-class Zend_Service_DeveloperGarden_Client_Exception extends Zend_Service_DeveloperGarden_Exception
+interface Zend_Log_Filter_Interface
 {
+    /**
+     * Returns TRUE to accept the message, FALSE to block it.
+     *
+     * @param  array    $event    event data
+     * @return boolean            accepted?
+     */
+    public function accept($event);
 }
diff --git a/lib/zend/Zend/Log/Filter/Message.php b/lib/zend/Zend/Log/Filter/Message.php
new file mode 100644
index 00000000000..eff0c99da80
--- /dev/null
+++ b/lib/zend/Zend/Log/Filter/Message.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Filter_Abstract */
+require_once 'Zend/Log/Filter/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Filter_Message extends Zend_Log_Filter_Abstract
+{
+    /**
+     * @var string
+     */
+    protected $_regexp;
+
+    /**
+     * Filter out any log messages not matching $regexp.
+     *
+     * @param  string  $regexp     Regular expression to test the log message
+     * @return void
+     * @throws Zend_Log_Exception
+     */
+    public function __construct($regexp)
+    {
+        if (@preg_match($regexp, '') === false) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception("Invalid regular expression '$regexp'");
+        }
+        $this->_regexp = $regexp;
+    }
+
+    /**
+     * Create a new instance of Zend_Log_Filter_Message
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Filter_Message
+     */
+    static public function factory($config)
+    {
+        $config = self::_parseConfig($config);
+        $config = array_merge(array(
+            'regexp' => null
+        ), $config);
+
+        return new self(
+            $config['regexp']
+        );
+    }
+
+    /**
+     * Returns TRUE to accept the message, FALSE to block it.
+     *
+     * @param  array    $event    event data
+     * @return boolean            accepted?
+     */
+    public function accept($event)
+    {
+        return preg_match($this->_regexp, $event['message']) > 0;
+    }
+}
diff --git a/lib/zend/Zend/Log/Filter/Priority.php b/lib/zend/Zend/Log/Filter/Priority.php
new file mode 100644
index 00000000000..d86f5d60fea
--- /dev/null
+++ b/lib/zend/Zend/Log/Filter/Priority.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Filter_Abstract */
+require_once 'Zend/Log/Filter/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Filter_Priority extends Zend_Log_Filter_Abstract
+{
+    /**
+     * @var integer
+     */
+    protected $_priority;
+
+    /**
+     * @var string
+     */
+    protected $_operator;
+
+    /**
+     * Filter logging by $priority.  By default, it will accept any log
+     * event whose priority value is less than or equal to $priority.
+     *
+     * @param  integer  $priority  Priority
+     * @param  string   $operator  Comparison operator
+     * @return void
+     * @throws Zend_Log_Exception
+     */
+    public function __construct($priority, $operator = null)
+    {
+        if (! is_int($priority)) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Priority must be an integer');
+        }
+
+        $this->_priority = $priority;
+        $this->_operator = $operator === null ? '<=' : $operator;
+    }
+
+    /**
+     * Create a new instance of Zend_Log_Filter_Priority
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Filter_Priority
+     */
+    static public function factory($config)
+    {
+        $config = self::_parseConfig($config);
+        $config = array_merge(array(
+            'priority' => null,
+            'operator' => null,
+        ), $config);
+
+        // Add support for constants
+        if (!is_numeric($config['priority']) && isset($config['priority']) && defined($config['priority'])) {
+            $config['priority'] = constant($config['priority']);
+        }
+
+        return new self(
+            (int) $config['priority'],
+            $config['operator']
+        );
+    }
+
+    /**
+     * Returns TRUE to accept the message, FALSE to block it.
+     *
+     * @param  array    $event    event data
+     * @return boolean            accepted?
+     */
+    public function accept($event)
+    {
+        return version_compare($event['priority'], $this->_priority, $this->_operator);
+    }
+}
diff --git a/lib/zend/Zend/Log/Filter/Suppress.php b/lib/zend/Zend/Log/Filter/Suppress.php
new file mode 100644
index 00000000000..a4f13568636
--- /dev/null
+++ b/lib/zend/Zend/Log/Filter/Suppress.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Filter_Interface */
+require_once 'Zend/Log/Filter/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Filter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Filter_Suppress extends Zend_Log_Filter_Abstract
+{
+    /**
+     * @var boolean
+     */
+    protected $_accept = true;
+
+    /**
+     * This is a simple boolean filter.
+     *
+     * Call suppress(true) to suppress all log events.
+     * Call suppress(false) to accept all log events.
+     *
+     * @param  boolean  $suppress  Should all log events be suppressed?
+     * @return  void
+     */
+    public function suppress($suppress)
+    {
+        $this->_accept = (! $suppress);
+    }
+
+    /**
+     * Returns TRUE to accept the message, FALSE to block it.
+     *
+     * @param  array    $event    event data
+     * @return boolean            accepted?
+     */
+    public function accept($event)
+    {
+        return $this->_accept;
+    }
+
+    /**
+     * Create a new instance of Zend_Log_Filter_Suppress
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Filter_Suppress
+     * @throws Zend_Log_Exception
+     */
+    static public function factory($config)
+    {
+        return new self();
+    }
+}
diff --git a/lib/zend/Zend/Log/Formatter/Abstract.php b/lib/zend/Zend/Log/Formatter/Abstract.php
new file mode 100644
index 00000000000..f0403f16217
--- /dev/null
+++ b/lib/zend/Zend/Log/Formatter/Abstract.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** @see Zend_Log_Formatter_Interface */
+require_once 'Zend/Log/Formatter/Interface.php';
+
+/** @see Zend_Log_FactoryInterface */
+require_once 'Zend/Log/FactoryInterface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+abstract class Zend_Log_Formatter_Abstract
+    implements Zend_Log_Formatter_Interface, Zend_Log_FactoryInterface
+{
+}
diff --git a/lib/zend/Zend/Log/Formatter/Firebug.php b/lib/zend/Zend/Log/Formatter/Firebug.php
new file mode 100644
index 00000000000..434843a1a29
--- /dev/null
+++ b/lib/zend/Zend/Log/Formatter/Firebug.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Formatter_Abstract */
+require_once 'Zend/Log/Formatter/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Log_Formatter_Firebug extends Zend_Log_Formatter_Abstract
+{
+    /**
+	 * Factory for Zend_Log_Formatter_Firebug classe
+	 *
+     * @param array|Zend_Config $options useless
+	 * @return Zend_Log_Formatter_Firebug
+     */
+    public static function factory($options)
+    {
+        return new self;
+    }
+
+    /**
+     * This method formats the event for the firebug writer.
+     *
+     * The default is to just send the message parameter, but through
+     * extension of this class and calling the
+     * {@see Zend_Log_Writer_Firebug::setFormatter()} method you can
+     * pass as much of the event data as you are interested in.
+     *
+     * @param  array    $event    event data
+     * @return mixed              event message
+     */
+    public function format($event)
+    {
+        return $event['message'];
+    }
+}
diff --git a/lib/zend/Zend/Log/Formatter/Interface.php b/lib/zend/Zend/Log/Formatter/Interface.php
new file mode 100644
index 00000000000..9b21fa7e2b1
--- /dev/null
+++ b/lib/zend/Zend/Log/Formatter/Interface.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+interface Zend_Log_Formatter_Interface
+{
+    /**
+     * Formats data into a single line to be written by the writer.
+     *
+     * @param  array    $event    event data
+     * @return string             formatted line to write to the log
+     */
+    public function format($event);
+
+}
diff --git a/lib/zend/Zend/Log/Formatter/Simple.php b/lib/zend/Zend/Log/Formatter/Simple.php
new file mode 100644
index 00000000000..965fa762a08
--- /dev/null
+++ b/lib/zend/Zend/Log/Formatter/Simple.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Formatter_Abstract */
+require_once 'Zend/Log/Formatter/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Formatter_Simple extends Zend_Log_Formatter_Abstract
+{
+    /**
+     * @var string
+     */
+    protected $_format;
+
+    const DEFAULT_FORMAT = '%timestamp% %priorityName% (%priority%): %message%';
+
+    /**
+     * Class constructor
+     *
+     * @param  null|string  $format  Format specifier for log messages
+     * @return void
+     * @throws Zend_Log_Exception
+     */
+    public function __construct($format = null)
+    {
+        if ($format === null) {
+            $format = self::DEFAULT_FORMAT . PHP_EOL;
+        }
+
+        if (!is_string($format)) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Format must be a string');
+        }
+
+        $this->_format = $format;
+    }
+
+    /**
+	 * Factory for Zend_Log_Formatter_Simple classe
+	 *
+	 * @param array|Zend_Config $options
+	 * @return Zend_Log_Formatter_Simple
+     */
+    public static function factory($options)
+    {
+        $format = null;
+        if (null !== $options) {
+            if ($options instanceof Zend_Config) {
+                $options = $options->toArray();
+            }
+
+            if (array_key_exists('format', $options)) {
+                $format = $options['format'];
+            }
+        }
+
+        return new self($format);
+    }
+
+    /**
+     * Formats data into a single line to be written by the writer.
+     *
+     * @param  array    $event    event data
+     * @return string             formatted line to write to the log
+     */
+    public function format($event)
+    {
+        $output = $this->_format;
+
+        foreach ($event as $name => $value) {
+            if ((is_object($value) && !method_exists($value,'__toString'))
+                || is_array($value)
+            ) {
+                $value = gettype($value);
+            }
+
+            $output = str_replace("%$name%", $value, $output);
+        }
+
+        return $output;
+    }
+}
diff --git a/lib/zend/Zend/Log/Formatter/Xml.php b/lib/zend/Zend/Log/Formatter/Xml.php
new file mode 100644
index 00000000000..71c47d336f5
--- /dev/null
+++ b/lib/zend/Zend/Log/Formatter/Xml.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Formatter_Abstract */
+require_once 'Zend/Log/Formatter/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Formatter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Formatter_Xml extends Zend_Log_Formatter_Abstract
+{
+    /**
+     * @var string Name of root element
+     */
+    protected $_rootElement;
+
+    /**
+     * @var array Relates XML elements to log data field keys.
+     */
+    protected $_elementMap;
+
+    /**
+     * @var string Encoding to use in XML
+     */
+    protected $_encoding;
+
+    /**
+     * Class constructor
+     * (the default encoding is UTF-8)
+     *
+     * @param array|Zend_Config $options
+     * @return void
+     */
+    public function __construct($options = array())
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } elseif (!is_array($options)) {
+            $args = func_get_args();
+
+            $options = array(
+            	'rootElement' => array_shift($args)
+            );
+
+            if (count($args)) {
+                $options['elementMap'] = array_shift($args);
+            }
+
+            if (count($args)) {
+                $options['encoding'] = array_shift($args);
+            }
+        }
+
+        if (!array_key_exists('rootElement', $options)) {
+            $options['rootElement'] = 'logEntry';
+        }
+
+        if (!array_key_exists('encoding', $options)) {
+            $options['encoding'] = 'UTF-8';
+        }
+
+        $this->_rootElement = $options['rootElement'];
+        $this->setEncoding($options['encoding']);
+
+        if (array_key_exists('elementMap', $options)) {
+            $this->_elementMap  = $options['elementMap'];
+        }
+    }
+
+    /**
+	 * Factory for Zend_Log_Formatter_Xml classe
+	 *
+	 * @param array|Zend_Config $options
+	 * @return Zend_Log_Formatter_Xml
+     */
+    public static function factory($options)
+    {
+        return new self($options);
+    }
+
+    /**
+     * Get encoding
+     *
+     * @return string
+     */
+    public function getEncoding()
+    {
+        return $this->_encoding;
+    }
+
+    /**
+     * Set encoding
+     *
+     * @param  string $value
+     * @return Zend_Log_Formatter_Xml
+     */
+    public function setEncoding($value)
+    {
+        $this->_encoding = (string) $value;
+        return $this;
+    }
+
+    /**
+     * Formats data into a single line to be written by the writer.
+     *
+     * @param  array    $event    event data
+     * @return string             formatted line to write to the log
+     */
+    public function format($event)
+    {
+        if ($this->_elementMap === null) {
+            $dataToInsert = $event;
+        } else {
+            $dataToInsert = array();
+            foreach ($this->_elementMap as $elementName => $fieldKey) {
+                $dataToInsert[$elementName] = $event[$fieldKey];
+            }
+        }
+
+        $enc = $this->getEncoding();
+        $dom = new DOMDocument('1.0', $enc);
+        $elt = $dom->appendChild(new DOMElement($this->_rootElement));
+
+        foreach ($dataToInsert as $key => $value) {
+            if (empty($value) 
+                || is_scalar($value) 
+                || (is_object($value) && method_exists($value,'__toString'))
+            ) {
+                if($key == "message") {
+                    $value = htmlspecialchars($value, ENT_COMPAT, $enc);
+                }
+                $elt->appendChild(new DOMElement($key, (string)$value));
+            }
+        }
+
+        $xml = $dom->saveXML();
+        $xml = preg_replace('/<\?xml version="1.0"( encoding="[^\"]*")?\?>\n/u', '', $xml);
+
+        return $xml . PHP_EOL;
+    }
+}
diff --git a/lib/zend/Zend/Log/Writer/Abstract.php b/lib/zend/Zend/Log/Writer/Abstract.php
new file mode 100644
index 00000000000..47c45ba8b8a
--- /dev/null
+++ b/lib/zend/Zend/Log/Writer/Abstract.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Filter_Priority */
+require_once 'Zend/Log/Filter/Priority.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface
+{
+    /**
+     * @var array of Zend_Log_Filter_Interface
+     */
+    protected $_filters = array();
+
+    /**
+     * Formats the log message before writing.
+     *
+     * @var Zend_Log_Formatter_Interface
+     */
+    protected $_formatter;
+
+    /**
+     * Add a filter specific to this writer.
+     *
+     * @param  Zend_Log_Filter_Interface|int $filter Filter class or filter
+     *                                               priority
+     * @return Zend_Log_Writer_Abstract
+     * @throws Zend_Log_Exception
+     */
+    public function addFilter($filter)
+    {
+        if (is_int($filter)) {
+            $filter = new Zend_Log_Filter_Priority($filter);
+        }
+
+        if (!$filter instanceof Zend_Log_Filter_Interface) {
+            /** @see Zend_Log_Exception */
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Invalid filter provided');
+        }
+
+        $this->_filters[] = $filter;
+        return $this;
+    }
+
+    /**
+     * Log a message to this writer.
+     *
+     * @param  array $event log data event
+     * @return void
+     */
+    public function write($event)
+    {
+        /** @var Zend_Log_Filter_Interface $filter */
+        foreach ($this->_filters as $filter) {
+            if (!$filter->accept($event)) {
+                return;
+            }
+        }
+
+        // exception occurs on error
+        $this->_write($event);
+    }
+
+    /**
+     * Set a new formatter for this writer
+     *
+     * @param  Zend_Log_Formatter_Interface $formatter
+     * @return Zend_Log_Writer_Abstract
+     */
+    public function setFormatter(Zend_Log_Formatter_Interface $formatter)
+    {
+        $this->_formatter = $formatter;
+        return $this;
+    }
+
+    /**
+     * Perform shutdown activites such as closing open resources
+     *
+     * @return void
+     */
+    public function shutdown()
+    {}
+
+    /**
+     * Write a message to the log.
+     *
+     * @param  array $event log data event
+     * @return void
+     */
+    abstract protected function _write($event);
+
+    /**
+     * Validate and optionally convert the config to array
+     *
+     * @param  array|Zend_Config $config Zend_Config or Array
+     * @return array
+     * @throws Zend_Log_Exception
+     */
+    static protected function _parseConfig($config)
+    {
+        if ($config instanceof Zend_Config) {
+            $config = $config->toArray();
+        }
+
+        if (!is_array($config)) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception(
+                'Configuration must be an array or instance of Zend_Config'
+            );
+        }
+
+        return $config;
+    }
+}
diff --git a/lib/zend/Zend/Log/Writer/Db.php b/lib/zend/Zend/Log/Writer/Db.php
new file mode 100644
index 00000000000..8dcaf9c61fb
--- /dev/null
+++ b/lib/zend/Zend/Log/Writer/Db.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Writer_Abstract */
+require_once 'Zend/Log/Writer/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract
+{
+    /**
+     * Database adapter instance
+     *
+     * @var Zend_Db_Adapter
+     */
+    protected $_db;
+
+    /**
+     * Name of the log table in the database
+     *
+     * @var string
+     */
+    protected $_table;
+
+    /**
+     * Relates database columns names to log data field keys.
+     *
+     * @var null|array
+     */
+    protected $_columnMap;
+
+    /**
+     * Class constructor
+     *
+     * @param Zend_Db_Adapter $db   Database adapter instance
+     * @param string $table         Log table in database
+     * @param array $columnMap
+     * @return void
+     */
+    public function __construct($db, $table, $columnMap = null)
+    {
+        $this->_db    = $db;
+        $this->_table = $table;
+        $this->_columnMap = $columnMap;
+    }
+
+    /**
+     * Create a new instance of Zend_Log_Writer_Db
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Writer_Db
+     */
+    static public function factory($config)
+    {
+        $config = self::_parseConfig($config);
+        $config = array_merge(array(
+            'db'        => null,
+            'table'     => null,
+            'columnMap' => null,
+        ), $config);
+
+        if (isset($config['columnmap'])) {
+            $config['columnMap'] = $config['columnmap'];
+        }
+
+        return new self(
+            $config['db'],
+            $config['table'],
+            $config['columnMap']
+        );
+    }
+
+    /**
+     * Formatting is not possible on this writer
+     *
+     * @return void
+     * @throws Zend_Log_Exception
+     */
+    public function setFormatter(Zend_Log_Formatter_Interface $formatter)
+    {
+        require_once 'Zend/Log/Exception.php';
+        throw new Zend_Log_Exception(get_class($this) . ' does not support formatting');
+    }
+
+    /**
+     * Remove reference to database adapter
+     *
+     * @return void
+     */
+    public function shutdown()
+    {
+        $this->_db = null;
+    }
+
+    /**
+     * Write a message to the log.
+     *
+     * @param  array  $event  event data
+     * @return void
+     * @throws Zend_Log_Exception
+     */
+    protected function _write($event)
+    {
+        if ($this->_db === null) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Database adapter is null');
+        }
+
+        if ($this->_columnMap === null) {
+            $dataToInsert = $event;
+        } else {
+            $dataToInsert = array();
+            foreach ($this->_columnMap as $columnName => $fieldKey) {
+                if (isset($event[$fieldKey])) {
+                    $dataToInsert[$columnName] = $event[$fieldKey];
+                }
+            }
+        }
+
+        $this->_db->insert($this->_table, $dataToInsert);
+    }
+}
diff --git a/lib/zend/Zend/Log/Writer/Mail.php b/lib/zend/Zend/Log/Writer/Mail.php
new file mode 100644
index 00000000000..931dfe97bc3
--- /dev/null
+++ b/lib/zend/Zend/Log/Writer/Mail.php
@@ -0,0 +1,430 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Writer_Abstract */
+require_once 'Zend/Log/Writer/Abstract.php';
+
+/** Zend_Log_Exception */
+require_once 'Zend/Log/Exception.php';
+
+/** Zend_Log_Formatter_Simple*/
+require_once 'Zend/Log/Formatter/Simple.php';
+
+/**
+ * Class used for writing log messages to email via Zend_Mail.
+ *
+ * Allows for emailing log messages at and above a certain level via a
+ * Zend_Mail object.  Note that this class only sends the email upon
+ * completion, so any log entries accumulated are sent in a single email.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Writer_Mail extends Zend_Log_Writer_Abstract
+{
+    /**
+     * Array of formatted events to include in message body.
+     *
+     * @var array
+     */
+    protected $_eventsToMail = array();
+
+    /**
+     * Array of formatted lines for use in an HTML email body; these events
+     * are formatted with an optional formatter if the caller is using
+     * Zend_Layout.
+     *
+     * @var array
+     */
+    protected $_layoutEventsToMail = array();
+
+    /**
+     * Zend_Mail instance to use
+     *
+     * @var Zend_Mail
+     */
+    protected $_mail;
+
+    /**
+     * Zend_Layout instance to use; optional.
+     *
+     * @var Zend_Layout
+     */
+    protected $_layout;
+
+    /**
+     * Optional formatter for use when rendering with Zend_Layout.
+     *
+     * @var Zend_Log_Formatter_Interface
+     */
+    protected $_layoutFormatter;
+
+    /**
+     * Array keeping track of the number of entries per priority level.
+     *
+     * @var array
+     */
+    protected $_numEntriesPerPriority = array();
+
+    /**
+     * Subject prepend text.
+     *
+     * Can only be used of the Zend_Mail object has not already had its
+     * subject line set.  Using this will cause the subject to have the entry
+     * counts per-priority level appended to it.
+     *
+     * @var string|null
+     */
+    protected $_subjectPrependText;
+
+    /**
+     * MethodMap for Zend_Mail's headers
+     *
+     * @var array
+     */
+    protected static $_methodMapHeaders = array(
+        'from' => 'setFrom',
+        'to' => 'addTo',
+        'cc' => 'addCc',
+        'bcc' => 'addBcc',
+    );
+
+    /**
+     * Class constructor.
+     *
+     * Constructs the mail writer; requires a Zend_Mail instance, and takes an
+     * optional Zend_Layout instance.  If Zend_Layout is being used,
+     * $this->_layout->events will be set for use in the layout template.
+     *
+     * @param  Zend_Mail $mail Mail instance
+     * @param  Zend_Layout $layout Layout instance; optional
+     * @return void
+     */
+    public function __construct(Zend_Mail $mail, Zend_Layout $layout = null)
+    {
+        $this->_mail = $mail;
+        if (null !== $layout) {
+            $this->setLayout($layout);
+        }
+        $this->_formatter = new Zend_Log_Formatter_Simple();
+    }
+
+    /**
+     * Create a new instance of Zend_Log_Writer_Mail
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Writer_Mail
+     */
+    static public function factory($config)
+    {
+        $config = self::_parseConfig($config);
+        $mail = self::_constructMailFromConfig($config);
+        $writer = new self($mail);
+
+        if (isset($config['layout']) || isset($config['layoutOptions'])) {
+            $writer->setLayout($config);
+        }
+        if (isset($config['layoutFormatter'])) {
+            $layoutFormatter = new $config['layoutFormatter'];
+            $writer->setLayoutFormatter($layoutFormatter);
+        }
+        if (isset($config['subjectPrependText'])) {
+            $writer->setSubjectPrependText($config['subjectPrependText']);
+        }
+
+        return $writer;
+    }
+
+    /**
+     * Set the layout
+     *
+     * @param Zend_Layout|array $layout
+     * @return Zend_Log_Writer_Mail
+     * @throws Zend_Log_Exception
+     */
+    public function setLayout($layout)
+    {
+        if (is_array($layout)) {
+            $layout = $this->_constructLayoutFromConfig($layout);
+        }
+
+        if (!$layout instanceof Zend_Layout) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Mail must be an instance of Zend_Layout or an array');
+        }
+        $this->_layout = $layout;
+
+        return $this;
+    }
+
+    /**
+     * Construct a Zend_Mail instance based on a configuration array
+     *
+     * @param array $config
+     * @return Zend_Mail
+     * @throws Zend_Log_Exception
+     */
+    protected static function _constructMailFromConfig(array $config)
+    {
+        $mailClass = 'Zend_Mail';
+        if (isset($config['mail'])) {
+            $mailClass = $config['mail'];
+        }
+
+        if (!array_key_exists('charset', $config)) {
+            $config['charset'] = null;
+        }
+        $mail = new $mailClass($config['charset']);
+        if (!$mail instanceof Zend_Mail) {
+            throw new Zend_Log_Exception($mail . 'must extend Zend_Mail');
+        }
+
+        if (isset($config['subject'])) {
+            $mail->setSubject($config['subject']);
+        }
+
+        $headerAddresses = array_intersect_key($config, self::$_methodMapHeaders);
+        if (count($headerAddresses)) {
+            foreach ($headerAddresses as $header => $address) {
+                $method = self::$_methodMapHeaders[$header];
+                if (is_array($address) && isset($address['name'])
+                    && !is_numeric($address['name'])
+                ) {
+                    $params = array(
+                        $address['email'],
+                        $address['name']
+                    );
+                } else if (is_array($address) && isset($address['email'])) {
+                    $params = array($address['email']);
+                } else {
+                    $params = array($address);
+                }
+                call_user_func_array(array($mail, $method), $params);
+            }
+        }
+
+        return $mail;
+    }
+
+    /**
+     * Construct a Zend_Layout instance based on a configuration array
+     *
+     * @param array $config
+     * @return Zend_Layout
+     * @throws Zend_Log_Exception
+     */
+    protected function _constructLayoutFromConfig(array $config)
+    {
+        $config = array_merge(array(
+            'layout' => 'Zend_Layout',
+            'layoutOptions' => null
+        ), $config);
+
+        $layoutClass = $config['layout'];
+        $layout = new $layoutClass($config['layoutOptions']);
+        if (!$layout instanceof Zend_Layout) {
+            throw new Zend_Log_Exception($layout . 'must extend Zend_Layout');
+        }
+
+        return $layout;
+    }
+
+    /**
+     * Places event line into array of lines to be used as message body.
+     *
+     * Handles the formatting of both plaintext entries, as well as those
+     * rendered with Zend_Layout.
+     *
+     * @param  array $event Event data
+     * @return void
+     */
+    protected function _write($event)
+    {
+        // Track the number of entries per priority level.
+        if (!isset($this->_numEntriesPerPriority[$event['priorityName']])) {
+            $this->_numEntriesPerPriority[$event['priorityName']] = 1;
+        } else {
+            $this->_numEntriesPerPriority[$event['priorityName']]++;
+        }
+
+        $formattedEvent = $this->_formatter->format($event);
+
+        // All plaintext events are to use the standard formatter.
+        $this->_eventsToMail[] = $formattedEvent;
+
+        // If we have a Zend_Layout instance, use a specific formatter for the
+        // layout if one exists.  Otherwise, just use the event with its
+        // default format.
+        if ($this->_layout) {
+            if ($this->_layoutFormatter) {
+                $this->_layoutEventsToMail[] =
+                    $this->_layoutFormatter->format($event);
+            } else {
+                $this->_layoutEventsToMail[] = $formattedEvent;
+            }
+        }
+    }
+
+    /**
+     * Gets instance of Zend_Log_Formatter_Instance used for formatting a
+     * message using Zend_Layout, if applicable.
+     *
+     * @return Zend_Log_Formatter_Interface|null The formatter, or null.
+     */
+    public function getLayoutFormatter()
+    {
+        return $this->_layoutFormatter;
+    }
+
+    /**
+     * Sets a specific formatter for use with Zend_Layout events.
+     *
+     * Allows use of a second formatter on lines that will be rendered with
+     * Zend_Layout.  In the event that Zend_Layout is not being used, this
+     * formatter cannot be set, so an exception will be thrown.
+     *
+     * @param  Zend_Log_Formatter_Interface $formatter
+     * @return Zend_Log_Writer_Mail
+     * @throws Zend_Log_Exception
+     */
+    public function setLayoutFormatter(Zend_Log_Formatter_Interface $formatter)
+    {
+        if (!$this->_layout) {
+            throw new Zend_Log_Exception(
+                'cannot set formatter for layout; ' .
+                    'a Zend_Layout instance is not in use');
+        }
+
+        $this->_layoutFormatter = $formatter;
+        return $this;
+    }
+
+    /**
+     * Allows caller to have the mail subject dynamically set to contain the
+     * entry counts per-priority level.
+     *
+     * Sets the text for use in the subject, with entry counts per-priority
+     * level appended to the end.  Since a Zend_Mail subject can only be set
+     * once, this method cannot be used if the Zend_Mail object already has a
+     * subject set.
+     *
+     * @param  string $subject Subject prepend text.
+     * @return Zend_Log_Writer_Mail
+     * @throws Zend_Log_Exception
+     */
+    public function setSubjectPrependText($subject)
+    {
+        if ($this->_mail->getSubject()) {
+            throw new Zend_Log_Exception(
+                'subject already set on mail; ' .
+                    'cannot set subject prepend text');
+        }
+
+        $this->_subjectPrependText = (string) $subject;
+        return $this;
+    }
+
+    /**
+     * Sends mail to recipient(s) if log entries are present.  Note that both
+     * plaintext and HTML portions of email are handled here.
+     *
+     * @return void
+     */
+    public function shutdown()
+    {
+        // If there are events to mail, use them as message body.  Otherwise,
+        // there is no mail to be sent.
+        if (empty($this->_eventsToMail)) {
+            return;
+        }
+
+        if ($this->_subjectPrependText !== null) {
+            // Tack on the summary of entries per-priority to the subject
+            // line and set it on the Zend_Mail object.
+            $numEntries = $this->_getFormattedNumEntriesPerPriority();
+            $this->_mail->setSubject(
+                "{$this->_subjectPrependText} ({$numEntries})");
+        }
+
+
+        // Always provide events to mail as plaintext.
+        $this->_mail->setBodyText(implode('', $this->_eventsToMail));
+
+        // If a Zend_Layout instance is being used, set its "events"
+        // value to the lines formatted for use with the layout.
+        if ($this->_layout) {
+            // Set the required "messages" value for the layout.  Here we
+            // are assuming that the layout is for use with HTML.
+            $this->_layout->events =
+                implode('', $this->_layoutEventsToMail);
+
+            // If an exception occurs during rendering, convert it to a notice
+            // so we can avoid an exception thrown without a stack frame.
+            try {
+                $this->_mail->setBodyHtml($this->_layout->render());
+            } catch (Exception $e) {
+                trigger_error(
+                    "exception occurred when rendering layout; " .
+                        "unable to set html body for message; " .
+                        "message = {$e->getMessage()}; " .
+                        "code = {$e->getCode()}; " .
+                        "exception class = " . get_class($e),
+                    E_USER_NOTICE);
+            }
+        }
+
+        // Finally, send the mail.  If an exception occurs, convert it into a
+        // warning-level message so we can avoid an exception thrown without a
+        // stack frame.
+        try {
+            $this->_mail->send();
+        } catch (Exception $e) {
+            trigger_error(
+                "unable to send log entries via email; " .
+                    "message = {$e->getMessage()}; " .
+                    "code = {$e->getCode()}; " .
+                        "exception class = " . get_class($e),
+                E_USER_WARNING);
+        }
+    }
+
+    /**
+     * Gets a string of number of entries per-priority level that occurred, or
+     * an emptry string if none occurred.
+     *
+     * @return string
+     */
+    protected function _getFormattedNumEntriesPerPriority()
+    {
+        $strings = array();
+
+        foreach ($this->_numEntriesPerPriority as $priority => $numEntries) {
+            $strings[] = "{$priority}={$numEntries}";
+        }
+
+        return implode(', ', $strings);
+    }
+}
diff --git a/lib/zend/Zend/Log/Writer/Mock.php b/lib/zend/Zend/Log/Writer/Mock.php
new file mode 100644
index 00000000000..d8674bd85f0
--- /dev/null
+++ b/lib/zend/Zend/Log/Writer/Mock.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Writer_Abstract */
+require_once 'Zend/Log/Writer/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Writer_Mock extends Zend_Log_Writer_Abstract
+{
+    /**
+     * array of log events
+     *
+     * @var array
+     */
+    public $events = array();
+
+    /**
+     * shutdown called?
+     *
+     * @var boolean
+     */
+    public $shutdown = false;
+
+    /**
+     * Write a message to the log.
+     *
+     * @param  array  $event  event data
+     * @return void
+     */
+    public function _write($event)
+    {
+        $this->events[] = $event;
+    }
+
+    /**
+     * Record shutdown
+     *
+     * @return void
+     */
+    public function shutdown()
+    {
+        $this->shutdown = true;
+    }
+
+    /**
+     * Create a new instance of Zend_Log_Writer_Mock
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Writer_Mock
+     */
+    static public function factory($config)
+    {
+        return new self();
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php b/lib/zend/Zend/Log/Writer/Null.php
similarity index 53%
rename from lib/zend/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php
rename to lib/zend/Zend/Log/Writer/Null.php
index 5cee9287f72..f07bb7b6cdd 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php
+++ b/lib/zend/Zend/Log/Writer/Null.php
@@ -13,50 +13,44 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/** Zend_Log_Writer_Abstract */
+require_once 'Zend/Log/Writer/Abstract.php';
+
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
  */
-class Zend_Service_DeveloperGarden_BaseUserService_AccountBalance
+class Zend_Log_Writer_Null extends Zend_Log_Writer_Abstract
 {
     /**
-     * @var integer
-     */
-    public $Account = null;
-
-    /**
-     * @var integer $Credits
-     */
-    public $Credits = null;
-
-    /**
-     * returns the account id
+     * Write a message to the log.
      *
-     * @return integer
+     * @param  array  $event  event data
+     * @return void
      */
-    public function getAccount()
+    protected function _write($event)
     {
-        return $this->Account;
     }
 
     /**
-     * returns the credits
+     * Create a new instance of Zend_Log_Writer_Null
      *
-     * @return integer
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Writer_Null
      */
-    public function getCredits()
+    static public function factory($config)
     {
-        return $this->Credits;
+        return new self();
     }
 }
diff --git a/lib/zend/Zend/Log/Writer/Stream.php b/lib/zend/Zend/Log/Writer/Stream.php
new file mode 100644
index 00000000000..e3664d99c6d
--- /dev/null
+++ b/lib/zend/Zend/Log/Writer/Stream.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Writer_Abstract */
+require_once 'Zend/Log/Writer/Abstract.php';
+
+/** Zend_Log_Formatter_Simple */
+require_once 'Zend/Log/Formatter/Simple.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract
+{
+    /**
+     * Holds the PHP stream to log to.
+     *
+     * @var null|stream
+     */
+    protected $_stream = null;
+
+    /**
+     * Class Constructor
+     *
+     * @param array|string|resource $streamOrUrl Stream or URL to open as a stream
+     * @param string|null $mode Mode, only applicable if a URL is given
+     * @return void
+     * @throws Zend_Log_Exception
+     */
+    public function __construct($streamOrUrl, $mode = null)
+    {
+        // Setting the default
+        if (null === $mode) {
+            $mode = 'a';
+        }
+
+        if (is_resource($streamOrUrl)) {
+            if (get_resource_type($streamOrUrl) != 'stream') {
+                require_once 'Zend/Log/Exception.php';
+                throw new Zend_Log_Exception('Resource is not a stream');
+            }
+
+            if ($mode != 'a') {
+                require_once 'Zend/Log/Exception.php';
+                throw new Zend_Log_Exception('Mode cannot be changed on existing streams');
+            }
+
+            $this->_stream = $streamOrUrl;
+        } else {
+            if (is_array($streamOrUrl) && isset($streamOrUrl['stream'])) {
+                $streamOrUrl = $streamOrUrl['stream'];
+            }
+
+            if (! $this->_stream = @fopen($streamOrUrl, $mode, false)) {
+                require_once 'Zend/Log/Exception.php';
+                $msg = "\"$streamOrUrl\" cannot be opened with mode \"$mode\"";
+                throw new Zend_Log_Exception($msg);
+            }
+        }
+
+        $this->_formatter = new Zend_Log_Formatter_Simple();
+    }
+
+    /**
+     * Create a new instance of Zend_Log_Writer_Stream
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Writer_Stream
+     */
+    static public function factory($config)
+    {
+        $config = self::_parseConfig($config);
+        $config = array_merge(array(
+            'stream' => null,
+            'mode'   => null,
+        ), $config);
+
+        $streamOrUrl = isset($config['url']) ? $config['url'] : $config['stream'];
+
+        return new self(
+            $streamOrUrl,
+            $config['mode']
+        );
+    }
+
+    /**
+     * Close the stream resource.
+     *
+     * @return void
+     */
+    public function shutdown()
+    {
+        if (is_resource($this->_stream)) {
+            fclose($this->_stream);
+        }
+    }
+
+    /**
+     * Write a message to the log.
+     *
+     * @param  array  $event  event data
+     * @return void
+     * @throws Zend_Log_Exception
+     */
+    protected function _write($event)
+    {
+        $line = $this->_formatter->format($event);
+
+        if (false === @fwrite($this->_stream, $line)) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception("Unable to write to stream");
+        }
+    }
+}
diff --git a/lib/zend/Zend/Log/Writer/Syslog.php b/lib/zend/Zend/Log/Writer/Syslog.php
new file mode 100644
index 00000000000..66dfeaabf9f
--- /dev/null
+++ b/lib/zend/Zend/Log/Writer/Syslog.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log */
+require_once 'Zend/Log.php';
+
+/** Zend_Log_Writer_Abstract */
+require_once 'Zend/Log/Writer/Abstract.php';
+
+/**
+ * Writes log messages to syslog
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Log_Writer_Syslog extends Zend_Log_Writer_Abstract
+{
+    /**
+     * Maps Zend_Log priorities to PHP's syslog priorities
+     *
+     * @var array
+     */
+    protected $_priorities = array(
+        Zend_Log::EMERG  => LOG_EMERG,
+        Zend_Log::ALERT  => LOG_ALERT,
+        Zend_Log::CRIT   => LOG_CRIT,
+        Zend_Log::ERR    => LOG_ERR,
+        Zend_Log::WARN   => LOG_WARNING,
+        Zend_Log::NOTICE => LOG_NOTICE,
+        Zend_Log::INFO   => LOG_INFO,
+        Zend_Log::DEBUG  => LOG_DEBUG,
+    );
+
+    /**
+     * The default log priority - for unmapped custom priorities
+     *
+     * @var string
+     */
+    protected $_defaultPriority = LOG_NOTICE;
+
+    /**
+     * Last application name set by a syslog-writer instance
+     *
+     * @var string
+     */
+    protected static $_lastApplication;
+
+    /**
+     * Last facility name set by a syslog-writer instance
+     *
+     * @var string
+     */
+    protected static $_lastFacility;
+
+    /**
+     * Application name used by this syslog-writer instance
+     *
+     * @var string
+     */
+    protected $_application = 'Zend_Log';
+
+    /**
+     * Facility used by this syslog-writer instance
+     *
+     * @var int
+     */
+    protected $_facility = LOG_USER;
+
+    /**
+     * Types of program available to logging of message
+     *
+     * @var array
+     */
+    protected $_validFacilities = array();
+
+    /**
+     * Class constructor
+     *
+     * @param  array $params Array of options; may include "application" and "facility" keys
+     * @return void
+     */
+    public function __construct(array $params = array())
+    {
+        if (isset($params['application'])) {
+            $this->_application = $params['application'];
+        }
+
+        $runInitializeSyslog = true;
+        if (isset($params['facility'])) {
+            $this->setFacility($params['facility']);
+            $runInitializeSyslog = false;
+        }
+
+        if ($runInitializeSyslog) {
+            $this->_initializeSyslog();
+        }
+    }
+
+    /**
+     * Create a new instance of Zend_Log_Writer_Syslog
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Writer_Syslog
+     */
+    static public function factory($config)
+    {
+        return new self(self::_parseConfig($config));
+    }
+
+    /**
+     * Initialize values facilities
+     *
+     * @return void
+     */
+    protected function _initializeValidFacilities()
+    {
+        $constants = array(
+            'LOG_AUTH',
+            'LOG_AUTHPRIV',
+            'LOG_CRON',
+            'LOG_DAEMON',
+            'LOG_KERN',
+            'LOG_LOCAL0',
+            'LOG_LOCAL1',
+            'LOG_LOCAL2',
+            'LOG_LOCAL3',
+            'LOG_LOCAL4',
+            'LOG_LOCAL5',
+            'LOG_LOCAL6',
+            'LOG_LOCAL7',
+            'LOG_LPR',
+            'LOG_MAIL',
+            'LOG_NEWS',
+            'LOG_SYSLOG',
+            'LOG_USER',
+            'LOG_UUCP'
+        );
+
+        foreach ($constants as $constant) {
+            if (defined($constant)) {
+                $this->_validFacilities[] = constant($constant);
+            }
+        }
+    }
+
+    /**
+     * Initialize syslog / set application name and facility
+     *
+     * @return void
+     */
+    protected function _initializeSyslog()
+    {
+        self::$_lastApplication = $this->_application;
+        self::$_lastFacility    = $this->_facility;
+        openlog($this->_application, LOG_PID, $this->_facility);
+    }
+
+    /**
+     * Set syslog facility
+     *
+     * @param  int $facility Syslog facility
+     * @return Zend_Log_Writer_Syslog
+     * @throws Zend_Log_Exception for invalid log facility
+     */
+    public function setFacility($facility)
+    {
+        if ($this->_facility === $facility) {
+            return $this;
+        }
+
+        if (!count($this->_validFacilities)) {
+            $this->_initializeValidFacilities();
+        }
+
+        if (!in_array($facility, $this->_validFacilities)) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Invalid log facility provided; please see http://php.net/openlog for a list of valid facility values');
+        }
+
+        if ('WIN' == strtoupper(substr(PHP_OS, 0, 3))
+            && ($facility !== LOG_USER)
+        ) {
+            require_once 'Zend/Log/Exception.php';
+            throw new Zend_Log_Exception('Only LOG_USER is a valid log facility on Windows');
+        }
+
+        $this->_facility = $facility;
+        $this->_initializeSyslog();
+        return $this;
+    }
+
+    /**
+     * Set application name
+     *
+     * @param  string $application Application name
+     * @return Zend_Log_Writer_Syslog
+     */
+    public function setApplicationName($application)
+    {
+        if ($this->_application === $application) {
+            return $this;
+        }
+        $this->_application = $application;
+        $this->_initializeSyslog();
+        return $this;
+    }
+
+    /**
+     * Close syslog.
+     *
+     * @return void
+     */
+    public function shutdown()
+    {
+        closelog();
+    }
+
+    /**
+     * Write a message to syslog.
+     *
+     * @param  array $event event data
+     * @return void
+     */
+    protected function _write($event)
+    {
+        if (array_key_exists($event['priority'], $this->_priorities)) {
+            $priority = $this->_priorities[$event['priority']];
+        } else {
+            $priority = $this->_defaultPriority;
+        }
+
+        if ($this->_application !== self::$_lastApplication
+            || $this->_facility !== self::$_lastFacility)
+        {
+            $this->_initializeSyslog();
+        }
+
+        $message = $event['message'];
+        if ($this->_formatter instanceof Zend_Log_Formatter_Interface) {
+            $message = $this->_formatter->format($event);
+        }
+
+        syslog($priority, $message);
+    }
+}
diff --git a/lib/zend/Zend/Log/Writer/ZendMonitor.php b/lib/zend/Zend/Log/Writer/ZendMonitor.php
new file mode 100644
index 00000000000..0713a892257
--- /dev/null
+++ b/lib/zend/Zend/Log/Writer/ZendMonitor.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Log_Writer_Abstract */
+require_once 'Zend/Log/Writer/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage Writer
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Log_Writer_ZendMonitor extends Zend_Log_Writer_Abstract
+{
+    /**
+     * Is Zend Monitor enabled?
+     *
+     * @var boolean
+     */
+    protected $_isEnabled = true;
+
+    /**
+     * Is this for a Zend Server intance?
+     *
+     * @var boolean
+     */
+    protected $_isZendServer = false;
+
+    /**
+     * @return void
+     */
+    public function __construct()
+    {
+        if (!function_exists('monitor_custom_event')) {
+            $this->_isEnabled = false;
+        }
+        if (function_exists('zend_monitor_custom_event')) {
+            $this->_isZendServer = true;
+        }
+    }
+
+    /**
+     * Create a new instance of Zend_Log_Writer_ZendMonitor
+     *
+     * @param  array|Zend_Config $config
+     * @return Zend_Log_Writer_ZendMonitor
+     */
+    static public function factory($config)
+    {
+        return new self();
+    }
+
+    /**
+     * Is logging to this writer enabled?
+     *
+     * If the Zend Monitor extension is not enabled, this log writer will
+     * fail silently. You can query this method to determine if the log
+     * writer is enabled.
+     *
+     * @return boolean
+     */
+    public function isEnabled()
+    {
+        return $this->_isEnabled;
+    }
+
+    /**
+     * Log a message to this writer.
+     *
+     * @param  array $event log data event
+     * @return void
+     */
+    public function write($event)
+    {
+        if (!$this->isEnabled()) {
+            return;
+        }
+
+        parent::write($event);
+    }
+
+    /**
+     * Write a message to the log.
+     *
+     * @param  array  $event log data event
+     * @return void
+     */
+    protected function _write($event)
+    {
+        $priority = $event['priority'];
+        $message  = $event['message'];
+        unset($event['priority'], $event['message']);
+
+        if (!empty($event)) {
+            if ($this->_isZendServer) {
+                // On Zend Server; third argument should be the event
+                zend_monitor_custom_event($priority, $message, $event);
+            } else {
+                // On Zend Platform; third argument is severity -- either
+                // 0 or 1 -- and fourth is optional (event)
+                // Severity is either 0 (normal) or 1 (severe); classifying
+                // notice, info, and debug as "normal", and all others as
+                // "severe"
+                monitor_custom_event($priority, $message, ($priority > 4) ? 0 : 1, $event);
+            }
+        } else {
+            monitor_custom_event($priority, $message);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Mime.php b/lib/zend/Zend/Mime.php
deleted file mode 100644
index 68224b114c3..00000000000
--- a/lib/zend/Zend/Mime.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * Support class for MultiPart Mime Messages
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mime
-{
-    const TYPE_OCTETSTREAM = 'application/octet-stream';
-    const TYPE_TEXT = 'text/plain';
-    const TYPE_HTML = 'text/html';
-    const ENCODING_7BIT = '7bit';
-    const ENCODING_8BIT = '8bit';
-    const ENCODING_QUOTEDPRINTABLE = 'quoted-printable';
-    const ENCODING_BASE64 = 'base64';
-    const DISPOSITION_ATTACHMENT = 'attachment';
-    const DISPOSITION_INLINE = 'inline';
-    const LINELENGTH = 72;
-    const LINEEND = "\n";
-    const MULTIPART_ALTERNATIVE = 'multipart/alternative';
-    const MULTIPART_MIXED = 'multipart/mixed';
-    const MULTIPART_RELATED = 'multipart/related';
-
-    protected $_boundary;
-    protected static $makeUnique = 0;
-
-    // lookup-Tables for QuotedPrintable
-    public static $qpKeys = array(
-        "\x00","\x01","\x02","\x03","\x04","\x05","\x06","\x07",
-        "\x08","\x09","\x0A","\x0B","\x0C","\x0D","\x0E","\x0F",
-        "\x10","\x11","\x12","\x13","\x14","\x15","\x16","\x17",
-        "\x18","\x19","\x1A","\x1B","\x1C","\x1D","\x1E","\x1F",
-        "\x7F","\x80","\x81","\x82","\x83","\x84","\x85","\x86",
-        "\x87","\x88","\x89","\x8A","\x8B","\x8C","\x8D","\x8E",
-        "\x8F","\x90","\x91","\x92","\x93","\x94","\x95","\x96",
-        "\x97","\x98","\x99","\x9A","\x9B","\x9C","\x9D","\x9E",
-        "\x9F","\xA0","\xA1","\xA2","\xA3","\xA4","\xA5","\xA6",
-        "\xA7","\xA8","\xA9","\xAA","\xAB","\xAC","\xAD","\xAE",
-        "\xAF","\xB0","\xB1","\xB2","\xB3","\xB4","\xB5","\xB6",
-        "\xB7","\xB8","\xB9","\xBA","\xBB","\xBC","\xBD","\xBE",
-        "\xBF","\xC0","\xC1","\xC2","\xC3","\xC4","\xC5","\xC6",
-        "\xC7","\xC8","\xC9","\xCA","\xCB","\xCC","\xCD","\xCE",
-        "\xCF","\xD0","\xD1","\xD2","\xD3","\xD4","\xD5","\xD6",
-        "\xD7","\xD8","\xD9","\xDA","\xDB","\xDC","\xDD","\xDE",
-        "\xDF","\xE0","\xE1","\xE2","\xE3","\xE4","\xE5","\xE6",
-        "\xE7","\xE8","\xE9","\xEA","\xEB","\xEC","\xED","\xEE",
-        "\xEF","\xF0","\xF1","\xF2","\xF3","\xF4","\xF5","\xF6",
-        "\xF7","\xF8","\xF9","\xFA","\xFB","\xFC","\xFD","\xFE",
-        "\xFF"
-        );
-
-    public static $qpReplaceValues = array(
-        "=00","=01","=02","=03","=04","=05","=06","=07",
-        "=08","=09","=0A","=0B","=0C","=0D","=0E","=0F",
-        "=10","=11","=12","=13","=14","=15","=16","=17",
-        "=18","=19","=1A","=1B","=1C","=1D","=1E","=1F",
-        "=7F","=80","=81","=82","=83","=84","=85","=86",
-        "=87","=88","=89","=8A","=8B","=8C","=8D","=8E",
-        "=8F","=90","=91","=92","=93","=94","=95","=96",
-        "=97","=98","=99","=9A","=9B","=9C","=9D","=9E",
-        "=9F","=A0","=A1","=A2","=A3","=A4","=A5","=A6",
-        "=A7","=A8","=A9","=AA","=AB","=AC","=AD","=AE",
-        "=AF","=B0","=B1","=B2","=B3","=B4","=B5","=B6",
-        "=B7","=B8","=B9","=BA","=BB","=BC","=BD","=BE",
-        "=BF","=C0","=C1","=C2","=C3","=C4","=C5","=C6",
-        "=C7","=C8","=C9","=CA","=CB","=CC","=CD","=CE",
-        "=CF","=D0","=D1","=D2","=D3","=D4","=D5","=D6",
-        "=D7","=D8","=D9","=DA","=DB","=DC","=DD","=DE",
-        "=DF","=E0","=E1","=E2","=E3","=E4","=E5","=E6",
-        "=E7","=E8","=E9","=EA","=EB","=EC","=ED","=EE",
-        "=EF","=F0","=F1","=F2","=F3","=F4","=F5","=F6",
-        "=F7","=F8","=F9","=FA","=FB","=FC","=FD","=FE",
-        "=FF"
-        );
-
-    public static $qpKeysString =
-         "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF";
-
-    /**
-     * Check if the given string is "printable"
-     *
-     * Checks that a string contains no unprintable characters. If this returns
-     * false, encode the string for secure delivery.
-     *
-     * @param string $str
-     * @return boolean
-     */
-    public static function isPrintable($str)
-    {
-        return (strcspn($str, self::$qpKeysString) == strlen($str));
-    }
-
-    /**
-     * Encode a given string with the QUOTED_PRINTABLE mechanism and wrap the lines.
-     *
-     * @param string $str
-     * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
-     * @return string
-     */
-    public static function encodeQuotedPrintable($str,
-        $lineLength = self::LINELENGTH,
-        $lineEnd = self::LINEEND)
-    {
-        $out = '';
-        $str = self::_encodeQuotedPrintable($str);
-
-        // Split encoded text into separate lines
-        while ($str) {
-            $ptr = strlen($str);
-            if ($ptr > $lineLength) {
-                $ptr = $lineLength;
-            }
-
-            // Ensure we are not splitting across an encoded character
-            $pos = strrpos(substr($str, 0, $ptr), '=');
-            if ($pos !== false && $pos >= $ptr - 2) {
-                $ptr = $pos;
-            }
-
-            // Check if there is a space at the end of the line and rewind
-            if ($ptr > 0 && $str[$ptr - 1] == ' ') {
-                --$ptr;
-            }
-
-            // Add string and continue
-            $out .= substr($str, 0, $ptr) . '=' . $lineEnd;
-            $str = substr($str, $ptr);
-        }
-
-        $out = rtrim($out, $lineEnd);
-        $out = rtrim($out, '=');
-        return $out;
-    }
-
-    /**
-     * Converts a string into quoted printable format.
-     *
-     * @param  string $str
-     * @return string
-     */
-    private static function _encodeQuotedPrintable($str)
-    {
-        $str = str_replace('=', '=3D', $str);
-        $str = str_replace(self::$qpKeys, self::$qpReplaceValues, $str);
-        $str = rtrim($str);
-        return $str;
-    }
-
-    /**
-     * Encode a given string with the QUOTED_PRINTABLE mechanism for Mail Headers.
-     *
-     * Mail headers depend on an extended quoted printable algorithm otherwise
-     * a range of bugs can occur.
-     *
-     * @param string $str
-     * @param string $charset
-     * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
-     * @return string
-     */
-    public static function encodeQuotedPrintableHeader($str, $charset,
-        $lineLength = self::LINELENGTH,
-        $lineEnd = self::LINEEND)
-    {
-        // Reduce line-length by the length of the required delimiter, charsets and encoding
-        $prefix = sprintf('=?%s?Q?', $charset);
-        $lineLength = $lineLength-strlen($prefix)-3;
-
-        $str = self::_encodeQuotedPrintable($str);
-
-        // Mail-Header required chars have to be encoded also:
-        $str = str_replace(array('?', ' ', '_'), array('=3F', '=20', '=5F'), $str);
-
-        // initialize first line, we need it anyways
-        $lines = array(0 => "");
-
-        // Split encoded text into separate lines
-        $tmp = "";
-        while(strlen($str) > 0) {
-            $currentLine = max(count($lines)-1, 0);
-            $token       = self::getNextQuotedPrintableToken($str);
-            $str         = substr($str, strlen($token));
-
-            $tmp .= $token;
-            if($token == '=20') {
-                // only if we have a single char token or space, we can append the
-                // tempstring it to the current line or start a new line if necessary.
-                if(strlen($lines[$currentLine].$tmp) > $lineLength) {
-                    $lines[$currentLine+1] = $tmp;
-                } else {
-                    $lines[$currentLine] .= $tmp;
-                }
-                $tmp = "";
-            }
-            // don't forget to append the rest to the last line
-            if(strlen($str) == 0) {
-                $lines[$currentLine] .= $tmp;
-            }
-        }
-
-        // assemble the lines together by pre- and appending delimiters, charset, encoding.
-        for($i = 0; $i < count($lines); $i++) {
-            $lines[$i] = " ".$prefix.$lines[$i]."?=";
-        }
-        $str = trim(implode($lineEnd, $lines));
-        return $str;
-    }
-
-    /**
-     * Retrieves the first token from a quoted printable string.
-     *
-     * @param  string $str
-     * @return string
-     */
-    private static function getNextQuotedPrintableToken($str)
-    {
-        if(substr($str, 0, 1) == "=") {
-            $token = substr($str, 0, 3);
-        } else {
-            $token = substr($str, 0, 1);
-        }
-        return $token;
-    }
-
-    /**
-     * Encode a given string in mail header compatible base64 encoding.
-     *
-     * @param string $str
-     * @param string $charset
-     * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
-     * @return string
-     */
-    public static function encodeBase64Header($str,
-        $charset,
-        $lineLength = self::LINELENGTH,
-        $lineEnd = self::LINEEND)
-    {
-        $prefix = '=?' . $charset . '?B?';
-        $suffix = '?=';
-        $remainingLength = $lineLength - strlen($prefix) - strlen($suffix);
-
-        $encodedValue = self::encodeBase64($str, $remainingLength, $lineEnd);
-        $encodedValue = str_replace($lineEnd, $suffix . $lineEnd . ' ' . $prefix, $encodedValue);
-        $encodedValue = $prefix . $encodedValue . $suffix;
-        return $encodedValue;
-    }
-
-    /**
-     * Encode a given string in base64 encoding and break lines
-     * according to the maximum linelength.
-     *
-     * @param string $str
-     * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
-     * @return string
-     */
-    public static function encodeBase64($str,
-        $lineLength = self::LINELENGTH,
-        $lineEnd = self::LINEEND)
-    {
-        return rtrim(chunk_split(base64_encode($str), $lineLength, $lineEnd));
-    }
-
-    /**
-     * Constructor
-     *
-     * @param null|string $boundary
-     * @access public
-     * @return void
-     */
-    public function __construct($boundary = null)
-    {
-        // This string needs to be somewhat unique
-        if ($boundary === null) {
-            $this->_boundary = '=_' . md5(microtime(1) . self::$makeUnique++);
-        } else {
-            $this->_boundary = $boundary;
-        }
-    }
-
-    /**
-     * Encode the given string with the given encoding.
-     *
-     * @param string $str
-     * @param string $encoding
-     * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return string
-     */
-    public static function encode($str, $encoding, $EOL = self::LINEEND)
-    {
-        switch ($encoding) {
-            case self::ENCODING_BASE64:
-                return self::encodeBase64($str, self::LINELENGTH, $EOL);
-
-            case self::ENCODING_QUOTEDPRINTABLE:
-                return self::encodeQuotedPrintable($str, self::LINELENGTH, $EOL);
-
-            default:
-                /**
-                 * @todo 7Bit and 8Bit is currently handled the same way.
-                 */
-                return $str;
-        }
-    }
-
-    /**
-     * Return a MIME boundary
-     *
-     * @access public
-     * @return string
-     */
-    public function boundary()
-    {
-        return $this->_boundary;
-    }
-
-    /**
-     * Return a MIME boundary line
-     *
-     * @param mixed $EOL Defaults to {@link LINEEND}
-     * @access public
-     * @return string
-     */
-    public function boundaryLine($EOL = self::LINEEND)
-    {
-        return $EOL . '--' . $this->_boundary . $EOL;
-    }
-
-    /**
-     * Return MIME ending
-     *
-     * @access public
-     * @return string
-     */
-    public function mimeEnd($EOL = self::LINEEND)
-    {
-        return $EOL . '--' . $this->_boundary . '--' . $EOL;
-    }
-}
diff --git a/lib/zend/Zend/Mime/Decode.php b/lib/zend/Zend/Mime/Decode.php
deleted file mode 100644
index af413a90a80..00000000000
--- a/lib/zend/Zend/Mime/Decode.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-/**
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mime_Decode
-{
-    /**
-     * Explode MIME multipart string into seperate parts
-     *
-     * Parts consist of the header and the body of each MIME part.
-     *
-     * @param  string $body     raw body of message
-     * @param  string $boundary boundary as found in content-type
-     * @return array parts with content of each part, empty if no parts found
-     * @throws Zend_Exception
-     */
-    public static function splitMime($body, $boundary)
-    {
-        // TODO: we're ignoring \r for now - is this function fast enough and is it safe to asume noone needs \r?
-        $body = str_replace("\r", '', $body);
-
-        $start = 0;
-        $res = array();
-        // find every mime part limiter and cut out the
-        // string before it.
-        // the part before the first boundary string is discarded:
-        $p = strpos($body, '--' . $boundary . "\n", $start);
-        if ($p === false) {
-            // no parts found!
-            return array();
-        }
-
-        // position after first boundary line
-        $start = $p + 3 + strlen($boundary);
-
-        while (($p = strpos($body, '--' . $boundary . "\n", $start)) !== false) {
-            $res[] = substr($body, $start, $p-$start);
-            $start = $p + 3 + strlen($boundary);
-        }
-
-        // no more parts, find end boundary
-        $p = strpos($body, '--' . $boundary . '--', $start);
-        if ($p===false) {
-            throw new Zend_Exception('Not a valid Mime Message: End Missing');
-        }
-
-        // the remaining part also needs to be parsed:
-        $res[] = substr($body, $start, $p-$start);
-        return $res;
-    }
-
-    /**
-     * decodes a mime encoded String and returns a
-     * struct of parts with header and body
-     *
-     * @param  string $message  raw message content
-     * @param  string $boundary boundary as found in content-type
-     * @param  string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return array|null parts as array('header' => array(name => value), 'body' => content), null if no parts found
-     * @throws Zend_Exception
-     */
-    public static function splitMessageStruct($message, $boundary, $EOL = Zend_Mime::LINEEND)
-    {
-        $parts = self::splitMime($message, $boundary);
-        if (count($parts) <= 0) {
-            return null;
-        }
-        $result = array();
-        foreach ($parts as $part) {
-            self::splitMessage($part, $headers, $body, $EOL);
-            $result[] = array('header' => $headers,
-                              'body'   => $body    );
-        }
-        return $result;
-    }
-
-    /**
-     * split a message in header and body part, if no header or an
-     * invalid header is found $headers is empty
-     *
-     * The charset of the returned headers depend on your iconv settings.
-     *
-     * @param  string $message raw message with header and optional content
-     * @param  array  $headers output param, array with headers as array(name => value)
-     * @param  string $body    output param, content of message
-     * @param  string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return null
-     */
-    public static function splitMessage($message, &$headers, &$body, $EOL = Zend_Mime::LINEEND)
-    {
-        // check for valid header at first line
-        $firstline = strtok($message, "\n");
-        if (!preg_match('%^[^\s]+[^:]*:%', $firstline)) {
-            $headers = array();
-            // TODO: we're ignoring \r for now - is this function fast enough and is it safe to asume noone needs \r?
-            $body = str_replace(array("\r", "\n"), array('', $EOL), $message);
-            return;
-        }
-
-        // find an empty line between headers and body
-        // default is set new line
-        if (strpos($message, $EOL . $EOL)) {
-            list($headers, $body) = explode($EOL . $EOL, $message, 2);
-        // next is the standard new line
-        } else if ($EOL != "\r\n" && strpos($message, "\r\n\r\n")) {
-            list($headers, $body) = explode("\r\n\r\n", $message, 2);
-        // next is the other "standard" new line
-        } else if ($EOL != "\n" && strpos($message, "\n\n")) {
-            list($headers, $body) = explode("\n\n", $message, 2);
-        // at last resort find anything that looks like a new line
-        } else {
-            @list($headers, $body) = @preg_split("%([\r\n]+)\\1%U", $message, 2);
-        }
-
-        $headers = iconv_mime_decode_headers($headers, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
-
-        if ($headers === false ) {
-            // an error occurs during the decoding
-            return;
-        }
-
-        // normalize header names
-        foreach ($headers as $name => $header) {
-            $lower = strtolower($name);
-            if ($lower == $name) {
-                continue;
-            }
-            unset($headers[$name]);
-            if (!isset($headers[$lower])) {
-                $headers[$lower] = $header;
-                continue;
-            }
-            if (is_array($headers[$lower])) {
-                $headers[$lower][] = $header;
-                continue;
-            }
-            $headers[$lower] = array($headers[$lower], $header);
-        }
-    }
-
-    /**
-     * split a content type in its different parts
-     *
-     * @param  string $type       content-type
-     * @param  string $wantedPart the wanted part, else an array with all parts is returned
-     * @return string|array wanted part or all parts as array('type' => content-type, partname => value)
-     */
-    public static function splitContentType($type, $wantedPart = null)
-    {
-        return self::splitHeaderField($type, $wantedPart, 'type');
-    }
-
-    /**
-     * split a header field like content type in its different parts
-     *
-     * @param  string $type       header field
-     * @param  string $wantedPart the wanted part, else an array with all parts is returned
-     * @param  string $firstName  key name for the first part
-     * @return string|array wanted part or all parts as array($firstName => firstPart, partname => value)
-     * @throws Zend_Exception
-     */
-    public static function splitHeaderField($field, $wantedPart = null, $firstName = 0)
-    {
-        $wantedPart = strtolower($wantedPart);
-        $firstName = strtolower($firstName);
-
-        // special case - a bit optimized
-        if ($firstName === $wantedPart) {
-            $field = strtok($field, ';');
-            return $field[0] == '"' ? substr($field, 1, -1) : $field;
-        }
-
-        $field = $firstName . '=' . $field;
-        if (!preg_match_all('%([^=\s]+)\s*=\s*("[^"]+"|[^;]+)(;\s*|$)%', $field, $matches)) {
-            throw new Zend_Exception('not a valid header field');
-        }
-
-        if ($wantedPart) {
-            foreach ($matches[1] as $key => $name) {
-                if (strcasecmp($name, $wantedPart)) {
-                    continue;
-                }
-                if ($matches[2][$key][0] != '"') {
-                    return $matches[2][$key];
-                }
-                return substr($matches[2][$key], 1, -1);
-            }
-            return null;
-        }
-
-        $split = array();
-        foreach ($matches[1] as $key => $name) {
-            $name = strtolower($name);
-            if ($matches[2][$key][0] == '"') {
-                $split[$name] = substr($matches[2][$key], 1, -1);
-            } else {
-                $split[$name] = $matches[2][$key];
-            }
-        }
-
-        return $split;
-    }
-
-    /**
-     * decode a quoted printable encoded string
-     *
-     * The charset of the returned string depends on your iconv settings.
-     *
-     * @param  string encoded string
-     * @return string decoded string
-     */
-    public static function decodeQuotedPrintable($string)
-    {
-        return iconv_mime_decode($string, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
-    }
-}
diff --git a/lib/zend/Zend/Mime/Message.php b/lib/zend/Zend/Mime/Message.php
deleted file mode 100644
index 6ca1f17a76c..00000000000
--- a/lib/zend/Zend/Mime/Message.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-/**
- * Zend_Mime_Part
- */
-require_once 'Zend/Mime/Part.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mime_Message
-{
-
-    protected $_parts = array();
-    protected $_mime = null;
-
-    /**
-     * Returns the list of all Zend_Mime_Parts in the message
-     *
-     * @return array of Zend_Mime_Part
-     */
-    public function getParts()
-    {
-        return $this->_parts;
-    }
-
-    /**
-     * Sets the given array of Zend_Mime_Parts as the array for the message
-     *
-     * @param array $parts
-     */
-    public function setParts($parts)
-    {
-        $this->_parts = $parts;
-    }
-
-    /**
-     * Append a new Zend_Mime_Part to the current message
-     *
-     * @param Zend_Mime_Part $part
-     */
-    public function addPart(Zend_Mime_Part $part)
-    {
-        /**
-         * @todo check for duplicate object handle
-         */
-        $this->_parts[] = $part;
-    }
-
-    /**
-     * Check if message needs to be sent as multipart
-     * MIME message or if it has only one part.
-     *
-     * @return boolean
-     */
-    public function isMultiPart()
-    {
-        return (count($this->_parts) > 1);
-    }
-
-    /**
-     * Set Zend_Mime object for the message
-     *
-     * This can be used to set the boundary specifically or to use a subclass of
-     * Zend_Mime for generating the boundary.
-     *
-     * @param Zend_Mime $mime
-     */
-    public function setMime(Zend_Mime $mime)
-    {
-        $this->_mime = $mime;
-    }
-
-    /**
-     * Returns the Zend_Mime object in use by the message
-     *
-     * If the object was not present, it is created and returned. Can be used to
-     * determine the boundary used in this message.
-     *
-     * @return Zend_Mime
-     */
-    public function getMime()
-    {
-        if ($this->_mime === null) {
-            $this->_mime = new Zend_Mime();
-        }
-
-        return $this->_mime;
-    }
-
-    /**
-     * Generate MIME-compliant message from the current configuration
-     *
-     * This can be a multipart message if more than one MIME part was added. If
-     * only one part is present, the content of this part is returned. If no
-     * part had been added, an empty string is returned.
-     *
-     * Parts are seperated by the mime boundary as defined in Zend_Mime. If
-     * {@link setMime()} has been called before this method, the Zend_Mime
-     * object set by this call will be used. Otherwise, a new Zend_Mime object
-     * is generated and used.
-     *
-     * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return string
-     */
-    public function generateMessage($EOL = Zend_Mime::LINEEND)
-    {
-        if (! $this->isMultiPart()) {
-            $body = array_shift($this->_parts);
-            $body = $body->getContent($EOL);
-        } else {
-            $mime = $this->getMime();
-
-            $boundaryLine = $mime->boundaryLine($EOL);
-            $body = 'This is a message in Mime Format.  If you see this, '
-                  . "your mail reader does not support this format." . $EOL;
-
-            foreach (array_keys($this->_parts) as $p) {
-                $body .= $boundaryLine
-                       . $this->getPartHeaders($p, $EOL)
-                       . $EOL
-                       . $this->getPartContent($p, $EOL);
-            }
-
-            $body .= $mime->mimeEnd($EOL);
-        }
-
-        return trim($body);
-    }
-
-    /**
-     * Get the headers of a given part as an array
-     *
-     * @param int $partnum
-     * @return array
-     */
-    public function getPartHeadersArray($partnum)
-    {
-        return $this->_parts[$partnum]->getHeadersArray();
-    }
-
-    /**
-     * Get the headers of a given part as a string
-     *
-     * @param int $partnum
-     * @return string
-     */
-    public function getPartHeaders($partnum, $EOL = Zend_Mime::LINEEND)
-    {
-        return $this->_parts[$partnum]->getHeaders($EOL);
-    }
-
-    /**
-     * Get the (encoded) content of a given part as a string
-     *
-     * @param int $partnum
-     * @return string
-     */
-    public function getPartContent($partnum, $EOL = Zend_Mime::LINEEND)
-    {
-        return $this->_parts[$partnum]->getContent($EOL);
-    }
-
-    /**
-     * Explode MIME multipart string into seperate parts
-     *
-     * Parts consist of the header and the body of each MIME part.
-     *
-     * @param string $body
-     * @param string $boundary
-     * @return array
-     */
-    protected static function _disassembleMime($body, $boundary)
-    {
-        $start = 0;
-        $res = array();
-        // find every mime part limiter and cut out the
-        // string before it.
-        // the part before the first boundary string is discarded:
-        $p = strpos($body, '--'.$boundary."\n", $start);
-        if ($p === false) {
-            // no parts found!
-            return array();
-        }
-
-        // position after first boundary line
-        $start = $p + 3 + strlen($boundary);
-
-        while (($p = strpos($body, '--' . $boundary . "\n", $start)) !== false) {
-            $res[] = substr($body, $start, $p-$start);
-            $start = $p + 3 + strlen($boundary);
-        }
-
-        // no more parts, find end boundary
-        $p = strpos($body, '--' . $boundary . '--', $start);
-        if ($p===false) {
-            throw new Zend_Exception('Not a valid Mime Message: End Missing');
-        }
-
-        // the remaining part also needs to be parsed:
-        $res[] = substr($body, $start, $p-$start);
-        return $res;
-    }
-
-    /**
-     * Decodes a MIME encoded string and returns a Zend_Mime_Message object with
-     * all the MIME parts set according to the given string
-     *
-     * @param string $message
-     * @param string $boundary
-     * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return Zend_Mime_Message
-     */
-    public static function createFromMessage($message, $boundary, $EOL = Zend_Mime::LINEEND)
-    {
-        require_once 'Zend/Mime/Decode.php';
-        $parts = Zend_Mime_Decode::splitMessageStruct($message, $boundary, $EOL);
-
-        $res = new self();
-        foreach ($parts as $part) {
-            // now we build a new MimePart for the current Message Part:
-            $newPart = new Zend_Mime_Part($part['body']);
-            foreach ($part['header'] as $key => $value) {
-                /**
-                 * @todo check for characterset and filename
-                 */
-                switch(strtolower($key)) {
-                    case 'content-type':
-                        $newPart->type = $value;
-                        break;
-                    case 'content-transfer-encoding':
-                        $newPart->encoding = $value;
-                        break;
-                    case 'content-id':
-                        $newPart->id = trim($value,'<>');
-                        break;
-                    case 'content-disposition':
-                        $newPart->disposition = $value;
-                        break;
-                    case 'content-description':
-                        $newPart->description = $value;
-                        break;
-                    case 'content-location':
-                        $newPart->location = $value;
-                        break;
-                    case 'content-language':
-                        $newPart->language = $value;
-                        break;
-                    default:
-                        throw new Zend_Exception('Unknown header ignored for MimePart:' . $key);
-                }
-            }
-            $res->addPart($newPart);
-        }
-        return $res;
-    }
-}
diff --git a/lib/zend/Zend/Mime/Part.php b/lib/zend/Zend/Mime/Part.php
deleted file mode 100644
index f88b1312591..00000000000
--- a/lib/zend/Zend/Mime/Part.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-/**
- * Class representing a MIME part.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mime_Part {
-
-    public $type = Zend_Mime::TYPE_OCTETSTREAM;
-    public $encoding = Zend_Mime::ENCODING_8BIT;
-    public $id;
-    public $disposition;
-    public $filename;
-    public $description;
-    public $charset;
-    public $boundary;
-    public $location;
-    public $language;
-    protected $_content;
-    protected $_isStream = false;
-
-
-    /**
-     * create a new Mime Part.
-     * The (unencoded) content of the Part as passed
-     * as a string or stream
-     *
-     * @param mixed $content  String or Stream containing the content
-     */
-    public function __construct($content)
-    {
-        $this->_content = $content;
-        if (is_resource($content)) {
-            $this->_isStream = true;
-        }
-    }
-
-    /**
-     * @todo setters/getters
-     * @todo error checking for setting $type
-     * @todo error checking for setting $encoding
-     */
-
-    /**
-     * check if this part can be read as a stream.
-     * if true, getEncodedStream can be called, otherwise
-     * only getContent can be used to fetch the encoded
-     * content of the part
-     *
-     * @return bool
-     */
-    public function isStream()
-    {
-      return $this->_isStream;
-    }
-
-    /**
-     * if this was created with a stream, return a filtered stream for
-     * reading the content. very useful for large file attachments.
-     *
-     * @return stream
-     * @throws Zend_Mime_Exception if not a stream or unable to append filter
-     */
-    public function getEncodedStream()
-    {
-        if (!$this->_isStream) {
-            require_once 'Zend/Mime/Exception.php';
-            throw new Zend_Mime_Exception('Attempt to get a stream from a string part');
-        }
-
-        //stream_filter_remove(); // ??? is that right?
-        switch ($this->encoding) {
-            case Zend_Mime::ENCODING_QUOTEDPRINTABLE:
-                $filter = stream_filter_append(
-                    $this->_content,
-                    'convert.quoted-printable-encode',
-                    STREAM_FILTER_READ,
-                    array(
-                        'line-length'      => 76,
-                        'line-break-chars' => Zend_Mime::LINEEND
-                    )
-                );
-                if (!is_resource($filter)) {
-                    require_once 'Zend/Mime/Exception.php';
-                    throw new Zend_Mime_Exception('Failed to append quoted-printable filter');
-                }
-                break;
-            case Zend_Mime::ENCODING_BASE64:
-                $filter = stream_filter_append(
-                    $this->_content,
-                    'convert.base64-encode',
-                    STREAM_FILTER_READ,
-                    array(
-                        'line-length'      => 76,
-                        'line-break-chars' => Zend_Mime::LINEEND
-                    )
-                );
-                if (!is_resource($filter)) {
-                    require_once 'Zend/Mime/Exception.php';
-                    throw new Zend_Mime_Exception('Failed to append base64 filter');
-                }
-                break;
-            default:
-        }
-        return $this->_content;
-    }
-
-    /**
-     * Get the Content of the current Mime Part in the given encoding.
-     *
-     * @return String
-     */
-    public function getContent($EOL = Zend_Mime::LINEEND)
-    {
-        if ($this->_isStream) {
-            return stream_get_contents($this->getEncodedStream());
-        } else {
-            return Zend_Mime::encode($this->_content, $this->encoding, $EOL);
-        }
-    }
-
-    /**
-     * Create and return the array of headers for this MIME part
-     *
-     * @access public
-     * @return array
-     */
-    public function getHeadersArray($EOL = Zend_Mime::LINEEND)
-    {
-        $headers = array();
-
-        $contentType = $this->type;
-        if ($this->charset) {
-            $contentType .= '; charset=' . $this->charset;
-        }
-
-        if ($this->boundary) {
-            $contentType .= ';' . $EOL
-                          . " boundary=\"" . $this->boundary . '"';
-        }
-
-        $headers[] = array('Content-Type', $contentType);
-
-        if ($this->encoding) {
-            $headers[] = array('Content-Transfer-Encoding', $this->encoding);
-        }
-
-        if ($this->id) {
-            $headers[]  = array('Content-ID', '<' . $this->id . '>');
-        }
-
-        if ($this->disposition) {
-            $disposition = $this->disposition;
-            if ($this->filename) {
-                $disposition .= '; filename="' . $this->filename . '"';
-            }
-            $headers[] = array('Content-Disposition', $disposition);
-        }
-
-        if ($this->description) {
-            $headers[] = array('Content-Description', $this->description);
-        }
-
-        if ($this->location) {
-            $headers[] = array('Content-Location', $this->location);
-        }
-
-        if ($this->language){
-            $headers[] = array('Content-Language', $this->language);
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Return the headers for this part as a string
-     *
-     * @return String
-     */
-    public function getHeaders($EOL = Zend_Mime::LINEEND)
-    {
-        $res = '';
-        foreach ($this->getHeadersArray($EOL) as $header) {
-            $res .= $header[0] . ': ' . $header[1] . $EOL;
-        }
-
-        return $res;
-    }
-}
diff --git a/lib/zend/Zend/Navigation.php b/lib/zend/Zend/Navigation.php
new file mode 100644
index 00000000000..0c7f7c5781a
--- /dev/null
+++ b/lib/zend/Zend/Navigation.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Navigation
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Navigation_Container
+ */
+require_once 'Zend/Navigation/Container.php';
+
+/**
+ * A simple container class for {@link Zend_Navigation_Page} pages
+ *
+ * @category  Zend
+ * @package   Zend_Navigation
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Navigation extends Zend_Navigation_Container
+{
+    /**
+     * Creates a new navigation container
+     *
+     * @param array|Zend_Config $pages    [optional] pages to add
+     * @throws Zend_Navigation_Exception  if $pages is invalid
+     */
+    public function __construct($pages = null)
+    {
+        if (is_array($pages) || $pages instanceof Zend_Config) {
+            $this->addPages($pages);
+        } elseif (null !== $pages) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $pages must be an array, an ' .
+                    'instance of Zend_Config, or null');
+        }
+    }
+}
diff --git a/lib/zend/Zend/Navigation/Container.php b/lib/zend/Zend/Navigation/Container.php
new file mode 100644
index 00000000000..8a05075f073
--- /dev/null
+++ b/lib/zend/Zend/Navigation/Container.php
@@ -0,0 +1,623 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Navigation
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Zend_Navigation_Container
+ *
+ * Container class for Zend_Navigation_Page classes.
+ *
+ * @category  Zend
+ * @package   Zend_Navigation
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Navigation_Container implements RecursiveIterator, Countable
+{
+    /**
+     * Contains sub pages
+     *
+     * @var Zend_Navigation_Page[]
+     */
+    protected $_pages = array();
+
+    /**
+     * An index that contains the order in which to iterate pages
+     *
+     * @var array
+     */
+    protected $_index = array();
+
+    /**
+     * Whether index is dirty and needs to be re-arranged
+     *
+     * @var bool
+     */
+    protected $_dirtyIndex = false;
+
+    // Internal methods:
+
+    /**
+     * Sorts the page index according to page order
+     *
+     * @return void
+     */
+    protected function _sort()
+    {
+        if ($this->_dirtyIndex) {
+            $newIndex = array();
+            $index = 0;
+
+            foreach ($this->_pages as $hash => $page) {
+                $order = $page->getOrder();
+                if ($order === null) {
+                    $newIndex[$hash] = $index;
+                    $index++;
+                } else {
+                    $newIndex[$hash] = $order;
+                }
+            }
+
+            asort($newIndex);
+            $this->_index = $newIndex;
+            $this->_dirtyIndex = false;
+        }
+    }
+
+    // Public methods:
+
+    /**
+     * Notifies container that the order of pages are updated
+     *
+     * @return void
+     */
+    public function notifyOrderUpdated()
+    {
+        $this->_dirtyIndex = true;
+    }
+
+    /**
+     * Adds a page to the container
+     *
+     * This method will inject the container as the given page's parent by
+     * calling {@link Zend_Navigation_Page::setParent()}.
+     *
+     * @param  Zend_Navigation_Page|array|Zend_Config $page  page to add
+     * @return Zend_Navigation_Container                     fluent interface,
+     *                                                       returns self
+     * @throws Zend_Navigation_Exception                     if page is invalid
+     */
+    public function addPage($page)
+    {
+        if ($page === $this) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'A page cannot have itself as a parent');
+        }
+
+        if (is_array($page) || $page instanceof Zend_Config) {
+            require_once 'Zend/Navigation/Page.php';
+            $page = Zend_Navigation_Page::factory($page);
+        } elseif (!$page instanceof Zend_Navigation_Page) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $page must be an instance of ' .
+                    'Zend_Navigation_Page or Zend_Config, or an array');
+        }
+
+        $hash = $page->hashCode();
+
+        if (array_key_exists($hash, $this->_index)) {
+            // page is already in container
+            return $this;
+        }
+
+        // adds page to container and sets dirty flag
+        $this->_pages[$hash] = $page;
+        $this->_index[$hash] = $page->getOrder();
+        $this->_dirtyIndex = true;
+
+        // inject self as page parent
+        $page->setParent($this);
+
+        return $this;
+    }
+
+    /**
+     * Adds several pages at once
+     *
+     * @param  Zend_Navigation_Page[]|Zend_Config|Zend_Navigation_Container  $pages  pages to add
+     * @return Zend_Navigation_Container                    fluent interface,
+     *                                                      returns self
+     * @throws Zend_Navigation_Exception                    if $pages is not 
+     *                                                      array, Zend_Config or
+     *                                                      Zend_Navigation_Container
+     */
+    public function addPages($pages)
+    {
+        if ($pages instanceof Zend_Config) {
+            $pages = $pages->toArray();
+        }
+
+        if ($pages instanceof Zend_Navigation_Container) {
+            $pages = iterator_to_array($pages);
+        }
+
+        if (!is_array($pages)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $pages must be an array, an ' .
+                    'instance of Zend_Config or an instance of ' .
+                    'Zend_Navigation_Container');
+        }
+
+        foreach ($pages as $page) {
+            $this->addPage($page);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sets pages this container should have, removing existing pages
+     *
+     * @param  Zend_Navigation_Page[] $pages               pages to set
+     * @return Zend_Navigation_Container  fluent interface, returns self
+     */
+    public function setPages(array $pages)
+    {
+        $this->removePages();
+        return $this->addPages($pages);
+    }
+
+    /**
+     * Returns pages in the container
+     *
+     * @return Zend_Navigation_Page[]  array of Zend_Navigation_Page instances
+     */
+    public function getPages()
+    {
+        return $this->_pages;
+    }
+
+    /**
+     * Removes the given page from the container
+     *
+     * @param  Zend_Navigation_Page|int $page      page to remove, either a page
+     *                                             instance or a specific page order
+     * @param  bool                     $recursive [optional] whether to remove recursively
+     * @return bool whether the removal was successful
+     */
+    public function removePage($page, $recursive = false)
+    {
+        if ($page instanceof Zend_Navigation_Page) {
+            $hash = $page->hashCode();
+        } elseif (is_int($page)) {
+            $this->_sort();
+            if (!$hash = array_search($page, $this->_index)) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+
+        if (isset($this->_pages[$hash])) {
+            unset($this->_pages[$hash]);
+            unset($this->_index[$hash]);
+            $this->_dirtyIndex = true;
+            return true;
+        }
+
+        if ($recursive) {
+            /** @var Zend_Navigation_Page $childPage */
+            foreach ($this->_pages as $childPage) {
+                if ($childPage->hasPage($page, true)) {
+                    $childPage->removePage($page, true);
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes all pages in container
+     *
+     * @return Zend_Navigation_Container  fluent interface, returns self
+     */
+    public function removePages()
+    {
+        $this->_pages = array();
+        $this->_index = array();
+        return $this;
+    }
+
+    /**
+     * Checks if the container has the given page
+     *
+     * @param  Zend_Navigation_Page $page       page to look for
+     * @param  bool                 $recursive  [optional] whether to search
+     *                                          recursively. Default is false.
+     * @return bool                             whether page is in container
+     */
+    public function hasPage(Zend_Navigation_Page $page, $recursive = false)
+    {
+        if (array_key_exists($page->hashCode(), $this->_index)) {
+            return true;
+        } elseif ($recursive) {
+            foreach ($this->_pages as $childPage) {
+                if ($childPage->hasPage($page, true)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns true if container contains any pages
+     *
+     * @return bool  whether container has any pages
+     */
+    public function hasPages()
+    {
+        return count($this->_index) > 0;
+    }
+
+    /**
+     * Returns a child page matching $property == $value or 
+     * preg_match($value, $property), or null if not found
+     *
+     * @param  string  $property          name of property to match against
+     * @param  mixed   $value             value to match property against
+     * @param  bool    $useRegex          [optional] if true PHP's preg_match
+     *                                    is used. Default is false.
+     * @return Zend_Navigation_Page|null  matching page or null
+     */
+    public function findOneBy($property, $value, $useRegex = false)
+    {        
+        $iterator = new RecursiveIteratorIterator(
+            $this,
+            RecursiveIteratorIterator::SELF_FIRST
+        );
+
+        foreach ($iterator as $page) {
+            $pageProperty = $page->get($property);
+            
+            // Rel and rev
+            if (is_array($pageProperty)) {
+                foreach ($pageProperty as $item) {
+                    if (is_array($item)) {
+                        // Use regex?
+                        if (true === $useRegex) {
+                            foreach ($item as $item2) {
+                                if (0 !== preg_match($value, $item2)) {
+                                    return $page;
+                                }
+                            }
+                        } else {
+                            if (in_array($value, $item)) {
+                                return $page;
+                            }
+                        }
+                    } else {
+                        // Use regex?
+                        if (true === $useRegex) {
+                            if (0 !== preg_match($value, $item)) {
+                                return $page;
+                            }
+                        } else {
+                            if ($item == $value) {
+                                return $page;
+                            }
+                        }
+                    }
+                }
+                
+                continue;
+            }
+            
+            // Use regex?
+            if (true === $useRegex) {
+                if (preg_match($value, $pageProperty)) {
+                    return $page;
+                }
+            } else {
+                if ($pageProperty == $value) {
+                    return $page;
+                }
+            }
+        }
+        
+        return null;
+    }
+
+    /**
+     * Returns all child pages matching $property == $value or
+     * preg_match($value, $property), or an empty array if no pages are found
+     *
+     * @param  string $property  name of property to match against
+     * @param  mixed  $value     value to match property against
+     * @param  bool   $useRegex  [optional] if true PHP's preg_match is used.
+     *                           Default is false.
+     * @return Zend_Navigation_Page[] array containing only Zend_Navigation_Page
+     *                           instances
+     */
+    public function findAllBy($property, $value, $useRegex = false)
+    {        
+        $found = array();
+
+        $iterator = new RecursiveIteratorIterator(
+            $this,
+            RecursiveIteratorIterator::SELF_FIRST
+        );
+        
+        foreach ($iterator as $page) {
+            $pageProperty = $page->get($property);
+            
+            // Rel and rev
+            if (is_array($pageProperty)) {
+                foreach ($pageProperty as $item) {
+                    if (is_array($item)) {
+                        // Use regex?
+                        if (true === $useRegex) {
+                            foreach ($item as $item2) {
+                                if (0 !== preg_match($value, $item2)) {
+                                    $found[] = $page;
+                                }
+                            }
+                        } else {
+                            if (in_array($value, $item)) {
+                                $found[] = $page;
+                            }
+                        }
+                    } else {
+                        // Use regex?
+                        if (true === $useRegex) {
+                            if (0 !== preg_match($value, $item)) {
+                                $found[] = $page;
+                            }
+                        } else {
+                            if ($item == $value) {
+                                $found[] = $page;
+                            }
+                        }
+                    }
+                }
+                
+                continue;
+            }
+            
+            // Use regex?
+            if (true === $useRegex) {
+                if (0 !== preg_match($value, $pageProperty)) {
+                    $found[] = $page;
+                }
+            } else {
+                if ($pageProperty == $value) {
+                    $found[] = $page;
+                }
+            }
+        }
+
+        return $found;
+    }
+
+    /**
+     * Returns page(s) matching $property == $value or
+     * preg_match($value, $property)
+     *
+     * @param  string $property  name of property to match against
+     * @param  mixed  $value     value to match property against
+     * @param  bool   $all       [optional] whether an array of all matching
+     *                           pages should be returned, or only the first.
+     *                           If true, an array will be returned, even if not
+     *                           matching pages are found. If false, null will
+     *                           be returned if no matching page is found.
+     *                           Default is false.
+     * @param  bool   $useRegex  [optional] if true PHP's preg_match is used.
+     *                           Default is false.
+     * @return Zend_Navigation_Page|null  matching page or null
+     */
+    public function findBy($property, $value, $all = false, $useRegex = false)
+    {
+        if ($all) {
+            return $this->findAllBy($property, $value, $useRegex);
+        } else {
+            return $this->findOneBy($property, $value, $useRegex);
+        }
+    }
+
+    /**
+     * Magic overload: Proxy calls to finder methods
+     *
+     * Examples of finder calls:
+     * <code>
+     * // METHOD                         // SAME AS
+     * $nav->findByLabel('foo');         // $nav->findOneBy('label', 'foo');
+     * $nav->findByLabel('/foo/', true); // $nav->findBy('label', '/foo/', true);
+     * $nav->findOneByLabel('foo');      // $nav->findOneBy('label', 'foo');
+     * $nav->findAllByClass('foo');      // $nav->findAllBy('class', 'foo');
+     * </code>
+     *
+     * @param  string $method                       method name
+     * @param  array  $arguments                    method arguments
+     * @return mixed  Zend_Navigation|array|null    matching page, array of pages
+     *                                              or null
+     * @throws Zend_Navigation_Exception            if method does not exist
+     */
+    public function __call($method, $arguments)
+    {
+        if (@preg_match('/(find(?:One|All)?By)(.+)/', $method, $match)) {
+            return $this->{$match[1]}($match[2], $arguments[0], !empty($arguments[1]));
+        }
+
+        require_once 'Zend/Navigation/Exception.php';
+        throw new Zend_Navigation_Exception(
+            sprintf(
+                'Bad method call: Unknown method %s::%s',
+                get_class($this),
+                $method
+            )
+        );
+    }
+
+    /**
+     * Returns an array representation of all pages in container
+     *
+     * @return Zend_Navigation_Page[]
+     */
+    public function toArray()
+    {
+        $pages = array();
+
+        $this->_dirtyIndex = true;
+        $this->_sort();
+        $indexes = array_keys($this->_index);
+        foreach ($indexes as $hash) {
+            $pages[] = $this->_pages[$hash]->toArray();
+        }
+        return $pages;
+    }
+
+    // RecursiveIterator interface:
+
+    /**
+     * Returns current page
+     *
+     * Implements RecursiveIterator interface.
+     *
+     * @return Zend_Navigation_Page       current page or null
+     * @throws Zend_Navigation_Exception  if the index is invalid
+     */
+    public function current()
+    {
+        $this->_sort();
+        current($this->_index);
+        $hash = key($this->_index);
+
+        if (isset($this->_pages[$hash])) {
+            return $this->_pages[$hash];
+        } else {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Corruption detected in container; ' .
+                    'invalid key found in internal iterator');
+        }
+    }
+
+    /**
+     * Returns hash code of current page
+     *
+     * Implements RecursiveIterator interface.
+     *
+     * @return string  hash code of current page
+     */
+    public function key()
+    {
+        $this->_sort();
+        return key($this->_index);
+    }
+
+    /**
+     * Moves index pointer to next page in the container
+     *
+     * Implements RecursiveIterator interface.
+     *
+     * @return void
+     */
+    public function next()
+    {
+        $this->_sort();
+        next($this->_index);
+    }
+
+    /**
+     * Sets index pointer to first page in the container
+     *
+     * Implements RecursiveIterator interface.
+     *
+     * @return void
+     */
+    public function rewind()
+    {
+        $this->_sort();
+        reset($this->_index);
+    }
+
+    /**
+     * Checks if container index is valid
+     *
+     * Implements RecursiveIterator interface.
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        $this->_sort();
+        return current($this->_index) !== false;
+    }
+
+    /**
+     * Proxy to hasPages()
+     *
+     * Implements RecursiveIterator interface.
+     *
+     * @return bool  whether container has any pages
+     */
+    public function hasChildren()
+    {
+        return $this->hasPages();
+    }
+
+    /**
+     * Returns the child container.
+     *
+     * Implements RecursiveIterator interface.
+     *
+     * @return Zend_Navigation_Page|null
+     */
+    public function getChildren()
+    {
+        $hash = key($this->_index);
+
+        if (isset($this->_pages[$hash])) {
+            return $this->_pages[$hash];
+        }
+
+        return null;
+    }
+
+    // Countable interface:
+
+    /**
+     * Returns number of pages in container
+     *
+     * Implements Countable interface.
+     *
+     * @return int  number of pages in the container
+     */
+    public function count()
+    {
+        return count($this->_index);
+    }
+}
diff --git a/lib/zend/Zend/Navigation/Exception.php b/lib/zend/Zend/Navigation/Exception.php
new file mode 100644
index 00000000000..81be80311e3
--- /dev/null
+++ b/lib/zend/Zend/Navigation/Exception.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Navigation
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+/**
+ * Navigation exception
+ *
+ * @category  Zend
+ * @package   Zend_Navigation
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Navigation_Exception extends Zend_Exception
+{
+
+}
diff --git a/lib/zend/Zend/Navigation/Page.php b/lib/zend/Zend/Navigation/Page.php
new file mode 100644
index 00000000000..c3a799800f8
--- /dev/null
+++ b/lib/zend/Zend/Navigation/Page.php
@@ -0,0 +1,1367 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Navigation
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Navigation_Container
+ */
+require_once 'Zend/Navigation/Container.php';
+
+/**
+ * Base class for Zend_Navigation_Page pages
+ *
+ * @category  Zend
+ * @package   Zend_Navigation
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Navigation_Page extends Zend_Navigation_Container
+{
+    /**
+     * Page label
+     *
+     * @var string|null
+     */
+    protected $_label;
+
+    /**
+     * Fragment identifier (anchor identifier)
+     * 
+     * The fragment identifier (anchor identifier) pointing to an anchor within 
+     * a resource that is subordinate to another, primary resource.
+     * The fragment identifier introduced by a hash mark "#".
+     * Example: http://www.example.org/foo.html#bar ("bar" is the fragment identifier)
+     * 
+     * @link http://www.w3.org/TR/html401/intro/intro.html#fragment-uri
+     * 
+     * @var string|null
+     */
+    protected $_fragment;
+
+    /**
+     * Page id
+     *
+     * @var string|null
+     */
+    protected $_id;
+
+    /**
+     * Style class for this page (CSS)
+     *
+     * @var string|null
+     */
+    protected $_class;
+
+    /**
+     * A more descriptive title for this page
+     *
+     * @var string|null
+     */
+    protected $_title;
+
+    /**
+     * This page's target
+     *
+     * @var string|null
+     */
+    protected $_target;
+
+    /**
+     * Accessibility key character
+     *
+     * This attribute assigns an access key to an element. An access key is a
+     * single character from the document character set.
+     *
+     * @link http://www.w3.org/TR/html401/interact/forms.html#access-keys
+     *
+     * @var string|null
+     */
+    protected $_accesskey;
+
+    /**
+     * Forward links to other pages
+     *
+     * @link http://www.w3.org/TR/html4/struct/links.html#h-12.3.1
+     *
+     * @var array
+     */
+    protected $_rel = array();
+
+    /**
+     * Reverse links to other pages
+     *
+     * @link http://www.w3.org/TR/html4/struct/links.html#h-12.3.1
+     *
+     * @var array
+     */
+    protected $_rev = array();
+
+    /**
+     * Page order used by parent container
+     *
+     * @var int|null
+     */
+    protected $_order;
+
+    /**
+     * ACL resource associated with this page
+     *
+     * @var string|Zend_Acl_Resource_Interface|null
+     */
+    protected $_resource;
+
+    /**
+     * ACL privilege associated with this page
+     *
+     * @var string|null
+     */
+    protected $_privilege;
+
+    /**
+     * Whether this page should be considered active
+     *
+     * @var bool
+     */
+    protected $_active = false;
+
+    /**
+     * Whether this page should be considered visible
+     *
+     * @var bool
+     */
+    protected $_visible = true;
+
+    /**
+     * Parent container
+     *
+     * @var Zend_Navigation_Container|null
+     */
+    protected $_parent;
+
+    /**
+     * Custom page properties, used by __set(), __get() and __isset()
+     *
+     * @var array
+     */
+    protected $_properties = array();
+
+    /**
+     * Custom HTML attributes
+     *
+     * @var array
+     */
+    protected $_customHtmlAttribs = array();
+
+    /**
+     * The type of page to use when it wasn't set
+     *
+     * @var string
+     */
+    protected static $_defaultPageType;
+
+    // Initialization:
+
+    /**
+     * Factory for Zend_Navigation_Page classes
+     *
+     * A specific type to construct can be specified by specifying the key
+     * 'type' in $options. If type is 'uri' or 'mvc', the type will be resolved
+     * to Zend_Navigation_Page_Uri or Zend_Navigation_Page_Mvc. Any other value
+     * for 'type' will be considered the full name of the class to construct.
+     * A valid custom page class must extend Zend_Navigation_Page.
+     *
+     * If 'type' is not given, the type of page to construct will be determined
+     * by the following rules:
+     * - If $options contains either of the keys 'action', 'controller',
+     *   'module', or 'route', a Zend_Navigation_Page_Mvc page will be created.
+     * - If $options contains the key 'uri', a Zend_Navigation_Page_Uri page
+     *   will be created.
+     *
+     * @param  array|Zend_Config $options  options used for creating page
+     * @return Zend_Navigation_Page        a page instance
+     * @throws Zend_Navigation_Exception   if $options is not array/Zend_Config
+     * @throws Zend_Exception              if 'type' is specified and
+     *                                     Zend_Loader is unable to load the
+     *                                     class
+     * @throws Zend_Navigation_Exception   if something goes wrong during
+     *                                     instantiation of the page
+     * @throws Zend_Navigation_Exception   if 'type' is given, and the specified
+     *                                     type does not extend this class
+     * @throws Zend_Navigation_Exception   if unable to determine which class
+     *                                     to instantiate
+     */
+    public static function factory($options)
+    {
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+
+        if (!is_array($options)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $options must be an array or Zend_Config');
+        }
+
+        if (isset($options['type'])) {
+            $type = $options['type'];
+        } elseif(self::getDefaultPageType()!= null) {
+            $type = self::getDefaultPageType();
+        }
+
+        if(isset($type)) {
+            if (is_string($type) && !empty($type)) {
+                switch (strtolower($type)) {
+                    case 'mvc':
+                        $type = 'Zend_Navigation_Page_Mvc';
+                        break;
+                    case 'uri':
+                        $type = 'Zend_Navigation_Page_Uri';
+                        break;
+                }
+
+                if (!class_exists($type)) {
+                    require_once 'Zend/Loader.php';
+                    @Zend_Loader::loadClass($type);
+                }
+
+                $page = new $type($options);
+                if (!$page instanceof Zend_Navigation_Page) {
+                    require_once 'Zend/Navigation/Exception.php';
+                    throw new Zend_Navigation_Exception(sprintf(
+                            'Invalid argument: Detected type "%s", which ' .
+                            'is not an instance of Zend_Navigation_Page',
+                            $type));
+                }
+                return $page;
+            }
+        }
+
+        $hasUri = isset($options['uri']);
+        $hasMvc = isset($options['action']) || isset($options['controller']) ||
+                  isset($options['module']) || isset($options['route']) ||
+                  isset($options['params']);
+
+        if ($hasMvc) {
+            require_once 'Zend/Navigation/Page/Mvc.php';
+            return new Zend_Navigation_Page_Mvc($options);
+        } elseif ($hasUri) {
+            require_once 'Zend/Navigation/Page/Uri.php';
+            return new Zend_Navigation_Page_Uri($options);
+        } else {
+            require_once 'Zend/Navigation/Exception.php';
+            
+            $message = 'Invalid argument: Unable to determine class to instantiate';
+            if (isset($options['label'])) {
+                $message .= ' (Page label: ' . $options['label'] . ')';
+        }
+            
+            throw new Zend_Navigation_Exception($message);
+    }
+    }
+
+    /**
+     * Page constructor
+     *
+     * @param  array|Zend_Config $options   [optional] page options. Default is
+     *                                      null, which should set defaults.
+     * @throws Zend_Navigation_Exception    if invalid options are given
+     */
+    public function __construct($options = null)
+    {
+        if (is_array($options)) {
+            $this->setOptions($options);
+        } elseif ($options instanceof Zend_Config) {
+            $this->setConfig($options);
+        }
+
+        // do custom initialization
+        $this->_init();
+    }
+
+    /**
+     * Initializes page (used by subclasses)
+     *
+     * @return void
+     */
+    protected function _init()
+    {
+    }
+
+    /**
+     * Sets page properties using a Zend_Config object
+     *
+     * @param  Zend_Config $config        config object to get properties from
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if invalid options are given
+     */
+    public function setConfig(Zend_Config $config)
+    {
+        return $this->setOptions($config->toArray());
+    }
+
+    /**
+     * Sets page properties using options from an associative array
+     *
+     * Each key in the array corresponds to the according set*() method, and
+     * each word is separated by underscores, e.g. the option 'target'
+     * corresponds to setTarget(), and the option 'reset_params' corresponds to
+     * the method setResetParams().
+     *
+     * @param  array $options             associative array of options to set
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if invalid options are given
+     */
+    public function setOptions(array $options)
+    {
+        foreach ($options as $key => $value) {
+            $this->set($key, $value);
+        }
+
+        return $this;
+    }
+
+    // Accessors:
+
+    /**
+     * Sets page label
+     *
+     * @param  string $label              new page label
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if empty/no string is given
+     */
+    public function setLabel($label)
+    {
+        if (null !== $label && !is_string($label)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $label must be a string or null');
+        }
+
+        $this->_label = $label;
+        return $this;
+    }
+
+    /**
+     * Returns page label
+     *
+     * @return string  page label or null
+     */
+    public function getLabel()
+    {
+        return $this->_label;
+    }
+
+    /**
+     * Sets a fragment identifier
+     *
+     * @param  string $fragment   new fragment identifier
+     * @return Zend_Navigation_Page         fluent interface, returns self
+     * @throws Zend_Navigation_Exception    if empty/no string is given
+     */
+    public function setFragment($fragment)
+    {
+        if (null !== $fragment && !is_string($fragment)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $fragment must be a string or null');
+        }
+ 
+        $this->_fragment = $fragment;
+        return $this;
+    }
+    
+     /**
+     * Returns fragment identifier
+     *
+     * @return string|null  fragment identifier
+     */
+    public function getFragment()
+    {
+        return $this->_fragment;
+    }
+
+    /**
+     * Sets page id
+     *
+     * @param  string|null $id            [optional] id to set. Default is null,
+     *                                    which sets no id.
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if not given string or null
+     */
+    public function setId($id = null)
+    {
+        if (null !== $id && !is_string($id) && !is_numeric($id)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $id must be a string, number or null');
+        }
+
+        $this->_id = null === $id ? $id : (string) $id;
+
+        return $this;
+    }
+
+    /**
+     * Returns page id
+     *
+     * @return string|null  page id or null
+     */
+    public function getId()
+    {
+        return $this->_id;
+    }
+
+    /**
+     * Sets page CSS class
+     *
+     * @param  string|null $class         [optional] CSS class to set. Default
+     *                                    is null, which sets no CSS class.
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if not given string or null
+     */
+    public function setClass($class = null)
+    {
+        if (null !== $class && !is_string($class)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $class must be a string or null');
+        }
+
+        $this->_class = $class;
+        return $this;
+    }
+
+    /**
+     * Returns page class (CSS)
+     *
+     * @return string|null  page's CSS class or null
+     */
+    public function getClass()
+    {
+        return $this->_class;
+    }
+
+    /**
+     * Sets page title
+     *
+     * @param  string $title              [optional] page title. Default is
+     *                                    null, which sets no title.
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if not given string or null
+     */
+    public function setTitle($title = null)
+    {
+        if (null !== $title && !is_string($title)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $title must be a non-empty string');
+        }
+
+        $this->_title = $title;
+        return $this;
+    }
+
+    /**
+     * Returns page title
+     *
+     * @return string|null  page title or null
+     */
+    public function getTitle()
+    {
+        return $this->_title;
+    }
+
+    /**
+     * Sets page target
+     *
+     * @param  string|null $target        [optional] target to set. Default is
+     *                                    null, which sets no target.
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if target is not string or null
+     */
+    public function setTarget($target = null)
+    {
+        if (null !== $target && !is_string($target)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $target must be a string or null');
+        }
+
+        $this->_target = $target;
+        return $this;
+    }
+
+    /**
+     * Returns page target
+     *
+     * @return string|null  page target or null
+     */
+    public function getTarget()
+    {
+        return $this->_target;
+    }
+
+    /**
+     * Sets access key for this page
+     *
+     * @param  string|null $character     [optional] access key to set. Default
+     *                                    is null, which sets no access key.
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if access key is not string or null or
+     *                                    if the string length not equal to one
+     */
+    public function setAccesskey($character = null)
+    {
+        if (null !== $character
+            && (!is_string($character) || 1 != strlen($character)))
+        {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $character must be a single character or null'
+            );
+        }
+ 
+        $this->_accesskey = $character;
+        return $this;
+    }
+
+     /**
+     * Returns page access key
+     *
+     * @return string|null  page access key or null
+     */
+    public function getAccesskey()
+    {
+        return $this->_accesskey;
+    }
+
+    /**
+     * Sets the page's forward links to other pages
+     *
+     * This method expects an associative array of forward links to other pages,
+     * where each element's key is the name of the relation (e.g. alternate,
+     * prev, next, help, etc), and the value is a mixed value that could somehow
+     * be considered a page.
+     *
+     * @param  array|Zend_Config $relations  [optional] an associative array of
+     *                                       forward links to other pages
+     * @return Zend_Navigation_Page          fluent interface, returns self
+     */
+    public function setRel($relations = null)
+    {
+        $this->_rel = array();
+
+        if (null !== $relations) {
+            if ($relations instanceof Zend_Config) {
+                $relations = $relations->toArray();
+            }
+
+            if (!is_array($relations)) {
+                require_once 'Zend/Navigation/Exception.php';
+                throw new Zend_Navigation_Exception(
+                        'Invalid argument: $relations must be an ' .
+                        'array or an instance of Zend_Config');
+            }
+
+            foreach ($relations as $name => $relation) {
+                if (is_string($name)) {
+                    $this->_rel[$name] = $relation;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the page's forward links to other pages
+     *
+     * This method returns an associative array of forward links to other pages,
+     * where each element's key is the name of the relation (e.g. alternate,
+     * prev, next, help, etc), and the value is a mixed value that could somehow
+     * be considered a page.
+     *
+     * @param  string $relation  [optional] name of relation to return. If not
+     *                           given, all relations will be returned.
+     * @return array             an array of relations. If $relation is not
+     *                           specified, all relations will be returned in
+     *                           an associative array.
+     */
+    public function getRel($relation = null)
+    {
+        if (null !== $relation) {
+            return isset($this->_rel[$relation]) ?
+                   $this->_rel[$relation] :
+                   null;
+        }
+
+        return $this->_rel;
+    }
+
+    /**
+     * Sets the page's reverse links to other pages
+     *
+     * This method expects an associative array of reverse links to other pages,
+     * where each element's key is the name of the relation (e.g. alternate,
+     * prev, next, help, etc), and the value is a mixed value that could somehow
+     * be considered a page.
+     *
+     * @param  array|Zend_Config $relations  [optional] an associative array of
+     *                                       reverse links to other pages
+     * @return Zend_Navigation_Page          fluent interface, returns self
+     */
+    public function setRev($relations = null)
+    {
+        $this->_rev = array();
+
+        if (null !== $relations) {
+            if ($relations instanceof Zend_Config) {
+                $relations = $relations->toArray();
+            }
+
+            if (!is_array($relations)) {
+                require_once 'Zend/Navigation/Exception.php';
+                throw new Zend_Navigation_Exception(
+                        'Invalid argument: $relations must be an ' .
+                        'array or an instance of Zend_Config');
+            }
+
+            foreach ($relations as $name => $relation) {
+                if (is_string($name)) {
+                    $this->_rev[$name] = $relation;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the page's reverse links to other pages
+     *
+     * This method returns an associative array of forward links to other pages,
+     * where each element's key is the name of the relation (e.g. alternate,
+     * prev, next, help, etc), and the value is a mixed value that could somehow
+     * be considered a page.
+     *
+     * @param  string $relation  [optional] name of relation to return. If not
+     *                           given, all relations will be returned.
+     * @return array             an array of relations. If $relation is not
+     *                           specified, all relations will be returned in
+     *                           an associative array.
+     */
+    public function getRev($relation = null)
+    {
+        if (null !== $relation) {
+            return isset($this->_rev[$relation]) ?
+                   $this->_rev[$relation] :
+                   null;
+        }
+
+        return $this->_rev;
+    }
+
+    /**
+     * Sets a single custom HTML attribute
+     *
+     * @param  string      $name            name of the HTML attribute
+     * @param  string|null $value           value for the HTML attribute
+     * @return Zend_Navigation_Page         fluent interface, returns self
+     * @throws Zend_Navigation_Exception    if name is not string or value is
+     *                                      not null or a string
+     */
+    public function setCustomHtmlAttrib($name, $value)
+    {
+        if (!is_string($name)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $name must be a string'
+            );
+        }
+
+        if (null !== $value && !is_string($value)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $value must be a string or null'
+            );
+        }
+
+        if (null === $value && isset($this->_customHtmlAttribs[$name])) {
+            unset($this->_customHtmlAttribs[$name]);
+        } else {
+            $this->_customHtmlAttribs[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns a single custom HTML attributes by name
+     *
+     * @param  string $name                 name of the HTML attribute
+     * @return string|null                  value for the HTML attribute or null
+     * @throws Zend_Navigation_Exception    if name is not string
+     */
+    public function getCustomHtmlAttrib($name)
+    {
+        if (!is_string($name)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $name must be a string'
+            );
+        }
+
+        if (isset($this->_customHtmlAttribs[$name])) {
+            return $this->_customHtmlAttribs[$name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Sets multiple custom HTML attributes at once
+     *
+     * @param array $attribs        an associative array of html attributes
+     * @return Zend_Navigation_Page fluent interface, returns self
+     */
+    public function setCustomHtmlAttribs(array $attribs)
+    {
+        foreach ($attribs as $key => $value) {
+            $this->setCustomHtmlAttrib($key, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * Returns all custom HTML attributes as an array
+     *
+     * @return array    an array containing custom HTML attributes
+     */
+    public function getCustomHtmlAttribs()
+    {
+        return $this->_customHtmlAttribs;
+    }
+
+    /**
+     * Removes a custom HTML attribute from the page
+     *
+     * @param  string $name          name of the custom HTML attribute
+     * @return Zend_Navigation_Page  fluent interface, returns self
+     */
+    public function removeCustomHtmlAttrib($name)
+    {
+        if (!is_string($name)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $name must be a string'
+            );
+        }
+
+        if (isset($this->_customHtmlAttribs[$name])) {
+            unset($this->_customHtmlAttribs[$name]);
+        }
+    }
+
+    /**
+     * Clear all custom HTML attributes
+     *
+     * @return Zend_Navigation_Page fluent interface, returns self
+     */
+    public function clearCustomHtmlAttribs()
+    {
+        $this->_customHtmlAttribs = array();
+
+        return $this;
+    }
+
+    /**
+     * Sets page order to use in parent container
+     *
+     * @param  int $order                 [optional] page order in container.
+     *                                    Default is null, which sets no
+     *                                    specific order.
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if order is not integer or null
+     */
+    public function setOrder($order = null)
+    {
+        if (is_string($order)) {
+            $temp = (int) $order;
+            if ($temp < 0 || $temp > 0 || $order == '0') {
+                $order = $temp;
+            }
+        }
+
+        if (null !== $order && !is_int($order)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $order must be an integer or null, ' .
+                    'or a string that casts to an integer');
+        }
+
+        $this->_order = $order;
+
+        // notify parent, if any
+        if (isset($this->_parent)) {
+            $this->_parent->notifyOrderUpdated();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns page order used in parent container
+     *
+     * @return int|null  page order or null
+     */
+    public function getOrder()
+    {
+        return $this->_order;
+    }
+
+    /**
+     * Sets ACL resource assoicated with this page
+     *
+     * @param  string|Zend_Acl_Resource_Interface $resource  [optional] resource
+     *                                                       to associate with
+     *                                                       page. Default is
+     *                                                       null, which sets no
+     *                                                       resource.
+     * @throws Zend_Navigation_Exception                     if $resource if
+     *                                                       invalid
+     * @return Zend_Navigation_Page                          fluent interface,
+     *                                                       returns self
+     */
+    public function setResource($resource = null)
+    {
+        if (null === $resource || is_string($resource) ||
+            $resource instanceof Zend_Acl_Resource_Interface) {
+            $this->_resource = $resource;
+        } else {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $resource must be null, a string, ' .
+                    ' or an instance of Zend_Acl_Resource_Interface');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns ACL resource assoicated with this page
+     *
+     * @return string|Zend_Acl_Resource_Interface|null  ACL resource or null
+     */
+    public function getResource()
+    {
+        return $this->_resource;
+    }
+
+    /**
+     * Sets ACL privilege associated with this page
+     *
+     * @param  string|null $privilege  [optional] ACL privilege to associate
+     *                                 with this page. Default is null, which
+     *                                 sets no privilege.
+     * @return Zend_Navigation_Page    fluent interface, returns self
+     */
+    public function setPrivilege($privilege = null)
+    {
+        $this->_privilege = is_string($privilege) ? $privilege : null;
+        return $this;
+    }
+
+    /**
+     * Returns ACL privilege associated with this page
+     *
+     * @return string|null  ACL privilege or null
+     */
+    public function getPrivilege()
+    {
+        return $this->_privilege;
+    }
+
+    /**
+     * Sets whether page should be considered active or not
+     *
+     * @param  bool $active          [optional] whether page should be
+     *                               considered active or not. Default is true.
+     * @return Zend_Navigation_Page  fluent interface, returns self
+     */
+    public function setActive($active = true)
+    {
+        $this->_active = (bool) $active;
+        return $this;
+    }
+
+    /**
+     * Returns whether page should be considered active or not
+     *
+     * @param  bool $recursive  [optional] whether page should be considered
+     *                          active if any child pages are active. Default is
+     *                          false.
+     * @return bool             whether page should be considered active
+     */
+    public function isActive($recursive = false)
+    {
+        if (!$this->_active && $recursive) {
+            foreach ($this->_pages as $page) {
+                if ($page->isActive(true)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        return $this->_active;
+    }
+
+    /**
+     * Proxy to isActive()
+     *
+     * @param  bool $recursive  [optional] whether page should be considered
+     *                          active if any child pages are active. Default
+     *                          is false.
+     * @return bool             whether page should be considered active
+     */
+    public function getActive($recursive = false)
+    {
+        return $this->isActive($recursive);
+    }
+
+    /**
+     * Sets whether the page should be visible or not
+     *
+     * @param  bool $visible         [optional] whether page should be
+     *                               considered visible or not. Default is true.
+     * @return Zend_Navigation_Page  fluent interface, returns self
+     */
+    public function setVisible($visible = true)
+    {
+        if (is_string($visible) && 'false' == strtolower($visible)) {
+            $visible = false;
+        }
+        $this->_visible = (bool) $visible;
+        return $this;
+    }
+
+    /**
+     * Returns a boolean value indicating whether the page is visible
+     *
+     * @param  bool $recursive  [optional] whether page should be considered
+     *                          invisible if parent is invisible. Default is
+     *                          false.
+     * @return bool             whether page should be considered visible
+     */
+    public function isVisible($recursive = false)
+    {
+        if ($recursive && isset($this->_parent) &&
+            $this->_parent instanceof Zend_Navigation_Page) {
+            if (!$this->_parent->isVisible(true)) {
+                return false;
+            }
+        }
+
+        return $this->_visible;
+    }
+
+    /**
+     * Proxy to isVisible()
+     *
+     * Returns a boolean value indicating whether the page is visible
+     *
+     * @param  bool $recursive  [optional] whether page should be considered
+     *                          invisible if parent is invisible. Default is
+     *                          false.
+     * @return bool             whether page should be considered visible
+     */
+    public function getVisible($recursive = false)
+    {
+        return $this->isVisible($recursive);
+    }
+
+    /**
+     * Sets parent container
+     *
+     * @param  Zend_Navigation_Container $parent  [optional] new parent to set.
+     *                                            Default is null which will set
+     *                                            no parent.
+     * @return Zend_Navigation_Page               fluent interface, returns self
+     */
+    public function setParent(Zend_Navigation_Container $parent = null)
+    {
+        if ($parent === $this) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'A page cannot have itself as a parent');
+        }
+
+        // return if the given parent already is parent
+        if ($parent === $this->_parent) {
+            return $this;
+        }
+
+        // remove from old parent
+        if (null !== $this->_parent) {
+            $this->_parent->removePage($this);
+        }
+
+        // set new parent
+        $this->_parent = $parent;
+
+        // add to parent if page and not already a child
+        if (null !== $this->_parent && !$this->_parent->hasPage($this, false)) {
+            $this->_parent->addPage($this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns parent container
+     *
+     * @return Zend_Navigation_Container|null  parent container or null
+     */
+    public function getParent()
+    {
+        return $this->_parent;
+    }
+
+    /**
+     * Sets the given property
+     *
+     * If the given property is native (id, class, title, etc), the matching
+     * set method will be used. Otherwise, it will be set as a custom property.
+     *
+     * @param  string $property           property name
+     * @param  mixed  $value              value to set
+     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if property name is invalid
+     */
+    public function set($property, $value)
+    {
+        if (!is_string($property) || empty($property)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $property must be a non-empty string');
+        }
+
+        $method = 'set' . self::_normalizePropertyName($property);
+
+        if ($method != 'setOptions' && $method != 'setConfig' &&
+            method_exists($this, $method)) {
+            $this->$method($value);
+        } else {
+            $this->_properties[$property] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the value of the given property
+     *
+     * If the given property is native (id, class, title, etc), the matching
+     * get method will be used. Otherwise, it will return the matching custom
+     * property, or null if not found.
+     *
+     * @param  string $property           property name
+     * @return mixed                      the property's value or null
+     * @throws Zend_Navigation_Exception  if property name is invalid
+     */
+    public function get($property)
+    {
+        if (!is_string($property) || empty($property)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $property must be a non-empty string');
+        }
+
+        $method = 'get' . self::_normalizePropertyName($property);
+
+        if (method_exists($this, $method)) {
+            return $this->$method();
+        } elseif (isset($this->_properties[$property])) {
+            return $this->_properties[$property];
+        }
+
+        return null;
+    }
+
+    // Magic overloads:
+
+    /**
+     * Sets a custom property
+     *
+     * Magic overload for enabling <code>$page->propname = $value</code>.
+     *
+     * @param  string $name               property name
+     * @param  mixed  $value              value to set
+     * @return void
+     * @throws Zend_Navigation_Exception  if property name is invalid
+     */
+    public function __set($name, $value)
+    {
+        $this->set($name, $value);
+    }
+
+    /**
+     * Returns a property, or null if it doesn't exist
+     *
+     * Magic overload for enabling <code>$page->propname</code>.
+     *
+     * @param  string $name               property name
+     * @return mixed                      property value or null
+     * @throws Zend_Navigation_Exception  if property name is invalid
+     */
+    public function __get($name)
+    {
+        return $this->get($name);
+    }
+
+    /**
+     * Checks if a property is set
+     *
+     * Magic overload for enabling <code>isset($page->propname)</code>.
+     *
+     * Returns true if the property is native (id, class, title, etc), and
+     * true or false if it's a custom property (depending on whether the
+     * property actually is set).
+     *
+     * @param  string $name  property name
+     * @return bool          whether the given property exists
+     */
+    public function __isset($name)
+    {
+        $method = 'get' . self::_normalizePropertyName($name);
+        if (method_exists($this, $method)) {
+            return true;
+        }
+
+        return isset($this->_properties[$name]);
+    }
+
+    /**
+     * Unsets the given custom property
+     *
+     * Magic overload for enabling <code>unset($page->propname)</code>.
+     *
+     * @param  string $name               property name
+     * @return void
+     * @throws Zend_Navigation_Exception  if the property is native
+     */
+    public function __unset($name)
+    {
+        $method = 'set' . self::_normalizePropertyName($name);
+        if (method_exists($this, $method)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(sprintf(
+                    'Unsetting native property "%s" is not allowed',
+                    $name));
+        }
+
+        if (isset($this->_properties[$name])) {
+            unset($this->_properties[$name]);
+        }
+    }
+
+    /**
+     * Returns page label
+     *
+     * Magic overload for enabling <code>echo $page</code>.
+     *
+     * @return string  page label
+     */
+    public function __toString()
+    {
+        return $this->_label;
+    }
+
+    // Public methods:
+
+    /**
+     * Adds a forward relation to the page
+     *
+     * @param  string $relation      relation name (e.g. alternate, glossary,
+     *                               canonical, etc)
+     * @param  mixed  $value         value to set for relation
+     * @return Zend_Navigation_Page  fluent interface, returns self
+     */
+    public function addRel($relation, $value)
+    {
+        if (is_string($relation)) {
+            $this->_rel[$relation] = $value;
+        }
+        return $this;
+    }
+
+    /**
+     * Adds a reverse relation to the page
+     *
+     * @param  string $relation      relation name (e.g. alternate, glossary,
+     *                               canonical, etc)
+     * @param  mixed  $value         value to set for relation
+     * @return Zend_Navigation_Page  fluent interface, returns self
+     */
+    public function addRev($relation, $value)
+    {
+        if (is_string($relation)) {
+            $this->_rev[$relation] = $value;
+        }
+        return $this;
+    }
+
+    /**
+     * Removes a forward relation from the page
+     *
+     * @param  string $relation      name of relation to remove
+     * @return Zend_Navigation_Page  fluent interface, returns self
+     */
+    public function removeRel($relation)
+    {
+        if (isset($this->_rel[$relation])) {
+            unset($this->_rel[$relation]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes a reverse relation from the page
+     *
+     * @param  string $relation      name of relation to remove
+     * @return Zend_Navigation_Page  fluent interface, returns self
+     */
+    public function removeRev($relation)
+    {
+        if (isset($this->_rev[$relation])) {
+            unset($this->_rev[$relation]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns an array containing the defined forward relations
+     *
+     * @return array  defined forward relations
+     */
+    public function getDefinedRel()
+    {
+        return array_keys($this->_rel);
+    }
+
+    /**
+     * Returns an array containing the defined reverse relations
+     *
+     * @return array  defined reverse relations
+     */
+    public function getDefinedRev()
+    {
+        return array_keys($this->_rev);
+    }
+
+    /**
+     * Returns custom properties as an array
+     *
+     * @return array  an array containing custom properties
+     */
+    public function getCustomProperties()
+    {
+        return $this->_properties;
+    }
+
+    /**
+     * Returns a hash code value for the page
+     *
+     * @return string  a hash code value for this page
+     */
+    public final function hashCode()
+    {
+        return spl_object_hash($this);
+    }
+
+    /**
+     * Returns an array representation of the page
+     *
+     * @return array  associative array containing all page properties
+     */
+    public function toArray()
+    {
+        return array_merge(
+            $this->getCustomProperties(),
+            array(
+                'label'             => $this->getlabel(),
+                'fragment'          => $this->getFragment(),
+                'id'                => $this->getId(),
+                'class'             => $this->getClass(),
+                'title'             => $this->getTitle(),
+                'target'            => $this->getTarget(),
+                'accesskey'         => $this->getAccesskey(),
+                'rel'               => $this->getRel(),
+                'rev'               => $this->getRev(),
+                'customHtmlAttribs' => $this->getCustomHtmlAttribs(),
+                'order'             => $this->getOrder(),
+                'resource'          => $this->getResource(),
+                'privilege'         => $this->getPrivilege(),
+                'active'            => $this->isActive(),
+                'visible'           => $this->isVisible(),
+                'type'              => get_class($this),
+                'pages'             => parent::toArray()
+            )
+        );
+    }
+
+    // Internal methods:
+
+    /**
+     * Normalizes a property name
+     *
+     * @param  string $property  property name to normalize
+     * @return string            normalized property name
+     */
+    protected static function _normalizePropertyName($property)
+    {
+        return str_replace(' ', '', ucwords(str_replace('_', ' ', $property)));
+    }
+
+    public static function setDefaultPageType($type = null) {
+        if($type !== null && !is_string($type)) {
+            throw new Zend_Navigation_Exception(
+                'Cannot set default page type: type is no string but should be'
+            );
+        }
+
+        self::$_defaultPageType = $type;
+    }
+
+    public static function getDefaultPageType() {
+        return self::$_defaultPageType;
+    }
+
+    // Abstract methods:
+
+    /**
+     * Returns href for this page
+     *
+     * @return string  the page's href
+     */
+    abstract public function getHref();
+}
diff --git a/lib/zend/Zend/Navigation/Page/Mvc.php b/lib/zend/Zend/Navigation/Page/Mvc.php
new file mode 100644
index 00000000000..4c55f378c00
--- /dev/null
+++ b/lib/zend/Zend/Navigation/Page/Mvc.php
@@ -0,0 +1,696 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Navigation
+ * @subpackage Page
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Navigation_Page
+ */
+require_once 'Zend/Navigation/Page.php';
+
+/**
+ * @see Zend_Controller_Action_HelperBroker
+ */
+require_once 'Zend/Controller/Action/HelperBroker.php';
+
+/**
+ * Used to check if page is active
+ *
+ * @see Zend_Controller_Front
+ */
+require_once 'Zend/Controller/Front.php';
+
+/**
+ * Represents a page that is defined using module, controller, action, route
+ * name and route params to assemble the href
+ *
+ * @category   Zend
+ * @package    Zend_Navigation
+ * @subpackage Page
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page
+{
+    /**
+     * Action name to use when assembling URL
+     *
+     * @var string
+     */
+    protected $_action;
+
+    /**
+     * Controller name to use when assembling URL
+     *
+     * @var string
+     */
+    protected $_controller;
+
+    /**
+     * Module name to use when assembling URL
+     *
+     * @var string
+     */
+    protected $_module;
+
+    /**
+     * Params to use when assembling URL
+     *
+     * @see getHref()
+     * @var array
+     */
+    protected $_params = array();
+
+    /**
+     * Route name to use when assembling URL
+     *
+     * @see getHref()
+     * @var string
+     */
+    protected $_route;
+
+    /**
+     * Whether params should be reset when assembling URL
+     *
+     * @see getHref()
+     * @var bool
+     */
+    protected $_resetParams = true;
+
+    /**
+     * Whether href should be encoded when assembling URL
+     *
+     * @see getHref()
+     * @var bool
+     */
+    protected $_encodeUrl = true;
+
+    /**
+     * Whether this page should be considered active
+     *
+     * @var bool
+     */
+    protected $_active = null;
+
+    /**
+     * Scheme to use when assembling URL
+     *
+     * @see getHref()
+     * @var string
+     */
+    protected $_scheme;
+
+    /**
+     * Cached href
+     *
+     * The use of this variable minimizes execution time when getHref() is
+     * called more than once during the lifetime of a request. If a property
+     * is updated, the cache is invalidated.
+     *
+     * @var string
+     */
+    protected $_hrefCache;
+
+    /**
+     * Action helper for assembling URLs
+     *
+     * @see getHref()
+     * @var Zend_Controller_Action_Helper_Url
+     */
+    protected static $_urlHelper = null;
+
+    /**
+     * View helper for assembling URLs with schemes
+     *
+     * @see getHref()
+     * @var Zend_View_Helper_ServerUrl
+     */
+    protected static $_schemeHelper = null;
+
+    // Accessors:
+
+    /**
+     * Returns whether page should be considered active or not
+     *
+     * This method will compare the page properties against the request object
+     * that is found in the front controller.
+     *
+     * @param  bool $recursive  [optional] whether page should be considered
+     *                          active if any child pages are active. Default is
+     *                          false.
+     * @return bool             whether page should be considered active or not
+     */
+    public function isActive($recursive = false)
+    {
+        if (null === $this->_active) {
+            $front     = Zend_Controller_Front::getInstance();
+            $request   = $front->getRequest();
+            $reqParams = array();
+            if ($request) {
+                $reqParams = $request->getParams();
+                if (!array_key_exists('module', $reqParams)) {
+                    $reqParams['module'] = $front->getDefaultModule();
+                }
+            }
+
+            $myParams = $this->_params;
+
+            if ($this->_route
+                && method_exists($front->getRouter(), 'getRoute')
+            ) {
+                $route = $front->getRouter()->getRoute($this->_route);
+                if (method_exists($route, 'getDefaults')) {
+                    $myParams = array_merge($route->getDefaults(), $myParams);
+                }
+            }
+
+            if (null !== $this->_module) {
+                $myParams['module'] = $this->_module;
+            } elseif (!array_key_exists('module', $myParams)) {
+                $myParams['module'] = $front->getDefaultModule();
+            }
+
+            if (null !== $this->_controller) {
+                $myParams['controller'] = $this->_controller;
+            } elseif (!array_key_exists('controller', $myParams)) {
+                $myParams['controller'] = $front->getDefaultControllerName();
+            }
+
+            if (null !== $this->_action) {
+                $myParams['action'] = $this->_action;
+            } elseif (!array_key_exists('action', $myParams)) {
+                $myParams['action'] = $front->getDefaultAction();
+            }
+
+            foreach ($myParams as $key => $value) {
+                if (null === $value) {
+                    unset($myParams[$key]);
+                }
+            }
+
+            if (count(array_intersect_assoc($reqParams, $myParams)) ==
+                count($myParams)
+            ) {
+                $this->_active = true;
+
+                return true;
+            }
+
+            $this->_active = false;
+        }
+
+        return parent::isActive($recursive);
+    }
+
+    /**
+     * Returns href for this page
+     *
+     * This method uses {@link Zend_Controller_Action_Helper_Url} to assemble
+     * the href based on the page's properties.
+     *
+     * @return string  page href
+     */
+    public function getHref()
+    {
+        if ($this->_hrefCache) {
+            return $this->_hrefCache;
+        }
+
+        if (null === self::$_urlHelper) {
+            self::$_urlHelper =
+                Zend_Controller_Action_HelperBroker::getStaticHelper('Url');
+        }
+
+        $params = $this->getParams();
+
+        if ($param = $this->getModule()) {
+            $params['module'] = $param;
+        }
+
+        if ($param = $this->getController()) {
+            $params['controller'] = $param;
+        }
+
+        if ($param = $this->getAction()) {
+            $params['action'] = $param;
+        }
+
+        $url = self::$_urlHelper->url(
+            $params,
+            $this->getRoute(),
+            $this->getResetParams(),
+            $this->getEncodeUrl()
+        );
+
+        // Use scheme?
+        $scheme = $this->getScheme();
+        if (null !== $scheme) {
+            if (null === self::$_schemeHelper) {
+                require_once 'Zend/View/Helper/ServerUrl.php';
+                self::$_schemeHelper = new Zend_View_Helper_ServerUrl();
+            }
+
+            $url = self::$_schemeHelper->setScheme($scheme)->serverUrl($url);
+        }
+
+        // Add the fragment identifier if it is set
+        $fragment = $this->getFragment();
+        if (null !== $fragment) {
+            $url .= '#' . $fragment;
+        }
+
+        return $this->_hrefCache = $url;
+    }
+
+    /**
+     * Sets action name to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @param  string $action             action name
+     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if invalid $action is given
+     */
+    public function setAction($action)
+    {
+        if (null !== $action && !is_string($action)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $action must be a string or null'
+            );
+        }
+
+        $this->_action    = $action;
+        $this->_hrefCache = null;
+
+        return $this;
+    }
+
+    /**
+     * Returns action name to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @return string|null  action name
+     */
+    public function getAction()
+    {
+        return $this->_action;
+    }
+
+    /**
+     * Sets controller name to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @param  string|null $controller    controller name
+     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if invalid controller name is given
+     */
+    public function setController($controller)
+    {
+        if (null !== $controller && !is_string($controller)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $controller must be a string or null'
+            );
+        }
+
+        $this->_controller = $controller;
+        $this->_hrefCache  = null;
+
+        return $this;
+    }
+
+    /**
+     * Returns controller name to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @return string|null  controller name or null
+     */
+    public function getController()
+    {
+        return $this->_controller;
+    }
+
+    /**
+     * Sets module name to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @param  string|null $module        module name
+     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if invalid module name is given
+     */
+    public function setModule($module)
+    {
+        if (null !== $module && !is_string($module)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $module must be a string or null'
+            );
+        }
+
+        $this->_module    = $module;
+        $this->_hrefCache = null;
+
+        return $this;
+    }
+
+    /**
+     * Returns module name to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @return string|null  module name or null
+     */
+    public function getModule()
+    {
+        return $this->_module;
+    }
+
+    /**
+     * Set multiple parameters (to use when assembling URL) at once
+     *
+     * URL options passed to the url action helper for assembling URLs.
+     * Overwrites any previously set parameters!
+     *
+     * @see getHref()
+     *
+     * @param  array|null $params           [optional] paramters as array
+     *                                      ('name' => 'value'). Default is null
+     *                                      which clears all params.
+     * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+     */
+    public function setParams(array $params = null)
+    {
+        $this->clearParams();
+
+        if (is_array($params)) {
+            $this->addParams($params);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set parameter (to use when assembling URL)
+     *
+     * URL option passed to the url action helper for assembling URLs.
+     *
+     * @see getHref()
+     *
+     * @param  string $name                 parameter name
+     * @param  mixed $value                 parameter value
+     * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+     */
+    public function setParam($name, $value)
+    {
+        $name                 = (string)$name;
+        $this->_params[$name] = $value;
+
+        $this->_hrefCache = null;
+
+        return $this;
+    }
+
+    /**
+     * Add multiple parameters (to use when assembling URL) at once
+     *
+     * URL options passed to the url action helper for assembling URLs.
+     *
+     * @see getHref()
+     *
+     * @param  array $params                paramters as array ('name' => 'value')
+     * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+     */
+    public function addParams(array $params)
+    {
+        foreach ($params as $name => $value) {
+            $this->setParam($name, $value);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove parameter (to use when assembling URL)
+     *
+     * @see getHref()
+     *
+     * @param  string $name
+     * @return bool
+     */
+    public function removeParam($name)
+    {
+        if (array_key_exists($name, $this->_params)) {
+            unset($this->_params[$name]);
+
+            $this->_hrefCache = null;
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Clear all parameters (to use when assembling URL)
+     *
+     * @see getHref()
+     *
+     * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+     */
+    public function clearParams()
+    {
+        $this->_params = array();
+
+        $this->_hrefCache = null;
+        return $this;
+    }
+
+    /**
+     * Retrieve all parameters (to use when assembling URL)
+     *
+     * @see getHref()
+     *
+     * @return array parameters as array ('name' => 'value')
+     */
+    public function getParams()
+    {
+        return $this->_params;
+    }
+
+    /**
+     * Retrieve a single parameter (to use when assembling URL)
+     *
+     * @see getHref()
+     *
+     * @param  string $name parameter name
+     * @return mixed
+     */
+    public function getParam($name)
+    {
+        $name = (string) $name;
+
+        if (!array_key_exists($name, $this->_params)) {
+            return null;
+        }
+
+        return $this->_params[$name];
+    }
+
+    /**
+     * Sets route name to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @param  string $route              route name to use when assembling URL
+     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if invalid $route is given
+     */
+    public function setRoute($route)
+    {
+        if (null !== $route && (!is_string($route) || strlen($route) < 1)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $route must be a non-empty string or null'
+            );
+        }
+
+        $this->_route     = $route;
+        $this->_hrefCache = null;
+
+        return $this;
+    }
+
+    /**
+     * Returns route name to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @return string  route name
+     */
+    public function getRoute()
+    {
+        return $this->_route;
+    }
+
+    /**
+     * Sets whether params should be reset when assembling URL
+     *
+     * @see getHref()
+     *
+     * @param  bool $resetParams         whether params should be reset when
+     *                                   assembling URL
+     * @return Zend_Navigation_Page_Mvc  fluent interface, returns self
+     */
+    public function setResetParams($resetParams)
+    {
+        $this->_resetParams = (bool) $resetParams;
+        $this->_hrefCache   = null;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether params should be reset when assembling URL
+     *
+     * @see getHref()
+     *
+     * @return bool  whether params should be reset when assembling URL
+     */
+    public function getResetParams()
+    {
+        return $this->_resetParams;
+    }
+
+    /**
+     * Sets whether href should be encoded when assembling URL
+     *
+     * @see getHref()
+     *
+     * @param $encodeUrl
+     * @return Zend_Navigation_Page_Mvc fluent interface, returns self
+     */
+    public function setEncodeUrl($encodeUrl)
+    {
+        $this->_encodeUrl = (bool) $encodeUrl;
+        $this->_hrefCache = null;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether herf should be encoded when assembling URL
+     *
+     * @see getHref()
+     *
+     * @return bool whether herf should be encoded when assembling URL
+     */
+    public function getEncodeUrl()
+    {
+        return $this->_encodeUrl;
+    }
+
+    /**
+     * Sets scheme to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @param  string|null $scheme        scheme
+     * @throws Zend_Navigation_Exception
+     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     */
+    public function setScheme($scheme)
+    {
+        if (null !== $scheme && !is_string($scheme)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                'Invalid argument: $scheme must be a string or null'
+            );
+        }
+
+        $this->_scheme = $scheme;
+        return $this;
+    }
+
+    /**
+     * Returns scheme to use when assembling URL
+     *
+     * @see getHref()
+     *
+     * @return string|null  scheme or null
+     */
+    public function getScheme()
+    {
+        return $this->_scheme;
+    }
+
+    /**
+     * Sets action helper for assembling URLs
+     *
+     * @see getHref()
+     *
+     * @param  Zend_Controller_Action_Helper_Url $uh  URL helper
+     * @return void
+     */
+    public static function setUrlHelper(Zend_Controller_Action_Helper_Url $uh)
+    {
+        self::$_urlHelper = $uh;
+    }
+
+    /**
+     * Sets view helper for assembling URLs with schemes
+     *
+     * @see getHref()
+     *
+     * @param  Zend_View_Helper_ServerUrl $sh   scheme helper
+     * @return void
+     */
+    public static function setSchemeHelper(Zend_View_Helper_ServerUrl $sh)
+    {
+        self::$_schemeHelper = $sh;
+    }
+
+    // Public methods:
+
+    /**
+     * Returns an array representation of the page
+     *
+     * @return array  associative array containing all page properties
+     */
+    public function toArray()
+    {
+        return array_merge(
+            parent::toArray(),
+            array(
+                 'action'       => $this->getAction(),
+                 'controller'   => $this->getController(),
+                 'module'       => $this->getModule(),
+                 'params'       => $this->getParams(),
+                 'route'        => $this->getRoute(),
+                 'reset_params' => $this->getResetParams(),
+                 'encodeUrl'    => $this->getEncodeUrl(),
+                 'scheme'       => $this->getScheme(),
+            )
+        );
+    }
+}
diff --git a/lib/zend/Zend/Navigation/Page/Uri.php b/lib/zend/Zend/Navigation/Page/Uri.php
new file mode 100644
index 00000000000..130b0d4d1a0
--- /dev/null
+++ b/lib/zend/Zend/Navigation/Page/Uri.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Navigation
+ * @subpackage Page
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Navigation_Page_Abstract
+ */
+require_once 'Zend/Navigation/Page.php';
+
+/**
+ * Represents a page that is defined by specifying a URI
+ *
+ * @category   Zend
+ * @package    Zend_Navigation
+ * @subpackage Page
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Navigation_Page_Uri extends Zend_Navigation_Page
+{
+    /**
+     * Page URI
+     *
+     * @var string|null
+     */
+    protected $_uri = null;
+
+    /**
+     * Sets page URI
+     *
+     * @param  string $uri                page URI, must a string or null
+     * @return Zend_Navigation_Page_Uri   fluent interface, returns self
+     * @throws Zend_Navigation_Exception  if $uri is invalid
+     */
+    public function setUri($uri)
+    {
+        if (null !== $uri && !is_string($uri)) {
+            require_once 'Zend/Navigation/Exception.php';
+            throw new Zend_Navigation_Exception(
+                    'Invalid argument: $uri must be a string or null');
+        }
+
+        $this->_uri = $uri;
+        return $this;
+    }
+
+    /**
+     * Returns URI
+     *
+     * @return string
+     */
+    public function getUri()
+    {
+        return $this->_uri;
+    }
+
+    /**
+     * Returns href for this page
+     *
+     * @return string
+     */
+    public function getHref()
+    {
+        $uri = $this->getUri();
+        
+        $fragment = $this->getFragment();       
+        if (null !== $fragment) {
+            if ('#' == substr($uri, -1)) {
+                return $uri . $fragment;
+            } else {                
+                return $uri . '#' . $fragment;
+            }
+        }
+        
+        return $uri;
+    }
+
+    // Public methods:
+
+    /**
+     * Returns an array representation of the page
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return array_merge(
+            parent::toArray(),
+            array(
+                'uri' => $this->getUri()
+            ));
+    }
+}
diff --git a/lib/zend/Zend/Oauth.php b/lib/zend/Zend/Oauth.php
new file mode 100644
index 00000000000..77fa13d1fd2
--- /dev/null
+++ b/lib/zend/Zend/Oauth.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Http_Client */
+require_once 'Zend/Http/Client.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth
+{
+    const REQUEST_SCHEME_HEADER      = 'header';
+    const REQUEST_SCHEME_POSTBODY    = 'postbody';
+    const REQUEST_SCHEME_QUERYSTRING = 'querystring';
+    const GET                        = 'GET';
+    const POST                       = 'POST';
+    const PUT                        = 'PUT';
+    const DELETE                     = 'DELETE';
+    const HEAD                       = 'HEAD';
+    const OPTIONS                    = 'OPTIONS';
+
+    /**
+     * Singleton instance if required of the HTTP client
+     *
+     * @var Zend_Http_Client
+     */
+    protected static $httpClient = null;
+
+    /**
+     * Allows the external environment to make Zend_Oauth use a specific
+     * Client instance.
+     *
+     * @param Zend_Http_Client $httpClient
+     * @return void
+     */
+    public static function setHttpClient(Zend_Http_Client $httpClient)
+    {
+        self::$httpClient = $httpClient;
+    }
+
+    /**
+     * Return the singleton instance of the HTTP Client. Note that
+     * the instance is reset and cleared of previous parameters and
+     * Authorization header values.
+     *
+     * @return Zend_Http_Client
+     */
+    public static function getHttpClient()
+    {
+        if (!isset(self::$httpClient)) {
+            self::$httpClient = new Zend_Http_Client;
+        } else {
+            self::$httpClient->setHeaders('Authorization', null);
+            self::$httpClient->resetParameters();
+        }
+        return self::$httpClient;
+    }
+
+    /**
+     * Simple mechanism to delete the entire singleton HTTP Client instance
+     * which forces an new instantiation for subsequent requests.
+     *
+     * @return void
+     */
+    public static function clearHttpClient()
+    {
+        self::$httpClient = null;
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Client.php b/lib/zend/Zend/Oauth/Client.php
new file mode 100644
index 00000000000..03b794dc84f
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Client.php
@@ -0,0 +1,329 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth */
+require_once 'Zend/Oauth.php';
+
+/** Zend_Http_Client */
+require_once 'Zend/Http/Client.php';
+
+/** Zend_Oauth_Http_Utility */
+require_once 'Zend/Oauth/Http/Utility.php';
+
+/** Zend_Oauth_Config */
+require_once 'Zend/Oauth/Config.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Client extends Zend_Http_Client
+{
+    /**
+     * Flag to indicate that the client has detected the server as supporting
+     * OAuth 1.0a
+     */
+    public static $supportsRevisionA = false;
+
+    /**
+     * Holds the current OAuth Configuration set encapsulated in an instance
+     * of Zend_Oauth_Config; it's not a Zend_Config instance since that level
+     * of abstraction is unnecessary and doesn't let me escape the accessors
+     * and mutators anyway!
+     *
+     * @var Zend_Oauth_Config
+     */
+    protected $_config = null;
+
+    /**
+     * True if this request is being made with data supplied by
+     * a stream object instead of a raw encoded string.
+     *
+     * @var bool
+     */
+    protected $_streamingRequest = null;
+
+    /**
+     * Constructor; creates a new HTTP Client instance which itself is
+     * just a typical Zend_Http_Client subclass with some OAuth icing to
+     * assist in automating OAuth parameter generation, addition and
+     * cryptographioc signing of requests.
+     *
+     * @param  array|Zend_Config $oauthOptions
+     * @param  string            $uri
+     * @param  array|Zend_Config $config
+     * @return void
+     */
+    public function __construct($oauthOptions, $uri = null, $config = null)
+    {
+        if ($config instanceof Zend_Config && !isset($config->rfc3986_strict)) {
+            $config                   = $config->toArray();
+            $config['rfc3986_strict'] = true;
+        } else if (null === $config ||
+                   (is_array($config) && !isset($config['rfc3986_strict']))) {
+            $config['rfc3986_strict'] = true;
+        }
+        parent::__construct($uri, $config);
+        $this->_config = new Zend_Oauth_Config;
+        if ($oauthOptions !== null) {
+            if ($oauthOptions instanceof Zend_Config) {
+                $oauthOptions = $oauthOptions->toArray();
+            }
+            $this->_config->setOptions($oauthOptions);
+        }
+    }
+
+   /**
+     * Load the connection adapter
+     *
+     * @param Zend_Http_Client_Adapter_Interface $adapter
+     * @return void
+     */
+    public function setAdapter($adapter)
+    {
+        if ($adapter == null) {
+            $this->adapter = $adapter;
+        } else {
+              parent::setAdapter($adapter);
+        }
+    }
+
+    /**
+     * Set the streamingRequest variable which controls whether we are
+     * sending the raw (already encoded) POST data from a stream source.
+     *
+     * @param boolean $value The value to set.
+     * @return void
+     */
+    public function setStreamingRequest($value)
+    {
+        $this->_streamingRequest = $value;
+    }
+
+    /**
+     * Check whether the client is set to perform streaming requests.
+     *
+     * @return boolean True if yes, false otherwise.
+     */
+    public function getStreamingRequest()
+    {
+        if ($this->_streamingRequest) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Prepare the request body (for POST and PUT requests)
+     *
+     * @return string
+     * @throws Zend_Http_Client_Exception
+     */
+    protected function _prepareBody()
+    {
+        if($this->_streamingRequest) {
+            $this->setHeaders(self::CONTENT_LENGTH,
+                $this->raw_post_data->getTotalSize());
+            return $this->raw_post_data;
+        }
+        else {
+            return parent::_prepareBody();
+        }
+    }
+
+    /**
+     * Clear all custom parameters we set.
+     *
+     * @return Zend_Http_Client
+     */
+    public function resetParameters($clearAll = false)
+    {
+        $this->_streamingRequest = false;
+        return parent::resetParameters($clearAll);
+    }
+
+    /**
+     * Set the raw (already encoded) POST data from a stream source.
+     *
+     * This is used to support POSTing from open file handles without
+     * caching the entire body into memory. It is a wrapper around
+     * Zend_Http_Client::setRawData().
+     *
+     * @param string $data The request data
+     * @param string $enctype The encoding type
+     * @return Zend_Http_Client
+     */
+    public function setRawDataStream($data, $enctype = null)
+    {
+        $this->_streamingRequest = true;
+        return $this->setRawData($data, $enctype);
+    }
+
+    /**
+     * Same as Zend_Http_Client::setMethod() except it also creates an
+     * Oauth specific reference to the method type.
+     * Might be defunct and removed in a later iteration.
+     *
+     * @param  string $method
+     * @return Zend_Http_Client
+     */
+    public function setMethod($method = self::GET)
+    {
+        if ($method == self::GET) {
+            $this->setRequestMethod(self::GET);
+        } elseif($method == self::POST) {
+            $this->setRequestMethod(self::POST);
+        } elseif($method == self::PUT) {
+            $this->setRequestMethod(self::PUT);
+        } elseif($method == self::DELETE) {
+            $this->setRequestMethod(self::DELETE);
+        } elseif($method == self::HEAD) {
+            $this->setRequestMethod(self::HEAD);
+        } elseif($method == self::OPTIONS) {
+            $this->setRequestMethod(self::OPTIONS);
+        }
+        return parent::setMethod($method);
+    }
+
+    /**
+     * Same as Zend_Http_Client::request() except just before the request is
+     * executed, we automatically append any necessary OAuth parameters and
+     * sign the request using the relevant signature method.
+     *
+     * @param  string $method
+     * @return Zend_Http_Response
+     */
+    public function request($method = null)
+    {
+        if ($method !== null) {
+            $this->setMethod($method);
+        }
+        $this->prepareOauth();
+        return parent::request();
+    }
+
+    /**
+     * Performs OAuth preparation on the request before sending.
+     *
+     * This primarily means taking a request, correctly encoding and signing
+     * all parameters, and applying the correct OAuth scheme to the method
+     * being used.
+     *
+     * @return void
+     * @throws Zend_Oauth_Exception If POSTBODY scheme requested, but GET request method used; or if invalid request scheme provided
+     */
+    public function prepareOauth()
+    {
+        $requestScheme = $this->getRequestScheme();
+        $requestMethod = $this->getRequestMethod();
+        $query = null;
+        if ($requestScheme == Zend_Oauth::REQUEST_SCHEME_HEADER) {
+            $oauthHeaderValue = $this->getToken()->toHeader(
+                $this->getUri(true),
+                $this->_config,
+                $this->_getSignableParametersAsQueryString(),
+                $this->getRealm()
+            );
+            $this->setHeaders('Authorization', $oauthHeaderValue);
+        } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY) {
+            if ($requestMethod == self::GET) {
+                require_once 'Zend/Oauth/Exception.php';
+                throw new Zend_Oauth_Exception(
+                    'The client is configured to'
+                    . ' pass OAuth parameters through a POST body but request method'
+                    . ' is set to GET'
+                );
+            }
+            $raw = $this->getToken()->toQueryString(
+                $this->getUri(true),
+                $this->_config,
+                $this->_getSignableParametersAsQueryString()
+            );
+            $this->setRawData($raw, 'application/x-www-form-urlencoded');
+            $this->paramsPost = array();
+        } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_QUERYSTRING) {
+            $params = $this->paramsGet;            
+            $query = $this->getUri()->getQuery();
+            if ($query) {
+                $queryParts = explode('&', $this->getUri()->getQuery());
+                foreach ($queryParts as $queryPart) {
+                    $kvTuple = explode('=', $queryPart);
+                    $params[urldecode($kvTuple[0])] =
+                        (array_key_exists(1, $kvTuple) ? urldecode($kvTuple[1]) : null);
+                }
+            }
+            if (!empty($this->paramsPost)) {
+                $params = array_merge($params, $this->paramsPost);
+                $query  = $this->getToken()->toQueryString(
+                    $this->getUri(true), $this->_config, $params
+                );
+            }
+            $query = $this->getToken()->toQueryString(
+                $this->getUri(true), $this->_config, $params
+            );
+            $this->getUri()->setQuery($query);
+            $this->paramsGet = array();
+        } else {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception('Invalid request scheme: ' . $requestScheme);
+        }
+    }
+
+    /**
+     * Collect all signable parameters into a single array across query string
+     * and POST body. Don't include POST parameters if content type is multipart POST.
+     *
+     * @return array
+     */
+    protected function _getSignableParametersAsQueryString()
+    {
+        $params = array();
+        if (!empty($this->paramsGet)) {
+            $params = array_merge($params, $this->paramsGet);
+        }
+        if ($this->enctype != self::ENC_FORMDATA && !empty($this->paramsPost)) {
+            $params = array_merge($params, $this->paramsPost);
+        }
+        return $params;
+    }
+
+    /**
+     * Simple Proxy to the current Zend_Oauth_Config method. It's that instance
+     * which holds all configuration methods and values this object also presents
+     * as it's API.
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return mixed
+     * @throws Zend_Oauth_Exception if method does not exist in config object
+     */
+    public function __call($method, array $args)
+    {
+        if (!method_exists($this->_config, $method)) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception('Method does not exist: ' . $method);
+        }
+        return call_user_func_array(array($this->_config,$method), $args);
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Config.php b/lib/zend/Zend/Oauth/Config.php
new file mode 100644
index 00000000000..61ab53cf569
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Config.php
@@ -0,0 +1,691 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth */
+require_once 'Zend/Oauth.php';
+
+/** Zend_Uri */
+require_once 'Zend/Uri.php';
+
+/** Zend_Oauth_Config_Interface */
+require_once 'Zend/Oauth/Config/ConfigInterface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface
+{
+    /**
+     * Signature method used when signing all parameters for an HTTP request
+     *
+     * @var string
+     */
+    protected $_signatureMethod = 'HMAC-SHA1';
+
+    /**
+     * Three request schemes are defined by OAuth, of which passing
+     * all OAuth parameters by Header is preferred. The other two are
+     * POST Body and Query String.
+     *
+     * @var string
+     */
+    protected $_requestScheme = Zend_Oauth::REQUEST_SCHEME_HEADER;
+
+    /**
+     * Preferred request Method - one of GET or POST - which Zend_Oauth
+     * will enforce as standard throughout the library. Generally a default
+     * of POST works fine unless a Provider specifically requires otherwise.
+     *
+     * @var string
+     */
+    protected $_requestMethod = Zend_Oauth::POST;
+
+    /**
+     * OAuth Version; This defaults to 1.0 - Must not be changed!
+     *
+     * @var string
+     */
+    protected $_version = '1.0';
+
+    /**
+     * This optional value is used to define where the user is redirected to
+     * after authorizing a Request Token from an OAuth Providers website.
+     * It's optional since a Provider may ask for this to be defined in advance
+     * when registering a new application for a Consumer Key.
+     *
+     * @var string
+     */
+    protected $_callbackUrl = null;
+
+    /**
+     * The URL root to append default OAuth endpoint paths.
+     *
+     * @var string
+     */
+    protected $_siteUrl = null;
+
+    /**
+     * The URL to which requests for a Request Token should be directed.
+     * When absent, assumed siteUrl+'/request_token'
+     *
+     * @var string
+     */
+    protected $_requestTokenUrl = null;
+
+    /**
+     * The URL to which requests for an Access Token should be directed.
+     * When absent, assumed siteUrl+'/access_token'
+     *
+     * @var string
+     */
+    protected $_accessTokenUrl = null;
+
+    /**
+     * The URL to which users should be redirected to authorize a Request Token.
+     * When absent, assumed siteUrl+'/authorize'
+     *
+     * @var string
+     */
+    protected $_authorizeUrl = null;
+
+    /**
+     * An OAuth application's Consumer Key.
+     *
+     * @var string
+     */
+    protected $_consumerKey = null;
+
+    /**
+     * Every Consumer Key has a Consumer Secret unless you're in RSA-land.
+     *
+     * @var string
+     */
+    protected $_consumerSecret = null;
+
+    /**
+     * If relevant, a PEM encoded RSA private key encapsulated as a
+     * Zend_Crypt_Rsa Key
+     *
+     * @var Zend_Crypt_Rsa_Key_Private
+     */
+    protected $_rsaPrivateKey = null;
+
+    /**
+     * If relevant, a PEM encoded RSA public key encapsulated as a
+     * Zend_Crypt_Rsa Key
+     *
+     * @var Zend_Crypt_Rsa_Key_Public
+     */
+    protected $_rsaPublicKey = null;
+
+    /**
+     * Generally this will nearly always be an Access Token represented as a
+     * Zend_Oauth_Token_Access object.
+     *
+     * @var Zend_Oauth_Token
+     */
+    protected $_token = null;
+    
+    /**
+     * Define the OAuth realm
+     * 
+     * @var string
+     */
+    protected $_realm = null;
+
+    /**
+     * Constructor; create a new object with an optional array|Zend_Config
+     * instance containing initialising options.
+     *
+     * @param  array|Zend_Config $options
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        if ($options !== null) {
+            if ($options instanceof Zend_Config) {
+                $options = $options->toArray();
+            }
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * Parse option array or Zend_Config instance and setup options using their
+     * relevant mutators.
+     *
+     * @param  array|Zend_Config $options
+     * @return Zend_Oauth_Config
+     */
+    public function setOptions(array $options)
+    {
+        foreach ($options as $key => $value) {
+            switch ($key) {
+                case 'consumerKey':
+                    $this->setConsumerKey($value);
+                    break;
+                case 'consumerSecret':
+                    $this->setConsumerSecret($value);
+                    break;
+                case 'signatureMethod':
+                    $this->setSignatureMethod($value);
+                    break;
+                case 'version':
+                    $this->setVersion($value);
+                    break;
+                case 'callbackUrl':
+                    $this->setCallbackUrl($value);
+                    break;
+                case 'siteUrl':
+                    $this->setSiteUrl($value);
+                    break;
+                case 'requestTokenUrl':
+                    $this->setRequestTokenUrl($value);
+                    break;
+                case 'accessTokenUrl':
+                    $this->setAccessTokenUrl($value);
+                    break;
+                case 'userAuthorizationUrl':
+                    $this->setUserAuthorizationUrl($value);
+                    break;
+                case 'authorizeUrl':
+                    $this->setAuthorizeUrl($value);
+                    break;
+                case 'requestMethod':
+                    $this->setRequestMethod($value);
+                    break;
+                case 'rsaPrivateKey':
+                    $this->setRsaPrivateKey($value);
+                    break;
+                case 'rsaPublicKey':
+                    $this->setRsaPublicKey($value);
+                    break;
+                case 'realm':
+                    $this->setRealm($value);
+                    break;
+            }
+        }
+        if (isset($options['requestScheme'])) {
+            $this->setRequestScheme($options['requestScheme']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set consumer key
+     *
+     * @param  string $key
+     * @return Zend_Oauth_Config
+     */
+    public function setConsumerKey($key)
+    {
+        $this->_consumerKey = $key;
+        return $this;
+    }
+
+    /**
+     * Get consumer key
+     *
+     * @return string
+     */
+    public function getConsumerKey()
+    {
+        return $this->_consumerKey;
+    }
+
+    /**
+     * Set consumer secret
+     *
+     * @param  string $secret
+     * @return Zend_Oauth_Config
+     */
+    public function setConsumerSecret($secret)
+    {
+        $this->_consumerSecret = $secret;
+        return $this;
+    }
+
+    /**
+     * Get consumer secret
+     *
+     * Returns RSA private key if set; otherwise, returns any previously set
+     * consumer secret.
+     *
+     * @return string
+     */
+    public function getConsumerSecret()
+    {
+        if ($this->_rsaPrivateKey !== null) {
+            return $this->_rsaPrivateKey;
+        }
+        return $this->_consumerSecret;
+    }
+
+    /**
+     * Set signature method
+     *
+     * @param  string $method
+     * @return Zend_Oauth_Config
+     * @throws Zend_Oauth_Exception if unsupported signature method specified
+     */
+    public function setSignatureMethod($method)
+    {
+        $method = strtoupper($method);
+        if (!in_array($method, array(
+                'HMAC-SHA1', 'HMAC-SHA256', 'RSA-SHA1', 'PLAINTEXT'
+            ))
+        ) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception('Unsupported signature method: '
+                . $method
+                . '. Supported are HMAC-SHA1, RSA-SHA1, PLAINTEXT and HMAC-SHA256');
+        }
+        $this->_signatureMethod = $method;;
+        return $this;
+    }
+
+    /**
+     * Get signature method
+     *
+     * @return string
+     */
+    public function getSignatureMethod()
+    {
+        return $this->_signatureMethod;
+    }
+
+    /**
+     * Set request scheme
+     *
+     * @param  string $scheme
+     * @return Zend_Oauth_Config
+     * @throws Zend_Oauth_Exception if invalid scheme specified, or if POSTBODY set when request method of GET is specified
+     */
+    public function setRequestScheme($scheme)
+    {
+        $scheme = strtolower($scheme);
+        if (!in_array($scheme, array(
+                Zend_Oauth::REQUEST_SCHEME_HEADER,
+                Zend_Oauth::REQUEST_SCHEME_POSTBODY,
+                Zend_Oauth::REQUEST_SCHEME_QUERYSTRING,
+            ))
+        ) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                '\'' . $scheme . '\' is an unsupported request scheme'
+            );
+        }
+        if ($scheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY
+            && $this->getRequestMethod() == Zend_Oauth::GET
+        ) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                'Cannot set POSTBODY request method if HTTP method set to GET'
+            );
+        }
+        $this->_requestScheme = $scheme;
+        return $this;
+    }
+
+    /**
+     * Get request scheme
+     *
+     * @return string
+     */
+    public function getRequestScheme()
+    {
+        return $this->_requestScheme;
+    }
+
+    /**
+     * Set version
+     *
+     * @param  string $version
+     * @return Zend_Oauth_Config
+     */
+    public function setVersion($version)
+    {
+        $this->_version = $version;
+        return $this;
+    }
+
+    /**
+     * Get version
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return $this->_version;
+    }
+
+    /**
+     * Set callback URL
+     *
+     * @param  string $url
+     * @return Zend_Oauth_Config
+     * @throws Zend_Oauth_Exception for invalid URLs
+     */
+    public function setCallbackUrl($url)
+    {
+        if (!Zend_Uri::check($url) && $url !== 'oob') {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                '\'' . $url . '\' is not a valid URI'
+            );
+        }
+        $this->_callbackUrl = $url;
+        return $this;
+    }
+
+    /**
+     * Get callback URL
+     *
+     * @return string
+     */
+    public function getCallbackUrl()
+    {
+        return $this->_callbackUrl;
+    }
+
+    /**
+     * Set site URL
+     *
+     * @param  string $url
+     * @return Zend_Oauth_Config
+     * @throws Zend_Oauth_Exception for invalid URLs
+     */
+    public function setSiteUrl($url)
+    {
+        if (!Zend_Uri::check($url)) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                '\'' . $url . '\' is not a valid URI'
+            );
+        }
+        $this->_siteUrl = $url;
+        return $this;
+    }
+
+    /**
+     * Get site URL
+     *
+     * @return string
+     */
+    public function getSiteUrl()
+    {
+        return $this->_siteUrl;
+    }
+
+    /**
+     * Set request token URL
+     *
+     * @param  string $url
+     * @return Zend_Oauth_Config
+     * @throws Zend_Oauth_Exception for invalid URLs
+     */
+    public function setRequestTokenUrl($url)
+    {
+        if (!Zend_Uri::check($url)) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                '\'' . $url . '\' is not a valid URI'
+            );
+        }
+        $this->_requestTokenUrl = rtrim($url, '/');
+        return $this;
+    }
+
+    /**
+     * Get request token URL
+     *
+     * If no request token URL has been set, but a site URL has, returns the
+     * site URL with the string "/request_token" appended.
+     *
+     * @return string
+     */
+    public function getRequestTokenUrl()
+    {
+        if (!$this->_requestTokenUrl && $this->_siteUrl) {
+            return $this->_siteUrl . '/request_token';
+        }
+        return $this->_requestTokenUrl;
+    }
+
+    /**
+     * Set access token URL
+     *
+     * @param  string $url
+     * @return Zend_Oauth_Config
+     * @throws Zend_Oauth_Exception for invalid URLs
+     */
+    public function setAccessTokenUrl($url)
+    {
+        if (!Zend_Uri::check($url)) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                '\'' . $url . '\' is not a valid URI'
+            );
+        }
+        $this->_accessTokenUrl = rtrim($url, '/');
+        return $this;
+    }
+
+    /**
+     * Get access token URL
+     *
+     * If no access token URL has been set, but a site URL has, returns the
+     * site URL with the string "/access_token" appended.
+     *
+     * @return string
+     */
+    public function getAccessTokenUrl()
+    {
+        if (!$this->_accessTokenUrl && $this->_siteUrl) {
+            return $this->_siteUrl . '/access_token';
+        }
+        return $this->_accessTokenUrl;
+    }
+
+    /**
+     * Set user authorization URL
+     *
+     * @param  string $url
+     * @return Zend_Oauth_Config
+     * @throws Zend_Oauth_Exception for invalid URLs
+     */
+    public function setUserAuthorizationUrl($url)
+    {
+        return $this->setAuthorizeUrl($url);
+    }
+
+    /**
+     * Set authorization URL
+     *
+     * @param  string $url
+     * @return Zend_Oauth_Config
+     * @throws Zend_Oauth_Exception for invalid URLs
+     */
+    public function setAuthorizeUrl($url)
+    {
+        if (!Zend_Uri::check($url)) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                '\'' . $url . '\' is not a valid URI'
+            );
+        }
+        $this->_authorizeUrl = rtrim($url, '/');
+        return $this;
+    }
+
+    /**
+     * Get user authorization URL
+     *
+     * @return string
+     */
+    public function getUserAuthorizationUrl()
+    {
+        return $this->getAuthorizeUrl();
+    }
+
+    /**
+     * Get authorization URL
+     *
+     * If no authorization URL has been set, but a site URL has, returns the
+     * site URL with the string "/authorize" appended.
+     *
+     * @return string
+     */
+    public function getAuthorizeUrl()
+    {
+        if (!$this->_authorizeUrl && $this->_siteUrl) {
+            return $this->_siteUrl . '/authorize';
+        }
+        return $this->_authorizeUrl;
+    }
+
+    /**
+     * Set request method
+     *
+     * @param  string $method
+     * @return Zend_Oauth_Config
+     * @throws Zend_Oauth_Exception for invalid request methods
+     */
+    public function setRequestMethod($method)
+    {
+        $method = strtoupper($method);
+        if (!in_array($method, array(
+                Zend_Oauth::GET,
+                Zend_Oauth::POST,
+                Zend_Oauth::PUT,
+                Zend_Oauth::DELETE,
+                Zend_Oauth::OPTIONS,
+            ))
+        ) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception('Invalid method: ' . $method);
+        }
+        $this->_requestMethod = $method;
+        return $this;
+    }
+
+    /**
+     * Get request method
+     *
+     * @return string
+     */
+    public function getRequestMethod()
+    {
+        return $this->_requestMethod;
+    }
+
+    /**
+     * Set RSA public key
+     *
+     * @param  Zend_Crypt_Rsa_Key_Public $key
+     * @return Zend_Oauth_Config
+     */
+    public function setRsaPublicKey(Zend_Crypt_Rsa_Key_Public $key)
+    {
+        $this->_rsaPublicKey = $key;
+        return $this;
+    }
+
+    /**
+     * Get RSA public key
+     *
+     * @return Zend_Crypt_Rsa_Key_Public
+     */
+    public function getRsaPublicKey()
+    {
+        return $this->_rsaPublicKey;
+    }
+
+    /**
+     * Set RSA private key
+     *
+     * @param  Zend_Crypt_Rsa_Key_Private $key
+     * @return Zend_Oauth_Config
+     */
+    public function setRsaPrivateKey(Zend_Crypt_Rsa_Key_Private $key)
+    {
+        $this->_rsaPrivateKey = $key;
+        return $this;
+    }
+
+    /**
+     * Get RSA private key
+     *
+     * @return Zend_Crypt_Rsa_Key_Private
+     */
+    public function getRsaPrivateKey()
+    {
+        return $this->_rsaPrivateKey;
+    }
+
+    /**
+     * Set OAuth token
+     *
+     * @param  Zend_Oauth_Token $token
+     * @return Zend_Oauth_Config
+     */
+    public function setToken(Zend_Oauth_Token $token)
+    {
+        $this->_token = $token;
+        return $this;
+    }
+
+    /**
+     * Get OAuth token
+     *
+     * @return Zend_Oauth_Token
+     */
+    public function getToken()
+    {
+        return $this->_token;
+    }
+
+    /**
+     * Set OAuth realm
+     *
+     * @param  string $realm
+     * @return Zend_Oauth_Config
+     */
+    public function setRealm($realm)
+    {
+        $this->_realm = $realm;
+        return $this;
+    }
+
+    /**
+     * Get OAuth realm
+     *
+     * @return string
+     */
+    public function getRealm()
+    {
+        return $this->_realm;
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Config/ConfigInterface.php b/lib/zend/Zend/Oauth/Config/ConfigInterface.php
new file mode 100644
index 00000000000..03ed051e4b9
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Config/ConfigInterface.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Oauth_Config_ConfigInterface
+{
+    public function setOptions(array $options);
+
+    public function setConsumerKey($key);
+
+    public function getConsumerKey();
+
+    public function setConsumerSecret($secret);
+
+    public function getConsumerSecret();
+
+    public function setSignatureMethod($method);
+
+    public function getSignatureMethod();
+
+    public function setRequestScheme($scheme);
+
+    public function getRequestScheme();
+
+    public function setVersion($version);
+
+    public function getVersion();
+
+    public function setCallbackUrl($url);
+
+    public function getCallbackUrl();
+
+    public function setRequestTokenUrl($url);
+
+    public function getRequestTokenUrl();
+
+    public function setRequestMethod($method);
+
+    public function getRequestMethod();
+
+    public function setAccessTokenUrl($url);
+
+    public function getAccessTokenUrl();
+
+    public function setUserAuthorizationUrl($url);
+
+    public function getUserAuthorizationUrl();
+
+    public function setToken(Zend_Oauth_Token $token);
+
+    public function getToken();
+
+    public function setRealm($realm);
+
+    public function getRealm();
+}
diff --git a/lib/zend/Zend/Oauth/Consumer.php b/lib/zend/Zend/Oauth/Consumer.php
new file mode 100644
index 00000000000..5f5f32ffb49
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Consumer.php
@@ -0,0 +1,279 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth */
+require_once 'Zend/Oauth.php';
+
+/** Zend_Uri */
+require_once 'Zend/Uri.php';
+
+/** Zend_Oauth_Http_RequestToken */
+require_once 'Zend/Oauth/Http/RequestToken.php';
+
+/** Zend_Oauth_Http_UserAuthorization */
+require_once 'Zend/Oauth/Http/UserAuthorization.php';
+
+/** Zend_Oauth_Http_AccessToken */
+require_once 'Zend/Oauth/Http/AccessToken.php';
+
+/** Zend_Oauth_Token_AuthorizedRequest */
+require_once 'Zend/Oauth/Token/AuthorizedRequest.php';
+
+/** Zend_Oauth_Config */
+require_once 'Zend/Oauth/Config.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Consumer extends Zend_Oauth
+{
+    public $switcheroo = false; // replace later when this works
+
+    /**
+     * Request Token retrieved from OAuth Provider
+     *
+     * @var Zend_Oauth_Token_Request
+     */
+    protected $_requestToken = null;
+
+    /**
+     * Access token retrieved from OAuth Provider
+     *
+     * @var Zend_Oauth_Token_Access
+     */
+    protected $_accessToken = null;
+
+    /**
+     * @var Zend_Oauth_Config
+     */
+    protected $_config = null;
+
+    /**
+     * Constructor; create a new object with an optional array|Zend_Config
+     * instance containing initialising options.
+     *
+     * @param  array|Zend_Config $options
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        $this->_config = new Zend_Oauth_Config;
+        if ($options !== null) {
+            if ($options instanceof Zend_Config) {
+                $options = $options->toArray();
+            }
+            $this->_config->setOptions($options);
+        }
+    }
+
+    /**
+     * Attempts to retrieve a Request Token from an OAuth Provider which is
+     * later exchanged for an authorized Access Token used to access the
+     * protected resources exposed by a web service API.
+     *
+     * @param  null|array $customServiceParameters Non-OAuth Provider-specified parameters
+     * @param  null|string $httpMethod
+     * @param  null|Zend_Oauth_Http_RequestToken $request
+     * @return Zend_Oauth_Token_Request
+     */
+    public function getRequestToken(
+        array $customServiceParameters = null,
+        $httpMethod = null,
+        Zend_Oauth_Http_RequestToken $request = null
+    ) {
+        if ($request === null) {
+            $request = new Zend_Oauth_Http_RequestToken($this, $customServiceParameters);
+        } elseif($customServiceParameters !== null) {
+            $request->setParameters($customServiceParameters);
+        }
+        if ($httpMethod !== null) {
+            $request->setMethod($httpMethod);
+        } else {
+            $request->setMethod($this->getRequestMethod());
+        }
+        $this->_requestToken = $request->execute();
+        return $this->_requestToken;
+    }
+
+    /**
+     * After a Request Token is retrieved, the user may be redirected to the
+     * OAuth Provider to authorize the application's access to their
+     * protected resources - the redirect URL being provided by this method.
+     * Once the user has authorized the application for access, they are
+     * redirected back to the application which can now exchange the previous
+     * Request Token for a fully authorized Access Token.
+     *
+     * @param  null|array $customServiceParameters
+     * @param  null|Zend_Oauth_Token_Request $token
+     * @param  null|Zend_OAuth_Http_UserAuthorization $redirect
+     * @return string
+     */
+    public function getRedirectUrl(
+        array $customServiceParameters = null,
+        Zend_Oauth_Token_Request $token = null,
+        Zend_Oauth_Http_UserAuthorization $redirect = null
+    ) {
+        if ($redirect === null) {
+            $redirect = new Zend_Oauth_Http_UserAuthorization($this, $customServiceParameters);
+        } elseif($customServiceParameters !== null) {
+            $redirect->setParameters($customServiceParameters);
+        }
+        if ($token !== null) {
+            $this->_requestToken = $token;
+        }
+        return $redirect->getUrl();
+    }
+
+    /**
+     * Rather than retrieve a redirect URL for use, e.g. from a controller,
+     * one may perform an immediate redirect.
+     *
+     * Sends headers and exit()s on completion.
+     *
+     * @param  null|array $customServiceParameters
+     * @param  null|Zend_Oauth_Token_Request $token
+     * @param  null|Zend_Oauth_Http_UserAuthorization $request
+     * @return void
+     */
+    public function redirect(
+        array $customServiceParameters = null,
+        Zend_Oauth_Token_Request $token = null,
+        Zend_Oauth_Http_UserAuthorization $request = null
+    ) {
+        if ($token instanceof Zend_Oauth_Http_UserAuthorization) {
+            $request = $token;
+            $token = null;
+        }
+        $redirectUrl = $this->getRedirectUrl($customServiceParameters, $token, $request);
+        header('Location: ' . $redirectUrl);
+        exit(1);
+    }
+
+    /**
+     * Retrieve an Access Token in exchange for a previously received/authorized
+     * Request Token.
+     *
+     * @param  array $queryData GET data returned in user's redirect from Provider
+     * @param  Zend_Oauth_Token_Request Request Token information
+     * @param  string $httpMethod
+     * @param  Zend_Oauth_Http_AccessToken $request
+     * @return Zend_Oauth_Token_Access
+     * @throws Zend_Oauth_Exception on invalid authorization token, non-matching response authorization token, or unprovided authorization token
+     */
+    public function getAccessToken(
+        $queryData,
+        Zend_Oauth_Token_Request $token,
+        $httpMethod = null,
+        Zend_Oauth_Http_AccessToken $request = null
+    ) {
+        $authorizedToken = new Zend_Oauth_Token_AuthorizedRequest($queryData);
+        if (!$authorizedToken->isValid()) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                'Response from Service Provider is not a valid authorized request token');
+        }
+        if ($request === null) {
+            $request = new Zend_Oauth_Http_AccessToken($this);
+        }
+
+        // OAuth 1.0a Verifier
+        if ($authorizedToken->getParam('oauth_verifier') !== null) {
+            $params = array_merge($request->getParameters(), array(
+                'oauth_verifier' => $authorizedToken->getParam('oauth_verifier')
+            ));
+            $request->setParameters($params);
+        }
+        if ($httpMethod !== null) {
+            $request->setMethod($httpMethod);
+        } else {
+            $request->setMethod($this->getRequestMethod());
+        }
+        if (isset($token)) {
+            if ($authorizedToken->getToken() !== $token->getToken()) {
+                require_once 'Zend/Oauth/Exception.php';
+                throw new Zend_Oauth_Exception(
+                    'Authorized token from Service Provider does not match'
+                    . ' supplied Request Token details'
+                );
+            }
+        } else {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception('Request token must be passed to method');
+        }
+        $this->_requestToken = $token;
+        $this->_accessToken = $request->execute();
+        return $this->_accessToken;
+    }
+
+    /**
+     * Return whatever the last Request Token retrieved was while using the
+     * current Consumer instance.
+     *
+     * @return Zend_Oauth_Token_Request
+     */
+    public function getLastRequestToken()
+    {
+        return $this->_requestToken;
+    }
+
+    /**
+     * Return whatever the last Access Token retrieved was while using the
+     * current Consumer instance.
+     *
+     * @return Zend_Oauth_Token_Access
+     */
+    public function getLastAccessToken()
+    {
+        return $this->_accessToken;
+    }
+
+    /**
+     * Alias to self::getLastAccessToken()
+     *
+     * @return Zend_Oauth_Token_Access
+     */
+    public function getToken()
+    {
+        return $this->_accessToken;
+    }
+
+    /**
+     * Simple Proxy to the current Zend_Oauth_Config method. It's that instance
+     * which holds all configuration methods and values this object also presents
+     * as it's API.
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return mixed
+     * @throws Zend_Oauth_Exception if method does not exist in config object
+     */
+    public function __call($method, array $args)
+    {
+        if (!method_exists($this->_config, $method)) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception('Method does not exist: '.$method);
+        }
+        return call_user_func_array(array($this->_config,$method), $args);
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Exception.php b/lib/zend/Zend/Oauth/Exception.php
new file mode 100644
index 00000000000..ae76b488b23
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Exception.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Exception extends Zend_Exception {}
diff --git a/lib/zend/Zend/Oauth/Http.php b/lib/zend/Zend/Oauth/Http.php
new file mode 100644
index 00000000000..6cf79ac4f16
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Http.php
@@ -0,0 +1,266 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Http_Utility */
+require_once 'Zend/Oauth/Http/Utility.php';
+
+/** Zend_Uri_Http */
+require_once 'Zend/Uri/Http.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Http
+{
+    /**
+     * Array of all custom service parameters to be sent in the HTTP request
+     * in addition to the usual OAuth parameters.
+     *
+     * @var array
+     */
+    protected $_parameters = array();
+
+    /**
+     * Reference to the Zend_Oauth_Consumer instance in use.
+     *
+     * @var string
+     */
+    protected $_consumer = null;
+
+    /**
+     * OAuth specifies three request methods, this holds the current preferred
+     * one which by default uses the Authorization Header approach for passing
+     * OAuth parameters, and a POST body for non-OAuth custom parameters.
+     *
+     * @var string
+     */
+    protected $_preferredRequestScheme = null;
+
+    /**
+     * Request Method for the HTTP Request.
+     *
+     * @var string
+     */
+    protected $_preferredRequestMethod = Zend_Oauth::POST;
+
+    /**
+     * Instance of the general Zend_Oauth_Http_Utility class.
+     *
+     * @var Zend_Oauth_Http_Utility
+     */
+    protected $_httpUtility = null;
+
+    /**
+     * Constructor
+     *
+     * @param  Zend_Oauth_Consumer $consumer
+     * @param  null|array $parameters
+     * @param  null|Zend_Oauth_Http_Utility $utility
+     * @return void
+     */
+    public function __construct(
+        Zend_Oauth_Consumer $consumer,
+        array $parameters = null,
+        Zend_Oauth_Http_Utility $utility = null
+    ) {
+        $this->_consumer = $consumer;
+        $this->_preferredRequestScheme = $this->_consumer->getRequestScheme();
+        if ($parameters !== null) {
+            $this->setParameters($parameters);
+        }
+        if ($utility !== null) {
+            $this->_httpUtility = $utility;
+        } else {
+            $this->_httpUtility = new Zend_Oauth_Http_Utility;
+        }
+    }
+
+    /**
+     * Set a preferred HTTP request method.
+     *
+     * @param  string $method
+     * @return Zend_Oauth_Http
+     */
+    public function setMethod($method)
+    {
+        if (!in_array($method, array(Zend_Oauth::POST, Zend_Oauth::GET))) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception('invalid HTTP method: ' . $method);
+        }
+        $this->_preferredRequestMethod = $method;
+        return $this;
+    }
+
+    /**
+     * Preferred HTTP request method accessor.
+     *
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->_preferredRequestMethod;
+    }
+
+    /**
+     * Mutator to set an array of custom parameters for the HTTP request.
+     *
+     * @param  array $customServiceParameters
+     * @return Zend_Oauth_Http
+     */
+    public function setParameters(array $customServiceParameters)
+    {
+        $this->_parameters = $customServiceParameters;
+        return $this;
+    }
+
+    /**
+     * Accessor for an array of custom parameters.
+     *
+     * @return array
+     */
+    public function getParameters()
+    {
+        return $this->_parameters;
+    }
+
+    /**
+     * Return the Consumer instance in use.
+     *
+     * @return Zend_Oauth_Consumer
+     */
+    public function getConsumer()
+    {
+        return $this->_consumer;
+    }
+
+    /**
+     * Commence a request cycle where the current HTTP method and OAuth
+     * request scheme set an upper preferred HTTP request style and where
+     * failures generate a new HTTP request style further down the OAuth
+     * preference list for OAuth Request Schemes.
+     * On success, return the Request object that results for processing.
+     *
+     * @param  array $params
+     * @return Zend_Http_Response
+     * @throws Zend_Oauth_Exception on HTTP request errors
+     * @todo   Remove cycling?; Replace with upfront do-or-die configuration
+     */
+    public function startRequestCycle(array $params)
+    {
+        $response = null;
+        $body     = null;
+        $status   = null;
+        try {
+            $response = $this->_attemptRequest($params);
+        } catch (Zend_Http_Client_Exception $e) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception('Error in HTTP request', null, $e);
+        }
+        if ($response !== null) {
+            $body   = $response->getBody();
+            $status = $response->getStatus();
+        }
+        if ($response === null // Request failure/exception
+            || $status == 500  // Internal Server Error
+            || $status == 400  // Bad Request
+            || $status == 401  // Unauthorized
+            || empty($body)    // Missing token
+        ) {
+            $this->_assessRequestAttempt($response);
+            $response = $this->startRequestCycle($params);
+        }
+        return $response;
+    }
+
+    /**
+     * Return an instance of Zend_Http_Client configured to use the Query
+     * String scheme for an OAuth driven HTTP request.
+     *
+     * @param array $params
+     * @param string $url
+     * @return Zend_Http_Client
+     */
+    public function getRequestSchemeQueryStringClient(array $params, $url)
+    {
+        $client = Zend_Oauth::getHttpClient();
+        $client->setUri($url);
+        $client->getUri()->setQuery(
+            $this->_httpUtility->toEncodedQueryString($params)
+        );
+        $client->setMethod($this->_preferredRequestMethod);
+        return $client;
+    }
+
+    /**
+     * Manages the switch from OAuth request scheme to another lower preference
+     * scheme during a request cycle.
+     *
+     * @param  Zend_Http_Response
+     * @return void
+     * @throws Zend_Oauth_Exception if unable to retrieve valid token response
+     */
+    protected function _assessRequestAttempt(Zend_Http_Response $response = null)
+    {
+        switch ($this->_preferredRequestScheme) {
+            case Zend_Oauth::REQUEST_SCHEME_HEADER:
+                $this->_preferredRequestScheme = Zend_Oauth::REQUEST_SCHEME_POSTBODY;
+                break;
+            case Zend_Oauth::REQUEST_SCHEME_POSTBODY:
+                $this->_preferredRequestScheme = Zend_Oauth::REQUEST_SCHEME_QUERYSTRING;
+                break;
+            default:
+                require_once 'Zend/Oauth/Exception.php';
+                throw new Zend_Oauth_Exception(
+                    'Could not retrieve a valid Token response from Token URL:'
+                    . ($response !== null
+                        ? PHP_EOL . $response->getBody()
+                        : ' No body - check for headers')
+                );
+        }
+    }
+
+    /**
+     * Generates a valid OAuth Authorization header based on the provided
+     * parameters and realm.
+     *
+     * @param  array $params
+     * @param  string $realm
+     * @return string
+     */
+    protected function _toAuthorizationHeader(array $params, $realm = null)
+    {
+        $headerValue = array();
+        $headerValue[] = 'OAuth realm="' . $realm . '"';
+        foreach ($params as $key => $value) {
+            if (!preg_match("/^oauth_/", $key)) {
+                continue;
+            }
+            $headerValue[] = Zend_Oauth_Http_Utility::urlEncode($key)
+                           . '="'
+                           . Zend_Oauth_Http_Utility::urlEncode($value)
+                           . '"';
+        }
+        return implode(",", $headerValue);
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Http/AccessToken.php b/lib/zend/Zend/Oauth/Http/AccessToken.php
new file mode 100644
index 00000000000..8efd0f16b13
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Http/AccessToken.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Http */
+require_once 'Zend/Oauth/Http.php';
+
+/** Zend_Oauth_Token_Access */
+require_once 'Zend/Oauth/Token/Access.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Http_AccessToken extends Zend_Oauth_Http
+{
+    /**
+     * Singleton instance if required of the HTTP client
+     *
+     * @var Zend_Http_Client
+     */
+    protected $_httpClient = null;
+
+    /**
+     * Initiate a HTTP request to retrieve an Access Token.
+     *
+     * @return Zend_Oauth_Token_Access
+     */
+    public function execute()
+    {
+        $params   = $this->assembleParams();
+        $response = $this->startRequestCycle($params);
+        $return   = new Zend_Oauth_Token_Access($response);
+        return $return;
+    }
+
+    /**
+     * Assemble all parameters for an OAuth Access Token request.
+     *
+     * @return array
+     */
+    public function assembleParams()
+    {
+        $params = array(
+            'oauth_consumer_key'     => $this->_consumer->getConsumerKey(),
+            'oauth_nonce'            => $this->_httpUtility->generateNonce(),
+            'oauth_signature_method' => $this->_consumer->getSignatureMethod(),
+            'oauth_timestamp'        => $this->_httpUtility->generateTimestamp(),
+            'oauth_token'            => $this->_consumer->getLastRequestToken()->getToken(),
+            'oauth_version'          => $this->_consumer->getVersion(),
+        );
+
+        if (!empty($this->_parameters)) {
+            $params = array_merge($params, $this->_parameters);
+        }
+
+        $params['oauth_signature'] = $this->_httpUtility->sign(
+            $params,
+            $this->_consumer->getSignatureMethod(),
+            $this->_consumer->getConsumerSecret(),
+            $this->_consumer->getLastRequestToken()->getTokenSecret(),
+            $this->_preferredRequestMethod,
+            $this->_consumer->getAccessTokenUrl()
+        );
+
+        return $params;
+    }
+
+    /**
+     * Generate and return a HTTP Client configured for the Header Request Scheme
+     * specified by OAuth, for use in requesting an Access Token.
+     *
+     * @param  array $params
+     * @return Zend_Http_Client
+     */
+    public function getRequestSchemeHeaderClient(array $params)
+    {
+        $params      = $this->_cleanParamsOfIllegalCustomParameters($params);
+        $headerValue = $this->_toAuthorizationHeader($params);
+        $client      = Zend_Oauth::getHttpClient();
+
+        $client->setUri($this->_consumer->getAccessTokenUrl());
+        $client->setHeaders('Authorization', $headerValue);
+        $client->setMethod($this->_preferredRequestMethod);
+
+        return $client;
+    }
+
+    /**
+     * Generate and return a HTTP Client configured for the POST Body Request
+     * Scheme specified by OAuth, for use in requesting an Access Token.
+     *
+     * @param  array $params
+     * @return Zend_Http_Client
+     */
+    public function getRequestSchemePostBodyClient(array $params)
+    {
+        $params = $this->_cleanParamsOfIllegalCustomParameters($params);
+        $client = Zend_Oauth::getHttpClient();
+        $client->setUri($this->_consumer->getAccessTokenUrl());
+        $client->setMethod($this->_preferredRequestMethod);
+        $client->setRawData(
+            $this->_httpUtility->toEncodedQueryString($params)
+        );
+        $client->setHeaders(
+            Zend_Http_Client::CONTENT_TYPE,
+            Zend_Http_Client::ENC_URLENCODED
+        );
+        return $client;
+    }
+
+    /**
+     * Generate and return a HTTP Client configured for the Query String Request
+     * Scheme specified by OAuth, for use in requesting an Access Token.
+     *
+     * @param  array $params
+     * @param  string $url
+     * @return Zend_Http_Client
+     */
+    public function getRequestSchemeQueryStringClient(array $params, $url)
+    {
+        $params = $this->_cleanParamsOfIllegalCustomParameters($params);
+        return parent::getRequestSchemeQueryStringClient($params, $url);
+    }
+
+    /**
+     * Attempt a request based on the current configured OAuth Request Scheme and
+     * return the resulting HTTP Response.
+     *
+     * @param  array $params
+     * @return Zend_Http_Response
+     */
+    protected function _attemptRequest(array $params)
+    {
+        switch ($this->_preferredRequestScheme) {
+            case Zend_Oauth::REQUEST_SCHEME_HEADER:
+                $httpClient = $this->getRequestSchemeHeaderClient($params);
+                break;
+            case Zend_Oauth::REQUEST_SCHEME_POSTBODY:
+                $httpClient = $this->getRequestSchemePostBodyClient($params);
+                break;
+            case Zend_Oauth::REQUEST_SCHEME_QUERYSTRING:
+                $httpClient = $this->getRequestSchemeQueryStringClient($params,
+                    $this->_consumer->getAccessTokenUrl());
+                break;
+        }
+        return $httpClient->request();
+    }
+
+    /**
+     * Access Token requests specifically may not contain non-OAuth parameters.
+     * So these should be striped out and excluded. Detection is easy since
+     * specified OAuth parameters start with "oauth_", Extension params start
+     * with "xouth_", and no other parameters should use these prefixes.
+     *
+     * xouth params are not currently allowable.
+     *
+     * @param  array $params
+     * @return array
+     */
+    protected function _cleanParamsOfIllegalCustomParameters(array $params)
+    {
+        foreach ($params as $key=>$value) {
+            if (!preg_match("/^oauth_/", $key)) {
+                unset($params[$key]);
+            }
+        }
+        return $params;
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Http/RequestToken.php b/lib/zend/Zend/Oauth/Http/RequestToken.php
new file mode 100644
index 00000000000..44ae2da7a10
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Http/RequestToken.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Http */
+require_once 'Zend/Oauth/Http.php';
+
+/** Zend_Oauth_Token_Request */
+require_once 'Zend/Oauth/Token/Request.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Http_RequestToken extends Zend_Oauth_Http
+{
+    /**
+     * Singleton instance if required of the HTTP client
+     *
+     * @var Zend_Http_Client
+     */
+    protected $_httpClient = null;
+
+    /**
+     * Initiate a HTTP request to retrieve a Request Token.
+     *
+     * @return Zend_Oauth_Token_Request
+     */
+    public function execute()
+    {
+        $params   = $this->assembleParams();
+        $response = $this->startRequestCycle($params);
+        $return   = new Zend_Oauth_Token_Request($response);
+        return $return;
+    }
+
+    /**
+     * Assemble all parameters for an OAuth Request Token request.
+     *
+     * @return array
+     */
+    public function assembleParams()
+    {
+        $params = array(
+            'oauth_consumer_key'     => $this->_consumer->getConsumerKey(),
+            'oauth_nonce'            => $this->_httpUtility->generateNonce(),
+            'oauth_timestamp'        => $this->_httpUtility->generateTimestamp(),
+            'oauth_signature_method' => $this->_consumer->getSignatureMethod(),
+            'oauth_version'          => $this->_consumer->getVersion(),
+        );
+
+        // indicates we support 1.0a
+        if ($this->_consumer->getCallbackUrl()) {
+            $params['oauth_callback'] = $this->_consumer->getCallbackUrl();
+        } else {
+            $params['oauth_callback'] = 'oob';
+        }
+
+        if (!empty($this->_parameters)) {
+            $params = array_merge($params, $this->_parameters);
+        }
+
+        $params['oauth_signature'] = $this->_httpUtility->sign(
+            $params,
+            $this->_consumer->getSignatureMethod(),
+            $this->_consumer->getConsumerSecret(),
+            null,
+            $this->_preferredRequestMethod,
+            $this->_consumer->getRequestTokenUrl()
+        );
+
+        return $params;
+    }
+
+    /**
+     * Generate and return a HTTP Client configured for the Header Request Scheme
+     * specified by OAuth, for use in requesting a Request Token.
+     *
+     * @param array $params
+     * @return Zend_Http_Client
+     */
+    public function getRequestSchemeHeaderClient(array $params)
+    {
+        $headerValue = $this->_httpUtility->toAuthorizationHeader(
+            $params
+        );
+        $client = Zend_Oauth::getHttpClient();
+        $client->setUri($this->_consumer->getRequestTokenUrl());
+        $client->setHeaders('Authorization', $headerValue);
+        $rawdata = $this->_httpUtility->toEncodedQueryString($params, true);
+        if (!empty($rawdata)) {
+            $client->setRawData($rawdata, 'application/x-www-form-urlencoded');
+        }
+        $client->setMethod($this->_preferredRequestMethod);
+        return $client;
+    }
+
+    /**
+     * Generate and return a HTTP Client configured for the POST Body Request
+     * Scheme specified by OAuth, for use in requesting a Request Token.
+     *
+     * @param  array $params
+     * @return Zend_Http_Client
+     */
+    public function getRequestSchemePostBodyClient(array $params)
+    {
+        $client = Zend_Oauth::getHttpClient();
+        $client->setUri($this->_consumer->getRequestTokenUrl());
+        $client->setMethod($this->_preferredRequestMethod);
+        $client->setRawData(
+            $this->_httpUtility->toEncodedQueryString($params)
+        );
+        $client->setHeaders(
+            Zend_Http_Client::CONTENT_TYPE,
+            Zend_Http_Client::ENC_URLENCODED
+        );
+        return $client;
+    }
+
+    /**
+     * Attempt a request based on the current configured OAuth Request Scheme and
+     * return the resulting HTTP Response.
+     *
+     * @param  array $params
+     * @return Zend_Http_Response
+     */
+    protected function _attemptRequest(array $params)
+    {
+        switch ($this->_preferredRequestScheme) {
+            case Zend_Oauth::REQUEST_SCHEME_HEADER:
+                $httpClient = $this->getRequestSchemeHeaderClient($params);
+                break;
+            case Zend_Oauth::REQUEST_SCHEME_POSTBODY:
+                $httpClient = $this->getRequestSchemePostBodyClient($params);
+                break;
+            case Zend_Oauth::REQUEST_SCHEME_QUERYSTRING:
+                $httpClient = $this->getRequestSchemeQueryStringClient($params,
+                    $this->_consumer->getRequestTokenUrl());
+                break;
+        }
+        return $httpClient->request();
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Http/UserAuthorization.php b/lib/zend/Zend/Oauth/Http/UserAuthorization.php
new file mode 100644
index 00000000000..8582bac0560
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Http/UserAuthorization.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Http */
+require_once 'Zend/Oauth/Http.php';
+
+/** Zend_Uri_Http */
+require_once 'Zend/Uri/Http.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Http_UserAuthorization extends Zend_Oauth_Http
+{
+    /**
+     * Generate a redirect URL from the allowable parameters and configured
+     * values.
+     *
+     * @return string
+     */
+    public function getUrl()
+    {
+        $params = $this->assembleParams();
+        $uri    = Zend_Uri_Http::fromString($this->_consumer->getUserAuthorizationUrl());
+
+        $uri->setQuery(
+            $this->_httpUtility->toEncodedQueryString($params)
+        );
+
+        return $uri->getUri();
+    }
+
+    /**
+     * Assemble all parameters for inclusion in a redirect URL.
+     *
+     * @return array
+     */
+    public function assembleParams()
+    {
+        $params = array(
+            'oauth_token' => $this->_consumer->getLastRequestToken()->getToken(),
+        );
+
+        if (!Zend_Oauth_Client::$supportsRevisionA) {
+            $callback = $this->_consumer->getCallbackUrl();
+            if (!empty($callback)) {
+                $params['oauth_callback'] = $callback;
+            }
+        }
+
+        if (!empty($this->_parameters)) {
+            $params = array_merge($params, $this->_parameters);
+        }
+
+        return $params;
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Http/Utility.php b/lib/zend/Zend/Oauth/Http/Utility.php
new file mode 100644
index 00000000000..3c063744b74
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Http/Utility.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth */
+require_once 'Zend/Oauth.php';
+
+/** Zend_Oauth_Http */
+require_once 'Zend/Oauth/Http.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Http_Utility
+{
+    /**
+     * Assemble all parameters for a generic OAuth request - i.e. no special
+     * params other than the defaults expected for any OAuth query.
+     *
+     * @param  string $url
+     * @param  Zend_Oauth_Config_ConfigInterface $config
+     * @param  null|array $serviceProviderParams
+     * @return array
+     */
+    public function assembleParams(
+        $url,
+        Zend_Oauth_Config_ConfigInterface $config,
+        array $serviceProviderParams = null
+    ) {
+        $params = array(
+            'oauth_consumer_key'     => $config->getConsumerKey(),
+            'oauth_nonce'            => $this->generateNonce(),
+            'oauth_signature_method' => $config->getSignatureMethod(),
+            'oauth_timestamp'        => $this->generateTimestamp(),
+            'oauth_version'          => $config->getVersion(),
+        );
+
+        if ($config->getToken()->getToken() != null) {
+            $params['oauth_token'] = $config->getToken()->getToken();
+        }
+
+
+        if ($serviceProviderParams !== null) {
+            $params = array_merge($params, $serviceProviderParams);
+        }
+
+        $params['oauth_signature'] = $this->sign(
+            $params,
+            $config->getSignatureMethod(),
+            $config->getConsumerSecret(),
+            $config->getToken()->getTokenSecret(),
+            $config->getRequestMethod(),
+            $url
+        );
+
+        return $params;
+    }
+
+    /**
+     * Given both OAuth parameters and any custom parametere, generate an
+     * encoded query string. This method expects parameters to have been
+     * assembled and signed beforehand.
+     *
+     * @param array $params
+     * @param bool $customParamsOnly Ignores OAuth params e.g. for requests using OAuth Header
+     * @return string
+     */
+    public function toEncodedQueryString(array $params, $customParamsOnly = false)
+    {
+        if ($customParamsOnly) {
+            foreach ($params as $key=>$value) {
+                if (preg_match("/^oauth_/", $key)) {
+                    unset($params[$key]);
+                }
+            }
+        }
+        $encodedParams = array();
+        foreach ($params as $key => $value) {
+            $encodedParams[] = self::urlEncode($key)
+                             . '='
+                             . self::urlEncode($value);
+        }
+        return implode('&', $encodedParams);
+    }
+
+    /**
+     * Cast to authorization header
+     *
+     * @param  array $params
+     * @param  null|string $realm
+     * @param  bool $excludeCustomParams
+     * @return void
+     */
+    public function toAuthorizationHeader(array $params, $realm = null, $excludeCustomParams = true)
+    {
+        $headerValue = array(
+            'OAuth realm="' . $realm . '"',
+        );
+
+        foreach ($params as $key => $value) {
+            if ($excludeCustomParams) {
+                if (!preg_match("/^oauth_/", $key)) {
+                    continue;
+                }
+            }
+            $headerValue[] = self::urlEncode($key)
+                           . '="'
+                           . self::urlEncode($value) . '"';
+        }
+        return implode(",", $headerValue);
+    }
+
+    /**
+     * Sign request
+     *
+     * @param  array $params
+     * @param  string $signatureMethod
+     * @param  string $consumerSecret
+     * @param  null|string $tokenSecret
+     * @param  null|string $method
+     * @param  null|string $url
+     * @return string
+     */
+    public function sign(
+        array $params, $signatureMethod, $consumerSecret, $tokenSecret = null, $method = null, $url = null
+    ) {
+        $className = '';
+        $hashAlgo  = null;
+        $parts     = explode('-', $signatureMethod);
+        if (count($parts) > 1) {
+            $className = 'Zend_Oauth_Signature_' . ucfirst(strtolower($parts[0]));
+            $hashAlgo  = $parts[1];
+        } else {
+            $className = 'Zend_Oauth_Signature_' . ucfirst(strtolower($signatureMethod));
+        }
+
+        require_once str_replace('_', '/', $className) . '.php';
+        $signatureObject = new $className($consumerSecret, $tokenSecret, $hashAlgo);
+        return $signatureObject->sign($params, $method, $url);
+    }
+
+    /**
+     * Parse query string
+     *
+     * @param  mixed $query
+     * @return array
+     */
+    public function parseQueryString($query)
+    {
+        $params = array();
+        if (empty($query)) {
+            return array();
+        }
+
+        // Not remotely perfect but beats parse_str() which converts
+        // periods and uses urldecode, not rawurldecode.
+        $parts = explode('&', $query);
+        foreach ($parts as $pair) {
+            $kv = explode('=', $pair);
+            $params[rawurldecode($kv[0])] = rawurldecode($kv[1]);
+        }
+        return $params;
+    }
+
+    /**
+     * Generate nonce
+     *
+     * @return string
+     */
+    public function generateNonce()
+    {
+        return md5(uniqid(rand(), true));
+    }
+
+    /**
+     * Generate timestamp
+     *
+     * @return int
+     */
+    public function generateTimestamp()
+    {
+        return time();
+    }
+
+    /**
+     * urlencode a value
+     *
+     * @param  string $value
+     * @return string
+     */
+    public static function urlEncode($value)
+    {
+        $encoded = rawurlencode($value);
+        $encoded = str_replace('%7E', '~', $encoded);
+        return $encoded;
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Signature/Hmac.php b/lib/zend/Zend/Oauth/Signature/Hmac.php
new file mode 100644
index 00000000000..b93cc5891fb
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Signature/Hmac.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Signature_SignatureAbstract */
+require_once 'Zend/Oauth/Signature/SignatureAbstract.php';
+
+/** Zend_Crypt_Hmac */
+require_once 'Zend/Crypt/Hmac.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Signature_Hmac extends Zend_Oauth_Signature_SignatureAbstract
+{
+    /**
+     * Sign a request
+     *
+     * @param  array $params
+     * @param  mixed $method
+     * @param  mixed $url
+     * @return string
+     */
+    public function sign(array $params, $method = null, $url = null)
+    {
+        $binaryHash = Zend_Crypt_Hmac::compute(
+            $this->_key,
+            $this->_hashAlgorithm,
+            $this->_getBaseSignatureString($params, $method, $url),
+            Zend_Crypt_Hmac::BINARY
+        );
+        return base64_encode($binaryHash);
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php b/lib/zend/Zend/Oauth/Signature/Plaintext.php
similarity index 51%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php
rename to lib/zend/Zend/Oauth/Signature/Plaintext.php
index c61e2c46b39..e39b676770a 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php
+++ b/lib/zend/Zend/Oauth/Signature/Plaintext.php
@@ -13,43 +13,37 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
+/** Zend_Oauth_Signature_SignatureAbstract */
+require_once 'Zend/Oauth/Signature/SignatureAbstract.php';
 
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
+class Zend_Oauth_Signature_Plaintext extends Zend_Oauth_Signature_SignatureAbstract
 {
     /**
-     * the conference Id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * return the conference id
+     * Sign a request
      *
+     * @param  array $params
+     * @param  null|string $method
+     * @param  null|string $url
      * @return string
      */
-    public function getConferenceId()
+    public function sign(array $params, $method = null, $url = null)
     {
-        return $this->conferenceId;
+        if ($this->_tokenSecret === null) {
+            return $this->_consumerSecret . '&';
+        }
+        $return = implode('&', array($this->_consumerSecret, $this->_tokenSecret));
+        return $return;
     }
 }
diff --git a/lib/zend/Zend/Oauth/Signature/Rsa.php b/lib/zend/Zend/Oauth/Signature/Rsa.php
new file mode 100644
index 00000000000..c79d4a3e79f
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Signature/Rsa.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Signature_SignatureAbstract */
+require_once 'Zend/Oauth/Signature/SignatureAbstract.php';
+
+/** Zend_Crypt_Rsa */
+require_once 'Zend/Crypt/Rsa.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Signature_Rsa extends Zend_Oauth_Signature_SignatureAbstract
+{
+    /**
+     * Sign a request
+     *
+     * @param  array $params
+     * @param  null|string $method
+     * @param  null|string $url
+     * @return string
+     */
+    public function sign(array $params, $method = null, $url = null)
+    {
+        $rsa = new Zend_Crypt_Rsa;
+        $rsa->setHashAlgorithm($this->_hashAlgorithm);
+        $sign = $rsa->sign(
+            $this->_getBaseSignatureString($params, $method, $url),
+            $this->_key,
+            Zend_Crypt_Rsa::BASE64
+        );
+        return $sign;
+    }
+
+    /**
+     * Assemble encryption key
+     *
+     * @return string
+     */
+    protected function _assembleKey()
+    {
+        return $this->_consumerSecret;
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Signature/SignatureAbstract.php b/lib/zend/Zend/Oauth/Signature/SignatureAbstract.php
new file mode 100644
index 00000000000..688f4606ce0
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Signature/SignatureAbstract.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Http_Utility */
+require_once 'Zend/Oauth/Http/Utility.php';
+
+/** Zend_Uri_Http */
+require_once 'Zend/Uri/Http.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Oauth_Signature_SignatureAbstract
+{
+    /**
+     * Hash algorithm to use when generating signature
+     * @var string
+     */
+    protected $_hashAlgorithm = null;
+
+    /**
+     * Key to use when signing
+     * @var string
+     */
+    protected $_key = null;
+
+    /**
+     * Consumer secret
+     * @var string
+     */
+    protected $_consumerSecret = null;
+
+    /**
+     * Token secret
+     * @var string
+     */
+    protected $_tokenSecret = '';
+
+    /**
+     * Constructor
+     *
+     * @param  string $consumerSecret
+     * @param  null|string $tokenSecret
+     * @param  null|string $hashAlgo
+     * @return void
+     */
+    public function __construct($consumerSecret, $tokenSecret = null, $hashAlgo = null)
+    {
+        $this->_consumerSecret = $consumerSecret;
+        if (isset($tokenSecret)) {
+            $this->_tokenSecret = $tokenSecret;
+        }
+        $this->_key = $this->_assembleKey();
+        if (isset($hashAlgo)) {
+            $this->_hashAlgorithm = $hashAlgo;
+        }
+    }
+
+    /**
+     * Sign a request
+     *
+     * @param  array $params
+     * @param  null|string $method
+     * @param  null|string $url
+     * @return string
+     */
+    public abstract function sign(array $params, $method = null, $url = null);
+
+    /**
+     * Normalize the base signature URL
+     *
+     * @param  string $url
+     * @return string
+     */
+    public function normaliseBaseSignatureUrl($url)
+    {
+        $uri = Zend_Uri_Http::fromString($url);
+        if ($uri->getScheme() == 'http' && $uri->getPort() == '80') {
+            $uri->setPort('');
+        } elseif ($uri->getScheme() == 'https' && $uri->getPort() == '443') {
+            $uri->setPort('');
+        }
+        $uri->setQuery('');
+        $uri->setFragment('');
+        $uri->setHost(strtolower($uri->getHost()));
+        return $uri->getUri(true);
+    }
+
+    /**
+     * Assemble key from consumer and token secrets
+     *
+     * @return string
+     */
+    protected function _assembleKey()
+    {
+        $parts = array($this->_consumerSecret);
+        if ($this->_tokenSecret !== null) {
+            $parts[] = $this->_tokenSecret;
+        }
+        foreach ($parts as $key => $secret) {
+            $parts[$key] = Zend_Oauth_Http_Utility::urlEncode($secret);
+        }
+        return implode('&', $parts);
+    }
+
+    /**
+     * Get base signature string
+     *
+     * @param  array $params
+     * @param  null|string $method
+     * @param  null|string $url
+     * @return string
+     */
+    protected function _getBaseSignatureString(array $params, $method = null, $url = null)
+    {
+        $encodedParams = array();
+        foreach ($params as $key => $value) {
+            $encodedParams[Zend_Oauth_Http_Utility::urlEncode($key)] =
+                Zend_Oauth_Http_Utility::urlEncode($value);
+        }
+        $baseStrings = array();
+        if (isset($method)) {
+            $baseStrings[] = strtoupper($method);
+        }
+        if (isset($url)) {
+            // should normalise later
+            $baseStrings[] = Zend_Oauth_Http_Utility::urlEncode(
+                $this->normaliseBaseSignatureUrl($url)
+            );
+        }
+        if (isset($encodedParams['oauth_signature'])) {
+            unset($encodedParams['oauth_signature']);
+        }
+        $baseStrings[] = Zend_Oauth_Http_Utility::urlEncode(
+            $this->_toByteValueOrderedQueryString($encodedParams)
+        );
+        return implode('&', $baseStrings);
+    }
+
+    /**
+     * Transform an array to a byte value ordered query string
+     *
+     * @param  array $params
+     * @return string
+     */
+    protected function _toByteValueOrderedQueryString(array $params)
+    {
+        $return = array();
+        uksort($params, 'strnatcmp');
+        foreach ($params as $key => $value) {
+            if (is_array($value)) {
+                natsort($value);
+                foreach ($value as $keyduplicate) {
+                    $return[] = $key . '=' . $keyduplicate;
+                }
+            } else {
+                $return[] = $key . '=' . $value;
+            }
+        }
+        return implode('&', $return);
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Token.php b/lib/zend/Zend/Oauth/Token.php
new file mode 100644
index 00000000000..08f23e5c12b
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Token.php
@@ -0,0 +1,285 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Http_Utility */
+require_once 'Zend/Oauth/Http/Utility.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Oauth_Token
+{
+    /**@+
+     * Token constants
+     */
+    const TOKEN_PARAM_KEY                = 'oauth_token';
+    const TOKEN_SECRET_PARAM_KEY         = 'oauth_token_secret';
+    const TOKEN_PARAM_CALLBACK_CONFIRMED = 'oauth_callback_confirmed';
+    /**@-*/
+
+    /**
+     * Token parameters
+     *
+     * @var array
+     */
+    protected $_params = array();
+
+    /**
+     * OAuth response object
+     *
+     * @var Zend_Http_Response
+     */
+    protected $_response = null;
+
+    /**
+     * @var Zend_Oauth_Http_Utility
+     */
+    protected $_httpUtility = null;
+
+    /**
+     * Constructor; basic setup for any Token subclass.
+     *
+     * @param  null|Zend_Http_Response $response
+     * @param  null|Zend_Oauth_Http_Utility $utility
+     * @return void
+     */
+    public function __construct(
+        Zend_Http_Response $response = null,
+        Zend_Oauth_Http_Utility $utility = null
+    ) {
+        if ($response !== null) {
+            $this->_response = $response;
+            $params = $this->_parseParameters($response);
+            if (count($params) > 0) {
+                $this->setParams($params);
+            }
+        }
+        if ($utility !== null) {
+            $this->_httpUtility = $utility;
+        } else {
+            $this->_httpUtility = new Zend_Oauth_Http_Utility;
+        }
+    }
+
+    /**
+     * Attempts to validate the Token parsed from the HTTP response - really
+     * it's just very basic existence checks which are minimal.
+     *
+     * @return bool
+     */
+    public function isValid()
+    {
+        if (isset($this->_params[self::TOKEN_PARAM_KEY])
+            && !empty($this->_params[self::TOKEN_PARAM_KEY])
+            && isset($this->_params[self::TOKEN_SECRET_PARAM_KEY])
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Return the HTTP response object used to initialise this instance.
+     *
+     * @return Zend_Http_Response
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Sets the value for the this Token's secret which may be used when signing
+     * requests with this Token.
+     *
+     * @param  string $secret
+     * @return Zend_Oauth_Token
+     */
+    public function setTokenSecret($secret)
+    {
+        $this->setParam(self::TOKEN_SECRET_PARAM_KEY, $secret);
+        return $this;
+    }
+
+    /**
+     * Retrieve this Token's secret which may be used when signing
+     * requests with this Token.
+     *
+     * @return string
+     */
+    public function getTokenSecret()
+    {
+        return $this->getParam(self::TOKEN_SECRET_PARAM_KEY);
+    }
+
+    /**
+     * Sets the value for a parameter (e.g. token secret or other) and run
+     * a simple filter to remove any trailing newlines.
+     *
+     * @param  string $key
+     * @param  string $value
+     * @return Zend_Oauth_Token
+     */
+    public function setParam($key, $value)
+    {
+        $this->_params[$key] = trim($value, "\n");
+        return $this;
+    }
+
+    /**
+     * Sets the value for some parameters (e.g. token secret or other) and run
+     * a simple filter to remove any trailing newlines.
+     *
+     * @param  array $params
+     * @return Zend_Oauth_Token
+     */
+    public function setParams(array $params)
+    {
+        foreach ($params as $key=>$value) {
+            $this->setParam($key, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * Get the value for a parameter (e.g. token secret or other).
+     *
+     * @param  string $key
+     * @return mixed
+     */
+    public function getParam($key)
+    {
+        if (isset($this->_params[$key])) {
+            return $this->_params[$key];
+        }
+        return null;
+    }
+
+    /**
+     * Sets the value for a Token.
+     *
+     * @param  string $token
+     * @return Zend_Oauth_Token
+     */
+    public function setToken($token)
+    {
+        $this->setParam(self::TOKEN_PARAM_KEY, $token);
+        return $this;
+    }
+
+    /**
+     * Gets the value for a Token.
+     *
+     * @return string
+     */
+    public function getToken()
+    {
+        return $this->getParam(self::TOKEN_PARAM_KEY);
+    }
+
+    /**
+     * Generic accessor to enable access as public properties.
+     *
+     * @return string
+     */
+    public function __get($key)
+    {
+        return $this->getParam($key);
+    }
+
+    /**
+     * Generic mutator to enable access as public properties.
+     *
+     * @param  string $key
+     * @param  string $value
+     * @return void
+     */
+    public function __set($key, $value)
+    {
+        $this->setParam($key, $value);
+    }
+
+    /**
+     * Convert Token to a string, specifically a raw encoded query string.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->_httpUtility->toEncodedQueryString($this->_params);
+    }
+
+    /**
+     * Convert Token to a string, specifically a raw encoded query string.
+     * Aliases to self::toString()
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Parse a HTTP response body and collect returned parameters
+     * as raw url decoded key-value pairs in an associative array.
+     *
+     * @param  Zend_Http_Response $response
+     * @return array
+     */
+    protected function _parseParameters(Zend_Http_Response $response)
+    {
+        $params = array();
+        $body   = $response->getBody();
+        if (empty($body)) {
+            return;
+        }
+
+        // validate body based on acceptable characters...todo
+        $parts = explode('&', $body);
+        foreach ($parts as $kvpair) {
+            $pair = explode('=', $kvpair);
+            $params[rawurldecode($pair[0])] = rawurldecode($pair[1]);
+        }
+        return $params;
+    }
+
+    /**
+     * Limit serialisation stored data to the parameters
+     */
+    public function __sleep()
+    {
+        return array('_params');
+    }
+
+    /**
+     * After serialisation, re-instantiate a HTTP utility class for use
+     */
+    public function __wakeup()
+    {
+        if ($this->_httpUtility === null) {
+            $this->_httpUtility = new Zend_Oauth_Http_Utility;
+        }
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Token/Access.php b/lib/zend/Zend/Oauth/Token/Access.php
new file mode 100644
index 00000000000..b31100651d6
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Token/Access.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Token */
+require_once 'Zend/Oauth/Token.php';
+
+/** Zend_Oauth_Http */
+require_once 'Zend/Oauth/Http.php';
+
+/** Zend_Uri_Http */
+require_once 'Zend/Uri/Http.php';
+
+/** Zend_Oauth_Client */
+require_once 'Zend/Oauth/Client.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Token_Access extends Zend_Oauth_Token
+{
+    /**
+     * Cast to HTTP header
+     *
+     * @param  string $url
+     * @param  Zend_Oauth_Config_ConfigInterface $config
+     * @param  null|array $customParams
+     * @param  null|string $realm
+     * @return string
+     */
+    public function toHeader(
+        $url, Zend_Oauth_Config_ConfigInterface $config, array $customParams = null, $realm = null
+    ) {
+        if (!Zend_Uri::check($url)) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                '\'' . $url . '\' is not a valid URI'
+            );
+        }
+        $params = $this->_httpUtility->assembleParams($url, $config, $customParams);
+        return $this->_httpUtility->toAuthorizationHeader($params, $realm);
+    }
+
+    /**
+     * Cast to HTTP query string
+     *
+     * @param  mixed $url
+     * @param  Zend_Oauth_Config_ConfigInterface $config
+     * @param  null|array $params
+     * @return string
+     */
+    public function toQueryString($url, Zend_Oauth_Config_ConfigInterface $config, array $params = null)
+    {
+        if (!Zend_Uri::check($url)) {
+            require_once 'Zend/Oauth/Exception.php';
+            throw new Zend_Oauth_Exception(
+                '\'' . $url . '\' is not a valid URI'
+            );
+        }
+        $params = $this->_httpUtility->assembleParams($url, $config, $params);
+        return $this->_httpUtility->toEncodedQueryString($params);
+    }
+
+    /**
+     * Get OAuth client
+     *
+     * @param  array $oauthOptions
+     * @param  null|string $uri
+     * @param  null|array|Zend_Config $config
+     * @param  bool $excludeCustomParamsFromHeader
+     * @return Zend_Oauth_Client
+     */
+    public function getHttpClient(array $oauthOptions, $uri = null, $config = null, $excludeCustomParamsFromHeader = true)
+    {
+        $client = new Zend_Oauth_Client($oauthOptions, $uri, $config, $excludeCustomParamsFromHeader);
+        $client->setToken($this);
+        return $client;
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Token/AuthorizedRequest.php b/lib/zend/Zend/Oauth/Token/AuthorizedRequest.php
new file mode 100644
index 00000000000..9ae2bbb0325
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Token/AuthorizedRequest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Token */
+require_once 'Zend/Oauth/Token.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Token_AuthorizedRequest extends Zend_Oauth_Token
+{
+    /**
+     * @var array
+     */
+    protected $_data = array();
+
+    /**
+     * Constructor
+     *
+     * @param  null|array $data
+     * @param  null|Zend_Oauth_Http_Utility $utility
+     * @return void
+     */
+    public function __construct(array $data = null, Zend_Oauth_Http_Utility $utility = null)
+    {
+        if ($data !== null) {
+            $this->_data = $data;
+            $params = $this->_parseData();
+            if (count($params) > 0) {
+                $this->setParams($params);
+            }
+        }
+        if ($utility !== null) {
+            $this->_httpUtility = $utility;
+        } else {
+            $this->_httpUtility = new Zend_Oauth_Http_Utility;
+        }
+    }
+
+    /**
+     * Retrieve token data
+     *
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->_data;
+    }
+
+    /**
+     * Indicate if token is valid
+     *
+     * @return bool
+     */
+    public function isValid()
+    {
+        if (isset($this->_params[self::TOKEN_PARAM_KEY])
+            && !empty($this->_params[self::TOKEN_PARAM_KEY])
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Parse string data into array
+     *
+     * @return array
+     */
+    protected function _parseData()
+    {
+        $params = array();
+        if (empty($this->_data)) {
+            return;
+        }
+        foreach ($this->_data as $key => $value) {
+            $params[rawurldecode($key)] = rawurldecode($value);
+        }
+        return $params;
+    }
+}
diff --git a/lib/zend/Zend/Oauth/Token/Request.php b/lib/zend/Zend/Oauth/Token/Request.php
new file mode 100644
index 00000000000..6697bff6cfd
--- /dev/null
+++ b/lib/zend/Zend/Oauth/Token/Request.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Oauth_Token */
+require_once 'Zend/Oauth/Token.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Oauth
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Oauth_Token_Request extends Zend_Oauth_Token
+{
+    /**
+     * Constructor
+     *
+     * @param null|Zend_Http_Response $response
+     * @param null|Zend_Oauth_Http_Utility $utility
+     */
+    public function __construct(
+        Zend_Http_Response $response = null,
+        Zend_Oauth_Http_Utility $utility = null
+    ) {
+        parent::__construct($response, $utility);
+
+        // detect if server supports OAuth 1.0a
+        if (isset($this->_params[Zend_Oauth_Token::TOKEN_PARAM_CALLBACK_CONFIRMED])) {
+            Zend_Oauth_Client::$supportsRevisionA = true;
+        }
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Class.php b/lib/zend/Zend/Reflection/Class.php
new file mode 100644
index 00000000000..4819ef86955
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Class.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Reflection_Property
+ */
+require_once 'Zend/Reflection/Property.php';
+
+/**
+ * @see Zend_Reflection_Method
+ */
+require_once 'Zend/Reflection/Method.php';
+
+/**
+ * Zend_Reflection_Docblock
+ */
+require_once 'Zend/Reflection/Docblock.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Class extends ReflectionClass
+{
+    /**
+     * Return the reflection file of the declaring file.
+     *
+     * @return Zend_Reflection_File
+     */
+    public function getDeclaringFile($reflectionClass = 'Zend_Reflection_File')
+    {
+        $instance = new $reflectionClass($this->getFileName());
+        if (!$instance instanceof Zend_Reflection_File) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_File');
+        }
+        return $instance;
+    }
+
+    /**
+     * Return the classes Docblock reflection object
+     *
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return Zend_Reflection_Docblock
+     * @throws Zend_Reflection_Exception for missing docblock or invalid reflection class
+     */
+    public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock')
+    {
+        if ('' == $this->getDocComment()) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock');
+        }
+
+        $instance = new $reflectionClass($this);
+        if (!$instance instanceof Zend_Reflection_Docblock) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Docblock');
+        }
+        return $instance;
+    }
+
+    /**
+     * Return the start line of the class
+     *
+     * @param bool $includeDocComment
+     * @return int
+     */
+    public function getStartLine($includeDocComment = false)
+    {
+        if ($includeDocComment) {
+            if ($this->getDocComment() != '') {
+                return $this->getDocblock()->getStartLine();
+            }
+        }
+
+        return parent::getStartLine();
+    }
+
+    /**
+     * Return the contents of the class
+     *
+     * @param bool $includeDocblock
+     * @return string
+     */
+    public function getContents($includeDocblock = true)
+    {
+        $filename  = $this->getFileName();
+        $filelines = file($filename);
+        $startnum  = $this->getStartLine($includeDocblock);
+        $endnum    = $this->getEndLine() - $this->getStartLine();
+
+        return implode('', array_splice($filelines, $startnum, $endnum, true));
+    }
+
+    /**
+     * Get all reflection objects of implemented interfaces
+     *
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return array Array of Zend_Reflection_Class
+     */
+    public function getInterfaces($reflectionClass = 'Zend_Reflection_Class')
+    {
+        $phpReflections  = parent::getInterfaces();
+        $zendReflections = array();
+        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
+            $instance = new $reflectionClass($phpReflection->getName());
+            if (!$instance instanceof Zend_Reflection_Class) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Class');
+            }
+            $zendReflections[] = $instance;
+            unset($phpReflection);
+        }
+        unset($phpReflections);
+        return $zendReflections;
+    }
+
+    /**
+     * Return method reflection by name
+     *
+     * @param  string $name
+     * @param  string $reflectionClass Reflection class to utilize
+     * @return Zend_Reflection_Method
+     */
+    public function getMethod($name, $reflectionClass = 'Zend_Reflection_Method')
+    {
+        $phpReflection  = parent::getMethod($name);
+        $zendReflection = new $reflectionClass($this->getName(), $phpReflection->getName());
+
+        if (!$zendReflection instanceof Zend_Reflection_Method) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Method');
+        }
+
+        unset($phpReflection);
+        return $zendReflection;
+    }
+
+    /**
+     * Get reflection objects of all methods
+     *
+     * @param  string $filter
+     * @param  string $reflectionClass Reflection class to use for methods
+     * @return array Array of Zend_Reflection_Method objects
+     */
+    public function getMethods($filter = -1, $reflectionClass = 'Zend_Reflection_Method')
+    {
+        $phpReflections  = parent::getMethods($filter);
+        $zendReflections = array();
+        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
+            $instance = new $reflectionClass($this->getName(), $phpReflection->getName());
+            if (!$instance instanceof Zend_Reflection_Method) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Method');
+            }
+            $zendReflections[] = $instance;
+            unset($phpReflection);
+        }
+        unset($phpReflections);
+        return $zendReflections;
+    }
+
+    /**
+     * Get parent reflection class of reflected class
+     *
+     * @param  string $reflectionClass Name of Reflection class to use
+     * @return Zend_Reflection_Class
+     */
+    public function getParentClass($reflectionClass = 'Zend_Reflection_Class')
+    {
+        $phpReflection = parent::getParentClass();
+        if ($phpReflection) {
+            $zendReflection = new $reflectionClass($phpReflection->getName());
+            if (!$zendReflection instanceof Zend_Reflection_Class) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Class');
+            }
+            unset($phpReflection);
+            return $zendReflection;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Return reflection property of this class by name
+     *
+     * @param  string $name
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return Zend_Reflection_Property
+     */
+    public function getProperty($name, $reflectionClass = 'Zend_Reflection_Property')
+    {
+        $phpReflection  = parent::getProperty($name);
+        $zendReflection = new $reflectionClass($this->getName(), $phpReflection->getName());
+        if (!$zendReflection instanceof Zend_Reflection_Property) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Property');
+        }
+        unset($phpReflection);
+        return $zendReflection;
+    }
+
+    /**
+     * Return reflection properties of this class
+     *
+     * @param  int $filter
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return array Array of Zend_Reflection_Property
+     */
+    public function getProperties($filter = -1, $reflectionClass = 'Zend_Reflection_Property')
+    {
+        $phpReflections = parent::getProperties($filter);
+        $zendReflections = array();
+        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
+            $instance = new $reflectionClass($this->getName(), $phpReflection->getName());
+            if (!$instance instanceof Zend_Reflection_Property) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Property');
+            }
+            $zendReflections[] = $instance;
+            unset($phpReflection);
+        }
+        unset($phpReflections);
+        return $zendReflections;
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Docblock.php b/lib/zend/Zend/Reflection/Docblock.php
new file mode 100644
index 00000000000..afe434c6b29
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Docblock.php
@@ -0,0 +1,294 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Reflection_Docblock_Tag
+ */
+require_once 'Zend/Reflection/Docblock/Tag.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Docblock implements Reflector
+{
+    /**
+     * @var Reflector
+     */
+    protected $_reflector = null;
+
+    /**#@+
+     * @var int
+     */
+    protected $_startLine = null;
+    protected $_endLine   = null;
+    /**#@-*/
+
+    /**
+     * @var string
+     */
+    protected $_docComment = null;
+
+    /**
+     * @var string
+     */
+    protected $_cleanDocComment = null;
+
+    /**
+     * @var string
+     */
+    protected $_longDescription = null;
+
+    /**
+     * @var string
+     */
+    protected $_shortDescription = null;
+
+    /**
+     * @var array
+     */
+    protected $_tags = array();
+
+    /**
+     * Export reflection
+     *
+     * Reqired by the Reflector interface.
+     *
+     * @todo   What should this do?
+     * @return void
+     */
+    public static function export()
+    {
+
+    }
+
+    /**
+     * Serialize to string
+     *
+     * Required by the Reflector interface
+     *
+     * @todo   What should this return?
+     * @return string
+     */
+    public function __toString()
+    {
+        $str = "Docblock [ /* Docblock */ ] {".PHP_EOL.PHP_EOL;
+        $str .= "  - Tags [".count($this->_tags)."] {".PHP_EOL;
+
+        foreach($this->_tags AS $tag) {
+            $str .= "    ".$tag;
+        }
+
+        $str .= "  }".PHP_EOL;
+        $str .= "}".PHP_EOL;
+
+        return $str;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param Reflector|string $commentOrReflector
+     */
+    public function __construct($commentOrReflector)
+    {
+        if ($commentOrReflector instanceof Reflector) {
+            $this->_reflector = $commentOrReflector;
+            if (!method_exists($commentOrReflector, 'getDocComment')) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Reflector must contain method "getDocComment"');
+            }
+            $docComment = $commentOrReflector->getDocComment();
+
+            $lineCount = substr_count($docComment, "\n");
+
+            $this->_startLine = $this->_reflector->getStartLine() - $lineCount - 1;
+            $this->_endLine   = $this->_reflector->getStartLine() - 1;
+
+        } elseif (is_string($commentOrReflector)) {
+            $docComment = $commentOrReflector;
+        } else {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception(get_class($this) . ' must have a (string) DocComment or a Reflector in the constructor');
+        }
+
+        if ($docComment == '') {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('DocComment cannot be empty');
+        }
+
+        $this->_docComment = $docComment;
+        $this->_parse();
+    }
+
+    /**
+     * Retrieve contents of docblock
+     *
+     * @return string
+     */
+    public function getContents()
+    {
+        return $this->_cleanDocComment;
+    }
+
+    /**
+     * Get start line (position) of docblock
+     *
+     * @return int
+     */
+    public function getStartLine()
+    {
+        return $this->_startLine;
+    }
+
+    /**
+     * Get last line (position) of docblock
+     *
+     * @return int
+     */
+    public function getEndLine()
+    {
+        return $this->_endLine;
+    }
+
+    /**
+     * Get docblock short description
+     *
+     * @return string
+     */
+    public function getShortDescription()
+    {
+        return $this->_shortDescription;
+    }
+
+    /**
+     * Get docblock long description
+     *
+     * @return string
+     */
+    public function getLongDescription()
+    {
+        return $this->_longDescription;
+    }
+
+    /**
+     * Does the docblock contain the given annotation tag?
+     *
+     * @param  string $name
+     * @return bool
+     */
+    public function hasTag($name)
+    {
+        foreach ($this->_tags as $tag) {
+            if ($tag->getName() == $name) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Retrieve the given docblock tag
+     *
+     * @param  string $name
+     * @return Zend_Reflection_Docblock_Tag|false
+     */
+    public function getTag($name)
+    {
+        foreach ($this->_tags as $tag) {
+            if ($tag->getName() == $name) {
+                return $tag;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get all docblock annotation tags
+     *
+     * @param string $filter
+     * @return array Array of Zend_Reflection_Docblock_Tag
+     */
+    public function getTags($filter = null)
+    {
+        if ($filter === null || !is_string($filter)) {
+            return $this->_tags;
+        }
+
+        $returnTags = array();
+        foreach ($this->_tags as $tag) {
+            if ($tag->getName() == $filter) {
+                $returnTags[] = $tag;
+            }
+        }
+        return $returnTags;
+    }
+
+    /**
+     * Parse the docblock
+     *
+     * @return void
+     */
+    protected function _parse()
+    {
+        $docComment = $this->_docComment;
+
+        // First remove doc block line starters
+        $docComment = preg_replace('#[ \t]*(?:\/\*\*|\*\/|\*)?[ ]{0,1}(.*)?#', '$1', $docComment);
+        $docComment = ltrim($docComment, "\r\n"); // @todo should be changed to remove first and last empty line
+
+        $this->_cleanDocComment = $docComment;
+
+        // Next parse out the tags and descriptions
+        $parsedDocComment = $docComment;
+        $lineNumber = $firstBlandLineEncountered = 0;
+        while (($newlinePos = strpos($parsedDocComment, "\n")) !== false) {
+            $lineNumber++;
+            $line = substr($parsedDocComment, 0, $newlinePos);
+
+            $matches = array();
+
+            if ((strpos($line, '@') === 0) && (preg_match('#^(@\w+.*?)(\n)(?:@|\r?\n|$)#s', $parsedDocComment, $matches))) {
+                $this->_tags[] = Zend_Reflection_Docblock_Tag::factory($matches[1]);
+                $parsedDocComment = str_replace($matches[1] . $matches[2], '', $parsedDocComment);
+            } else {
+                if ($lineNumber < 3 && !$firstBlandLineEncountered) {
+                    $this->_shortDescription .= $line . "\n";
+                } else {
+                    $this->_longDescription .= $line . "\n";
+                }
+
+                if ($line == '') {
+                    $firstBlandLineEncountered = true;
+                }
+
+                $parsedDocComment = substr($parsedDocComment, $newlinePos + 1);
+            }
+
+        }
+
+        $this->_shortDescription = rtrim($this->_shortDescription);
+        $this->_longDescription  = rtrim($this->_longDescription);
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Docblock/Tag.php b/lib/zend/Zend/Reflection/Docblock/Tag.php
new file mode 100644
index 00000000000..0dd3383ac1d
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Docblock/Tag.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Loader */
+require_once 'Zend/Loader.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Docblock_Tag implements Reflector
+{
+    /**
+     * @var array Array of Class names
+     */
+    protected static $_tagClasses = array(
+        'param'  => 'Zend_Reflection_Docblock_Tag_Param',
+        'return' => 'Zend_Reflection_Docblock_Tag_Return',
+        );
+
+    /**
+     * @var string
+     */
+    protected $_name = null;
+
+    /**
+     * @var string
+     */
+    protected $_description = null;
+
+    /**
+     * Factory: Create the appropriate annotation tag object
+     *
+     * @param  string $tagDocblockLine
+     * @return Zend_Reflection_Docblock_Tag
+     */
+    public static function factory($tagDocblockLine)
+    {
+        $matches = array();
+
+        if (!preg_match('#^@(\w+)(\s|$)#', $tagDocblockLine, $matches)) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('No valid tag name found within provided docblock line.');
+        }
+
+        $tagName = $matches[1];
+        if (array_key_exists($tagName, self::$_tagClasses)) {
+            $tagClass = self::$_tagClasses[$tagName];
+            if (!class_exists($tagClass)) {
+                Zend_Loader::loadClass($tagClass);
+            }
+            return new $tagClass($tagDocblockLine);
+        }
+        return new self($tagDocblockLine);
+    }
+
+    /**
+     * Export reflection
+     *
+     * Required by Reflector
+     *
+     * @todo   What should this do?
+     * @return void
+     */
+    public static function export()
+    {
+    }
+
+    /**
+     * Serialize to string
+     *
+     * Required by Reflector
+     *
+     * @todo   What should this do?
+     * @return string
+     */
+    public function __toString()
+    {
+        $str = "Docblock Tag [ * @".$this->_name." ]".PHP_EOL;
+
+        return $str;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param  string $tagDocblockLine
+     * @return void
+     */
+    public function __construct($tagDocblockLine)
+    {
+        $matches = array();
+
+        // find the line
+        if (!preg_match('#^@(\w+)(?:\s+([^\s].*)|$)?#', $tagDocblockLine, $matches)) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Provided docblock line does not contain a valid tag');
+        }
+
+        $this->_name = $matches[1];
+        if (isset($matches[2]) && $matches[2]) {
+            $this->_description = $matches[2];
+        }
+    }
+
+    /**
+     * Get annotation tag name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Get annotation tag description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->_description;
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Docblock/Tag/Param.php b/lib/zend/Zend/Reflection/Docblock/Tag/Param.php
new file mode 100644
index 00000000000..2682e6b4b96
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Docblock/Tag/Param.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Reflection_Docblock_Tag */
+require_once 'Zend/Reflection/Docblock/Tag.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Docblock_Tag_Param extends Zend_Reflection_Docblock_Tag
+{
+    /**
+     * @var string
+     */
+    protected $_type = null;
+
+    /**
+     * @var string
+     */
+    protected $_variableName = null;
+
+    /**
+     * Constructor
+     *
+     * @param string $tagDocblockLine
+     */
+    public function __construct($tagDocblockLine)
+    {
+        $matches = array();
+
+        if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(\$\S+))?(?:\s+(.*))?#s', $tagDocblockLine, $matches)) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag');
+        }
+
+        if ($matches[1] != 'param') {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid @param tag');
+        }
+
+        $this->_name = 'param';
+        $this->_type = $matches[2];
+
+        if (isset($matches[3])) {
+            $this->_variableName = $matches[3];
+        }
+
+        if (isset($matches[4])) {
+            $this->_description = preg_replace('#\s+#', ' ', $matches[4]);
+        }
+    }
+
+    /**
+     * Get parameter variable type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->_type;
+    }
+
+    /**
+     * Get parameter name
+     *
+     * @return string
+     */
+    public function getVariableName()
+    {
+        return $this->_variableName;
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Docblock/Tag/Return.php b/lib/zend/Zend/Reflection/Docblock/Tag/Return.php
new file mode 100644
index 00000000000..3be218d0ace
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Docblock/Tag/Return.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Reflection_Docblock_Tag */
+require_once 'Zend/Reflection/Docblock/Tag.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Docblock_Tag_Return extends Zend_Reflection_Docblock_Tag
+{
+    /**
+     * @var string
+     */
+    protected $_type = null;
+
+    /**
+     * Constructor
+     *
+     * @param  string $tagDocblockLine
+     * @return \Zend_Reflection_Docblock_Tag_Return
+     */
+    public function __construct($tagDocblockLine)
+    {
+        if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(.*))?#', $tagDocblockLine, $matches)) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag');
+        }
+
+        if ($matches[1] != 'return') {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid @return tag');
+        }
+
+        $this->_name = 'return';
+        $this->_type = $matches[2];
+        if (isset($matches[3])) {
+            $this->_description = $matches[3];
+        }
+    }
+
+    /**
+     * Get return variable type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->_type;
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Exception.php b/lib/zend/Zend/Reflection/Exception.php
new file mode 100644
index 00000000000..e31dc2357b6
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Exception extends Zend_Exception
+{
+
+}
diff --git a/lib/zend/Zend/Reflection/Extension.php b/lib/zend/Zend/Reflection/Extension.php
new file mode 100644
index 00000000000..37d4fea1577
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Extension.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Reflection_Class
+ */
+require_once 'Zend/Reflection/Class.php';
+
+/**
+ * @see Zend_Reflection_Function
+ */
+require_once 'Zend/Reflection/Function.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Extension extends ReflectionExtension
+{
+    /**
+     * Get extension function reflection objects
+     *
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return array Array of Zend_Reflection_Function objects
+     */
+    public function getFunctions($reflectionClass = 'Zend_Reflection_Function')
+    {
+        $phpReflections  = parent::getFunctions();
+        $zendReflections = array();
+        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
+            $instance = new $reflectionClass($phpReflection->getName());
+            if (!$instance instanceof Zend_Reflection_Function) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Function');
+            }
+            $zendReflections[] = $instance;
+            unset($phpReflection);
+        }
+        unset($phpReflections);
+        return $zendReflections;
+    }
+
+    /**
+     * Get extension class reflection objects
+     *
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return array Array of Zend_Reflection_Class objects
+     */
+    public function getClasses($reflectionClass = 'Zend_Reflection_Class')
+    {
+        $phpReflections  = parent::getClasses();
+        $zendReflections = array();
+        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
+            $instance = new $reflectionClass($phpReflection->getName());
+            if (!$instance instanceof Zend_Reflection_Class) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
+            }
+            $zendReflections[] = $instance;
+            unset($phpReflection);
+        }
+        unset($phpReflections);
+        return $zendReflections;
+    }
+}
diff --git a/lib/zend/Zend/Reflection/File.php b/lib/zend/Zend/Reflection/File.php
new file mode 100644
index 00000000000..86d9ffa35ab
--- /dev/null
+++ b/lib/zend/Zend/Reflection/File.php
@@ -0,0 +1,432 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Reflection_Class
+ */
+require_once 'Zend/Reflection/Class.php';
+
+/**
+ * @see Zend_Reflection_Function
+ */
+require_once 'Zend/Reflection/Function.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_File implements Reflector
+{
+    /**
+     * @var string
+     */
+    protected $_filepath        = null;
+
+    /**
+     * @var string
+     */
+    protected $_docComment      = null;
+
+    /**
+     * @var int
+     */
+    protected $_startLine       = 1;
+
+    /**
+     * @var int
+     */
+    protected $_endLine         = null;
+
+    /**
+     * @var string[]
+     */
+    protected $_requiredFiles   = array();
+
+    /**
+     * @var Zend_Reflection_Class[]
+     */
+    protected $_classes         = array();
+
+    /**
+     * @var Zend_Reflection_Function[]
+     */
+    protected $_functions       = array();
+
+    /**
+     * @var string
+     */
+    protected $_contents        = null;
+
+    /**
+     * Constructor
+     *
+     * @param  string $file
+     * @return void
+     */
+    public function __construct($file)
+    {
+        $fileName = $file;
+        
+        $fileRealpath = realpath($fileName);
+        if ($fileRealpath) {
+            // realpath() doesn't return false if Suhosin is included
+            // see http://uk3.php.net/manual/en/function.realpath.php#82770
+            if (!file_exists($fileRealpath)) {
+                $fileRealpath = false;
+            }
+        }
+        
+        if ($fileRealpath === false) {
+            $fileRealpath = self::findRealpathInIncludePath($file);
+        }
+
+        if (!$fileRealpath || !in_array($fileRealpath, get_included_files())) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('File ' . $file . ' must be required before it can be reflected');
+        }
+
+        $this->_fileName = $fileRealpath;
+        $this->_contents = file_get_contents($this->_fileName);
+        $this->_reflect();
+    }
+
+    /**
+     * Find realpath of file based on include_path
+     *
+     * @param  string $fileName
+     * @return string
+     */
+    public static function findRealpathInIncludePath($fileName)
+    {
+        require_once 'Zend/Loader.php';
+        $includePaths = Zend_Loader::explodeIncludePath();
+        while (count($includePaths) > 0) {
+            $filePath = array_shift($includePaths) . DIRECTORY_SEPARATOR . $fileName;
+
+            if ( ($foundRealpath = realpath($filePath)) !== false) {
+                break;
+            }
+        }
+
+        return $foundRealpath;
+    }
+
+    /**
+     * Export
+     *
+     * Required by the Reflector interface.
+     *
+     * @todo   What should this do?
+     * @return null
+     */
+    public static function export()
+    {
+        return null;
+    }
+
+    /**
+     * Return the file name of the reflected file
+     *
+     * @return string
+     */
+    public function getFileName()
+    {
+        return $this->_fileName;
+    }
+
+    /**
+     * Get the start line - Always 1, staying consistent with the Reflection API
+     *
+     * @return int
+     */
+    public function getStartLine()
+    {
+        return $this->_startLine;
+    }
+
+    /**
+     * Get the end line / number of lines
+     *
+     * @return int
+     */
+    public function getEndLine()
+    {
+        return $this->_endLine;
+    }
+
+    /**
+     * Return the doc comment
+     *
+     * @return string
+     */
+    public function getDocComment()
+    {
+        return $this->_docComment;
+    }
+
+    /**
+     * Return the docblock
+     *
+     * @param  string $reflectionClass Reflection class to use
+     * @return Zend_Reflection_Docblock
+     */
+    public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock')
+    {
+        $instance = new $reflectionClass($this);
+        if (!$instance instanceof Zend_Reflection_Docblock) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Docblock');
+        }
+        return $instance;
+    }
+
+    /**
+     * Return the reflection classes of the classes found inside this file
+     *
+     * @param  string $reflectionClass Name of reflection class to use for instances
+     * @return array Array of Zend_Reflection_Class instances
+     */
+    public function getClasses($reflectionClass = 'Zend_Reflection_Class')
+    {
+        $classes = array();
+        foreach ($this->_classes as $class) {
+            $instance = new $reflectionClass($class);
+            if (!$instance instanceof Zend_Reflection_Class) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
+            }
+            $classes[] = $instance;
+        }
+        return $classes;
+    }
+
+    /**
+     * Return the reflection functions of the functions found inside this file
+     *
+     * @param  string $reflectionClass Name of reflection class to use for instances
+     * @return array Array of Zend_Reflection_Functions
+     */
+    public function getFunctions($reflectionClass = 'Zend_Reflection_Function')
+    {
+        $functions = array();
+        foreach ($this->_functions as $function) {
+            $instance = new $reflectionClass($function);
+            if (!$instance instanceof Zend_Reflection_Function) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Function');
+            }
+            $functions[] = $instance;
+        }
+        return $functions;
+    }
+
+    /**
+     * Retrieve the reflection class of a given class found in this file
+     *
+     * @param  null|string $name
+     * @param  string $reflectionClass Reflection class to use when creating reflection instance
+     * @return Zend_Reflection_Class
+     * @throws Zend_Reflection_Exception for invalid class name or invalid reflection class
+     */
+    public function getClass($name = null, $reflectionClass = 'Zend_Reflection_Class')
+    {
+        if ($name === null) {
+            reset($this->_classes);
+            $selected = current($this->_classes);
+            $instance = new $reflectionClass($selected);
+            if (!$instance instanceof Zend_Reflection_Class) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class given; must extend Zend_Reflection_Class');
+            }
+            return $instance;
+        }
+
+        if (in_array($name, $this->_classes)) {
+            $instance = new $reflectionClass($name);
+            if (!$instance instanceof Zend_Reflection_Class) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class given; must extend Zend_Reflection_Class');
+            }
+            return $instance;
+        }
+
+        require_once 'Zend/Reflection/Exception.php';
+        throw new Zend_Reflection_Exception('Class by name ' . $name . ' not found.');
+    }
+
+    /**
+     * Return the full contents of file
+     *
+     * @return string
+     */
+    public function getContents()
+    {
+        return $this->_contents;
+    }
+
+    /**
+     * Serialize to string
+     *
+     * Required by the Reflector interface
+     *
+     * @todo   What should this serialization look like?
+     * @return string
+     */
+    public function __toString()
+    {
+        return '';
+    }
+
+    /**
+     * This method does the work of "reflecting" the file
+     *
+     * Uses PHP's tokenizer to perform file reflection.
+     *
+     * @return void
+     */
+    protected function _reflect()
+    {
+        $contents = $this->_contents;
+        $tokens   = token_get_all($contents);
+
+        $functionTrapped           = false;
+        $classTrapped              = false;
+        $requireTrapped            = false;
+        $embeddedVariableTrapped   = false;
+        $openBraces                = 0;
+
+        $this->_checkFileDocBlock($tokens);
+
+        foreach ($tokens as $token) {
+            /*
+             * Tokens are characters representing symbols or arrays
+             * representing strings. The keys/values in the arrays are
+             *
+             * - 0 => token id,
+             * - 1 => string,
+             * - 2 => line number
+             *
+             * Token ID's are explained here:
+             * http://www.php.net/manual/en/tokens.php.
+             */
+
+            if (is_array($token)) {
+                $type    = $token[0];
+                $value   = $token[1];
+                $lineNum = $token[2];
+            } else {
+                // It's a symbol
+                // Maintain the count of open braces
+                if ($token == '{') {
+                    $openBraces++;
+                } else if ($token == '}') {
+                    if ( $embeddedVariableTrapped ) {
+                        $embeddedVariableTrapped = false;
+                    } else {
+                        $openBraces--;
+                    }
+                }
+
+                continue;
+            }
+
+            switch ($type) {
+                case T_STRING_VARNAME:
+                case T_DOLLAR_OPEN_CURLY_BRACES:
+                case T_CURLY_OPEN:
+                    $embeddedVariableTrapped = true;
+                    continue;
+
+                // Name of something
+                case T_STRING:
+                    if ($functionTrapped) {
+                        $this->_functions[] = $value;
+                        $functionTrapped = false;
+                    } elseif ($classTrapped) {
+                        $this->_classes[] = $value;
+                        $classTrapped = false;
+                    }
+                    continue;
+
+                // Required file names are T_CONSTANT_ENCAPSED_STRING
+                case T_CONSTANT_ENCAPSED_STRING:
+                    if ($requireTrapped) {
+                        $this->_requiredFiles[] = $value ."\n";
+                        $requireTrapped = false;
+                    }
+                    continue;
+
+                // Functions
+                case T_FUNCTION:
+                    if ($openBraces == 0) {
+                        $functionTrapped = true;
+                    }
+                    break;
+
+                // Classes
+                case T_CLASS:
+                case T_INTERFACE:
+                    $classTrapped = true;
+                    break;
+
+                // All types of requires
+                case T_REQUIRE:
+                case T_REQUIRE_ONCE:
+                case T_INCLUDE:
+                case T_INCLUDE_ONCE:
+                    $requireTrapped = true;
+                    break;
+
+                // Default case: do nothing
+                default:
+                    break;
+            }
+        }
+
+        $this->_endLine = count(explode("\n", $this->_contents));
+    }
+
+    /**
+     * Validate / check a file level docblock
+     *
+     * @param  array $tokens Array of tokenizer tokens
+     * @return void
+     */
+    protected function _checkFileDocBlock($tokens) {
+        foreach ($tokens as $token) {
+            $type    = $token[0];
+            $value   = $token[1];
+            $lineNum = $token[2];
+            if(($type == T_OPEN_TAG) || ($type == T_WHITESPACE)) {
+                continue;
+            } elseif ($type == T_DOC_COMMENT) {
+                $this->_docComment = $value;
+                $this->_startLine  = $lineNum + substr_count($value, "\n") + 1;
+                return;
+            } else {
+                // Only whitespace is allowed before file docblocks
+                return;
+            }
+        }
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Function.php b/lib/zend/Zend/Reflection/Function.php
new file mode 100644
index 00000000000..ac7f448011e
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Function.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Reflection_Parameter
+ */
+require_once 'Zend/Reflection/Parameter.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Function extends ReflectionFunction
+{
+    /**
+     * Get function docblock
+     *
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return Zend_Reflection_Docblock
+     */
+    public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock')
+    {
+        if ('' == ($comment = $this->getDocComment())) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock');
+        }
+        $instance = new $reflectionClass($comment);
+        if (!$instance instanceof Zend_Reflection_Docblock) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock');
+        }
+        return $instance;
+    }
+
+    /**
+     * Get start line (position) of function
+     *
+     * @param  bool $includeDocComment
+     * @return int
+     */
+    public function getStartLine($includeDocComment = false)
+    {
+        if ($includeDocComment) {
+            if ($this->getDocComment() != '') {
+                return $this->getDocblock()->getStartLine();
+            }
+        }
+
+        return parent::getStartLine();
+    }
+
+    /**
+     * Get contents of function
+     *
+     * @param  bool $includeDocblock
+     * @return string
+     */
+    public function getContents($includeDocblock = true)
+    {
+        return implode("\n",
+            array_splice(
+                file($this->getFileName()),
+                $this->getStartLine($includeDocblock),
+                ($this->getEndLine() - $this->getStartLine()),
+                true
+                )
+            );
+    }
+
+    /**
+     * Get function parameters
+     *
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return array Array of Zend_Reflection_Parameter
+     */
+    public function getParameters($reflectionClass = 'Zend_Reflection_Parameter')
+    {
+        $phpReflections  = parent::getParameters();
+        $zendReflections = array();
+        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
+            $instance = new $reflectionClass($this->getName(), $phpReflection->getName());
+            if (!$instance instanceof Zend_Reflection_Parameter) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Parameter');
+            }
+            $zendReflections[] = $instance;
+            unset($phpReflection);
+        }
+        unset($phpReflections);
+        return $zendReflections;
+    }
+
+    /**
+     * Get return type tag
+     *
+     * @return Zend_Reflection_Docblock_Tag_Return
+     */
+    public function getReturn()
+    {
+        $docblock = $this->getDocblock();
+        if (!$docblock->hasTag('return')) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Function does not specify an @return annotation tag; cannot determine return type');
+        }
+        $tag    = $docblock->getTag('return');
+        $return = Zend_Reflection_Docblock_Tag::factory('@return ' . $tag->getDescription());
+        return $return;
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Method.php b/lib/zend/Zend/Reflection/Method.php
new file mode 100644
index 00000000000..02e5d7fbcd8
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Method.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Reflection_Class
+ */
+require_once 'Zend/Reflection/Class.php';
+
+/**
+ * @see Zend_Reflection_Docblock
+ */
+require_once 'Zend/Reflection/Docblock.php';
+
+/**
+ * @see Zend_Reflection_Parameter
+ */
+require_once 'Zend/Reflection/Parameter.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Method extends ReflectionMethod
+{
+    /**
+     * Retrieve method docblock reflection
+     *
+     * @return Zend_Reflection_Docblock
+     * @throws Zend_Reflection_Exception
+     */
+    public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock')
+    {
+        if ('' == $this->getDocComment()) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock');
+        }
+
+        $instance = new $reflectionClass($this);
+        if (!$instance instanceof Zend_Reflection_Docblock) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock');
+        }
+        return $instance;
+    }
+
+    /**
+     * Get start line (position) of method
+     *
+     * @param  bool $includeDocComment
+     * @return int
+     */
+    public function getStartLine($includeDocComment = false)
+    {
+        if ($includeDocComment) {
+            if ($this->getDocComment() != '') {
+                return $this->getDocblock()->getStartLine();
+            }
+        }
+
+        return parent::getStartLine();
+    }
+
+    /**
+     * Get reflection of declaring class
+     *
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return Zend_Reflection_Class
+     */
+    public function getDeclaringClass($reflectionClass = 'Zend_Reflection_Class')
+    {
+        $phpReflection  = parent::getDeclaringClass();
+        $zendReflection = new $reflectionClass($phpReflection->getName());
+        if (!$zendReflection instanceof Zend_Reflection_Class) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
+        }
+        unset($phpReflection);
+        return $zendReflection;
+    }
+
+    /**
+     * Get all method parameter reflection objects
+     *
+     * @param  string $reflectionClass Name of reflection class to use
+     * @return array of Zend_Reflection_Parameter objects
+     */
+    public function getParameters($reflectionClass = 'Zend_Reflection_Parameter')
+    {
+        $phpReflections  = parent::getParameters();
+        $zendReflections = array();
+        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
+            $instance = new $reflectionClass(array($this->getDeclaringClass()->getName(), $this->getName()), $phpReflection->getName());
+            if (!$instance instanceof Zend_Reflection_Parameter) {
+                require_once 'Zend/Reflection/Exception.php';
+                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Parameter');
+            }
+            $zendReflections[] = $instance;
+            unset($phpReflection);
+        }
+        unset($phpReflections);
+        return $zendReflections;
+    }
+
+    /**
+     * Get method contents
+     *
+     * @param  bool $includeDocblock
+     * @return string
+     */
+    public function getContents($includeDocblock = true)
+    {
+        $fileContents = file($this->getFileName());
+        $startNum = $this->getStartLine($includeDocblock);
+        $endNum = ($this->getEndLine() - $this->getStartLine());
+
+        return implode("\n", array_splice($fileContents, $startNum, $endNum, true));
+    }
+
+    /**
+     * Get method body
+     *
+     * @return string
+     */
+    public function getBody()
+    {
+        $lines = array_slice(
+            file($this->getDeclaringClass()->getFileName(), FILE_IGNORE_NEW_LINES),
+            $this->getStartLine()-1,
+            ($this->getEndLine() - $this->getStartLine()) + 1,
+            true
+        );
+
+        // Strip off lines until we come to a closing bracket
+        do {
+            if (count($lines) == 0) break;
+            $firstLine = array_shift($lines);
+        } while (strpos($firstLine, ')') === false);
+
+        // If the opening brace isn't on the same line as method 
+        // signature, then we should pop off more lines until we find it
+        if (strpos($firstLine,'{') === false) {
+            do {
+                if (count($lines) == 0) break;
+                $firstLine = array_shift($lines);
+            } while (strpos($firstLine, '{') === false);
+        }
+
+        // If there are more characters on the line after the opening brace,
+        // push them back onto the lines stack as they are part of the body
+        $restOfFirstLine = trim(substr($firstLine, strpos($firstLine, '{')+1));
+        if (!empty($restOfFirstLine)) {
+            array_unshift($lines, $restOfFirstLine);
+        }
+
+        $lastLine = array_pop($lines);
+
+        // If there are more characters on the line before the closing brace,
+        // push them back onto the lines stack as they are part of the body
+        $restOfLastLine = trim(substr($lastLine, 0, strrpos($lastLine, '}')-1));
+        if (!empty($restOfLastLine)) {
+            array_push($lines, $restOfLastLine);
+        }
+
+        // just in case we had code on the bracket lines
+        return implode("\n", $lines);
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Parameter.php b/lib/zend/Zend/Reflection/Parameter.php
new file mode 100644
index 00000000000..1800af0e8b5
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Parameter.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Parameter extends ReflectionParameter
+{
+    /**
+     * @var bool
+     */
+    protected $_isFromMethod = false;
+
+    /**
+     * Get declaring class reflection object
+     *
+     * @param  string $reflectionClass Reflection class to use
+     * @return Zend_Reflection_Class
+     */
+    public function getDeclaringClass($reflectionClass = 'Zend_Reflection_Class')
+    {
+        $phpReflection  = parent::getDeclaringClass();
+        $zendReflection = new $reflectionClass($phpReflection->getName());
+        if (!$zendReflection instanceof Zend_Reflection_Class) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
+        }
+        unset($phpReflection);
+        return $zendReflection;
+    }
+
+    /**
+     * Get class reflection object
+     *
+     * @param  string $reflectionClass Reflection class to use
+     * @return Zend_Reflection_Class
+     */
+    public function getClass($reflectionClass = 'Zend_Reflection_Class')
+    {
+        $phpReflection  = parent::getClass();
+        if($phpReflection == null) {
+            return null;
+        }
+
+        $zendReflection = new $reflectionClass($phpReflection->getName());
+        if (!$zendReflection instanceof Zend_Reflection_Class) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
+        }
+        unset($phpReflection);
+        return $zendReflection;
+    }
+
+    /**
+     * Get declaring function reflection object
+     *
+     * @param  string $reflectionClass Reflection class to use
+     * @return Zend_Reflection_Function|Zend_Reflection_Method
+     */
+    public function getDeclaringFunction($reflectionClass = null)
+    {
+        $phpReflection = parent::getDeclaringFunction();
+        if ($phpReflection instanceof ReflectionMethod) {
+            $baseClass = 'Zend_Reflection_Method';
+            if (null === $reflectionClass) {
+                $reflectionClass = $baseClass;
+            }
+            $zendReflection = new $reflectionClass($this->getDeclaringClass()->getName(), $phpReflection->getName());
+        } else {
+            $baseClass = 'Zend_Reflection_Function';
+            if (null === $reflectionClass) {
+                $reflectionClass = $baseClass;
+            }
+            $zendReflection = new $reflectionClass($phpReflection->getName());
+        }
+        if (!$zendReflection instanceof $baseClass) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend ' . $baseClass);
+        }
+        unset($phpReflection);
+        return $zendReflection;
+    }
+
+    /**
+     * Get parameter type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        if ($docblock = $this->getDeclaringFunction()->getDocblock()) {
+            $params = $docblock->getTags('param');
+
+            if (isset($params[$this->getPosition()])) {
+                return $params[$this->getPosition()]->getType();
+            }
+
+        }
+
+        return null;
+    }
+}
diff --git a/lib/zend/Zend/Reflection/Property.php b/lib/zend/Zend/Reflection/Property.php
new file mode 100644
index 00000000000..95a936f9eee
--- /dev/null
+++ b/lib/zend/Zend/Reflection/Property.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @todo       implement line numbers
+ * @category   Zend
+ * @package    Zend_Reflection
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Reflection_Property extends ReflectionProperty
+{
+    /**
+     * Get declaring class reflection object
+     *
+     * @return Zend_Reflection_Class
+     */
+    public function getDeclaringClass($reflectionClass = 'Zend_Reflection_Class')
+    {
+        $phpReflection  = parent::getDeclaringClass();
+        $zendReflection = new $reflectionClass($phpReflection->getName());
+        if (!$zendReflection instanceof Zend_Reflection_Class) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
+        }
+        unset($phpReflection);
+        return $zendReflection;
+    }
+
+    /**
+     * Get docblock comment
+     *
+     * @param  string $reflectionClass
+     * @return Zend_Reflection_Docblock|false False if no docblock defined
+     */
+    public function getDocComment($reflectionClass = 'Zend_Reflection_Docblock')
+    {
+        $docblock = parent::getDocComment();
+        if (!$docblock) {
+            return false;
+        }
+
+        $r = new $reflectionClass($docblock);
+        if (!$r instanceof Zend_Reflection_Docblock) {
+            require_once 'Zend/Reflection/Exception.php';
+            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock');
+        }
+        return $r;
+    }
+}
diff --git a/lib/zend/Zend/Registry.php b/lib/zend/Zend/Registry.php
index 786a94dca58..837b05ae507 100644
--- a/lib/zend/Zend/Registry.php
+++ b/lib/zend/Zend/Registry.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Registry
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @category   Zend
  * @package    Zend_Registry
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Registry extends ArrayObject
@@ -136,7 +136,7 @@ class Zend_Registry extends ArrayObject
      *
      * @param string $index - get the value associated with $index
      * @return mixed
-     * @throws Zend_Exception if no entry is registerd for $index.
+     * @throws Zend_Exception if no entry is registered for $index.
      */
     public static function get($index)
     {
diff --git a/lib/zend/Zend/Rest/Client.php b/lib/zend/Zend/Rest/Client.php
index db6be42d516..a96edf310e0 100644
--- a/lib/zend/Zend/Rest/Client.php
+++ b/lib/zend/Zend/Rest/Client.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,7 +34,7 @@ require_once 'Zend/Uri.php';
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Rest_Client extends Zend_Service_Abstract
@@ -50,6 +50,13 @@ class Zend_Rest_Client extends Zend_Service_Abstract
      * @var Zend_Uri_Http
      */
     protected $_uri = null;
+    
+    /**
+     * Flag indicating the Zend_Http_Client is fresh and needs no reset.
+     * Must be set explicitly if you want to keep preset parameters.
+     * @var bool true if you do not want a reset. Default false.
+     */
+    protected $_noReset = false;
 
     /**
      * Constructor
@@ -98,7 +105,7 @@ class Zend_Rest_Client extends Zend_Service_Abstract
      * @throws Zend_Rest_Client_Exception
      * @return void
      */
-    final private function _prepareRest($path)
+    private function _prepareRest($path)
     {
         // Get the URI object and configure it
         if (!$this->_uri instanceof Zend_Uri_Http) {
@@ -118,7 +125,29 @@ class Zend_Rest_Client extends Zend_Service_Abstract
          * Get the HTTP client and configure it for the endpoint URI.  Do this each time
          * because the Zend_Http_Client instance is shared among all Zend_Service_Abstract subclasses.
          */
-        self::getHttpClient()->resetParameters()->setUri($this->_uri);
+        if ($this->_noReset) {
+            // if $_noReset we do not want to reset on this request, 
+            // but we do on any subsequent request
+            $this->_noReset = false;
+        } else {
+            self::getHttpClient()->resetParameters();
+        }
+        
+        self::getHttpClient()->setUri($this->_uri);
+    }
+    
+    /**
+     * Tells Zend_Rest_Client not to reset all parameters on it's 
+     * Zend_Http_Client. If you want no reset, this must be called explicitly
+     * before every request for which you do not want to reset the parameters.
+     * Parameters will accumulate between requests, but as soon as you do not
+     * call this function prior to any request, all preset parameters will be reset
+     * as by default.
+     * @param boolean $bool
+     */
+    public function setNoReset($bool = true)
+    {
+        $this->_noReset = $bool;
     }
 
     /**
@@ -129,7 +158,7 @@ class Zend_Rest_Client extends Zend_Service_Abstract
      * @throws Zend_Http_Client_Exception
      * @return Zend_Http_Response
      */
-    final public function restGet($path, array $query = null)
+    public function restGet($path, array $query = null)
     {
         $this->_prepareRest($path);
         $client = self::getHttpClient();
@@ -167,7 +196,7 @@ class Zend_Rest_Client extends Zend_Service_Abstract
      * @throws Zend_Http_Client_Exception
      * @return Zend_Http_Response
      */
-    final public function restPost($path, $data = null)
+    public function restPost($path, $data = null)
     {
         $this->_prepareRest($path);
         return $this->_performPost('POST', $data);
@@ -181,7 +210,7 @@ class Zend_Rest_Client extends Zend_Service_Abstract
      * @throws Zend_Http_Client_Exception
      * @return Zend_Http_Response
      */
-    final public function restPut($path, $data = null)
+    public function restPut($path, $data = null)
     {
         $this->_prepareRest($path);
         return $this->_performPost('PUT', $data);
@@ -194,10 +223,10 @@ class Zend_Rest_Client extends Zend_Service_Abstract
      * @throws Zend_Http_Client_Exception
      * @return Zend_Http_Response
      */
-    final public function restDelete($path)
+    public function restDelete($path, $data = null)
     {
         $this->_prepareRest($path);
-        return self::getHttpClient()->request('DELETE');
+        return $this->_performPost('DELETE', $data);
     }
 
     /**
diff --git a/lib/zend/Zend/Rest/Client/Exception.php b/lib/zend/Zend/Rest/Client/Exception.php
index a4f73cd7692..b9a3245fe2e 100644
--- a/lib/zend/Zend/Rest/Client/Exception.php
+++ b/lib/zend/Zend/Rest/Client/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Rest/Exception.php';
  *
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Rest_Client_Exception extends Zend_Rest_Exception
diff --git a/lib/zend/Zend/Rest/Client/Result.php b/lib/zend/Zend/Rest/Client/Result.php
index b126f7e416a..26908427b31 100644
--- a/lib/zend/Zend/Rest/Client/Result.php
+++ b/lib/zend/Zend/Rest/Client/Result.php
@@ -15,16 +15,18 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+require_once 'Zend/Xml/Security.php';
+
 /**
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Rest_Client_Result implements IteratorAggregate {
@@ -48,7 +50,7 @@ class Zend_Rest_Client_Result implements IteratorAggregate {
     public function __construct($data)
     {
         set_error_handler(array($this, 'handleXmlErrors'));
-        $this->_sxml = simplexml_load_string($data);
+        $this->_sxml = Zend_Xml_Security::scan($data); 
         restore_error_handler();
         if($this->_sxml === false) {
             if ($this->_errstr === null) {
@@ -180,7 +182,8 @@ class Zend_Rest_Client_Result implements IteratorAggregate {
     public function getStatus()
     {
         $status = $this->_sxml->xpath('//status/text()');
-
+        if ( !isset($status[0]) ) return false;
+        
         $status = strtolower($status[0]);
 
         if (ctype_alpha($status) && $status == 'success') {
diff --git a/lib/zend/Zend/Rest/Client/Result/Exception.php b/lib/zend/Zend/Rest/Client/Result/Exception.php
index 486c0926a34..a027f496f55 100644
--- a/lib/zend/Zend/Rest/Client/Result/Exception.php
+++ b/lib/zend/Zend/Rest/Client/Result/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,7 +30,7 @@ require_once "Zend/Rest/Client/Exception.php";
  *
  * @package    Zend_Rest
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Rest_Client_Result_Exception extends Zend_Rest_Client_Exception{}
diff --git a/lib/zend/Zend/Rest/Controller.php b/lib/zend/Zend/Rest/Controller.php
index 803deaad295..e67bed3a200 100644
--- a/lib/zend/Zend/Rest/Controller.php
+++ b/lib/zend/Zend/Rest/Controller.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Controller/Action.php';
  * @category   Zend
  * @package Zend_Rest
  * @see Zend_Rest_Route
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Rest_Controller extends Zend_Controller_Action
@@ -47,6 +47,13 @@ abstract class Zend_Rest_Controller extends Zend_Controller_Action
      */
     abstract public function getAction();
 
+    /**
+     * The head action handles HEAD requests and receives an 'id' parameter; it
+     * should respond with the server resource state of the resource identified
+     * by the 'id' value.
+     */
+    abstract public function headAction();
+
     /**
      * The post action handles POST requests; it should accept and digest a
      * POSTed resource representation and persist the resource state.
@@ -67,4 +74,4 @@ abstract class Zend_Rest_Controller extends Zend_Controller_Action
      */
     abstract public function deleteAction();
 
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Rest/Exception.php b/lib/zend/Zend/Rest/Exception.php
index 938b0ee83da..94403938deb 100644
--- a/lib/zend/Zend/Rest/Exception.php
+++ b/lib/zend/Zend/Rest/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Exception.php';
 /**
  * @category   Zend
  * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Rest_Exception extends Zend_Exception
diff --git a/lib/zend/Zend/Rest/Route.php b/lib/zend/Zend/Rest/Route.php
index 639eeabf80f..2b7cdd62410 100644
--- a/lib/zend/Zend/Rest/Route.php
+++ b/lib/zend/Zend/Rest/Route.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -46,7 +46,7 @@ require_once 'Zend/Controller/Request/Abstract.php';
  *
  * @category   Zend
  * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Rest_Route extends Zend_Controller_Router_Route_Module
@@ -98,13 +98,13 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module
         $defaultsArray = array();
         $restfulConfigArray = array();
         foreach ($config as $key => $values) {
-        	if ($key == 'type') {
-        		// do nothing
-        	} elseif ($key == 'defaults') {
-        		$defaultsArray = $values->toArray();
-        	} else {
-        		$restfulConfigArray[$key] = explode(',', $values);
-        	}
+            if ($key == 'type') {
+                // do nothing
+            } elseif ($key == 'defaults') {
+                $defaultsArray = $values->toArray();
+            } else {
+                $restfulConfigArray[$key] = explode(',', $values);
+            }
         }
         $instance = new self($frontController, $defaultsArray, $restfulConfigArray);
         return $instance;
@@ -161,10 +161,10 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module
                     return false;
                 }
             } elseif ($this->_checkRestfulController($moduleName, $controllerName)) {
-            	$values[$this->_controllerKey] = $controllerName;
-            	$values[$this->_actionKey] = 'get';
+                $values[$this->_controllerKey] = $controllerName;
+                $values[$this->_actionKey] = 'get';
             } else {
-            	return false;
+                return false;
             }
 
             //Store path count for method mapping
@@ -176,7 +176,7 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module
                 $specialGetTarget = array_shift($path);
             } elseif ($pathElementCount && $path[$pathElementCount-1] == 'edit') {
                 $specialGetTarget = 'edit';
-                $params['id'] = $path[$pathElementCount-2];
+                $params['id'] = urldecode($path[$pathElementCount-2]);
             } elseif ($pathElementCount == 1) {
                 $params['id'] = urldecode(array_shift($path));
             } elseif ($pathElementCount == 0 && !isset($params['id'])) {
@@ -187,8 +187,8 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module
             if ($numSegs = count($path)) {
                 for ($i = 0; $i < $numSegs; $i = $i + 2) {
                     $key = urldecode($path[$i]);
-                    $val = isset($path[$i + 1]) ? urldecode($path[$i + 1]) : null;
-                    $params[$key] = $val;
+                    $val = isset($path[$i + 1]) ? $path[$i + 1] : null;
+                    $params[$key] = urldecode($val);
                 }
             }
 
@@ -274,15 +274,27 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module
         $controller = $params[$this->_controllerKey];
         unset($params[$this->_controllerKey]);
 
+        // set $action if value given is 'new' or 'edit'
+        if (in_array($params[$this->_actionKey], array('new', 'edit'))) {
+            $action = $params[$this->_actionKey];
+        }
         unset($params[$this->_actionKey]);
 
         if (isset($params['index']) && $params['index']) {
             unset($params['index']);
             $url .= '/index';
+            if (isset($params['id'])) {
+                $url .= '/'.$params['id'];
+                unset($params['id']);
+            }
             foreach ($params as $key => $value) {
                 if ($encode) $value = urlencode($value);
                 $url .= '/' . $key . '/' . $value;
             }
+        } elseif (! empty($action) && isset($params['id'])) {
+            $url .= sprintf('/%s/%s', $params['id'], $action);
+        } elseif (! empty($action)) {
+            $url .= sprintf('/%s', $action);
         } elseif (isset($params['id'])) {
             $url .= '/' . $params['id'];
         }
diff --git a/lib/zend/Zend/Rest/Server.php b/lib/zend/Zend/Rest/Server.php
index f2666afd827..26f6c503719 100644
--- a/lib/zend/Zend/Rest/Server.php
+++ b/lib/zend/Zend/Rest/Server.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Server/Abstract.php';
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Rest_Server implements Zend_Server_Interface
@@ -182,45 +182,66 @@ class Zend_Rest_Server implements Zend_Server_Interface
         if (isset($request['method'])) {
             $this->_method = $request['method'];
             if (isset($this->_functions[$this->_method])) {
-                if ($this->_functions[$this->_method] instanceof Zend_Server_Reflection_Function || $this->_functions[$this->_method] instanceof Zend_Server_Reflection_Method && $this->_functions[$this->_method]->isPublic()) {
-                    $request_keys = array_keys($request);
-                    array_walk($request_keys, array(__CLASS__, "lowerCase"));
-                    $request = array_combine($request_keys, $request);
+                if ($this->_functions[$this->_method] instanceof
+                    Zend_Server_Reflection_Function
+                    || $this->_functions[$this->_method] instanceof
+                       Zend_Server_Reflection_Method
+                       && $this->_functions[$this->_method]->isPublic()
+                ) {
+                    $requestKeys = array_keys($request);
+                    array_walk($requestKeys, array(__CLASS__, "lowerCase"));
+                    $request = array_combine($requestKeys, $request);
 
-                    $func_args = $this->_functions[$this->_method]->getParameters();
+                    $funcArgs = $this->_functions[$this->_method]->getParameters();
 
-                    $calling_args = array();
-                    $missing_args = array();
-                    foreach ($func_args as $arg) {
+                    // calling_args will be a zero-based array of the parameters
+                    $callingArgs = array();
+                    $missingArgs = array();
+                    foreach ($funcArgs as $i => $arg) {
                         if (isset($request[strtolower($arg->getName())])) {
-                            $calling_args[] = $request[strtolower($arg->getName())];
+                            $callingArgs[$i] = $request[strtolower($arg->getName())];
                         } elseif ($arg->isOptional()) {
-                            $calling_args[] = $arg->getDefaultValue();
+                            $callingArgs[$i] = $arg->getDefaultValue();
                         } else {
-                            $missing_args[] = $arg->getName();
+                            $missingArgs[] = $arg->getName();
                         }
                     }
 
+                    $anonymousArgs = array();
                     foreach ($request as $key => $value) {
                         if (substr($key, 0, 3) == 'arg') {
                             $key = str_replace('arg', '', $key);
-                            $calling_args[$key] = $value;
-                            if (($index = array_search($key, $missing_args)) !== false) {
-                                unset($missing_args[$index]);
+                            $anonymousArgs[$key] = $value;
+                            if (($index = array_search($key, $missingArgs)) !== false) {
+                                unset($missingArgs[$index]);
                             }
                         }
                     }
 
+                    // re-key the $anonymousArgs to be zero-based, and add in
+                    // any values already set in calling_args (optional defaults)
+                    ksort($anonymousArgs);
+                    $callingArgs = array_values($anonymousArgs) + $callingArgs;
+
                     // Sort arguments by key -- @see ZF-2279
-                    ksort($calling_args);
+                    ksort($callingArgs);
 
                     $result = false;
-                    if (count($calling_args) < count($func_args)) {
+                    if (count($callingArgs) < count($funcArgs)) {
                         require_once 'Zend/Rest/Server/Exception.php';
-                        $result = $this->fault(new Zend_Rest_Server_Exception('Invalid Method Call to ' . $this->_method . '. Missing argument(s): ' . implode(', ', $missing_args) . '.'), 400);
+                        $result = $this->fault(
+                            new Zend_Rest_Server_Exception(
+                                'Invalid Method Call to ' . $this->_method
+                                . '. Missing argument(s): ' . implode(
+                                    ', ', $missingArgs
+                                ) . '.'
+                            ), 400
+                        );
                     }
 
-                    if (!$result && $this->_functions[$this->_method] instanceof Zend_Server_Reflection_Method) {
+                    if (!$result && $this->_functions[$this->_method] instanceof
+                                    Zend_Server_Reflection_Method
+                    ) {
                         // Get class
                         $class = $this->_functions[$this->_method]->getDeclaringClass()->getName();
 
@@ -228,14 +249,23 @@ class Zend_Rest_Server implements Zend_Server_Interface
                             // for some reason, invokeArgs() does not work the same as
                             // invoke(), and expects the first argument to be an object.
                             // So, using a callback if the method is static.
-                            $result = $this->_callStaticMethod($class, $calling_args);
+                            $result = $this->_callStaticMethod(
+                                $class,
+                                $callingArgs
+                            );
                         } else {
                             // Object method
-                            $result = $this->_callObjectMethod($class, $calling_args);
+                            $result = $this->_callObjectMethod(
+                                $class,
+                                $callingArgs
+                            );
                         }
                     } elseif (!$result) {
                         try {
-                            $result = call_user_func_array($this->_functions[$this->_method]->getName(), $calling_args); //$this->_functions[$this->_method]->invokeArgs($calling_args);
+                            $result = call_user_func_array(
+                                $this->_functions[$this->_method]->getName(),
+                                $callingArgs
+                            );
                         } catch (Exception $e) {
                             $result = $this->fault($e);
                         }
@@ -243,14 +273,18 @@ class Zend_Rest_Server implements Zend_Server_Interface
                 } else {
                     require_once "Zend/Rest/Server/Exception.php";
                     $result = $this->fault(
-                        new Zend_Rest_Server_Exception("Unknown Method '$this->_method'."),
+                        new Zend_Rest_Server_Exception(
+                            "Unknown Method '$this->_method'."
+                        ),
                         404
                     );
                 }
             } else {
                 require_once "Zend/Rest/Server/Exception.php";
                 $result = $this->fault(
-                    new Zend_Rest_Server_Exception("Unknown Method '$this->_method'."),
+                    new Zend_Rest_Server_Exception(
+                        "Unknown Method '$this->_method'."
+                    ),
                     404
                 );
             }
@@ -355,9 +389,11 @@ class Zend_Rest_Server implements Zend_Server_Interface
      * @param DOMElement $parent
      * @return void
      */
-    protected function _structValue($struct, DOMDocument $dom, DOMElement $parent)
+    protected function _structValue(
+        $struct, DOMDocument $dom, DOMElement $parent
+    )
     {
-        $struct = (array) $struct;
+        $struct = (array)$struct;
 
         foreach ($struct as $key => $value) {
             if ($value === false) {
@@ -366,7 +402,7 @@ class Zend_Rest_Server implements Zend_Server_Interface
                 $value = 1;
             }
 
-            if (ctype_digit((string) $key)) {
+            if (ctype_digit((string)$key)) {
                 $key = 'key_' . $key;
             }
 
@@ -480,13 +516,23 @@ class Zend_Rest_Server implements Zend_Server_Interface
 
         if ($exception instanceof Exception) {
             $element = $dom->createElement('message');
-            $element->appendChild($dom->createTextNode($exception->getMessage()));
+            $element->appendChild(
+                $dom->createTextNode($exception->getMessage())
+            );
             $xmlResponse->appendChild($element);
             $code = $exception->getCode();
         } elseif (($exception !== null) || 'rest' == $function) {
-            $xmlResponse->appendChild($dom->createElement('message', 'An unknown error occured. Please try again.'));
+            $xmlResponse->appendChild(
+                $dom->createElement(
+                    'message', 'An unknown error occured. Please try again.'
+                )
+            );
         } else {
-            $xmlResponse->appendChild($dom->createElement('message', 'Call to ' . $method . ' failed.'));
+            $xmlResponse->appendChild(
+                $dom->createElement(
+                    'message', 'Call to ' . $method . ' failed.'
+                )
+            );
         }
 
         $xmlMethod->appendChild($xmlResponse);
@@ -529,7 +575,9 @@ class Zend_Rest_Server implements Zend_Server_Interface
                 $this->_functions[$func] = $this->_reflection->reflectFunction($func);
             } else {
                 require_once 'Zend/Rest/Server/Exception.php';
-                throw new Zend_Rest_Server_Exception("Invalid Method Added to Service.");
+                throw new Zend_Rest_Server_Exception(
+                    "Invalid Method Added to Service."
+                );
             }
         }
     }
@@ -574,7 +622,13 @@ class Zend_Rest_Server implements Zend_Server_Interface
     protected function _callStaticMethod($class, array $args)
     {
         try {
-            $result = call_user_func_array(array($class, $this->_functions[$this->_method]->getName()), $args);
+            $result = call_user_func_array(
+                array(
+                    $class,
+                    $this->_functions[$this->_method]->getName()
+                ),
+                $args
+            );
         } catch (Exception $e) {
             $result = $this->fault($e);
         }
@@ -599,14 +653,21 @@ class Zend_Rest_Server implements Zend_Server_Interface
             }
         } catch (Exception $e) {
             require_once 'Zend/Rest/Server/Exception.php';
-            throw new Zend_Rest_Server_Exception('Error instantiating class ' . $class .
-                                                 ' to invoke method ' . $this->_functions[$this->_method]->getName() .
-                                                 ' (' . $e->getMessage() . ') ',
-                                                 500, $e);
+            throw new Zend_Rest_Server_Exception(
+                'Error instantiating class ' . $class .
+                ' to invoke method '
+                . $this->_functions[$this->_method]->getName() .
+                ' (' . $e->getMessage() . ') ',
+                500,
+                $e
+            );
         }
 
         try {
-            $result = $this->_functions[$this->_method]->invokeArgs($object, $args);
+            $result = $this->_functions[$this->_method]->invokeArgs(
+                $object,
+                $args
+            );
         } catch (Exception $e) {
             $result = $this->fault($e);
         }
diff --git a/lib/zend/Zend/Rest/Server/Exception.php b/lib/zend/Zend/Rest/Server/Exception.php
index 6d635f743d6..98517b8e7b6 100644
--- a/lib/zend/Zend/Rest/Server/Exception.php
+++ b/lib/zend/Zend/Rest/Server/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Rest
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Rest/Exception.php';
  *
  * @package    Zend_Rest
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Rest_Server_Exception extends Zend_Rest_Exception
diff --git a/lib/zend/Zend/Server/Abstract.php b/lib/zend/Zend/Server/Abstract.php
index d1f0871af85..3d2d73e8f71 100644
--- a/lib/zend/Zend/Server/Abstract.php
+++ b/lib/zend/Zend/Server/Abstract.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -51,7 +51,7 @@ require_once 'Zend/Server/Method/Parameter.php';
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
diff --git a/lib/zend/Zend/Server/Cache.php b/lib/zend/Zend/Server/Cache.php
index 4d008d2a026..97264dfb09e 100644
--- a/lib/zend/Zend/Server/Cache.php
+++ b/lib/zend/Zend/Server/Cache.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Server_Cache
diff --git a/lib/zend/Zend/Server/Definition.php b/lib/zend/Zend/Server/Definition.php
index 7ec4735d4fc..1d8db47c546 100644
--- a/lib/zend/Zend/Server/Definition.php
+++ b/lib/zend/Zend/Server/Definition.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -25,7 +25,7 @@
  * @todo       Implement iterator
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Server_Definition implements Countable, Iterator
diff --git a/lib/zend/Zend/Server/Exception.php b/lib/zend/Zend/Server/Exception.php
index 34ada8961e1..c0c82542c65 100644
--- a/lib/zend/Zend/Server/Exception.php
+++ b/lib/zend/Zend/Server/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
diff --git a/lib/zend/Zend/Server/Interface.php b/lib/zend/Zend/Server/Interface.php
index fc9469b4af9..cc60bc59ed3 100644
--- a/lib/zend/Zend/Server/Interface.php
+++ b/lib/zend/Zend/Server/Interface.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -23,7 +23,7 @@
  *
  * @category Zend
  * @package  Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/Server/Method/Callback.php b/lib/zend/Zend/Server/Method/Callback.php
index 535310db7c6..e9268c3dc7e 100644
--- a/lib/zend/Zend/Server/Method/Callback.php
+++ b/lib/zend/Zend/Server/Method/Callback.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Server_Method_Callback
diff --git a/lib/zend/Zend/Server/Method/Definition.php b/lib/zend/Zend/Server/Method/Definition.php
index bb2f0577197..1397fdc564a 100644
--- a/lib/zend/Zend/Server/Method/Definition.php
+++ b/lib/zend/Zend/Server/Method/Definition.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Server_Method_Definition
diff --git a/lib/zend/Zend/Server/Method/Parameter.php b/lib/zend/Zend/Server/Method/Parameter.php
index fc29b302a7a..63e14a4efcd 100644
--- a/lib/zend/Zend/Server/Method/Parameter.php
+++ b/lib/zend/Zend/Server/Method/Parameter.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Server_Method_Parameter
diff --git a/lib/zend/Zend/Server/Method/Prototype.php b/lib/zend/Zend/Server/Method/Prototype.php
index 553320d2fe2..7baac3e57d4 100644
--- a/lib/zend/Zend/Server/Method/Prototype.php
+++ b/lib/zend/Zend/Server/Method/Prototype.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Server_Method_Prototype
diff --git a/lib/zend/Zend/Server/Reflection.php b/lib/zend/Zend/Server/Reflection.php
index 0559633354a..39a46dcde26 100644
--- a/lib/zend/Zend/Server/Reflection.php
+++ b/lib/zend/Zend/Server/Reflection.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -34,7 +34,7 @@ require_once 'Zend/Server/Reflection/Class.php';
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/Server/Reflection/Class.php b/lib/zend/Zend/Server/Reflection/Class.php
index 6e03191392c..324784afdad 100644
--- a/lib/zend/Zend/Server/Reflection/Class.php
+++ b/lib/zend/Zend/Server/Reflection/Class.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -32,7 +32,7 @@ require_once 'Zend/Server/Reflection/Method.php';
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/Server/Reflection/Exception.php b/lib/zend/Zend/Server/Reflection/Exception.php
index 4aff7efe88c..be6c22795d3 100644
--- a/lib/zend/Zend/Server/Reflection/Exception.php
+++ b/lib/zend/Zend/Server/Reflection/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,7 +29,7 @@ require_once 'Zend/Server/Exception.php';
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/Server/Reflection/Function.php b/lib/zend/Zend/Server/Reflection/Function.php
index b9faa4337bb..e01398d3f5d 100644
--- a/lib/zend/Zend/Server/Reflection/Function.php
+++ b/lib/zend/Zend/Server/Reflection/Function.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -30,7 +30,7 @@ require_once 'Zend/Server/Reflection/Function/Abstract.php';
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/Server/Reflection/Function/Abstract.php b/lib/zend/Zend/Server/Reflection/Function/Abstract.php
index d100c97d3a6..e54e2262d3c 100644
--- a/lib/zend/Zend/Server/Reflection/Function/Abstract.php
+++ b/lib/zend/Zend/Server/Reflection/Function/Abstract.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -46,7 +46,7 @@ require_once 'Zend/Server/Reflection/Prototype.php';
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
@@ -293,7 +293,7 @@ abstract class Zend_Server_Reflection_Function_Abstract
             // Get param types and description
             if (preg_match_all('/@param\s+([^\s]+)/m', $docBlock, $matches)) {
                 $paramTypesTmp = $matches[1];
-                if (preg_match_all('/@param\s+\S+\s+(\$\S+)\s+(.*?)(@|\*\/)/s', $docBlock, $matches))
+                if (preg_match_all('/@param\s+\S+\s+(\$\S+)\s+(.*?)(?=@|\*\/)/s', $docBlock, $matches))
                 {
                     $paramDesc = $matches[2];
                     foreach ($paramDesc as $key => $value) {
@@ -306,6 +306,16 @@ abstract class Zend_Server_Reflection_Function_Abstract
         } else {
             $helpText = $function->getName();
             $return   = 'void';
+
+            // Try and auto-determine type, based on reflection
+            $paramTypesTmp = array();
+            foreach ($parameters as $i => $param) {
+                $paramType = 'mixed';
+                if ($param->isArray()) {
+                    $paramType = 'array';
+                }
+                $paramTypesTmp[$i] = $paramType;
+            }
         }
 
         // Set method description
@@ -339,8 +349,9 @@ abstract class Zend_Server_Reflection_Function_Abstract
             require_once 'Zend/Server/Reflection/Exception.php';
             throw new Zend_Server_Reflection_Exception(
                'Variable number of arguments is not supported for services (except optional parameters). '
-             . 'Number of function arguments must correspond to actual number of arguments described in a docblock '
-             . '(function was ' . $function->getName() . ')');
+             . 'Number of function arguments in ' . $function->getDeclaringClass()->getName() . '::'
+             . $function->getName() . '() must correspond to actual number of arguments described in the '
+             . 'docblock.');
         }
 
         $paramTypes = array();
diff --git a/lib/zend/Zend/Server/Reflection/Method.php b/lib/zend/Zend/Server/Reflection/Method.php
index d75da71646c..bfae11c2044 100644
--- a/lib/zend/Zend/Server/Reflection/Method.php
+++ b/lib/zend/Zend/Server/Reflection/Method.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -30,7 +30,7 @@ require_once 'Zend/Server/Reflection/Function/Abstract.php';
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/Server/Reflection/Node.php b/lib/zend/Zend/Server/Reflection/Node.php
index 2de3cd825ed..d80abf342e6 100644
--- a/lib/zend/Zend/Server/Reflection/Node.php
+++ b/lib/zend/Zend/Server/Reflection/Node.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -25,7 +25,7 @@
  * @package    Zend_Server
  * @subpackage Reflection
  * @version $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Server_Reflection_Node
diff --git a/lib/zend/Zend/Server/Reflection/Parameter.php b/lib/zend/Zend/Server/Reflection/Parameter.php
index 687c7de7d27..1bc29eb7a6f 100644
--- a/lib/zend/Zend/Server/Reflection/Parameter.php
+++ b/lib/zend/Zend/Server/Reflection/Parameter.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/Server/Reflection/Prototype.php b/lib/zend/Zend/Server/Reflection/Prototype.php
index 43536735c23..cacd56ec72a 100644
--- a/lib/zend/Zend/Server/Reflection/Prototype.php
+++ b/lib/zend/Zend/Server/Reflection/Prototype.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -36,7 +36,7 @@ require_once 'Zend/Server/Reflection/Parameter.php';
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/Server/Reflection/ReturnValue.php b/lib/zend/Zend/Server/Reflection/ReturnValue.php
index a1d7a9ebd3f..6e654b2480c 100644
--- a/lib/zend/Zend/Server/Reflection/ReturnValue.php
+++ b/lib/zend/Zend/Server/Reflection/ReturnValue.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Server
  * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/Service/Abstract.php b/lib/zend/Zend/Service/Abstract.php
index 46375c397aa..6f98be98f3e 100644
--- a/lib/zend/Zend/Service/Abstract.php
+++ b/lib/zend/Zend/Service/Abstract.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Http/Client.php';
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_Abstract
diff --git a/lib/zend/Zend/Service/Akismet.php b/lib/zend/Zend/Service/Akismet.php
index 008c9341d26..105314c70f3 100644
--- a/lib/zend/Zend/Service/Akismet.php
+++ b/lib/zend/Zend/Service/Akismet.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Akismet
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Service/Abstract.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Akismet
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Akismet extends Zend_Service_Abstract
diff --git a/lib/zend/Zend/Service/Amazon.php b/lib/zend/Zend/Service/Amazon.php
index e58b383d630..318db2b4830 100644
--- a/lib/zend/Zend/Service/Amazon.php
+++ b/lib/zend/Zend/Service/Amazon.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,11 +26,14 @@
  */
 require_once 'Zend/Rest/Client.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon
@@ -104,7 +107,7 @@ class Zend_Service_Amazon
      * @param  array $options Options to use for the Search Query
      * @throws Zend_Service_Exception
      * @return Zend_Service_Amazon_ResultSet
-     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2005-10-05&p=ApiReference/ItemSearchOperation
+     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2011-08-01&p=ApiReference/ItemSearchOperation
      */
     public function itemSearch(array $options)
     {
@@ -126,7 +129,7 @@ class Zend_Service_Amazon
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -142,7 +145,7 @@ class Zend_Service_Amazon
      *
      * @param  string $asin    Amazon ASIN ID
      * @param  array  $options Query Options
-     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2005-10-05&p=ApiReference/ItemLookupOperation
+     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2011-08-01&p=ApiReference/ItemLookupOperation
      * @throws Zend_Service_Exception
      * @return Zend_Service_Amazon_Item|Zend_Service_Amazon_ResultSet
      */
@@ -168,10 +171,10 @@ class Zend_Service_Amazon
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
         $xpath = new DOMXPath($dom);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         $items = $xpath->query('//az:Items/az:Item');
 
         if ($items->length == 1) {
@@ -229,7 +232,7 @@ class Zend_Service_Amazon
         $options['AWSAccessKeyId'] = $this->appId;
         $options['Service']        = 'AWSECommerceService';
         $options['Operation']      = (string) $query;
-        $options['Version']        = '2005-10-05';
+        $options['Version']        = '2011-08-01';
 
         // de-canonicalize out sort key
         if (isset($options['ResponseGroup'])) {
@@ -302,7 +305,7 @@ class Zend_Service_Amazon
     protected static function _checkErrors(DOMDocument $dom)
     {
         $xpath = new DOMXPath($dom);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
 
         if ($xpath->query('//az:Error')->length >= 1) {
             $code = $xpath->query('//az:Error/az:Code/text()')->item(0)->data;
diff --git a/lib/zend/Zend/Service/Amazon/Abstract.php b/lib/zend/Zend/Service/Amazon/Abstract.php
index f4c7fa551b6..ed30354ac2f 100644
--- a/lib/zend/Zend/Service/Amazon/Abstract.php
+++ b/lib/zend/Zend/Service/Amazon/Abstract.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Abstract.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/Accessories.php b/lib/zend/Zend/Service/Amazon/Accessories.php
index d6b415b0787..53c62ece3d6 100644
--- a/lib/zend/Zend/Service/Amazon/Accessories.php
+++ b/lib/zend/Zend/Service/Amazon/Accessories.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Accessories
@@ -50,7 +50,7 @@ class Zend_Service_Amazon_Accessories
     public function __construct(DOMElement $dom)
     {
         $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         foreach (array('ASIN', 'Title') as $el) {
             $this->$el = (string) $xpath->query("./az:$el/text()", $dom)->item(0)->data;
         }
diff --git a/lib/zend/Zend/Service/Amazon/Authentication.php b/lib/zend/Zend/Service/Amazon/Authentication.php
new file mode 100644
index 00000000000..477ac126aa8
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/Authentication.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Service_Amazon_Authentication
+{
+    protected $_accessKey;
+    protected $_secretKey;
+    protected $_apiVersion;
+
+    /**
+     * Constructor
+     *
+     * @param  string $accessKey
+     * @param  string $secretKey
+     * @param  string $apiVersion
+     * @return void
+     */
+    public function __construct($accessKey, $secretKey, $apiVersion)
+    {
+        $this->setAccessKey($accessKey);
+        $this->setSecretKey($secretKey);
+        $this->setApiVersion($apiVersion);
+    }
+
+    /**
+     * Set access key
+     *
+     * @param  string $accessKey
+     * @return void
+     */
+    public function setAccessKey($accessKey)
+    {
+        $this->_accessKey = $accessKey;
+    }
+
+    /**
+     * Set secret key
+     *
+     * @param  string $secretKey
+     * @return void
+     */
+    public function setSecretKey($secretKey)
+    {
+        $this->_secretKey = $secretKey;
+    }
+
+    /**
+     * Set API version
+     *
+     * @param  string $apiVersion
+     * @return void
+     */
+    public function setApiVersion($apiVersion)
+    {
+        $this->_apiVersion = $apiVersion;
+    }
+}
diff --git a/lib/zend/Zend/Service/Amazon/Authentication/Exception.php b/lib/zend/Zend/Service/Amazon/Authentication/Exception.php
new file mode 100644
index 00000000000..d60a74209ad
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/Authentication/Exception.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Service_Amazon_Exception
+ */
+require_once 'Zend/Service/Amazon/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_Authentication_Exception extends Zend_Service_Amazon_Exception
+{
+
+}
diff --git a/lib/zend/Zend/Service/Amazon/Authentication/S3.php b/lib/zend/Zend/Service/Amazon/Authentication/S3.php
new file mode 100644
index 00000000000..d9a52d19589
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/Authentication/S3.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+
+/**
+ * @see Zend_Service_Amazon_Authentication
+ */
+require_once 'Zend/Service/Amazon/Authentication.php';
+
+/**
+ * @see Zend_Crypt_Hmac
+ */
+require_once 'Zend/Crypt/Hmac.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_Authentication_S3 extends Zend_Service_Amazon_Authentication
+{
+    /**
+     * Add the S3 Authorization signature to the request headers
+     *
+     * @param  string $method
+     * @param  string $path
+     * @param  array &$headers
+     * @return string
+     */
+    public function generateSignature($method, $path, &$headers)
+    {
+        if (! is_array($headers)) {
+            $headers = array($headers);
+        }
+
+        $type = $md5 = $date = '';
+
+        // Search for the Content-type, Content-MD5 and Date headers
+        foreach ($headers as $key => $val) {
+            if (strcasecmp($key, 'content-type') == 0) {
+                $type = $val;
+            } else if (strcasecmp($key, 'content-md5') == 0) {
+                $md5 = $val;
+            } else if (strcasecmp($key, 'date') == 0) {
+                $date = $val;
+            }
+        }
+
+        // If we have an x-amz-date header, use that instead of the normal Date
+        if (isset($headers['x-amz-date']) && isset($date)) {
+            $date = '';
+        }
+
+        $sig_str = "$method\n$md5\n$type\n$date\n";
+
+        // For x-amz- headers, combine like keys, lowercase them, sort them
+        // alphabetically and remove excess spaces around values
+        $amz_headers = array();
+        foreach ($headers as $key => $val) {
+            $key = strtolower($key);
+            if (substr($key, 0, 6) == 'x-amz-') {
+                if (is_array($val)) {
+                    $amz_headers[$key] = $val;
+                } else {
+                    $amz_headers[$key][] = preg_replace('/\s+/', ' ', $val);
+                }
+            }
+        }
+        if (!empty($amz_headers)) {
+            ksort($amz_headers);
+            foreach ($amz_headers as $key => $val) {
+                $sig_str .= $key . ':' . implode(',', $val) . "\n";
+            }
+        }
+
+        $sig_str .= '/'.parse_url($path, PHP_URL_PATH);
+        if (strpos($path, '?location') !== false) {
+            $sig_str .= '?location';
+        } else
+            if (strpos($path, '?acl') !== false) {
+                $sig_str .= '?acl';
+            } else
+                if (strpos($path, '?torrent') !== false) {
+                    $sig_str .= '?torrent';
+                }
+
+        $signature = base64_encode(Zend_Crypt_Hmac::compute($this->_secretKey, 'sha1', utf8_encode($sig_str), Zend_Crypt_Hmac::BINARY));
+        $headers['Authorization'] = 'AWS ' . $this->_accessKey . ':' . $signature;
+
+        return $sig_str;
+    }
+}
diff --git a/lib/zend/Zend/Service/Amazon/Authentication/V1.php b/lib/zend/Zend/Service/Amazon/Authentication/V1.php
new file mode 100644
index 00000000000..c014a9f163e
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/Authentication/V1.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Service_Amazon_Authentication
+ */
+require_once 'Zend/Service/Amazon/Authentication.php';
+
+/**
+ * @see Zend_Crypt_Hmac
+ */
+require_once 'Zend/Crypt/Hmac.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_Authentication_V1 extends Zend_Service_Amazon_Authentication
+{
+    /**
+     * Signature Version
+     */
+    protected $_signatureVersion = '1';
+
+    /**
+     * Signature Encoding Method
+     */
+    protected $_signatureMethod = 'HmacSHA256';
+
+    /**
+     * Generate the required attributes for the signature
+     * @param string $url
+     * @param array $parameters
+     * @return string
+     */
+    public function generateSignature($url, array &$parameters)
+    {
+        $parameters['AWSAccessKeyId']   = $this->_accessKey;
+        $parameters['SignatureVersion'] = $this->_signatureVersion;
+        $parameters['Version']          = $this->_apiVersion;
+        if(!isset($parameters['Timestamp'])) {
+            $parameters['Timestamp']    = gmdate('Y-m-d\TH:i:s\Z', time()+10);
+        }
+
+        $data = $this->_signParameters($url, $parameters);
+
+        return $data;
+    }
+
+    /**
+     * Computes the RFC 2104-compliant HMAC signature for request parameters
+     *
+     * This implements the Amazon Web Services signature, as per the following
+     * specification:
+     *
+     * 1. Sort all request parameters (including <tt>SignatureVersion</tt> and
+     *    excluding <tt>Signature</tt>, the value of which is being created),
+     *    ignoring case.
+     *
+     * 2. Iterate over the sorted list and append the parameter name (in its
+     *    original case) and then its value. Do not URL-encode the parameter
+     *    values before constructing this string. Do not use any separator
+     *    characters when appending strings.
+     *
+     * @param  string $queue_url  Queue URL
+     * @param  array  $parameters the parameters for which to get the signature.
+     *
+     * @return string the signed data.
+     */
+    protected function _signParameters($url, array &$paramaters)
+    {
+        $data = '';
+
+        uksort($paramaters, 'strcasecmp');
+        unset($paramaters['Signature']);
+
+        foreach($paramaters as $key => $value) {
+            $data .= $key . $value;
+        }
+
+        $hmac = Zend_Crypt_Hmac::compute($this->_secretKey, 'SHA1', $data, Zend_Crypt_Hmac::BINARY);
+
+        $paramaters['Signature'] = base64_encode($hmac);
+
+        return $data;
+    }
+}
diff --git a/lib/zend/Zend/Service/Amazon/Authentication/V2.php b/lib/zend/Zend/Service/Amazon/Authentication/V2.php
new file mode 100644
index 00000000000..58eb6fd6f70
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/Authentication/V2.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Service_Amazon_Authentication
+ */
+require_once 'Zend/Service/Amazon/Authentication.php';
+
+/**
+ * @see Zend_Crypt_Hmac
+ */
+require_once 'Zend/Crypt/Hmac.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage Authentication
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_Authentication_V2 extends Zend_Service_Amazon_Authentication
+{
+    /**
+     * Signature Version
+     */
+    protected $_signatureVersion = '2';
+
+    /**
+     * Signature Encoding Method
+     */
+    protected $_signatureMethod = 'HmacSHA256';
+
+    /**
+     * Type of http request
+     * @var string
+     */
+    protected $_httpMethod = "POST";
+
+    /**
+     * Generate the required attributes for the signature
+     * @param string $url
+     * @param array $parameters
+     * @return string
+     */
+    public function generateSignature($url, array &$parameters)
+    {
+        $parameters['AWSAccessKeyId']   = $this->_accessKey;
+        $parameters['SignatureVersion'] = $this->_signatureVersion;
+        $parameters['Version']          = $this->_apiVersion;
+        $parameters['SignatureMethod']  = $this->_signatureMethod;
+        if(!isset($parameters['Timestamp'])) {
+            $parameters['Timestamp']    = gmdate('Y-m-d\TH:i:s\Z', time()+10);
+        }
+
+        $data = $this->_signParameters($url, $parameters);
+
+        return $data;
+    }
+
+    /**
+     * Set http request type to POST or GET
+     * @param string $method
+     */
+    public function setHttpMethod($method = "POST") {
+        $this->_httpMethod = strtoupper($method);
+    }
+
+    /**
+     * Get the current http request type
+     * @return string
+     */
+    public function getHttpMethod()
+    {
+        return $this->_httpMethod;
+    }
+
+    /**
+     * Computes the RFC 2104-compliant HMAC signature for request parameters
+     *
+     * This implements the Amazon Web Services signature, as per the following
+     * specification:
+     *
+     * 1. Sort all request parameters (including <tt>SignatureVersion</tt> and
+     *    excluding <tt>Signature</tt>, the value of which is being created),
+     *    ignoring case.
+     *
+     * 2. Iterate over the sorted list and append the parameter name (in its
+     *    original case) and then its value. Do not URL-encode the parameter
+     *    values before constructing this string. Do not use any separator
+     *    characters when appending strings.
+     *
+     * @param  string $queue_url  Queue URL
+     * @param  array  $parameters the parameters for which to get the signature.
+     *
+     * @return string the signed data.
+     */
+    protected function _signParameters($url, array &$paramaters)
+    {
+        $data = $this->_httpMethod . "\n";
+        $data .= parse_url($url, PHP_URL_HOST) . "\n";
+        $data .= ('' == $path = parse_url($url, PHP_URL_PATH)) ? '/' : $path;
+        $data .= "\n";
+
+        uksort($paramaters, 'strcmp');
+        unset($paramaters['Signature']);
+
+        $arrData = array();
+        foreach($paramaters as $key => $value) {
+            $arrData[] = $key . '=' . str_replace('%7E', '~', rawurlencode($value));
+        }
+
+        $data .= implode('&', $arrData);
+
+        $hmac = Zend_Crypt_Hmac::compute($this->_secretKey, 'SHA256', $data, Zend_Crypt_Hmac::BINARY);
+
+        $paramaters['Signature'] = base64_encode($hmac);
+
+        return $data;
+    }
+}
diff --git a/lib/zend/Zend/Service/Amazon/CustomerReview.php b/lib/zend/Zend/Service/Amazon/CustomerReview.php
index 259c0696da1..4934a961452 100644
--- a/lib/zend/Zend/Service/Amazon/CustomerReview.php
+++ b/lib/zend/Zend/Service/Amazon/CustomerReview.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_CustomerReview
@@ -75,7 +75,7 @@ class Zend_Service_Amazon_CustomerReview
     public function __construct(DOMElement $dom)
     {
         $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         foreach (array('Rating', 'HelpfulVotes', 'CustomerId', 'TotalVotes', 'Date', 'Summary', 'Content') as $el) {
             $result = $xpath->query("./az:$el/text()", $dom);
             if ($result->length == 1) {
diff --git a/lib/zend/Zend/Service/Amazon/Ec2.php b/lib/zend/Zend/Service/Amazon/Ec2.php
index a6567fc7ba8..15690f3ade8 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Abstract.php b/lib/zend/Zend/Service/Amazon/Ec2/Abstract.php
index ae9dd360126..5030aa0cb3c 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Abstract.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Abstract.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,7 +41,7 @@ require_once 'Zend/Service/Amazon/Ec2/Exception.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abstract
@@ -142,7 +142,7 @@ abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abst
     /**
      * Sends a HTTP request to the queue service using Zend_Http_Client
      *
-     * @param array $params         List of parameters to send with the request
+     * @param  array $params List of parameters to send with the request
      * @return Zend_Service_Amazon_Ec2_Response
      * @throws Zend_Service_Amazon_Ec2_Exception
      */
@@ -166,7 +166,7 @@ abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abst
             $request->setParameterPost($params);
 
             $httpResponse = $request->request();
-
+            
 
         } catch (Zend_Http_Client_Exception $zhce) {
             $message = 'Error in request to AWS service: ' . $zhce->getMessage();
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Availabilityzones.php b/lib/zend/Zend/Service/Amazon/Ec2/Availabilityzones.php
index c47edf2a83f..c57ad8d96ca 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Availabilityzones.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Availabilityzones.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Availabilityzones extends Zend_Service_Amazon_Ec2_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/CloudWatch.php b/lib/zend/Zend/Service/Amazon/Ec2/CloudWatch.php
index 6f69e7fefa9..d3346b5c15c 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/CloudWatch.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/CloudWatch.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstract
@@ -281,7 +281,7 @@ class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstrac
                 $options['Dimensions.member.' . $x . '.Value'] = $dimVal;
                 $x++;
             }
-            
+
             unset($options['Dimensions']);
         }
 
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Ebs.php b/lib/zend/Zend/Service/Amazon/Ec2/Ebs.php
index 92687c18519..c3cded58f4e 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Ebs.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Ebs.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Ebs extends Zend_Service_Amazon_Ec2_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Elasticip.php b/lib/zend/Zend/Service/Amazon/Ec2/Elasticip.php
index edacfaeec22..5c53bf0a1a9 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Elasticip.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Elasticip.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Elasticip extends Zend_Service_Amazon_Ec2_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Exception.php b/lib/zend/Zend/Service/Amazon/Ec2/Exception.php
index 5f958a58f84..2de168935b8 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Exception.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/Exception.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Exception extends Zend_Service_Amazon_Exception
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Image.php b/lib/zend/Zend/Service/Amazon/Ec2/Image.php
index a2bf20ca1f7..d9a1b18d9e2 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Image.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Image.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Image extends Zend_Service_Amazon_Ec2_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Instance.php b/lib/zend/Zend/Service/Amazon/Ec2/Instance.php
index 77d2f8d2a64..3f61b97e88e 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Instance.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Instance.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,11 +32,15 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Instance extends Zend_Service_Amazon_Ec2_Abstract
 {
+    /**
+     * Constant for Micro Instance Type
+     */
+    const MICRO = 't1.micro';
     /**
      * Constant for Small Instance TYpe
      */
@@ -168,7 +172,6 @@ class Zend_Service_Amazon_Ec2_Instance extends Zend_Service_Amazon_Ec2_Abstract
         if(isset($options['monitor']) && $options['monitor'] === true) {
             $params['Monitoring.Enabled'] = true;
         }
-
         $response = $this->sendRequest($params);
         $xpath = $response->getXPath();
 
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Instance/Reserved.php b/lib/zend/Zend/Service/Amazon/Ec2/Instance/Reserved.php
index ae68e83fc37..00f5f657aa3 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Instance/Reserved.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Instance/Reserved.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Instance_Reserved extends Zend_Service_Amazon_Ec2_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Instance/Windows.php b/lib/zend/Zend/Service/Amazon/Ec2/Instance/Windows.php
index b268ecf688a..39099feac42 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Instance/Windows.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Instance/Windows.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -42,7 +42,7 @@ require_once 'Zend/Json.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Instance_Windows extends Zend_Service_Amazon_Ec2_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Keypair.php b/lib/zend/Zend/Service/Amazon/Ec2/Keypair.php
index e78df50d4d7..6db09c7dc89 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Keypair.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Keypair.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Keypair extends Zend_Service_Amazon_Ec2_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Region.php b/lib/zend/Zend/Service/Amazon/Ec2/Region.php
index 03fb49ba60b..63387d355ec 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Region.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Region.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Region extends Zend_Service_Amazon_Ec2_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Response.php b/lib/zend/Zend/Service/Amazon/Ec2/Response.php
index fcdf1b43101..c23707ef2fe 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Response.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Response.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -25,11 +25,14 @@
  */
 require_once 'Zend/Http/Response.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /**
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Response {
@@ -118,16 +121,14 @@ class Zend_Service_Amazon_Ec2_Response {
         } catch (Zend_Http_Exception $e) {
             $body = false;
         }
-
+        
         if ($this->_document === null) {
             if ($body !== false) {
                 // turn off libxml error handling
                 $errors = libxml_use_internal_errors();
 
                 $this->_document = new DOMDocument();
-                if (!$this->_document->loadXML($body)) {
-                    $this->_document = false;
-                }
+                $this->_document = Zend_Xml_Security::scan($body, $this->_document);
 
                 // reset libxml error handling
                 libxml_clear_errors();
diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Securitygroups.php b/lib/zend/Zend/Service/Amazon/Ec2/Securitygroups.php
index 63f2ad87662..f29757e02b9 100644
--- a/lib/zend/Zend/Service/Amazon/Ec2/Securitygroups.php
+++ b/lib/zend/Zend/Service/Amazon/Ec2/Securitygroups.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
  * @category   Zend
  * @package    Zend_Service_Amazon
  * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Ec2_Securitygroups extends Zend_Service_Amazon_Ec2_Abstract
diff --git a/lib/zend/Zend/Service/Amazon/EditorialReview.php b/lib/zend/Zend/Service/Amazon/EditorialReview.php
index 94c93869376..a9f48f655d8 100644
--- a/lib/zend/Zend/Service/Amazon/EditorialReview.php
+++ b/lib/zend/Zend/Service/Amazon/EditorialReview.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_EditorialReview
@@ -50,7 +50,7 @@ class Zend_Service_Amazon_EditorialReview
     public function __construct(DOMElement $dom)
     {
         $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         foreach (array('Source', 'Content') as $el) {
             $this->$el = (string) $xpath->query("./az:$el/text()", $dom)->item(0)->data;
         }
diff --git a/lib/zend/Zend/Service/Amazon/Exception.php b/lib/zend/Zend/Service/Amazon/Exception.php
old mode 100644
new mode 100755
index 62ccf3e6246..1d99574c39c
--- a/lib/zend/Zend/Service/Amazon/Exception.php
+++ b/lib/zend/Zend/Service/Amazon/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,8 +28,8 @@ require_once 'Zend/Service/Exception.php';
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Exception extends Zend_Service_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/zend/Zend/Service/Amazon/Image.php b/lib/zend/Zend/Service/Amazon/Image.php
index 673a776fd3c..a34f1e65d81 100644
--- a/lib/zend/Zend/Service/Amazon/Image.php
+++ b/lib/zend/Zend/Service/Amazon/Image.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Image
@@ -61,7 +61,7 @@ class Zend_Service_Amazon_Image
     public function __construct(DOMElement $dom)
     {
         $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         $this->Url = Zend_Uri::factory($xpath->query('./az:URL/text()', $dom)->item(0)->data);
         $this->Height = (int) $xpath->query('./az:Height/text()', $dom)->item(0)->data;
         $this->Width = (int) $xpath->query('./az:Width/text()', $dom)->item(0)->data;
diff --git a/lib/zend/Zend/Service/Amazon/Item.php b/lib/zend/Zend/Service/Amazon/Item.php
index 4ea008fd6bd..48a9b7e8a0f 100644
--- a/lib/zend/Zend/Service/Amazon/Item.php
+++ b/lib/zend/Zend/Service/Amazon/Item.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Item
@@ -114,22 +114,22 @@ class Zend_Service_Amazon_Item
      *
      * @param  null|DOMElement $dom
      * @return void
-     * @throws	Zend_Service_Amazon_Exception
-     * 
+     * @throws    Zend_Service_Amazon_Exception
+     *
      * @group ZF-9547
      */
     public function __construct($dom)
     {
-    	if (null === $dom) {
-    		require_once 'Zend/Service/Amazon/Exception.php';
-    		throw new Zend_Service_Amazon_Exception('Item element is empty');
-    	}
-    	if (!$dom instanceof DOMElement) {
-    		require_once 'Zend/Service/Amazon/Exception.php';
-    		throw new Zend_Service_Amazon_Exception('Item is not a valid DOM element');
-    	}
+        if (null === $dom) {
+            require_once 'Zend/Service/Amazon/Exception.php';
+            throw new Zend_Service_Amazon_Exception('Item element is empty');
+        }
+        if (!$dom instanceof DOMElement) {
+            require_once 'Zend/Service/Amazon/Exception.php';
+            throw new Zend_Service_Amazon_Exception('Item is not a valid DOM element');
+        }
         $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         $this->ASIN = $xpath->query('./az:ASIN/text()', $dom)->item(0)->data;
 
         $result = $xpath->query('./az:DetailPageURL/text()', $dom);
diff --git a/lib/zend/Zend/Service/Amazon/ListmaniaList.php b/lib/zend/Zend/Service/Amazon/ListmaniaList.php
index 0c57fbeeae6..cd9376403d9 100644
--- a/lib/zend/Zend/Service/Amazon/ListmaniaList.php
+++ b/lib/zend/Zend/Service/Amazon/ListmaniaList.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_ListmaniaList
@@ -50,7 +50,7 @@ class Zend_Service_Amazon_ListmaniaList
     public function __construct(DOMElement $dom)
     {
         $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         foreach (array('ListId', 'ListName') as $el) {
             $this->$el = (string) $xpath->query("./az:$el/text()", $dom)->item(0)->data;
         }
diff --git a/lib/zend/Zend/Service/Amazon/Offer.php b/lib/zend/Zend/Service/Amazon/Offer.php
index b53dee3717c..09927d6e2a0 100644
--- a/lib/zend/Zend/Service/Amazon/Offer.php
+++ b/lib/zend/Zend/Service/Amazon/Offer.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Offer
@@ -85,7 +85,7 @@ class Zend_Service_Amazon_Offer
     public function __construct(DOMElement $dom)
     {
         $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         $this->MerchantId = (string) $xpath->query('./az:Merchant/az:MerchantId/text()', $dom)->item(0)->data;
         $name = $xpath->query('./az:Merchant/az:Name/text()', $dom);
         if ($name->length == 1) {
@@ -108,4 +108,4 @@ class Zend_Service_Amazon_Offer
             $this->IsEligibleForSuperSaverShipping = (bool) $result->item(0)->data;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Service/Amazon/OfferSet.php b/lib/zend/Zend/Service/Amazon/OfferSet.php
index daf6f0e8723..8eb38ff5ae1 100644
--- a/lib/zend/Zend/Service/Amazon/OfferSet.php
+++ b/lib/zend/Zend/Service/Amazon/OfferSet.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_OfferSet
@@ -85,7 +85,7 @@ class Zend_Service_Amazon_OfferSet
     public function __construct(DOMElement $dom)
     {
         $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
 
         $offer = $xpath->query('./az:OfferSummary', $dom);
         if ($offer->length == 1) {
diff --git a/lib/zend/Zend/Service/Amazon/Query.php b/lib/zend/Zend/Service/Amazon/Query.php
index 1391298a0d6..c8a65c5e624 100644
--- a/lib/zend/Zend/Service/Amazon/Query.php
+++ b/lib/zend/Zend/Service/Amazon/Query.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Amazon.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Query extends Zend_Service_Amazon
diff --git a/lib/zend/Zend/Service/Amazon/ResultSet.php b/lib/zend/Zend/Service/Amazon/ResultSet.php
index 84e25f47ae3..767aca6395e 100644
--- a/lib/zend/Zend/Service/Amazon/ResultSet.php
+++ b/lib/zend/Zend/Service/Amazon/ResultSet.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Amazon/Item.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_ResultSet implements SeekableIterator
@@ -75,7 +75,7 @@ class Zend_Service_Amazon_ResultSet implements SeekableIterator
     {
         $this->_dom = $dom;
         $this->_xpath = new DOMXPath($dom);
-        $this->_xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $this->_xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         $this->_results = $this->_xpath->query('//az:Item');
     }
 
diff --git a/lib/zend/Zend/Service/Amazon/S3.php b/lib/zend/Zend/Service/Amazon/S3.php
old mode 100644
new mode 100755
index 80fed83fd09..613c95045a1
--- a/lib/zend/Zend/Service/Amazon/S3.php
+++ b/lib/zend/Zend/Service/Amazon/S3.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -36,7 +36,7 @@ require_once 'Zend/Crypt/Hmac.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://docs.amazonwebservices.com/AmazonS3/2006-03-01/
  */
@@ -157,14 +157,15 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
     public function createBucket($bucket, $location = null)
     {
         $this->_validBucketName($bucket);
-
+        $headers=array();
         if($location) {
             $data = '<CreateBucketConfiguration><LocationConstraint>'.$location.'</LocationConstraint></CreateBucketConfiguration>';
-        }
-        else {
+            $headers[self::S3_CONTENT_TYPE_HEADER]= 'text/plain';
+            $headers['Content-size']= strlen($data);
+        } else {
             $data = null;
         }
-        $response = $this->_makeRequest('PUT', $bucket, null, array(), $data);
+        $response = $this->_makeRequest('PUT', $bucket, null, $headers, $data);
 
         return ($response->getStatus() == 200);
     }
@@ -190,6 +191,7 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
      */
     public function isObjectAvailable($object)
     {
+        $object = $this->_fixupObjectName($object);
         $response = $this->_makeRequest('HEAD', $object);
 
         return ($response->getStatus() == 200);
@@ -272,9 +274,16 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
             return false;
         }
 
-        foreach ($objects as $object) {
-            $this->removeObject("$bucket/$object");
+        while (!empty($objects)) {
+            foreach ($objects as $object) {
+                $this->removeObject("$bucket/$object");
+            }
+            $params= array (
+                'marker' => $objects[count($objects)-1]
+            );
+            $objects = $this->getObjectsByBucket($bucket,$params);
         }
+        
         return true;
     }
 
@@ -312,7 +321,52 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
 
         return $objects;
     }
+     /**
+     * List the objects and common prefixes in a bucket.
+     *
+     * Provides the list of object keys and common prefixes that are contained in the bucket.  Valid params include the following.
+     * prefix - Limits the response to keys which begin with the indicated prefix. You can use prefixes to separate a bucket into different sets of keys in a way similar to how a file system uses folders.
+     * marker - Indicates where in the bucket to begin listing. The list will only include keys that occur lexicographically after marker. This is convenient for pagination: To get the next page of results use the last key of the current page as the marker.
+     * max-keys - The maximum number of keys you'd like to see in the response body. The server might return fewer than this many keys, but will not return more.
+     * delimiter - Causes keys that contain the same string between the prefix and the first occurrence of the delimiter to be rolled up into a single result element in the CommonPrefixes collection. These rolled-up keys are not returned elsewhere in the response.
+     *
+     * @see ZF-11401
+     * @param  string $bucket
+     * @param array $params S3 GET Bucket Paramater
+     * @return array|false
+     */
+    public function getObjectsAndPrefixesByBucket($bucket, $params = array())
+    {
+        $response = $this->_makeRequest('GET', $bucket, $params);
 
+        if ($response->getStatus() != 200) {
+            return false;
+        }
+
+        $xml = new SimpleXMLElement($response->getBody());
+
+        $objects = array();
+        if (isset($xml->Contents)) {
+            foreach ($xml->Contents as $contents) {
+                foreach ($contents->Key as $object) {
+                    $objects[] = (string)$object;
+                }
+            }
+        }
+        $prefixes = array();
+        if (isset($xml->CommonPrefixes)) {
+            foreach ($xml->CommonPrefixes as $prefix) {
+                foreach ($prefix->Prefix as $object) {
+                    $prefixes[] = (string)$object;
+                }
+            }
+        }
+
+        return array(
+            'objects'  => $objects,
+            'prefixes' => $prefixes
+        );
+    }
     /**
      * Make sure the object name is valid
      *
@@ -481,7 +535,7 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
         }
 
         if(!isset($meta['Content-MD5'])) {
-            $headers['Content-MD5'] = base64_encode(md5_file($path, true));
+            $meta['Content-MD5'] = base64_encode(md5_file($path, true));
         }
 
         return $this->putObject($object, $data, $meta);
@@ -502,14 +556,65 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
         return ($response->getStatus() == 204);
     }
 
+    /**
+     * Copy an object
+     *
+     * @param  string $sourceObject  Source object name
+     * @param  string $destObject    Destination object name
+     * @param  array  $meta          (OPTIONAL) Metadata to apply to desination object.
+     *                               Set to null to copy metadata from source object.
+     * @return boolean
+     */
+    public function copyObject($sourceObject, $destObject, $meta = null)
+    {
+        $sourceObject = $this->_fixupObjectName($sourceObject);
+        $destObject   = $this->_fixupObjectName($destObject);
+
+        $headers = (is_array($meta)) ? $meta : array();
+        $headers['x-amz-copy-source'] = $sourceObject;
+        $headers['x-amz-metadata-directive'] = $meta === null ? 'COPY' : 'REPLACE';
+
+        $response = $this->_makeRequest('PUT', $destObject, null, $headers);
+
+        if ($response->getStatus() == 200 && !stristr($response->getBody(), '<Error>')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Move an object
+     *
+     * Performs a copy to dest + verify + remove source
+     *
+     * @param string $sourceObject  Source object name
+     * @param string $destObject    Destination object name
+     * @param array  $meta          (OPTIONAL) Metadata to apply to destination object.
+     *                              Set to null to retain existing metadata.
+     */
+    public function moveObject($sourceObject, $destObject, $meta = null)
+    {
+        $sourceInfo = $this->getInfo($sourceObject);
+
+        $this->copyObject($sourceObject, $destObject, $meta);
+        $destInfo = $this->getInfo($destObject);
+
+        if ($sourceInfo['etag'] === $destInfo['etag']) {
+            return $this->removeObject($sourceObject);
+        } else {
+            return false;
+        }
+    }
+
     /**
      * Make a request to Amazon S3
      *
-     * @param  string $method	Request method
-     * @param  string $path		Path to requested object
-     * @param  array  $params	Request parameters
-     * @param  array  $headers	HTTP headers
-     * @param  string|resource $data		Request data
+     * @param  string $method    Request method
+     * @param  string $path        Path to requested object
+     * @param  array  $params    Request parameters
+     * @param  array  $headers    HTTP headers
+     * @param  string|resource $data        Request data
      * @return Zend_Http_Response
      */
     public function _makeRequest($method, $path='', $params=null, $headers=array(), $data=null)
@@ -538,7 +643,11 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
             $endpoint->setHost($parts[0].'.'.$endpoint->getHost());
         }
         if (!empty($parts[1])) {
-            $endpoint->setPath('/'.$parts[1]);
+            // ZF-10218, ZF-10122
+            $pathparts = explode('?',$parts[1]);
+            $endpath = $pathparts[0];
+            $endpoint->setPath('/'.$endpath);
+            
         }
         else {
             $endpoint->setPath('/');
@@ -546,21 +655,24 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
                 $path = $parts[0].'/';
             }
         }
-
         self::addSignature($method, $path, $headers);
 
         $client = self::getHttpClient();
 
-        $client->resetParameters();
+        $client->resetParameters(true);
         $client->setUri($endpoint);
         $client->setAuth(false);
         // Work around buglet in HTTP client - it doesn't clean headers
         // Remove when ZHC is fixed
-        $client->setHeaders(array('Content-MD5' => null,
-                                  'Expect'      => null,
-                                  'Range'       => null,
-                                  'x-amz-acl'   => null));
-
+        /*
+        $client->setHeaders(array('Content-MD5'              => null,
+                                  'Content-Encoding'         => null,
+                                  'Expect'                   => null,
+                                  'Range'                    => null,
+                                  'x-amz-acl'                => null,
+                                  'x-amz-copy-source'        => null,
+                                  'x-amz-metadata-directive' => null));
+        */
         $client->setHeaders($headers);
 
         if (is_array($params)) {
@@ -574,7 +686,7 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
                  $headers['Content-type'] = self::getMimeType($path);
              }
              $client->setRawData($data, $headers['Content-type']);
-         }
+         } 
          do {
             $retry = false;
 
@@ -665,6 +777,9 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
         else if (strpos($path, '?torrent') !== false) {
             $sig_str .= '?torrent';
         }
+        else if (strpos($path, '?versions') !== false) {
+            $sig_str .= '?versions';
+        }
 
         $signature = base64_encode(Zend_Crypt_Hmac::compute($this->_getSecretKey(), 'sha1', utf8_encode($sig_str), Zend_Crypt_Hmac::BINARY));
         $headers['Authorization'] = 'AWS '.$this->_getAccessKey().':'.$signature;
diff --git a/lib/zend/Zend/Service/Amazon/S3/Exception.php b/lib/zend/Zend/Service/Amazon/S3/Exception.php
old mode 100644
new mode 100755
index 6cba569b2a8..db1cdde9ef3
--- a/lib/zend/Zend/Service/Amazon/S3/Exception.php
+++ b/lib/zend/Zend/Service/Amazon/S3/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,7 +30,7 @@ require_once 'Zend/Service/Amazon/Exception.php';
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_S3_Exception extends Zend_Service_Amazon_Exception
diff --git a/lib/zend/Zend/Service/Amazon/S3/Stream.php b/lib/zend/Zend/Service/Amazon/S3/Stream.php
old mode 100644
new mode 100755
index e5a7bf164f2..d3d9fa2a708
--- a/lib/zend/Zend/Service/Amazon/S3/Stream.php
+++ b/lib/zend/Zend/Service/Amazon/S3/Stream.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/S3.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_S3_Stream
@@ -140,8 +140,7 @@ class Zend_Service_Amazon_S3_Stream
             $this->_writeBuffer = true;
             $this->_getS3Client($path);
             return true;
-        }
-        else {
+        } else {
             // Otherwise, just see if the file exists or not
             $info = $this->_getS3Client($path)->getInfo($name);
             if ($info) {
@@ -175,6 +174,10 @@ class Zend_Service_Amazon_S3_Stream
     /**
      * Read from the stream
      *
+     * http://bugs.php.net/21641 - stream_read() is always passed PHP's
+     * internal read buffer size (8192) no matter what is passed as $count
+     * parameter to fread().
+     *
      * @param  integer $count
      * @return string
      */
@@ -184,22 +187,25 @@ class Zend_Service_Amazon_S3_Stream
             return false;
         }
 
+        // make sure that count doesn't exceed object size
+        if ($count + $this->_position > $this->_objectSize) {
+            $count = $this->_objectSize - $this->_position;
+        }
+
         $range_start = $this->_position;
-        $range_end = $this->_position+$count;
+        $range_end   = $this->_position + $count - 1;
 
         // Only fetch more data from S3 if we haven't fetched any data yet (postion=0)
-        // OR, the range end position is greater than the size of the current object
-        // buffer AND if the range end position is less than or equal to the object's
-        // size returned by S3
-        if (($this->_position == 0) || (($range_end > strlen($this->_objectBuffer)) && ($range_end <= $this->_objectSize))) {
-
+        // OR, the range end position plus 1 is greater than the size of the current
+        // object buffer
+        if ($this->_objectBuffer === null  ||  $range_end >= strlen($this->_objectBuffer)) {
             $headers = array(
-                'Range' => "$range_start-$range_end"
+                'Range' => "bytes=$range_start-$range_end"
             );
 
             $response = $this->_s3->_makeRequest('GET', $this->_objectName, null, $headers);
 
-            if ($response->getStatus() == 200) {
+            if ($response->getStatus() == 206) { // 206 Partial Content
                 $this->_objectBuffer .= $response->getBody();
             }
         }
diff --git a/lib/zend/Zend/Service/Amazon/SimilarProduct.php b/lib/zend/Zend/Service/Amazon/SimilarProduct.php
index 01ab07b13cc..6b300187aef 100644
--- a/lib/zend/Zend/Service/Amazon/SimilarProduct.php
+++ b/lib/zend/Zend/Service/Amazon/SimilarProduct.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_SimilarProduct
@@ -50,7 +50,7 @@ class Zend_Service_Amazon_SimilarProduct
     public function __construct(DOMElement $dom)
     {
         $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         foreach (array('ASIN', 'Title') as $el) {
             $text = $xpath->query("./az:$el/text()", $dom)->item(0);
             if($text instanceof DOMText) {
diff --git a/lib/zend/Zend/Service/Amazon/SimpleDb.php b/lib/zend/Zend/Service/Amazon/SimpleDb.php
new file mode 100644
index 00000000000..080672c4bb3
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/SimpleDb.php
@@ -0,0 +1,579 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Service_Amazon_Abstract
+ */
+require_once 'Zend/Service/Amazon/Abstract.php';
+
+/**
+ * @see Zend_Service_Amazon_SimpleDb_Response
+ */
+require_once 'Zend/Service/Amazon/SimpleDb/Response.php';
+
+/**
+ * @see Zend_Service_Amazon_SimpleDb_Page
+ */
+require_once 'Zend/Service/Amazon/SimpleDb/Page.php';
+
+/**
+ * @see Zend_Service_Amazon_SimpleDb_Attribute
+ */
+require_once 'Zend/Service/Amazon/SimpleDb/Attribute.php';
+
+/**
+ * @see Zend_Service_Amazon_SimpleDb_Exception
+ */
+require_once 'Zend/Service/Amazon/SimpleDb/Exception.php';
+
+/**
+ * @see Zend_Crypt_Hmac
+ */
+require_once 'Zend/Crypt/Hmac.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_SimpleDb extends Zend_Service_Amazon_Abstract
+{
+    /* Notes */
+    // TODO SSL is required
+
+    /**
+     * The HTTP query server
+     */
+    protected $_sdbEndpoint = 'sdb.amazonaws.com/';
+
+    /**
+     * Period after which HTTP request will timeout in seconds
+     */
+    protected $_httpTimeout = 10;
+
+    /**
+     * The API version to use
+     */
+    protected $_sdbApiVersion = '2009-04-15';
+
+    /**
+     * Signature Version
+     */
+    protected $_signatureVersion = '2';
+
+    /**
+     * Signature Encoding Method
+     */
+    protected $_signatureMethod = 'HmacSHA256';
+
+    /**
+     * Create Amazon SimpleDB client.
+     *
+     * @param string $accessKey       Override the default Access Key
+     * @param string $secretKey       Override the default Secret Key
+     */
+    public function __construct($accessKey, $secretKey)
+    {
+        parent::__construct($accessKey, $secretKey);
+        $this->setEndpoint("https://" . $this->_sdbEndpoint);
+    }
+
+    /**
+     * Set SimpleDB endpoint to use
+     *
+     * @param string|Zend_Uri_Http $endpoint
+     * @throws Zend_Service_Amazon_SimpleDb_Exception
+     * @throws Zend_Uri_Exception
+     * @return Zend_Service_Amazon_SimpleDb
+     */
+    public function setEndpoint($endpoint)
+    {
+        if(!($endpoint instanceof Zend_Uri_Http)) {
+            $endpoint = Zend_Uri::factory($endpoint);
+        }
+        if(!$endpoint->valid()) {
+            require_once 'Zend/Service/Amazon/SimpleDb/Exception.php';
+            throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid endpoint supplied");
+        }
+        $this->_endpoint = $endpoint;
+        return $this;
+    }
+
+    /**
+     * Get SimpleDB endpoint
+     *
+     * @return Zend_Uri_Http
+     */
+    public function getEndpoint()
+    {
+        return $this->_endpoint;
+    }
+
+    /**
+     * Get attributes API method
+     *
+     * @param string      $domainName Domain name within database
+     * @param string      $itemName
+     * @param string|null $attributeName
+     * @throws Zend_Service_Amazon_SimpleDb_Exception
+     * @return array
+     */
+    public function getAttributes(
+        $domainName, $itemName, $attributeName = null
+    ) {
+        $params               = array();
+        $params['Action']     = 'GetAttributes';
+        $params['DomainName'] = $domainName;
+        $params['ItemName']   = $itemName;
+
+        if (isset($attributeName)) {
+            $params['AttributeName'] = $attributeName;
+        }
+
+        $response = $this->_sendRequest($params);
+        $document = $response->getSimpleXMLDocument();
+
+        $attributeNodes = $document->GetAttributesResult->Attribute;
+
+        // Return an array of arrays
+        $attributes = array();
+        foreach($attributeNodes as $attributeNode) {
+            $name       = (string)$attributeNode->Name;
+            $valueNodes = $attributeNode->Value;
+            $data       = null;
+            if (is_array($valueNodes) && !empty($valueNodes)) {
+                $data = array();
+                foreach($valueNodes as $valueNode) {
+                    $data[] = (string)$valueNode;
+                }
+            } elseif (isset($valueNodes)) {
+                $data = (string)$valueNodes;
+            }
+            if (isset($attributes[$name])) {
+                $attributes[$name]->addValue($data);
+            } else {
+                $attributes[$name] = new Zend_Service_Amazon_SimpleDb_Attribute($itemName, $name, $data);
+            }
+        }
+        return $attributes;
+    }
+
+    /**
+     * Push attributes
+     *
+     * @param  string $domainName
+     * @param  string $itemName
+     * @param  array|Traversable $attributes
+     * @param  array $replace
+     * @return void
+     */
+    public function putAttributes(
+        $domainName, $itemName, $attributes, $replace = array()
+    ) {
+        $params               = array();
+        $params['Action']     = 'PutAttributes';
+        $params['DomainName'] = $domainName;
+        $params['ItemName']   = $itemName;
+
+        $index = 0;
+        foreach ($attributes as $attribute) {
+            $attributeName = $attribute->getName();
+            foreach ($attribute->getValues() as $value) {
+                $params['Attribute.' . $index . '.Name']  = $attributeName;
+                $params['Attribute.' . $index . '.Value'] = $value;
+
+                // Check if it should be replaced
+                if(array_key_exists($attributeName, $replace) && $replace[$attributeName]) {
+                    $params['Attribute.' . $index . '.Replace'] = 'true';
+                }
+                $index++;
+            }
+        }
+
+        // Exception should get thrown if there's an error
+        $response = $this->_sendRequest($params);
+    }
+
+    /**
+     * Add many attributes at once
+     *
+     * @param  array $items
+     * @param  string $domainName
+     * @param  array $replace
+     * @return void
+     */
+    public function batchPutAttributes($items, $domainName, array $replace = array())
+    {
+
+        $params               = array();
+        $params['Action']     = 'BatchPutAttributes';
+        $params['DomainName'] = $domainName;
+
+        $itemIndex = 0;
+        foreach ($items as $name => $attributes) {
+            $params['Item.' . $itemIndex . '.ItemName'] = $name;
+            $attributeIndex = 0;
+            foreach ($attributes as $attribute) {
+                // attribute value cannot be array, so when several items are passed
+                // they are treated as separate values with the same attribute name
+                foreach($attribute->getValues() as $value) {
+                    $params['Item.' . $itemIndex . '.Attribute.' . $attributeIndex . '.Name'] = $attribute->getName();
+                    $params['Item.' . $itemIndex . '.Attribute.' . $attributeIndex . '.Value'] = $value;
+                    if (isset($replace[$name])
+                        && isset($replace[$name][$attribute->getName()])
+                        && $replace[$name][$attribute->getName()]
+                    ) {
+                        $params['Item.' . $itemIndex . '.Attribute.' . $attributeIndex . '.Replace'] = 'true';
+                    }
+                    $attributeIndex++;
+                }
+            }
+            $itemIndex++;
+        }
+
+        $response = $this->_sendRequest($params);
+    }
+
+    /**
+     * Delete attributes
+     *
+     * @param  string $domainName
+     * @param  string $itemName
+     * @param  array $attributes
+     * @return void
+     */
+    public function deleteAttributes($domainName, $itemName, array $attributes = array())
+    {
+        $params               = array();
+        $params['Action']     = 'DeleteAttributes';
+        $params['DomainName'] = $domainName;
+        $params['ItemName']   = $itemName;
+
+        $attributeIndex = 0;
+        foreach ($attributes as $attribute) {
+            foreach ($attribute->getValues() as $value) {
+                $params['Attribute.' . $attributeIndex . '.Name'] = $attribute->getName();
+                $params['Attribute.' . $attributeIndex . '.Value'] = $value;
+                $attributeIndex++;
+            }
+        }
+
+        $response = $this->_sendRequest($params);
+
+        return true;
+    }
+
+    /**
+     * List domains
+     *
+     * @param int $maxNumberOfDomains
+     * @param int $nextToken
+     * @return array              0 or more domain names
+     */
+    public function listDomains($maxNumberOfDomains = 100, $nextToken = null)
+    {
+        $params                       = array();
+        $params['Action']             = 'ListDomains';
+        $params['MaxNumberOfDomains'] = $maxNumberOfDomains;
+
+        if (null !== $nextToken) {
+            $params['NextToken'] = $nextToken;
+        }
+        $response = $this->_sendRequest($params);
+
+        $domainNodes = $response->getSimpleXMLDocument()->ListDomainsResult->DomainName;
+
+        $data = array();
+        foreach ($domainNodes as $domain) {
+            $data[] = (string)$domain;
+        }
+
+        $nextTokenNode = $response->getSimpleXMLDocument()->ListDomainsResult->NextToken;
+        $nextToken     = (string)$nextTokenNode;
+
+        return new Zend_Service_Amazon_SimpleDb_Page($data, $nextToken);
+    }
+
+    /**
+     * Retrieve domain metadata
+     *
+     * @param string $domainName Name of the domain for which metadata will be requested
+     * @return array Key/value array of metadatum names and values.
+     */
+    public function domainMetadata($domainName)
+    {
+        $params               = array();
+        $params['Action']     = 'DomainMetadata';
+        $params['DomainName'] = $domainName;
+        $response             = $this->_sendRequest($params);
+
+        $document = $response->getSimpleXMLDocument();
+
+        $metadataNodes = $document->DomainMetadataResult->children();
+        $metadata      = array();
+        foreach ($metadataNodes as $metadataNode) {
+            $name            = $metadataNode->getName();
+            $metadata[$name] = (string)$metadataNode;
+        }
+
+        return $metadata;
+    }
+
+    /**
+     * Create a new domain
+     *
+     * @param string $domainName Valid domain name of the domain to create
+     * @return boolean True if successful, false if not
+     */
+    public function createDomain($domainName)
+    {
+        $params               = array();
+        $params['Action']     = 'CreateDomain';
+        $params['DomainName'] = $domainName;
+        $response             = $this->_sendRequest($params);
+        return $response->getHttpResponse()->isSuccessful();
+    }
+
+    /**
+     * Delete a domain
+     *
+     * @param string $domainName Valid domain name of the domain to delete
+     * @return boolean True if successful, false if not
+     */
+    public function deleteDomain($domainName)
+    {
+        $params               = array();
+        $params['Action']     = 'DeleteDomain';
+        $params['DomainName'] = $domainName;
+        $response             = $this->_sendRequest($params);
+        return $response->getHttpResponse()->isSuccessful();
+    }
+
+    /**
+     * Select items from the database
+     *
+     * @param  string $selectExpression
+     * @param  null|string $nextToken
+     * @return Zend_Service_Amazon_SimpleDb_Page
+     */
+    public function select($selectExpression, $nextToken = null)
+    {
+        $params                     = array();
+        $params['Action']           = 'Select';
+        $params['SelectExpression'] = $selectExpression;
+
+        if (null !== $nextToken) {
+            $params['NextToken'] = $nextToken;
+        }
+
+        $response = $this->_sendRequest($params);
+        $xml      = $response->getSimpleXMLDocument();
+
+        $attributes = array();
+        foreach ($xml->SelectResult->Item as $item) {
+            $itemName = (string)$item->Name;
+
+            foreach ($item->Attribute as $attribute) {
+                $attributeName = (string)$attribute->Name;
+
+                $values = array();
+                foreach ($attribute->Value as $value) {
+                    $values[] = (string)$value;
+                }
+                $attributes[$itemName][$attributeName] = new Zend_Service_Amazon_SimpleDb_Attribute($itemName, $attributeName, $values);
+            }
+        }
+
+        $nextToken = (string)$xml->NextToken;
+
+        return new Zend_Service_Amazon_SimpleDb_Page($attributes, $nextToken);
+    }
+
+    /**
+     * Quote SDB value
+     *
+     * Wraps it in ''
+     *
+     * @param string $value
+     * @return string
+     */
+    public function quote($value)
+    {
+        // wrap in single quotes and convert each ' inside to ''
+        return "'" . str_replace("'", "''", $value) . "'";
+    }
+
+    /**
+     * Quote SDB column or table name
+     *
+     * Wraps it in ``
+     *
+     * @param  string $name
+     * @throws Zend_Service_Amazon_SimpleDb_Exception
+     * @return string
+     */
+    public function quoteName($name)
+    {
+        if (preg_match('/^[a-z_$][a-z0-9_$-]*$/i', $name) == false) {
+            throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid name: can contain only alphanumeric characters, \$ and _");
+        }
+        return "`$name`";
+    }
+
+   /**
+     * Sends a HTTP request to the SimpleDB service using Zend_Http_Client
+     *
+     * @param array $params         List of parameters to send with the request
+     * @return Zend_Service_Amazon_SimpleDb_Response
+     * @throws Zend_Service_Amazon_SimpleDb_Exception
+     */
+    protected function _sendRequest(array $params = array())
+    {
+        // UTF-8 encode all parameters and replace '+' characters
+        foreach ($params as $name => $value) {
+            unset($params[$name]);
+            $params[utf8_encode($name)] = $value;
+        }
+
+        $params = $this->_addRequiredParameters($params);
+
+        try {
+            /* @var $request Zend_Http_Client */
+            $request = self::getHttpClient();
+            $request->resetParameters();
+
+            $request->setConfig(array(
+                'timeout' => $this->_httpTimeout
+            ));
+
+
+            $request->setUri($this->getEndpoint());
+            $request->setMethod(Zend_Http_Client::POST);
+            foreach ($params as $key => $value) {
+                $params_out[] = rawurlencode($key)."=".rawurlencode($value);
+            }
+            $request->setRawData(join('&', $params_out), Zend_Http_Client::ENC_URLENCODED);
+            $httpResponse = $request->request();
+        } catch (Zend_Http_Client_Exception $zhce) {
+            $message = 'Error in request to AWS service: ' . $zhce->getMessage();
+            throw new Zend_Service_Amazon_SimpleDb_Exception($message, $zhce->getCode());
+        }
+        $response = new Zend_Service_Amazon_SimpleDb_Response($httpResponse);
+        $this->_checkForErrors($response);
+        return $response;
+    }
+
+    /**
+     * Adds required authentication and version parameters to an array of
+     * parameters
+     *
+     * The required parameters are:
+     * - AWSAccessKey
+     * - SignatureVersion
+     * - Timestamp
+     * - Version and
+     * - Signature
+     *
+     * If a required parameter is already set in the <tt>$parameters</tt> array,
+     * it is overwritten.
+     *
+     * @param array $parameters the array to which to add the required
+     *                          parameters.
+     *
+     * @return array
+     */
+    protected function _addRequiredParameters(array $parameters)
+    {
+        $parameters['AWSAccessKeyId']   = $this->_getAccessKey();
+        $parameters['SignatureVersion'] = $this->_signatureVersion;
+        $parameters['Timestamp']        = gmdate('c');
+        $parameters['Version']          = $this->_sdbApiVersion;
+        $parameters['SignatureMethod']  = $this->_signatureMethod;
+        $parameters['Signature']        = $this->_signParameters($parameters);
+
+        return $parameters;
+    }
+
+    /**
+     * Computes the RFC 2104-compliant HMAC signature for request parameters
+     *
+     * This implements the Amazon Web Services signature, as per the following
+     * specification:
+     *
+     * 1. Sort all request parameters (including <tt>SignatureVersion</tt> and
+     *    excluding <tt>Signature</tt>, the value of which is being created),
+     *    ignoring case.
+     *
+     * 2. Iterate over the sorted list and append the parameter name (in its
+     *    original case) and then its value. Do not URL-encode the parameter
+     *    values before constructing this string. Do not use any separator
+     *    characters when appending strings.
+     *
+     * @param array $parameters the parameters for which to get the signature.
+     * @return string the signed data.
+     */
+    protected function _signParameters(array $parameters)
+    {
+        $data  = "POST\n";
+        $data .= $this->getEndpoint()->getHost() . "\n";
+        $data .= "/\n";
+
+        uksort($parameters, 'strcmp');
+        unset($parameters['Signature']);
+
+        $arrData = array();
+        foreach ($parameters as $key => $value) {
+            $value = urlencode($value);
+            $value = str_replace("%7E", "~", $value);
+            $value = str_replace("+", "%20", $value);
+            $arrData[] = urlencode($key) . '=' . $value;
+        }
+
+        $data .= implode('&', $arrData);
+
+        require_once 'Zend/Crypt/Hmac.php';
+        $hmac = Zend_Crypt_Hmac::compute($this->_getSecretKey(), 'SHA256', $data, Zend_Crypt_Hmac::BINARY);
+
+        return base64_encode($hmac);
+    }
+
+    /**
+     * Checks for errors responses from Amazon
+     *
+     * @param Zend_Service_Amazon_SimpleDb_Response $response the response object to
+     *                                                   check.
+     * @throws Zend_Service_Amazon_SimpleDb_Exception if one or more errors are
+     *         returned from Amazon.
+     */
+    private function _checkForErrors(Zend_Service_Amazon_SimpleDb_Response $response)
+    {
+        $xpath = new DOMXPath($response->getDocument());
+        $list  = $xpath->query('//Error');
+        if ($list->length > 0) {
+            $node    = $list->item(0);
+            $code    = $xpath->evaluate('string(Code/text())', $node);
+            $message = $xpath->evaluate('string(Message/text())', $node);
+            throw new Zend_Service_Amazon_SimpleDb_Exception($message, 0, $code);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Service/Amazon/SimpleDb/Attribute.php b/lib/zend/Zend/Service/Amazon/SimpleDb/Attribute.php
new file mode 100644
index 00000000000..b8a7cca7e1f
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/SimpleDb/Attribute.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Response.php 17539 2009-08-10 22:51:26Z mikaelkael $
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_SimpleDb_Attribute
+{
+    protected $_itemName;
+    protected $_name;
+    protected $_values;
+
+    /**
+     * Constructor
+     *
+     * @param  string $itemName
+     * @param  string $name
+     * @param  array $values
+     * @return void
+     */
+    function __construct($itemName, $name, $values)
+    {
+        $this->_itemName = $itemName;
+        $this->_name     = $name;
+
+        if (!is_array($values)) {
+            $this->_values = array($values);
+        } else {
+            $this->_values = $values;
+        }
+    }
+
+    /**
+     * Return the item name to which the attribute belongs
+     *
+     * @return string
+     */
+    public function getItemName ()
+    {
+        return $this->_itemName;
+    }
+
+    /**
+     * Retrieve attribute values
+     *
+     * @return array
+     */
+    public function getValues()
+    {
+        return $this->_values;
+    }
+
+    /**
+     * Retrieve the attribute name
+     *
+     * @return string
+     */
+    public function getName ()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Add value
+     *
+     * @param  mixed $value
+     * @return void
+     */
+    public function addValue($value)
+    {
+        if (is_array($value)) {
+             $this->_values += $value;
+        } else {
+            $this->_values[] = $value;
+        }
+    }
+
+    public function setValues($values)
+    {
+        if (!is_array($values)) {
+            $values = array($values);
+        }
+        $this->_values = $values;
+    }
+}
diff --git a/lib/zend/Zend/Service/Amazon/SimpleDb/Exception.php b/lib/zend/Zend/Service/Amazon/SimpleDb/Exception.php
new file mode 100644
index 00000000000..8ffcd88fdfe
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/SimpleDb/Exception.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Service_Amazon_Exception
+ */
+require_once 'Zend/Service/Amazon/Exception.php';
+
+/**
+ * The Custom Exception class that allows you to have access to the AWS Error Code.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_SimpleDb_Exception extends Zend_Service_Amazon_Exception
+{
+    /**
+     * @var string
+     */
+    private $_awsErrorCode = '';
+
+    /**
+     * Constructor
+     *
+     * @param string $message
+     * @param int $code
+     * @param string $awsErrorCode
+     * @return void
+     */
+    public function __construct($message, $code = 0, $awsErrorCode = '')
+    {
+        parent::__construct($message, $code);
+        $this->_awsErrorCode = $awsErrorCode;
+    }
+
+    /**
+     * Get AWS error code
+     *
+     * @return string
+     */
+    public function getErrorCode()
+    {
+        return $this->_awsErrorCode;
+    }
+}
diff --git a/lib/zend/Zend/Service/Amazon/SimpleDb/Page.php b/lib/zend/Zend/Service/Amazon/SimpleDb/Page.php
new file mode 100644
index 00000000000..a687fb463ed
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/SimpleDb/Page.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Service_Amazon_Exception
+ */
+require_once 'Zend/Service/Amazon/Exception.php';
+
+/**
+ * The Custom Exception class that allows you to have access to the AWS Error Code.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_SimpleDb_Page
+{
+    /**
+     * Page data
+     *
+     * @var string
+     */
+    protected $_data;
+
+    /**
+     * Token identifying page
+     *
+     * @var string|null
+     */
+    protected $_token;
+
+    /**
+     * Constructor
+     *
+     * @param string      $data
+     * @param string|null $token
+     */
+    public function __construct($data, $token = null)
+    {
+        $this->setData($data);
+        $this->setToken($token);
+    }
+
+    /**
+     * Set page data
+     *
+     * @param string $data
+     */
+    public function setData($data)
+    {
+        $this->_data = $data;
+    }
+
+    /**
+     * Retrieve page data
+     *
+     * @return string
+     */
+    public function getData()
+    {
+        return $this->_data;
+    }
+
+    /**
+     * Set token
+     *
+     * @param string|null $token
+     */
+    public function setToken($token)
+    {
+        $this->_token = (trim($token) === '') ? null : $token;
+    }
+
+    /**
+     * Retrieve token
+     *
+     * @return string|null
+     */
+    public function getToken()
+    {
+        return $this->_token;
+    }
+
+    /**
+     * Determine whether this is the last page of data
+     *
+     * @return bool
+     */
+    public function isLast()
+    {
+        return (null === $this->_token);
+    }
+
+    /**
+     * Cast to string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return "Page with token: " . $this->_token
+             . "\n and data: " . $this->_data;
+    }
+}
diff --git a/lib/zend/Zend/Service/Amazon/SimpleDb/Response.php b/lib/zend/Zend/Service/Amazon/SimpleDb/Response.php
new file mode 100644
index 00000000000..d2f0a398cad
--- /dev/null
+++ b/lib/zend/Zend/Service/Amazon/SimpleDb/Response.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @see Zend_Http_Response
+ */
+require_once 'Zend/Http/Response.php';
+
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Amazon
+ * @subpackage SimpleDb
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_SimpleDb_Response
+{
+    /**
+     * XML namespace used for SimpleDB responses.
+     */
+    protected $_xmlNamespace = 'http://sdb.amazonaws.com/doc/2009-04-15/';
+
+    /**
+     * The original HTTP response
+     *
+     * This contains the response body and headers.
+     *
+     * @var Zend_Http_Response
+     */
+    private $_httpResponse = null;
+
+    /**
+     * The response document object
+     *
+     * @var DOMDocument
+     */
+    private $_document = null;
+
+    /**
+     * The response XPath
+     *
+     * @var DOMXPath
+     */
+    private $_xpath = null;
+
+    /**
+     * Last error code
+     *
+     * @var integer
+     */
+    private $_errorCode = 0;
+
+    /**
+     * Last error message
+     *
+     * @var string
+     */
+    private $_errorMessage = '';
+
+    /**
+     * Creates a new high-level SimpleDB response object
+     *
+     * @param  Zend_Http_Response $httpResponse the HTTP response.
+     * @return void
+     */
+    public function __construct(Zend_Http_Response $httpResponse)
+    {
+        $this->_httpResponse = $httpResponse;
+    }
+
+    /**
+     * Gets the XPath object for this response
+     *
+     * @return DOMXPath the XPath object for response.
+     */
+    public function getXPath()
+    {
+        if ($this->_xpath === null) {
+            $document = $this->getDocument();
+            if ($document === false) {
+                $this->_xpath = false;
+            } else {
+                $this->_xpath = new DOMXPath($document);
+                $this->_xpath->registerNamespace('sdb',
+                    $this->getNamespace());
+            }
+        }
+
+        return $this->_xpath;
+    }
+
+    /**
+     * Gets the SimpleXML document object for this response
+     *
+     * @return SimpleXMLElement
+     */
+    public function getSimpleXMLDocument()
+    {
+        try {
+            $body = $this->_httpResponse->getBody();
+        } catch (Zend_Http_Exception $e) {
+            $body = false;
+        }
+
+        return Zend_Xml_Security::scan($body);
+    }
+
+    /**
+     * Get HTTP response object
+     *
+     * @return Zend_Http_Response
+     */
+    public function getHttpResponse()
+    {
+        return $this->_httpResponse;
+    }
+
+    /**
+     * Gets the document object for this response
+     *
+     * @return DOMDocument the DOM Document for this response.
+     */
+    public function getDocument()
+    {
+        try {
+            $body = $this->_httpResponse->getBody();
+        } catch (Zend_Http_Exception $e) {
+            $body = false;
+        }
+
+        if ($this->_document === null) {
+            if ($body !== false) {
+                // turn off libxml error handling
+                $errors = libxml_use_internal_errors();
+
+                $this->_document = new DOMDocument();
+                $this->_document = Zend_Xml_Security::scan($body, $this->_document);
+
+                // reset libxml error handling
+                libxml_clear_errors();
+                libxml_use_internal_errors($errors);
+            } else {
+                $this->_document = false;
+            }
+        }
+
+        return $this->_document;
+    }
+
+    /**
+     * Return the current set XML Namespace.
+     *
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->_xmlNamespace;
+    }
+
+    /**
+     * Set a new XML Namespace
+     *
+     * @param string $namespace
+     */
+    public function setNamespace($namespace)
+    {
+        $this->_xmlNamespace = $namespace;
+    }
+}
diff --git a/lib/zend/Zend/Service/Amazon/Sqs.php b/lib/zend/Zend/Service/Amazon/Sqs.php
index 410fddddfd7..37fb2aef000 100644
--- a/lib/zend/Zend/Service/Amazon/Sqs.php
+++ b/lib/zend/Zend/Service/Amazon/Sqs.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_Sqs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -36,7 +36,7 @@ require_once 'Zend/Crypt/Hmac.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_Sqs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://aws.amazon.com/sqs/ Amazon Simple Queue Service
  */
@@ -67,9 +67,17 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
      */
     protected $_sqsSignatureMethod = 'HmacSHA256';
 
+    protected $_sqsEndpoints = array('us-east-1' => 'sqs.us-east-1.amazonaws.com',
+                                     'us-west-1' => 'sqs.us-west-1.amazonaws.com',
+                                     'eu-west-1' => 'sqs.eu-west-1.amazonaws.com',
+                                     'ap-southeast-1' => 'sqs.ap-southeast-1.amazonaws.com',
+                                     'ap-northeast-1' => 'sqs.ap-northeast-1.amazonaws.com');
     /**
      * Constructor
      *
+     * The default region is us-east-1. Use the region to set it to one of the regions that is build-in into ZF.
+     * To add a new AWS region use the setEndpoint() method.
+     *
      * @param string $accessKey
      * @param string $secretKey
      * @param string $region
@@ -77,8 +85,77 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
     public function __construct($accessKey = null, $secretKey = null, $region = null)
     {
         parent::__construct($accessKey, $secretKey, $region);
+        
+        if (null !== $region) {
+            $this->_setEndpoint($region);
+        }
     }
 
+    /**
+     * Set SQS endpoint
+     *
+     * Checks and sets endpoint if region exists in $_sqsEndpoints. If a new SQS region is added by amazon,
+     * please use the setEndpoint function to set it.
+     *
+     * @param  string  $region region
+     * @throws Zend_Service_Amazon_Sqs_Exception
+     */
+    protected function _setEndpoint($region)
+    {
+        if (array_key_exists($region, $this->_sqsEndpoints)) {
+            $this->_sqsEndpoint = $this->_sqsEndpoints[$region];
+        } else {
+            throw new Zend_Service_Amazon_Sqs_Exception('Invalid SQS region specified.');
+        }
+    }
+    
+    /**
+     * Set SQS endpoint
+     *
+     * You can set SQS to on of the build-in regions. If the region does not exsist it will be added.
+     *
+     * @param  string  $region region
+     * @throws Zend_Service_Amazon_Sqs_Exception
+     */
+    public function setEndpoint($region)
+    {
+        if (!empty($region)) {
+            if (array_key_exists($region, $this->_sqsEndpoints)) {
+                $this->_sqsEndpoint = $this->_sqsEndpoints[$region];
+            } else {
+                $this->_sqsEndpoints[$region] = "sqs.$region.amazonaws.com";
+                $this->_sqsEndpoint = $this->_sqsEndpoints[$region];
+            }
+        } else {
+            throw new Zend_Service_Amazon_Sqs_Exception('Empty region specified.');
+        }
+    }
+
+    /**
+     * Get the SQS endpoint
+     * 
+     * @return string 
+     */
+    public function getEndpoint()
+    {
+        return $this->_sqsEndpoint;
+    }
+
+    /**
+     * Get possible SQS endpoints
+     *
+     * Since there is not an SQS webserive to get all possible endpoints, a hardcoded list is available.
+     * For the actual region list please check:
+     * http://docs.amazonwebservices.com/AWSSimpleQueueService/2009-02-01/APIReference/index.html?QueueServiceWsdlArticle.html
+     *
+     * @param  string  $region region
+     * @return array
+     */
+    public function getEndpoints()
+    {
+        return $this->_sqsEndpoints;
+    }
+    
     /**
      * Create a new queue
      *
@@ -105,7 +182,9 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
             $retry  = false;
             $result = $this->_makeRequest(null, 'CreateQueue', $params);
 
-            if ($result->CreateQueueResult->QueueUrl === null) {
+            if (!isset($result->CreateQueueResult->QueueUrl)
+                || empty($result->CreateQueueResult->QueueUrl)
+            ) {
                 if ($result->Error->Code == 'AWS.SimpleQueueService.QueueNameExists') {
                     return false;
                 } elseif ($result->Error->Code == 'AWS.SimpleQueueService.QueueDeletedRecently') {
@@ -157,11 +236,17 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
     {
         $result = $this->_makeRequest(null, 'ListQueues');
 
-        if ($result->ListQueuesResult->QueueUrl === null) {
+        if (isset($result->Error)) {
             require_once 'Zend/Service/Amazon/Sqs/Exception.php';
             throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
         }
 
+        if (!isset($result->ListQueuesResult->QueueUrl)
+            || empty($result->ListQueuesResult->QueueUrl)
+        ) {
+            return array();
+        }
+
         $queues = array();
         foreach ($result->ListQueuesResult->QueueUrl as $queue_url) {
             $queues[] = (string)$queue_url;
@@ -199,7 +284,9 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
 
         $result = $this->_makeRequest($queue_url, 'SendMessage', $params);
 
-        if ($result->SendMessageResult->MessageId === null) {
+        if (!isset($result->SendMessageResult->MessageId)
+            || empty($result->SendMessageResult->MessageId)
+        ) {
             require_once 'Zend/Service/Amazon/Sqs/Exception.php';
             throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
         } else if ((string) $result->SendMessageResult->MD5OfMessageBody != $checksum) {
@@ -235,11 +322,18 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
 
         $result = $this->_makeRequest($queue_url, 'ReceiveMessage', $params);
 
-        if ($result->ReceiveMessageResult->Message === null) {
+        if (isset($result->Error)) {
             require_once 'Zend/Service/Amazon/Sqs/Exception.php';
             throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
         }
 
+        if (!isset($result->ReceiveMessageResult->Message)
+            || empty($result->ReceiveMessageResult->Message)
+        ) {
+            // no messages found
+            return array();
+        }
+
         $data = array();
         foreach ($result->ReceiveMessageResult->Message as $message) {
             $data[] = array(
@@ -271,7 +365,9 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
 
         $result = $this->_makeRequest($queue_url, 'DeleteMessage', $params);
 
-        if ($result->Error->Code !== null) {
+        if (isset($result->Error->Code)
+            && !empty($result->Error->Code)
+        ) {
             return false;
         }
 
@@ -294,11 +390,13 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
 
         $result = $this->_makeRequest($queue_url, 'GetQueueAttributes', $params);
 
-        if ($result->GetQueueAttributesResult->Attribute === null) {
+        if (!isset($result->GetQueueAttributesResult->Attribute)
+            || empty($result->GetQueueAttributesResult->Attribute)
+        ) {
             require_once 'Zend/Service/Amazon/Sqs/Exception.php';
             throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
         }
-        
+
         if(count($result->GetQueueAttributesResult->Attribute) > 1) {
             $attr_result = array();
             foreach($result->GetQueueAttributesResult->Attribute as $attribute) {
diff --git a/lib/zend/Zend/Service/Amazon/Sqs/Exception.php b/lib/zend/Zend/Service/Amazon/Sqs/Exception.php
index b40e8601fa5..7cc1183695d 100644
--- a/lib/zend/Zend/Service/Amazon/Sqs/Exception.php
+++ b/lib/zend/Zend/Service/Amazon/Sqs/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_Sqs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/Exception.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Amazon_Sqs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Sqs_Exception extends Zend_Service_Amazon_Exception
diff --git a/lib/zend/Zend/Service/Audioscrobbler.php b/lib/zend/Zend/Service/Audioscrobbler.php
index d95444bc888..4ef263cbfa8 100644
--- a/lib/zend/Zend/Service/Audioscrobbler.php
+++ b/lib/zend/Zend/Service/Audioscrobbler.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,12 +27,14 @@
  */
 require_once 'Zend/Http/Client.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Audioscrobbler
@@ -69,9 +71,15 @@ class Zend_Service_Audioscrobbler
     {
         $this->set('version', '1.0');
 
-        iconv_set_encoding('output_encoding', 'UTF-8');
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
+        if (PHP_VERSION_ID < 50600) {
+            iconv_set_encoding('output_encoding', 'UTF-8');
+            iconv_set_encoding('input_encoding', 'UTF-8');
+            iconv_set_encoding('internal_encoding', 'UTF-8');
+        } else {
+            ini_set('output_encoding', 'UTF-8');
+            ini_set('input_encoding', 'UTF-8');
+            ini_set('default_charset', 'UTF-8');
+        }
     }
 
     /**
@@ -182,7 +190,7 @@ class Zend_Service_Audioscrobbler
 
         set_error_handler(array($this, '_errorHandler'));
 
-        if (!$simpleXmlElementResponse = simplexml_load_string($responseBody)) {
+        if (!$simpleXmlElementResponse = Zend_Xml_Security::scan($responseBody)) {
             restore_error_handler();
             /**
              * @see Zend_Service_Exception
@@ -640,7 +648,7 @@ class Zend_Service_Audioscrobbler
      * @param  array   $errcontext
      * @return void
      */
-    protected function _errorHandler($errno, $errstr, $errfile, $errline, array $errcontext)
+    public function _errorHandler($errno, $errstr, $errfile, $errline, array $errcontext)
     {
         $this->_error = array(
             'errno'      => $errno,
diff --git a/lib/zend/Zend/Service/Console/Command.php b/lib/zend/Zend/Service/Console/Command.php
new file mode 100644
index 00000000000..22135451b9d
--- /dev/null
+++ b/lib/zend/Zend/Service/Console/Command.php
@@ -0,0 +1,413 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+class Zend_Service_Console_Command
+{
+	/**
+	 * The handler.
+	 *
+	 * @var array
+	 */
+	protected $_handler;
+
+	/**
+	 * Gets the handler.
+	 *
+	 * @return array
+	 */
+	public function getHandler()
+	{
+		return $this->_handler;
+	}
+
+	/**
+	 * Sets the handler.
+	 *
+	 * @param array $handler
+	 * @return Zend_Service_Console_Command
+	 */
+	public function setHandler($handler)
+	{
+		$this->_handler = $handler;
+		return $this;
+	}
+
+	/**
+	 * Replaces PHP's error handler
+	 *
+	 * @param mixed $errno
+	 * @param mixed $errstr
+	 * @param mixed $errfile
+	 * @param mixed $errline
+	 */
+	public static function phpstderr($errno, $errstr, $errfile, $errline)
+	{
+		self::stderr($errno . ': Error in ' . $errfile . ':' . $errline . ' - ' . $errstr);
+	}
+
+	/**
+	 * Replaces PHP's exception handler
+	 *
+	 * @param Exception $exception
+	 */
+	public static function phpstdex($exception)
+	{
+		self::stderr('Error: ' . $exception->getMessage());
+	}
+
+	/**
+	 * Writes output to STDERR, followed by a newline (optional)
+	 *
+	 * @param string $errorMessage
+	 * @param string $newLine
+	 */
+	public static function stderr($errorMessage, $newLine = true)
+	{
+		if (error_reporting() === 0) {
+			return;
+		}
+		file_put_contents('php://stderr', $errorMessage . ($newLine ? "\r\n" : ''));
+	}
+
+	/**
+	 * Bootstrap the shell command.
+	 *
+	 * @param array $argv PHP argument values.
+	 */
+	public static function bootstrap($argv)
+	{
+		// Abort bootstrapping depending on the MICROSOFT_CONSOLE_COMMAND_HOST constant.
+		if (defined('MICROSOFT_CONSOLE_COMMAND_HOST') && strtolower(MICROSOFT_CONSOLE_COMMAND_HOST) != 'console') {
+			return;
+		}
+
+		// Replace error handler
+		set_error_handler(array('Zend_Service_Console_Command', 'phpstderr'));
+		set_exception_handler(array('Zend_Service_Console_Command', 'phpstdex'));
+
+		// Build the application model
+		$model = self::_buildModel();
+
+		// Find a class that corresponds to the $argv[0] script name
+		$requiredHandlerName = str_replace('.bat', '', str_replace('.sh', '', str_replace('.php', '', strtolower(basename($argv[0])))));
+		$handler = null;
+		foreach ($model as $possibleHandler) {
+			if ($possibleHandler->handler == strtolower($requiredHandlerName)) {
+				$handler = $possibleHandler;
+				break;
+			}
+		}
+		if (is_null($handler)) {
+			self::stderr("No class found that implements handler '" . $requiredHandlerName . "'. Create a class that is named '" . $requiredHandlerName . "' and extends Zend_Service_Console_Command or is decorated with a docblock comment '@command-handler " . $requiredHandlerName . "'. Make sure it is loaded either through an autoloader or explicitly using require_once().");
+			die();
+		}
+
+		// Find a method that matches the command name
+		$command = null;
+		foreach ($handler->commands as $possibleCommand) {
+			if (in_array(strtolower(isset($argv[1]) ? $argv[1] : '<default>'), $possibleCommand->aliases)) {
+				$command = $possibleCommand;
+				break;
+			}
+		}
+		if (is_null($command)) {
+			$commandName = (isset($argv[1]) ? $argv[1] : '<default>');
+			self::stderr("No method found that implements command " . $commandName . ". Create a method in class '" . $handler->class . "' that is named '" . strtolower($commandName) . "Command' or is decorated with a docblock comment '@command-name " . $commandName . "'.");
+			die();
+		}
+
+		// Parse parameter values
+		$parameterValues = array();
+		$missingParameterValues = array();
+		$parameterInputs = array_splice($argv, 2);
+		foreach ($command->parameters as $parameter) {
+			// Default value: null
+			$value = null;
+
+			// Consult value providers for value. First one wins.
+			foreach ($parameter->valueproviders as $valueProviderName) {
+				if (!class_exists($valueProviderName)) {
+					$valueProviderName = 'Zend_Service_Console_Command_ParameterSource_' . $valueProviderName;
+				}
+				$valueProvider = new $valueProviderName();
+
+				$value = $valueProvider->getValueForParameter($parameter, $parameterInputs);
+				if (!is_null($value)) {
+					break;
+				}
+			}
+			if (is_null($value) && $parameter->required) {
+				$missingParameterValues[] = $parameter->aliases[0];
+			} else if (is_null($value)) {
+				$value = $parameter->defaultvalue;
+			}
+
+			// Set value
+			$parameterValues[] = $value;
+			$argvValues[$parameter->aliases[0]] = $value;
+		}
+
+		// Mising parameters?
+		if (count($missingParameterValues) > 0) {
+			self::stderr("Some parameters are missing:\r\n" . implode("\r\n", $missingParameterValues));
+			die();
+		}
+
+		// Supply argv in a nice way
+		$parameterValues['argv'] = $parameterInputs;
+
+		// Run the command
+		$className = $handler->class;
+		$classInstance = new $className();
+		$classInstance->setHandler($handler);
+		call_user_func_array(array($classInstance, $command->method), $parameterValues);
+
+		// Restore error handler
+		restore_exception_handler();
+		restore_error_handler();
+	}
+
+	/**
+	 * Builds the handler model.
+	 *
+	 * @return array
+	 */
+	protected static function _buildModel()
+	{
+		$model = array();
+
+		$classes = get_declared_classes();
+		foreach ($classes as $class) {
+			$type = new ReflectionClass($class);
+
+			$handlers = self::_findValueForDocComment('@command-handler', $type->getDocComment());
+			if (count($handlers) == 0 && $type->isSubclassOf('Zend_Service_Console_Command')) {
+				// Fallback: if the class extends Zend_Service_Console_Command, register it as
+				// a command handler.
+				$handlers[] = $class;
+			}
+			$handlerDescriptions = self::_findValueForDocComment('@command-handler-description', $type->getDocComment());
+			$handlerHeaders = self::_findValueForDocComment('@command-handler-header', $type->getDocComment());
+			$handlerFooters = self::_findValueForDocComment('@command-handler-footer', $type->getDocComment());
+
+			for ($hi = 0; $hi < count($handlers); $hi++) {
+				$handler = $handlers[$hi];
+				$handlerDescription = isset($handlerDescriptions[$hi]) ? $handlerDescriptions[$hi] : isset($handlerDescriptions[0]) ? $handlerDescriptions[0] : '';
+				$handlerDescription = str_replace('\r\n', "\r\n", $handlerDescription);
+				$handlerDescription = str_replace('\n', "\n", $handlerDescription);
+
+				$handlerModel = (object)array(
+					'handler'     => strtolower($handler),
+					'description' => $handlerDescription,
+					'headers'     => $handlerHeaders,
+					'footers'     => $handlerFooters,
+					'class'       => $class,
+					'commands'    => array()
+				);
+
+				$methods = $type->getMethods();
+			    foreach ($methods as $method) {
+			       	$commands = self::_findValueForDocComment('@command-name', $method->getDocComment());
+			    	if (substr($method->getName(), -7) == 'Command' && !in_array(substr($method->getName(), 0, -7), $commands)) {
+						// Fallback: if the method is named <commandname>Command,
+						// register it as a command.
+						$commands[] = substr($method->getName(), 0, -7);
+					}
+			       	for ($x = 0; $x < count($commands); $x++) {
+			       		$commands[$x] = strtolower($commands[$x]);
+			       	}
+			       	$commands = array_unique($commands);
+			       	$commandDescriptions = self::_findValueForDocComment('@command-description', $method->getDocComment());
+			       	$commandExamples = self::_findValueForDocComment('@command-example', $method->getDocComment());
+
+			       	if (count($commands) > 0) {
+						$command = $commands[0];
+						$commandDescription = isset($commandDescriptions[0]) ? $commandDescriptions[0] : '';
+
+						$commandModel = (object)array(
+							'command'     => $command,
+							'aliases'     => $commands,
+							'description' => $commandDescription,
+							'examples'    => $commandExamples,
+							'class'       => $class,
+							'method'      => $method->getName(),
+							'parameters'  => array()
+						);
+
+						$parameters = $method->getParameters();
+						$parametersFor = self::_findValueForDocComment('@command-parameter-for', $method->getDocComment());
+						for ($pi = 0; $pi < count($parameters); $pi++) {
+							// Initialize
+							$parameter = $parameters[$pi];
+							$parameterFor = null;
+							$parameterForDefaultValue = null;
+
+							// Is it a "catch-all" parameter?
+							if ($parameter->getName() == 'argv') {
+								continue;
+							}
+
+							// Find the $parametersFor with the same name defined
+							foreach ($parametersFor as $possibleParameterFor) {
+								$possibleParameterFor = explode(' ', $possibleParameterFor, 4);
+								if ($possibleParameterFor[0] == '$' . $parameter->getName()) {
+									$parameterFor = $possibleParameterFor;
+									break;
+								}
+							}
+							if (is_null($parameterFor)) {
+								die('@command-parameter-for missing for parameter $' . $parameter->getName());
+							}
+
+							if (is_null($parameterForDefaultValue) && $parameter->isOptional()) {
+								$parameterForDefaultValue = $parameter->getDefaultValue();
+							}
+
+							$parameterModel = (object)array(
+								'name'           => '$' . $parameter->getName(),
+								'defaultvalue'   => $parameterForDefaultValue,
+								'valueproviders' => explode('|', $parameterFor[1]),
+								'aliases'        => explode('|', $parameterFor[2]),
+								'description'    => (isset($parameterFor[3]) ? $parameterFor[3] : ''),
+								'required'       => (isset($parameterFor[3]) ? strpos(strtolower($parameterFor[3]), 'required') !== false && strpos(strtolower($parameterFor[3]), 'required if') === false : false),
+							);
+
+							// Add to model
+							$commandModel->parameters[] = $parameterModel;
+						}
+
+						// Add to model
+						$handlerModel->commands[] = $commandModel;
+			       	}
+				}
+
+				// Add to model
+				$model[] = $handlerModel;
+			}
+		}
+
+		return $model;
+	}
+
+	/**
+	 * Finds the value for a specific docComment.
+	 *
+	 * @param string $docCommentName Comment name
+	 * @param unknown_type $docComment Comment object
+	 * @return array
+	 */
+	protected static function _findValueForDocComment($docCommentName, $docComment)
+	{
+		$returnValue = array();
+
+		$commentLines = explode("\n", $docComment);
+	    foreach ($commentLines as $commentLine) {
+	        if (strpos($commentLine, $docCommentName . ' ') !== false) {
+	            $returnValue[] = trim(substr($commentLine, strpos($commentLine, $docCommentName) + strlen($docCommentName) + 1));
+	        }
+	    }
+
+	    return $returnValue;
+	}
+
+	/**
+	 * Display information on an object
+	 *
+	 * @param object $object Object
+	 * @param array $propertiesToDump Property names to display
+	 */
+	protected function _displayObjectInformation($object, $propertiesToDump = array())
+	{
+		foreach ($propertiesToDump as $property) {
+			printf('%-16s: %s' . "\r\n", $property, $object->$property);
+		}
+		printf("\r\n");
+	}
+
+	/**
+	 * Displays the help information.
+	 *
+	 * @command-name <default>
+	 * @command-name -h
+	 * @command-name -help
+	 * @command-description Displays the current help information.
+	 */
+	public function helpCommand() {
+		$handler = $this->getHandler();
+		$newline = "\r\n";
+
+		if (count($handler->headers) > 0) {
+			foreach ($handler->headers as $header) {
+				printf('%s%s', $header, $newline);
+			}
+			printf($newline);
+		}
+		printf('%s%s', $handler->description, $newline);
+		printf($newline);
+		printf('Available commands:%s', $newline);
+		foreach ($handler->commands as $command) {
+			$description = str_split($command->description, 50);
+			printf('  %-25s %s%s', implode(', ', $command->aliases), $description[0], $newline);
+			for ($di = 1; $di < count($description); $di++) {
+				printf('  %-25s %s%s', '', $description[$di], $newline);
+			}
+			printf($newline);
+
+			if (count($command->parameters) > 0) {
+				foreach ($command->parameters as $parameter) {
+					$description = str_split($parameter->description, 50);
+					printf('    %-23s %s%s', implode(', ', $parameter->aliases), $description[0], $newline);
+					for ($di = 1; $di < count($description); $di++) {
+						printf('    %-23s %s%s', '', $description[$di], $newline);
+					}
+					printf($newline);
+				}
+			}
+			printf($newline);
+
+			if (count($command->examples) > 0) {
+				printf('    Example usage:%s', $newline);
+				foreach ($command->examples as $example) {
+					printf('      %s%s', $example, $newline);
+				}
+				printf($newline);
+			}
+		}
+
+		if (count($handler->footers) > 0) {
+			printf($newline);
+			foreach ($handler->footers as $footer) {
+				printf('%s%s', $footer, $newline);
+			}
+			printf($newline);
+		}
+	}
+}
diff --git a/lib/zend/Zend/Service/Console/Command/ParameterSource/Argv.php b/lib/zend/Zend/Service/Console/Command/ParameterSource/Argv.php
new file mode 100644
index 00000000000..a530b0e3890
--- /dev/null
+++ b/lib/zend/Zend/Service/Console/Command/ParameterSource/Argv.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @subpackage Exception
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+
+/**
+ * @see Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+ */
+require_once 'Zend/Service/Console/Command/ParameterSource/ParameterSourceInterface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+class Zend_Service_Console_Command_ParameterSource_Argv
+	implements Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+{
+	/**
+	 * Get value for a named parameter.
+	 *
+	 * @param mixed $parameter Parameter to get a value for
+	 * @param array $argv Argument values passed to the script when run in console.
+	 * @return mixed
+	 */
+	public function getValueForParameter($parameter, $argv = array())
+	{
+		// Default value
+		$parameterValue = null;
+
+		// Loop parameter inputs
+		foreach ($argv as $parameterInput) {
+			$parameterInput = explode('=', $parameterInput, 2);
+
+			if (in_array($parameterInput[0], $parameter->aliases)) {
+				$parameterValue = isset($parameterInput[1]) ? $parameterInput[1] : true;
+				break;
+			}
+		}
+		if (strtolower($parameterValue) == 'true') {
+			$parameterValue = true;
+		} else if (strtolower($parameterValue) == 'false') {
+			$parameterValue = false;
+		}
+
+		// Done!
+		return $parameterValue;
+	}
+}
diff --git a/lib/zend/Zend/Service/Console/Command/ParameterSource/ConfigFile.php b/lib/zend/Zend/Service/Console/Command/ParameterSource/ConfigFile.php
new file mode 100644
index 00000000000..8a971ad507f
--- /dev/null
+++ b/lib/zend/Zend/Service/Console/Command/ParameterSource/ConfigFile.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @subpackage Exception
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+
+/**
+* @see Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+*/
+require_once 'Zend/Service/Console/Command/ParameterSource/ParameterSourceInterface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+class Zend_Service_Console_Command_ParameterSource_ConfigFile
+	implements Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+{
+	/**
+	 * Get value for a named parameter.
+	 *
+	 * @param mixed $parameter Parameter to get a value for
+	 * @param array $argv Argument values passed to the script when run in console.
+	 * @return mixed
+	 */
+	public function getValueForParameter($parameter, $argv = array())
+	{
+		// Configuration file path
+		$configurationFilePath = null;
+
+		// Check if a path to a configuration file is specified
+		foreach ($argv as $parameterInput) {
+			$parameterInput = explode('=', $parameterInput, 2);
+
+			if (strtolower($parameterInput[0]) == '--configfile' || strtolower($parameterInput[0]) == '-f') {
+				if (!isset($parameterInput[1])) {
+					require_once 'Zend/Service/Console/Exception.php';
+					throw new Zend_Service_Console_Exception("No path to a configuration file is given. Specify the path using the --ConfigFile or -F switch.");
+				}
+				$configurationFilePath = $parameterInput[1];
+				break;
+			}
+		}
+
+		// Value given?
+		if (is_null($configurationFilePath)) {
+			return null;
+		}
+		if (!file_exists($configurationFilePath)) {
+			require_once 'Zend/Service/Console/Exception.php';
+			throw new Zend_Service_Console_Exception("Invalid configuration file given. Specify the correct path using the --ConfigFile or -F switch.");
+		}
+
+		// Parse values
+		$iniValues = parse_ini_file($configurationFilePath);
+
+		// Default value
+		$parameterValue = null;
+
+		// Loop aliases
+		foreach ($parameter->aliases as $alias) {
+			if (array_key_exists($alias, $iniValues)) {
+				$parameterValue = $iniValues[$alias]; break;
+			} else if (array_key_exists(strtolower($alias), $iniValues)) {
+				$parameterValue = $iniValues[strtolower($alias)]; break;
+			} else if (array_key_exists(str_replace('-', '', $alias), $iniValues)) {
+				$parameterValue = $iniValues[str_replace('-', '', $alias)]; break;
+			} else if (array_key_exists(strtolower(str_replace('-', '', $alias)), $iniValues)) {
+				$parameterValue = $iniValues[strtolower(str_replace('-', '', $alias))]; break;
+			}
+		}
+
+		if (strtolower($parameterValue) == 'true') {
+			$parameterValue = true;
+		} else if (strtolower($parameterValue) == 'false') {
+			$parameterValue = false;
+		}
+
+		// Done!
+		return $parameterValue;
+	}
+}
diff --git a/lib/zend/Zend/Service/Console/Command/ParameterSource/Env.php b/lib/zend/Zend/Service/Console/Command/ParameterSource/Env.php
new file mode 100644
index 00000000000..9fd3680ebf4
--- /dev/null
+++ b/lib/zend/Zend/Service/Console/Command/ParameterSource/Env.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @subpackage Exception
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+
+/**
+* @see Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+*/
+require_once 'Zend/Service/Console/Command/ParameterSource/ParameterSourceInterface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+class Zend_Service_Console_Command_ParameterSource_Env
+	implements Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+{
+	/**
+	 * Get value for a named parameter.
+	 *
+	 * @param mixed $parameter Parameter to get a value for
+	 * @param array $argv Argument values passed to the script when run in console.
+	 * @return mixed
+	 */
+	public function getValueForParameter($parameter, $argv = array())
+	{
+		// Default value
+		$parameterValue = null;
+
+		// Fetch value for parameter
+		foreach ($parameter->aliases as $alias) {
+			while (strpos($alias, '-') !== false) {
+				$alias = substr($alias, 1);
+			}
+			$value = getenv($alias);
+
+			if (!is_null($value) && $value !== false) {
+				$parameterValue = $value;
+				break;
+			}
+		}
+
+		if (strtolower($parameterValue) == 'true') {
+			$parameterValue = true;
+		} else if (strtolower($parameterValue) == 'false') {
+			$parameterValue = false;
+		}
+
+		// Done!
+		return $parameterValue;
+	}
+}
diff --git a/lib/zend/Zend/Service/Console/Command/ParameterSource/ParameterSourceInterface.php b/lib/zend/Zend/Service/Console/Command/ParameterSource/ParameterSourceInterface.php
new file mode 100644
index 00000000000..598204eccd4
--- /dev/null
+++ b/lib/zend/Zend/Service/Console/Command/ParameterSource/ParameterSourceInterface.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @subpackage Exception
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+interface Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+{
+	/**
+	 * Get value for a named parameter.
+	 *
+	 * @param mixed $parameter Parameter to get a value for
+	 * @param array $argv Argument values passed to the script when run in console.
+	 * @return mixed
+	 */
+	public function getValueForParameter($parameter, $argv = array());
+}
diff --git a/lib/zend/Zend/Service/Console/Command/ParameterSource/Prompt.php b/lib/zend/Zend/Service/Console/Command/ParameterSource/Prompt.php
new file mode 100644
index 00000000000..782c12ef803
--- /dev/null
+++ b/lib/zend/Zend/Service/Console/Command/ParameterSource/Prompt.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @subpackage Exception
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+
+/**
+* @see Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+*/
+require_once 'Zend/Service/Console/Command/ParameterSource/ParameterSourceInterface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+class Zend_Service_Console_Command_ParameterSource_Prompt
+	implements Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+{
+	/**
+	 * Get value for a named parameter.
+	 *
+	 * @param mixed $parameter Parameter to get a value for
+	 * @param array $argv Argument values passed to the script when run in console.
+	 * @return mixed
+	 */
+	public function getValueForParameter($parameter, $argv = array())
+	{
+		// Default value
+		$parameterValue = null;
+
+		// Prompt the user
+		fwrite(STDOUT, "Supply a value for " . $parameter->aliases[0] . ": ");
+		/*if ($parameter->description != '' && !is_null($parameter->description)) {
+			fwrite(STDOUT, $parameter->description . ".\r\n");
+		}*/
+
+		while (is_null($parameterValue) || $parameterValue == '') {
+			$parameterValue = trim(fgets(STDIN));
+		}
+
+		// Done!
+		return $parameterValue;
+	}
+}
diff --git a/lib/zend/Zend/Service/Console/Command/ParameterSource/StdIn.php b/lib/zend/Zend/Service/Console/Command/ParameterSource/StdIn.php
new file mode 100644
index 00000000000..439634c4803
--- /dev/null
+++ b/lib/zend/Zend/Service/Console/Command/ParameterSource/StdIn.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @subpackage Exception
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+
+/**
+* @see Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+*/
+require_once 'Zend/Service/Console/Command/ParameterSource/ParameterSourceInterface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+class Zend_Service_Console_Command_ParameterSource_StdIn
+	implements Zend_Service_Console_Command_ParameterSource_ParameterSourceInterface
+{
+	/**
+	 * Get value for a named parameter.
+	 *
+	 * @param mixed $parameter Parameter to get a value for
+	 * @param array $argv Argument values passed to the script when run in console.
+	 * @return mixed
+	 */
+	public function getValueForParameter($parameter, $argv = array())
+	{
+		// Default value
+		$parameterValue = null;
+
+		// Check STDIN for data
+		if (ftell(STDIN) !== false) {
+			// Read from STDIN
+			$fs = fopen("php://stdin", "r");
+			if ($fs !== false) {
+				/*
+				while (!feof($fs)) {
+					$data = fread($fs, 1);
+					var_dump($data);
+					$parameterValue .= $data;
+				} */
+				$parameterValue = stream_get_contents($fs);
+				fclose($fs);
+			}
+
+			// Remove ending \r\n
+			$parameterValue = rtrim($parameterValue);
+
+			if (strtolower($parameterValue) == 'true') {
+				$parameterValue = true;
+			} else if (strtolower($parameterValue) == 'false') {
+				$parameterValue = false;
+			}
+		}
+
+		// Done!
+		return $parameterValue;
+	}
+}
diff --git a/lib/zend/Zend/Service/Console/Exception.php b/lib/zend/Zend/Service/Console/Exception.php
new file mode 100644
index 00000000000..c1c1f8f1369
--- /dev/null
+++ b/lib/zend/Zend/Service/Console/Exception.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @subpackage Exception
+ * @version    $Id$
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+
+/**
+ * Zend_Service_Exception
+ */
+require_once 'Zend/Service/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Console
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @copyright  Copyright (c) 2009 - 2011, RealDolmen (http://www.realdolmen.com)
+ * @license    http://phpazure.codeplex.com/license
+ */
+class Zend_Service_Console_Exception extends Zend_Service_Exception
+{}
diff --git a/lib/zend/Zend/Service/Delicious.php b/lib/zend/Zend/Service/Delicious.php
index 5a967593069..2f3c402f01a 100644
--- a/lib/zend/Zend/Service/Delicious.php
+++ b/lib/zend/Zend/Service/Delicious.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -47,6 +47,8 @@ require_once 'Zend/Service/Delicious/Post.php';
  */
 require_once 'Zend/Service/Delicious/PostList.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
 
 /**
  * Zend_Service_Delicious is a concrete implementation of the del.icio.us web service
@@ -54,7 +56,7 @@ require_once 'Zend/Service/Delicious/PostList.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Delicious
@@ -506,8 +508,8 @@ class Zend_Service_Delicious
         switch ($type) {
             case 'xml':
                 $dom = new DOMDocument() ;
-
-                if (!@$dom->loadXML($responseBody)) {
+    
+                if (!$dom = @Zend_Xml_Security::scan($responseBody, $dom)) {
                     /**
                      * @see Zend_Service_Delicious_Exception
                      */
diff --git a/lib/zend/Zend/Service/Delicious/Exception.php b/lib/zend/Zend/Service/Delicious/Exception.php
index 8424afe8574..2f8c0817059 100644
--- a/lib/zend/Zend/Service/Delicious/Exception.php
+++ b/lib/zend/Zend/Service/Delicious/Exception.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Exception.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Delicious_Exception extends Zend_Service_Exception
diff --git a/lib/zend/Zend/Service/Delicious/Post.php b/lib/zend/Zend/Service/Delicious/Post.php
index 0491d51dcdb..74798bec1e8 100644
--- a/lib/zend/Zend/Service/Delicious/Post.php
+++ b/lib/zend/Zend/Service/Delicious/Post.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -39,7 +39,7 @@ require_once 'Zend/Service/Delicious/SimplePost.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Delicious_Post extends Zend_Service_Delicious_SimplePost
diff --git a/lib/zend/Zend/Service/Delicious/PostList.php b/lib/zend/Zend/Service/Delicious/PostList.php
index e9493c493a1..bf46662b9f1 100644
--- a/lib/zend/Zend/Service/Delicious/PostList.php
+++ b/lib/zend/Zend/Service/Delicious/PostList.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,7 +28,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Delicious_PostList implements Countable, Iterator, ArrayAccess
diff --git a/lib/zend/Zend/Service/Delicious/SimplePost.php b/lib/zend/Zend/Service/Delicious/SimplePost.php
index 80ae08d6096..4e95d0e3fe2 100644
--- a/lib/zend/Zend/Service/Delicious/SimplePost.php
+++ b/lib/zend/Zend/Service/Delicious/SimplePost.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,7 +28,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Delicious_SimplePost
diff --git a/lib/zend/Zend/Service/DeveloperGarden/BaseUserService.php b/lib/zend/Zend/Service/DeveloperGarden/BaseUserService.php
deleted file mode 100644
index 0186ea21380..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/BaseUserService.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseUserService_GetAccountBalanceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_BaseUserService_AccountBalance
- */
-require_once 'Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_BaseUserService_GetQuotaInformation
- */
-require_once 'Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool
- */
-require_once 'Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_BaseUserService_GetAccountBalance
- */
-require_once 'Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_BaseUserService extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-admin/services/ODGBaseUserService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/ODGBaseUserService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'getQuotaInformationResponse' =>
-            'Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse',
-        'changeQuotaPoolResponse' =>
-            'Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse',
-        'getAccountBalanceResponse' =>
-            'Zend_Service_DeveloperGarden_Response_BaseUserService_GetAccountBalanceResponse',
-        'AccountBalance' =>
-            'Zend_Service_DeveloperGarden_BaseUserService_AccountBalance',
-    );
-
-    /**
-     * array with all QuotaModuleIds
-     *
-     * @var array
-     */
-    protected $_moduleIds = array(
-        'SmsProduction'            => 'SmsProduction',
-        'SmsSandbox'               => 'SmsSandbox',
-        'VoiceCallProduction'      => 'VoiceButlerProduction',
-        'VoiceCallSandbox'         => 'VoiceButlerSandbox',
-        'ConferenceCallProduction' => 'CCSProduction',
-        'ConferenceCallSandbox'    => 'CCSSandbox',
-        'LocalSearchProduction'    => 'localsearchProduction',
-        'LocalSearchSandbox'       => 'localsearchSandbox',
-        'IPLocationProduction'     => 'IPLocationProduction',
-        'IPLocationSandbox'        => 'IPLocationSandbox'
-    );
-
-    /**
-     * returns an array with all possible ModuleIDs
-     *
-     * @return array
-     */
-    public function getModuleIds()
-    {
-        return $this->_moduleIds;
-    }
-
-    /**
-     * checks the moduleId and throws exception if not valid
-     *
-     * @param string $moduleId
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return void
-     */
-    protected function _checkModuleId($moduleId)
-    {
-        if (!in_array($moduleId, $this->_moduleIds)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('moduleId not valid');
-        }
-    }
-
-    /**
-     * returns the correct module string
-     *
-     * @param string $module
-     * @param integer $environment
-     * @return string
-     */
-    protected function _buildModuleString($module, $environment)
-    {
-        $moduleString = $module;
-        switch($environment) {
-            case self::ENV_PRODUCTION :
-                $moduleString .= 'Production';
-                break;
-            case self::ENV_SANDBOX :
-                $moduleString .= 'Sandbox';
-                break;
-            default:
-                require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-                throw new Zend_Service_DeveloperGarden_Client_Exception(
-                    'Not a valid environment supplied.'
-                );
-        }
-
-        if (!in_array($moduleString, $this->_moduleIds)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception(
-                'Not a valid module name supplied.'
-            );
-        }
-
-        return $moduleString;
-    }
-
-    /**
-     * returns the request object with the specific moduleId
-     *
-     * @param string $moduleId
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    protected function _getRequestModule($moduleId)
-    {
-        return new Zend_Service_DeveloperGarden_Request_BaseUserService_GetQuotaInformation(
-            $moduleId
-        );
-    }
-
-    /**
-     * returns the request object with the specific moduleId and new quotaMax value
-     *
-     * @param string $moduleId
-     * @param integer $quotaMax
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    protected function _getChangeRequestModule($moduleId, $quotaMax)
-    {
-        return new Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool(
-            $moduleId,
-            $quotaMax
-        );
-    }
-
-    /**
-     * returns the Quota Information for SMS Service
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getSmsQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('Sms', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the Quota Information for VoiceCall Service
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getVoiceCallQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('VoiceButler', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the Quota Information for SMS ConferenceCall
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getConfernceCallQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('CCS', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the Quota Information for LocaleSearch Service
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getLocalSearchQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('localsearch', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the Quota Information for IPLocation Service
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getIPLocationQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('IPLocation', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the quota information
-     *
-     * @param Zend_Service_DeveloperGarden_Request_BaseUserService $request
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getQuotaInformation(
-        Zend_Service_DeveloperGarden_Request_BaseUserService_GetQuotaInformation $request
-    ) {
-        $this->_checkModuleId($request->getModuleId());
-        return $this->getSoapClient()
-                    ->getQuotaInformation($request)
-                    ->parse();
-    }
-
-    /**
-     * sets new user quota for the sms service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeSmsQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('Sms', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * sets new user quota for the voice call service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeVoiceCallQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('VoiceButler', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * sets new user quota for the IPLocation service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeIPLocationQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('IPLocation', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * sets new user quota for the Conference Call service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeConferenceCallQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('CCS', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * sets new user quota for the Local Search service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeLocalSearchQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('localsearch', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * set new quota values for the defined module
-     *
-     * @param Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool $request
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeQuotaPool(
-        Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool $request
-    ) {
-        $this->_checkModuleId($request->getModuleId());
-        return $this->getSoapClient()
-                    ->changeQuotaPool($request)
-                    ->parse();
-    }
-
-    /**
-     * get the result for a list of accounts
-     *
-     * @param array $accounts
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetAccountBalanceResponse
-     */
-    public function getAccountBalance(array $accounts = array())
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_BaseUserService_GetAccountBalance(
-            $accounts
-        );
-        return $this->getSoapClient()
-                    ->getAccountBalance($request)
-                    ->parse();
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Client/ClientAbstract.php b/lib/zend/Zend/Service/DeveloperGarden/Client/ClientAbstract.php
deleted file mode 100644
index fed11a9056f..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Client/ClientAbstract.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_Soap
- */
-require_once 'Zend/Service/DeveloperGarden/Client/Soap.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Credential
- */
-require_once 'Zend/Service/DeveloperGarden/Credential.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_SecurityTokenServer
- */
-require_once 'Zend/Service/DeveloperGarden/SecurityTokenServer.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * constants for using with the odg api
-     */
-    const ENV_PRODUCTION = 1; // Production Environment
-    const ENV_SANDBOX    = 2; // Sandbox Environment, limited access to the api
-    const ENV_MOCK       = 3; // Api calls are without any functionality
-
-    const PARTICIPANT_MUTE_OFF = 0; // removes mute from participant in a conference
-    const PARTICIPANT_MUTE_ON  = 1; // mute participant in a conference
-    const PARTICIPANT_RECALL   = 2; // recalls the participant in a conference
-
-    /**
-     * array of all possible env types
-     *
-     * @var int
-     */
-    static protected $_consts = null;
-
-    /**
-     * Available options
-     *
-     * @var array available options
-     */
-    protected $_options = array();
-
-    /**
-     * The service id to generate the auth service token
-     *
-     * @var string
-     */
-    protected $_serviceAuthId = 'https://odg.t-online.de';
-
-    /**
-     * Variable that holds the Zend_Service_DeveloperGarden env value
-     *
-     * @var int
-     */
-    protected $_serviceEnvironment = Zend_Service_DeveloperGarden_Client_ClientAbstract::ENV_PRODUCTION;
-
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = null;
-
-    /**
-     * the local wsdlFile
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = null;
-
-    /**
-     * should we use the local wsdl file?
-     *
-     * @var boolean
-     */
-    protected $_useLocalWsdl = true;
-
-    /**
-     * class with credentials
-     *
-     * @var Zend_Service_DeveloperGarden_Credential
-     */
-    protected $_credential = null;
-
-    /**
-     * The internal Soap Client
-     *
-     * @var Zend_Soap_Client
-     */
-    protected $_soapClient = null;
-
-    /**
-     * array with options for classmapping
-     *
-     * @var array
-     */
-    protected $_classMap = array();
-
-    /**
-     * constructor
-     *
-     * @param array $options Associative array of options
-     */
-    public function __construct(array $options = array())
-    {
-        $this->_credential = new Zend_Service_DeveloperGarden_Credential();
-
-        while (list($name, $value) = each($options)) {
-            switch (ucfirst($name)) {
-                case 'Username' :
-                    $this->_credential->setUsername($value);
-                    break;
-                case 'Password' :
-                    $this->_credential->setPassword($value);
-                    break;
-                case 'Realm' :
-                    $this->_credential->setRealm($value);
-                    break;
-                case 'Environment' :
-                    $this->setEnvironment($value);
-            }
-        }
-
-        if (empty($this->_wsdlFile)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('_wsdlFile not set for this service.');
-        }
-
-        if (!empty($this->_wsdlFileLocal)) {
-            $this->_wsdlFileLocal = realpath(dirname(__FILE__) . '/../' . $this->_wsdlFileLocal);
-        }
-
-        if (empty($this->_wsdlFileLocal) || $this->_wsdlFileLocal === false) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('_wsdlFileLocal not set for this service.');
-        }
-    }
-
-    /**
-     * Set an option
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setOption($name, $value)
-    {
-        if (!is_string($name)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Incorrect option name: ' . $name);
-        }
-        $name = strtolower($name);
-        if (array_key_exists($name, $this->_options)) {
-            $this->_options[$name] = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * get an option value from the internal options object
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function getOption($name)
-    {
-        $name = strtolower($name);
-        if (array_key_exists($name, $this->_options)) {
-            return $this->_options[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * returns the internal soap client
-     * if not allready exists we create an instance of
-     * Zend_Soap_Client
-     *
-     * @final
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    final public function getSoapClient()
-    {
-        if ($this->_soapClient === null) {
-            /**
-             * init the soapClient
-             */
-            $this->_soapClient = new Zend_Service_DeveloperGarden_Client_Soap(
-                $this->getWsdl(),
-                $this->getClientOptions()
-            );
-            $this->_soapClient->setCredential($this->_credential);
-            $tokenService = new Zend_Service_DeveloperGarden_SecurityTokenServer(
-                array(
-                    'username'    => $this->_credential->getUsername(),
-                    'password'    => $this->_credential->getPassword(),
-                    'environment' => $this->getEnvironment(),
-                    'realm'       => $this->_credential->getRealm(),
-                )
-            );
-            $this->_soapClient->setTokenService($tokenService);
-        }
-
-        return $this->_soapClient;
-    }
-
-    /**
-     * sets new environment
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setEnvironment($environment)
-    {
-        self::checkEnvironment($environment);
-        $this->_serviceEnvironment = $environment;
-        return $this;
-    }
-
-    /**
-     * returns the current configured environemnt
-     *
-     * @return int
-     */
-    public function getEnvironment()
-    {
-        return $this->_serviceEnvironment;
-    }
-
-    /**
-     * returns the wsdl file path, a uri or the local path
-     *
-     * @return string
-     */
-    public function getWsdl()
-    {
-        if ($this->_useLocalWsdl) {
-            $retVal = $this->_wsdlFileLocal;
-        } else {
-            $retVal = $this->_wsdlFile;
-        }
-
-        return $retVal;
-    }
-
-    /**
-     * switch to the local wsdl file usage
-     *
-     * @param boolen $use
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setUseLocalWsdl($use = true)
-    {
-        $this->_useLocalWsdl = (boolean) $use;
-        return $this;
-    }
-
-    /**
-     * sets a new wsdl file
-     *
-     * @param string $wsdlFile
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setWsdl($wsdlFile = null)
-    {
-        if (empty($wsdlFile)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('_wsdlFile not set for this service.');
-        }
-        $this->_wsdlFile = $wsdlFile;
-        return $this;
-    }
-
-    /**
-     * sets a new local wsdl file
-     *
-     * @param string $wsdlFile
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setLocalWsdl($wsdlFile = null)
-    {
-        if (empty($wsdlFile)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('_wsdlFileLocal not set for this service.');
-        }
-        $this->_wsdlFileLocal = $wsdlFile;
-        return $this;
-    }
-
-    /**
-     * returns an array with configured options for this client
-     *
-     * @return array
-     */
-    public function getClientOptions()
-    {
-        $options = array(
-            'soap_version' => SOAP_1_1,
-        );
-        if (!empty($this->_classMap)) {
-            $options['classmap'] = $this->_classMap;
-        }
-        $wsdlCache = Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::getWsdlCache();
-        if (!is_null($wsdlCache)) {
-            $options['cache_wsdl'] = $wsdlCache;
-        }
-        return $options;
-    }
-
-    /**
-     * returns the internal credential object
-     *
-     * @return Zend_Service_DeveloperGarden_Credential
-     */
-    public function getCredential()
-    {
-        return $this->_credential;
-    }
-
-    /**
-     * helper method to create const arrays
-     * @return null
-     */
-    static protected function _buildConstArray()
-    {
-        $r = new ReflectionClass(__CLASS__);
-        foreach ($r->getConstants() as $k => $v) {
-            $s = explode('_', $k, 2);
-            if (!isset(self::$_consts[$s[0]])) {
-                self::$_consts[$s[0]] = array();
-            }
-            self::$_consts[$s[0]][$v] = $k;
-        }
-    }
-
-    /**
-     * returns an array of all available environments
-     *
-     * @return array
-     */
-    static public function getParticipantActions()
-    {
-        if (empty(self::$_consts)) {
-            self::_buildConstArray();
-        }
-        return self::$_consts['PARTICIPANT'];
-    }
-
-    /**
-     * checks if the given action is valid
-     * otherwise it @throws Zend_Service_DeveloperGarden_Exception
-     *
-     * @param int $action
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return void
-     */
-    static public function checkParticipantAction($action)
-    {
-        if (!array_key_exists($action, self::getParticipantActions())) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception(
-                'Wrong Participant Action ' . $action . ' supplied.'
-            );
-        }
-    }
-
-    /**
-     * returns an array of all available environments
-     *
-     * @return array
-     */
-    static public function getEnvironments()
-    {
-        if (empty(self::$_consts)) {
-            self::_buildConstArray();
-        }
-        return self::$_consts['ENV'];
-    }
-
-    /**
-     * checks if the given environemnt is valid
-     * otherwise it @throws Zend_Service_DeveloperGarden_Client_Exception
-     *
-     * @param int $environment
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return void
-     */
-    static public function checkEnvironment($environment)
-    {
-        if (!array_key_exists($environment, self::getEnvironments())) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception(
-                'Wrong environment ' . $environment . ' supplied.'
-            );
-        }
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Client/Soap.php b/lib/zend/Zend/Service/DeveloperGarden/Client/Soap.php
deleted file mode 100644
index ef40cdf46b8..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Client/Soap.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Soap_Client
- */
-require_once 'Zend/Soap/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Client_Soap extends Zend_Soap_Client
-{
-    /**
-     * class with credential interface
-     *
-     * @var Zend_Service_DeveloperGarden_Credential
-     */
-    private $_credential = null;
-
-    /**
-     * WSSE Security Ext Namespace
-     *
-     * @var string
-     */
-    const WSSE_NAMESPACE_SECEXT = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd';
-
-    /**
-     * WSSE Saml Namespace
-     *
-     * @var string
-     */
-    const WSSE_NAMESPACE_SAML = 'urn:oasis:names:tc:SAML:2.0:assertion';
-
-    /**
-     * Security Element
-     *
-     * @var string
-     */
-    const WSSE_SECURITY_ELEMENT = 'Security';
-
-    /**
-     * UsernameToken Element
-     *
-     * @var string
-     */
-    const WSSE_ELEMENT_USERNAMETOKEN = 'UsernameToken';
-
-    /**
-     * Usernae Element
-     *
-     * @var string
-     */
-    const WSSE_ELEMENT_USERNAME = 'Username';
-
-    /**
-     * Password Element
-     *
-     * @var string
-     */
-    const WSSE_ELEMENT_PASSWORD = 'Password';
-
-    /**
-     * Password Element WSSE Type
-     *
-     */
-    const WSSE_ELEMENT_PASSWORD_TYPE = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText';
-
-    /**
-     * is this client used by the token service
-     *
-     * @var Zend_Service_DeveloperGarden_SecurityTokenServer
-     */
-    protected $_tokenService = null;
-
-    /**
-     * Perform a SOAP call but first check for adding STS Token or fetch one
-     *
-     * @param string $name
-     * @param array  $arguments
-     * @return mixed
-     */
-    public function __call($name, $arguments)
-    {
-        /**
-         * add WSSE Security header
-         */
-        if (!is_null($this->_tokenService)) {
-            // if login method we addWsseLoginHeader
-            if (in_array('login', $arguments)) {
-                $this->addWsseLoginHeader();
-            } elseif ($name == 'getTokens') {
-                $this->addWsseTokenHeader($this->_tokenService->getLoginToken());
-            } else {
-                $this->addWsseSecurityTokenHeader($this->_tokenService->getTokens());
-            }
-        }
-        return parent::__call($name, $arguments);
-    }
-
-    /**
-     * sets the internal handling for handle token service
-     *
-     * @param Zend_Service_DeveloperGarden_SecurityTokenServer $isTokenService
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function setTokenService(Zend_Service_DeveloperGarden_SecurityTokenServer $tokenService)
-    {
-        $this->_tokenService = $tokenService;
-        return $this;
-    }
-
-    /**
-     * returns the currently configured tokenService object
-     *
-     * @return Zend_Service_DeveloperGarden_SecurityTokenServer
-     */
-    public function getTokenService()
-    {
-        return $this->_tokenService;
-    }
-
-    /**
-     * Sets new credential callback object
-     *
-     * @param Zend_Service_DeveloperGarden_Credential $credential
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function setCredential(Zend_Service_DeveloperGarden_Credential $credential)
-    {
-        $this->_credential = $credential;
-        return $this;
-    }
-
-    /**
-     * returns the internal credential callback object
-     *
-     * @return Zend_Service_DeveloperGarden_Credential
-     */
-    public function getCredential()
-    {
-        return $this->_credential;
-    }
-
-    /**
-     * creates the login header and add
-     *
-     * @return SoapHeader
-     */
-    public function getWsseLoginHeader()
-    {
-        $dom = new DOMDocument();
-
-        /**
-         * Security Element
-         */
-        $securityElement = $dom->createElementNS(
-            self::WSSE_NAMESPACE_SECEXT,
-            'wsse:' . self::WSSE_SECURITY_ELEMENT
-        );
-        $securityElement->setAttribute('mustUnderstand', true);
-
-        /**
-         * Username Token Element
-         */
-        $usernameTokenElement = $dom->createElementNS(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_ELEMENT_USERNAMETOKEN
-        );
-
-        /**
-         * Username Element
-         */
-        $usernameElement = $dom->createElementNS(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_ELEMENT_USERNAME,
-            $this->_credential->getUsername(true)
-        );
-
-        /**
-         * Password Element
-         */
-        $passwordElement = $dom->createElementNS(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_ELEMENT_PASSWORD,
-            $this->_credential->getPassword()
-        );
-        $passwordElement->setAttribute('Type', self::WSSE_ELEMENT_PASSWORD_TYPE);
-
-        $usernameTokenElement->appendChild($usernameElement);
-        $usernameTokenElement->appendChild($passwordElement);
-
-        $securityElement->appendChild($usernameTokenElement);
-        $dom->appendChild($securityElement);
-
-        $authSoapVar = new SoapVar(
-            $dom->saveXML($securityElement),
-            XSD_ANYXML,
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapHeader = new SoapHeader(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT,
-            $authSoapVar,
-            true
-        );
-
-        return $authSoapHeader;
-    }
-
-    /**
-     * creates the token auth header for direct calls
-     *
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-     * @return SoapHeader
-     */
-    public function getWsseTokenHeader(
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-    ) {
-        $format = '<wsse:%s xmlns:wsse="%s" SOAP-ENV:mustUnderstand="1">%s</wsse:%s>';
-        $securityHeader = sprintf(
-            $format,
-            self::WSSE_SECURITY_ELEMENT,
-            self::WSSE_NAMESPACE_SECEXT,
-            $token->getTokenData(),
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapVar = new SoapVar(
-            $securityHeader,
-            XSD_ANYXML,
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapHeader = new SoapHeader(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT,
-            $authSoapVar,
-            true
-        );
-
-        return $authSoapHeader;
-    }
-
-    /**
-     * creates the security token auth header for direct calls
-     *
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-     * @return SoapHeader
-     */
-    public function getWsseSecurityTokenHeader(
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse $token
-    ) {
-        $format = '<wsse:%s xmlns:wsse="%s" SOAP-ENV:mustUnderstand="1">%s</wsse:%s>';
-        $securityHeader = sprintf(
-            $format,
-            self::WSSE_SECURITY_ELEMENT,
-            self::WSSE_NAMESPACE_SECEXT,
-            $token->getTokenData(),
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapVar = new SoapVar(
-            $securityHeader,
-            XSD_ANYXML,
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapHeader = new SoapHeader(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT,
-            $authSoapVar,
-            true
-        );
-
-        return $authSoapHeader;
-    }
-
-    /**
-     * adds the login specific header to the client
-     *
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function addWsseLoginHeader()
-    {
-        return $this->addSoapInputHeader($this->getWsseLoginHeader());
-    }
-
-    /**
-     * adds the earlier fetched token to the header
-     *
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function addWsseTokenHeader(
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-    ) {
-        return $this->addSoapInputHeader($this->getWsseTokenHeader($token));
-    }
-
-    /**
-     * adds the earlier fetched token to the header
-     *
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function addWsseSecurityTokenHeader(
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse $token
-    ) {
-        return $this->addSoapInputHeader($this->getWsseSecurityTokenHeader($token));
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall.php b/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall.php
deleted file mode 100644
index 3d2612b04f1..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall.php
+++ /dev/null
@@ -1,872 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetRunningConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_CommitConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CommitConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_Participant
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/Participant.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-ccs/services/ccsPort?wsdl';
-
-    /**
-     * the local WSDL file
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/ccsPort.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        //Struct
-        'ConferenceDetailStruct'  => 'Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail',
-        'ConferenceAccStruct'     => 'Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount',
-        'ScheduleStruct'          => 'Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule',
-        'ParticipantStruct'       => 'Zend_Service_DeveloperGarden_ConferenceCall_Participant',
-        'ParticipantDetailStruct' => 'Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail',
-        'ParticipantStatusStruct' => 'Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus',
-
-        //Responses
-        'CCSResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType',
-
-        //Conference
-        'createConferenceResponse'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponse',
-        'createConferenceResponseType'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType',
-        'removeConferenceResponse'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceResponse',
-        'commitConferenceResponse'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CommitConferenceResponse',
-        'updateConferenceResponse'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceResponse',
-        'getConferenceStatusResponse'      => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponse',
-        'getConferenceStatusResponseType'  => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType',
-        'getRunningConferenceResponse'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponse',
-        'getRunningConferenceResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType',
-        'getConferenceListResponse'        => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponse',
-        'getConferenceListResponseType'    => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType',
-
-        //Participant
-        'newParticipantResponse'           => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponse',
-        'newParticipantResponseType'       => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType',
-        'removeParticipantResponse'        => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveParticipantResponse',
-        'updateParticipantResponse'        => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateParticipantResponse',
-        'getParticipantStatusResponse'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponse',
-        'getParticipantStatusResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType',
-
-        //Templates
-        'createConferenceTemplateResponse'             => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponse',
-        'createConferenceTemplateResponseType'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType',
-        'getConferenceTemplateResponse'                => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponse',
-        'getConferenceTemplateResponseType'            => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType',
-        'updateConferenceTemplateResponse'             => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateResponse',
-        'removeConferenceTemplateResponse'             => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateResponse',
-        'getConferenceTemplateListResponse'            => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponse',
-        'getConferenceTemplateListResponseType'        => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType',
-        'addConferenceTemplateParticipantResponse'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponse',
-        'addConferenceTemplateParticipantResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType',
-        'getConferenceTemplateParticipantResponse'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponse',
-        'getConferenceTemplateParticipantResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType',
-        'updateConferenceTemplateParticipantResponse'  => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateParticipantResponse',
-        'removeConferenceTemplateParticipantResponse'  => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateParticipantResponse',
-    );
-
-    /**
-     * creates a new conference, ownerId should be between 3 and 39
-     * chars
-     *
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule
-     * @param integer $account
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType
-     */
-    public function createConference($ownerId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule = null,
-        $account = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest(
-            $this->getEnvironment(),
-            $ownerId,
-            $conferenceDetails,
-            $conferenceSchedule,
-            $account
-        );
-
-        $result = $this->getSoapClient()->createConference(array(
-            'createConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * commits the given conference
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CommitConferenceResponse
-     */
-    public function commitConference($conferenceId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_CommitConferenceRequest(
-            $this->getEnvironment(),
-            $conferenceId
-        );
-
-        $result = $this->getSoapClient()->commitConference(array(
-            'commitConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * updates a conference with the given parameter
-     *
-     * @param string $conferenceId
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule
-     * @param string $account
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function updateConference(
-        $conferenceId,
-        $ownerId = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule = null,
-        $account = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $ownerId,
-            $conferenceDetails,
-            $conferenceSchedule,
-            $account
-        );
-
-        $result = $this->getSoapClient()->updateConference(array(
-            'updateConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * get conference status details
-     *
-     * @param string $conferenceId
-     * @param integer $what
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType
-     */
-    public function getConferenceStatus($conferenceId, $what = 0)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $what
-        );
-
-        $result = $this->getSoapClient()->getConferenceStatus(array(
-            'getConferenceStatusRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * returns the conferenceId of the running conference instance for a planned
-     * recurring conference or the current conferenceId
-     *
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType
-     */
-    public function getRunningConference($conferenceId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetRunningConferenceRequest(
-            $this->getEnvironment(),
-            $conferenceId
-        );
-
-        $result = $this->getSoapClient()->getRunningConference(array(
-            'getRunningConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * remove a conference
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function removeConference($conferenceId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceRequest(
-            $this->getEnvironment(),
-            $conferenceId
-        );
-
-        $result = $this->getSoapClient()->removeConference(array(
-            'removeConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * returns a list of conferences
-     *
-     * @param integer $what
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType
-     */
-    public function getConferenceList($what = 0, $ownerId = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest(
-            $this->getEnvironment(),
-            $what,
-            $ownerId
-        );
-
-        $result = $this->getSoapClient()->getConferenceList(array(
-            'getConferenceListRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * adds a new participant to the given conference
-     *
-     * @param string $conferenceId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType
-     */
-    public function newParticipant(
-        $conferenceId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $participant
-        );
-
-        $result = $this->getSoapClient()->newParticipant(array(
-            'newParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * fetches the participant details for the given conferenceId
-     *
-     * @param string $conferenceId
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType
-     */
-    public function getParticipantStatus($conferenceId, $participantId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $participantId
-        );
-
-        $result = $this->getSoapClient()->getParticipantStatus(array(
-            'getParticipantStatusRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * removes the given participant from the conference
-     *
-     * @param string $conferenceId
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function removeParticipant($conferenceId, $participantId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $participantId
-        );
-
-        $result = $this->getSoapClient()->removeParticipant(array(
-            'removeParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * updates the participant in the given conference
-     *
-     * @param string $conferenceId
-     * @param string $participantId
-     * @param integer $action
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function updateParticipant(
-        $conferenceId,
-        $participantId,
-        $action = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $participantId,
-            $action,
-            $participant
-        );
-
-        $result = $this->getSoapClient()->updateParticipant(array(
-            'updateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * creates a new conference template
-     *
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param array $participants
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType
-     */
-    public function createConferenceTemplate(
-        $ownerId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails,
-        array $participants = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest(
-            $this->getEnvironment(),
-            $ownerId,
-            $conferenceDetails,
-            $participants
-        );
-
-        $result = $this->getSoapClient()->createConferenceTemplate(array(
-            'createConferenceTemplateRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * get a specific template
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType
-     */
-    public function getConferenceTemplate($templateId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateRequest(
-            $this->getEnvironment(),
-            $templateId
-        );
-
-        $result = $this->getSoapClient()->getConferenceTemplate(array(
-            'getConferenceTemplateRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * updates a conference template
-     *
-     * @param string $templateId
-     * @param string $initiatorId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function updateConferenceTemplate(
-        $templateId,
-        $initiatorId = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $initiatorId,
-            $conferenceDetails
-        );
-
-        $result = $this->getSoapClient()->updateConferenceTemplate(array(
-            'updateConferenceTemplateRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * remove a conference template
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function removeConferenceTemplate($templateId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateRequest(
-            $this->getEnvironment(),
-            $templateId
-        );
-
-        $result = $this->getSoapClient()->removeConferenceTemplate(array(
-            'removeConferenceTemplateRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * lists all available conference templates for the given owner
-     *
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType
-     */
-    public function getConferenceTemplateList($ownerId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest(
-            $this->getEnvironment(),
-            $ownerId
-        );
-
-        $result = $this->getSoapClient()->getConferenceTemplateList(array(
-            'getConferenceTemplateListRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * adds a new participants to the template
-     *
-     * @param string $templateId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType
-     */
-    public function addConferenceTemplateParticipant(
-        $templateId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $participant
-        );
-
-        $result = $this->getSoapClient()->addConferenceTemplateParticipant(array(
-            'addConferenceTemplateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * returns a praticipant for the given templateId
-     *
-     * @param string $templateId
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType
-     */
-    public function getConferenceTemplateParticipant($templateId, $participantId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $participantId
-        );
-
-        $result = $this->getSoapClient()->getConferenceTemplateParticipant(array(
-            'getConferenceTemplateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * updates the participants details
-     *
-     * @param string $templateId
-     * @param string $participantId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function updateConferenceTemplateParticipant(
-        $templateId,
-        $participantId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $participantId,
-            $participant
-        );
-
-        $result = $this->getSoapClient()->updateConferenceTemplateParticipant(array(
-            'updateConferenceTemplateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * removes a praticipant from the given templateId
-     *
-     * @param string $templateId
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function removeConferenceTemplateParticipant($templateId, $participantId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $participantId
-        );
-
-        $result = $this->getSoapClient()->removeConferenceTemplateParticipant(array(
-            'removeConferenceTemplateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php b/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php
deleted file mode 100644
index 66ca179a524..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-{
-    /**
-     * name of this conference
-     *
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * description of this conference
-     *
-     * @var string
-     */
-    public $description = null;
-
-    /**
-     * duration in seconds of this conference
-     *
-     * @var integer
-     */
-    public $duration = null;
-
-    /**
-     * create object
-     *
-     * @param string $name
-     * @param string $description
-     * @param integer $duration
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function __construct($name, $description, $duration)
-    {
-        $this->setName($name);
-        $this->setDescription($description);
-        $this->setDuration($duration);
-    }
-
-    /**
-     * sets new duration for this conference in seconds
-     *
-     * @param integer $duration
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function setDuration($duration)
-    {
-        $this->duration = $duration;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDuration()
-    {
-        return $this->duration;
-    }
-
-    /**
-     * set the description of this conference
-     *
-     * @param $description the $description to set
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function setDescription($description)
-    {
-        $this->description = $description;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * sets the name of this conference
-     *
-     * @param string $name
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php b/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php
deleted file mode 100644
index f73380fa5b4..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-{
-    /**
-     * @var integer
-     */
-    public $minute = null;
-
-    /**
-     * @var integer
-     */
-    public $hour = null;
-
-    /**
-     * @var integer
-     */
-    public $dayOfMonth = null;
-
-    /**
-     * @var integer
-     */
-    public $month = null;
-
-    /**
-     * @var integer
-     */
-    public $year = null;
-
-    /**
-     * @var integer
-     */
-    public $recurring = 0;
-
-    /**
-     * @var integer
-     */
-    public $notify = 0;
-
-    /**
-     * possible recurring values
-     *
-     * @var array
-     */
-    private $_recurringValues = array(
-        0 => 'no recurring',
-        1 => 'hourly',
-        2 => 'daily',
-        3 => 'weekly',
-        4 => 'monthly',
-    );
-
-    /**
-     * constructor for schedule object, all times are in UTC
-     *
-     * @param integer $minute
-     * @param integer $hour
-     * @param integer $dayOfMonth
-     * @param integer $month
-     * @param integer $year
-     * @param integer $recurring
-     * @param integer $notify
-     */
-    public function __construct($minute, $hour, $dayOfMonth, $month, $year, $recurring = 0, $notify = 0)
-    {
-        $this->setMinute($minute)
-             ->setHour($hour)
-             ->setDayOfMonth($dayOfMonth)
-             ->setMonth($month)
-             ->setYear($year)
-             ->setRecurring($recurring)
-             ->setNotify($notify);
-    }
-
-    /**
-     * returns the value of $minute
-     *
-     * @return integer
-     */
-    public function getMinute()
-    {
-        return $this->minute;
-    }
-
-    /**
-     * sets $minute
-     *
-     * @param integer $minute
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setMinute($minute)
-    {
-        $this->minute = $minute;
-        return $this;
-    }
-
-    /**
-     * returns the value of $hour
-     *
-     * @return integer
-     */
-    public function getHour()
-    {
-        return $this->hour;
-    }
-
-    /**
-     * sets $hour
-     *
-     * @param integer $hour
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setHour($hour)
-    {
-        $this->hour = $hour;
-        return $this;
-    }
-
-    /**
-     * returns the value of $dayOfMonth
-     *
-     * @return integer
-     */
-    public function getDayOfMonth()
-    {
-        return $this->dayOfMonth;
-    }
-
-    /**
-     * sets $dayOfMonth
-     *
-     * @param integer $dayOfMonth
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setDayOfMonth($dayOfMonth)
-    {
-        $this->dayOfMonth = $dayOfMonth;
-        return $this;
-    }
-
-    /**
-     * returns the value of $month
-     *
-     * @return integer
-     */
-    public function getMonth()
-    {
-        return $this->month;
-    }
-
-    /**
-     * sets $month
-     *
-     * @param integer $month
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setMonth($month)
-    {
-        $this->month = $month;
-        return $this;
-    }
-
-    /**
-     * returns the value of $year
-     *
-     * @return integer
-     */
-    public function getYear()
-    {
-        return $this->year;
-    }
-
-    /**
-     * sets $year
-     *
-     * @param integer $year
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setYear($year)
-    {
-        $this->year = $year;
-        return $this;
-    }
-
-    /**
-     * returns the value of $recurring
-     *
-     * @return integer
-     */
-    public function getRecurring()
-    {
-        return $this->recurring;
-    }
-
-    /**
-     * sets $recurring
-     *
-     * @param integer $recurring
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setRecurring($recurring)
-    {
-        if (!array_key_exists($recurring, $this->_recurringValues)) {
-            require_once 'Zend/Service/DeveloperGarden/ConferenceCall/Exception.php';
-            throw new Zend_Service_DeveloperGarden_ConferenceCall_Exception(
-                'Unknown ConferenceCall recurring mode.'
-            );
-        }
-        $this->recurring = $recurring;
-        return $this;
-    }
-
-    /**
-     * returns the value of $notify
-     *
-     * @return integer
-     */
-    public function getNotify()
-    {
-        return $this->notify;
-    }
-
-    /**
-     * sets $notify
-     *
-     * @param integer $notify
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setNotify($notify)
-    {
-        $this->notify = $notify;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php b/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php
deleted file mode 100644
index 7c1baea21c6..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * Zend_Service_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_Exception extends Zend_Service_DeveloperGarden_Exception
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php b/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
deleted file mode 100644
index 1f8286df894..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Validate_Ip
- */
-require_once 'Zend/Validate/Ip.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_Participant
-{
-    /**
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $detail = null;
-
-    /**
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * @var array
-     */
-    public $status = null;
-
-    /**
-     * participant details
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getDetail()
-    {
-        return $this->detail;
-    }
-
-    /**
-     * participant id
-     *
-     * @return string
-     */
-    public function getParticipantId()
-    {
-        return $this->participantId;
-    }
-
-    /**
-     * get the status
-     * returns an
-     * array of Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-     *
-     * @return array
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php b/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
deleted file mode 100644
index 2bed3d30385..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-/**
- * @see Zend_Validate_EmailAddress
- */
-require_once 'Zend/Validate/EmailAddress.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-{
-    /**
-     * @var string
-     */
-    public $firstName = null;
-
-    /**
-     * @var string
-     */
-    public $lastName = null;
-
-    /**
-     * @var string
-     */
-    public $number = null;
-
-    /**
-     * @var string
-     */
-    public $email = null;
-
-    /**
-     * @var integer
-     */
-    public $flags = null;
-
-    /**
-     * constructor for participant object
-     *
-     * @param string $firstName
-     * @param string $lastName
-     * @param string $number
-     * @param string $email
-     * @param integer $isInitiator
-     */
-    public function __construct($firstName, $lastName, $number, $email, $isInitiator = false)
-    {
-        $this->setFirstName($firstName)
-             ->setLastName($lastName)
-             ->setNumber($number)
-             ->setEmail($email)
-             ->setFlags((int) $isInitiator);
-    }
-
-    /**
-     * returns the value of $firstName
-     *
-     * @return string
-     */
-    public function getFirstName()
-    {
-        return $this->firstName;
-    }
-
-    /**
-     * sets $firstName
-     *
-     * @param string $firstName
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setFirstName($firstName)
-    {
-        $this->firstName = $firstName;
-        return $this;
-    }
-
-    /**
-     * returns the value of $lastName
-     *
-     * @return string
-     */
-    public function getLastName()
-    {
-        return $this->lastName;
-    }
-
-    /**
-     * sets $lastName
-     *
-     * @param string $lastName
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setLastName($lastName)
-    {
-        $this->lastName = $lastName;
-        return $this;
-    }
-
-    /**
-     * returns the value of $number
-     *
-     * @return string
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * sets $number
-     *
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-        return $this;
-    }
-
-    /**
-     * returns the value of $email
-     *
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-     * sets $email
-     *
-     * @param string email
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setEmail($email)
-    {
-        $validator = new Zend_Validate_EmailAddress();
-
-        if (!$validator->isValid($email)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('Not a valid e-mail address.');
-        }
-        $this->email = $email;
-        return $this;
-    }
-
-    /**
-     * returns the value of $flags
-     *
-     * @return integer
-     */
-    public function getFlags()
-    {
-        return $this->flags;
-    }
-
-    /**
-     * sets $flags (ie, initiator flag)
-     *
-     * @param integer $flags
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setFlags($flags)
-    {
-        $this->flags = $flags;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php b/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
deleted file mode 100644
index 64b65eda619..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Validate_Ip
- */
-require_once 'Zend/Validate/Ip.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-{
-    /**
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * @var string
-     */
-    public $value = null;
-
-    /**
-     * constructor for participant status object
-     *
-     * @param string $vame
-     * @param string $value
-     */
-    public function __construct($name, $value = null)
-    {
-        $this->setName($name)
-             ->setValue($value);
-    }
-
-    /**
-     * returns the value of $name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * sets $name
-     *
-     * @param string $name
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * returns the value of $value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * sets $value
-     *
-     * @param string $value
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-     */
-    public function setValue($value = null)
-    {
-        $this->value = $value;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Credential.php b/lib/zend/Zend/Service/DeveloperGarden/Credential.php
deleted file mode 100644
index f842a5d2e6e..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Credential.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Credential
-{
-    /**
-     * Service Auth Username
-     *
-     * @var string
-     */
-    protected $_username = null;
-
-    /**
-     * Service Password
-     *
-     * @var string
-     */
-    protected $_password = null;
-
-    /**
-     * Service Realm - default t-online.de
-     *
-     * @var string
-     */
-    protected $_realm = 't-online.de';
-
-    /**
-     * constructor to init the internal data
-     *
-     * @param string $username
-     * @param string $password
-     * @param string $realm
-     * @return Zend_Service_DeveloperGarden_Credential
-     */
-    public function __construct($username = null, $password = null, $realm = null)
-    {
-        if (!empty($username)) {
-            $this->setUsername($username);
-        }
-        if (!empty($password)) {
-            $this->setPassword($password);
-        }
-        if (!empty($realm)) {
-            $this->setRealm($realm);
-        }
-    }
-
-    /**
-     * split the password into an array
-     *
-     * @param string $password
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setPassword($password = null)
-    {
-        if (empty($password)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Empty password not permitted.');
-        }
-
-        if (!is_string($password)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Password must be a string.');
-        }
-
-        $this->_password = $password;
-        return $this;
-    }
-
-    /**
-     * returns the current configured password
-     *
-     * @return string
-     */
-    public function getPassword()
-    {
-        return $this->_password;
-    }
-
-    /**
-     * set the new login
-     *
-     * @param string $username
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setUsername($username = null)
-    {
-        if (empty($username)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Empty username not permitted.');
-        }
-
-        if (!is_string($username)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Username must be a string.');
-        }
-
-        $this->_username = $username;
-        return $this;
-    }
-
-    /**
-     * returns the username
-     *
-     * if $withRealm == true we combine username and realm like
-     * username@realm
-     *
-     * @param $boolean withRealm
-     * @return string|null
-     */
-    public function getUsername($withRealm = false)
-    {
-        $retValue = $this->_username;
-        if ($withRealm) {
-            $retValue = sprintf(
-                '%s@%s',
-                $this->_username,
-                $this->_realm
-            );
-        }
-        return $retValue;
-    }
-
-    /**
-     * set the new realm
-     *
-     * @param string $realm
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setRealm($realm = null)
-    {
-        if (empty($realm)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Empty realm not permitted.');
-        }
-
-        if (!is_string($realm)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Realm must be a string.');
-        }
-
-        $this->_realm = $realm;
-        return $this;
-    }
-
-    /**
-     * returns the realm
-     *
-     * @return string|null
-     */
-    public function getRealm()
-    {
-        return $this->_realm;
-    }
-}
-
diff --git a/lib/zend/Zend/Service/DeveloperGarden/IpLocation.php b/lib/zend/Zend/Service/DeveloperGarden/IpLocation.php
deleted file mode 100644
index cc4dde5936d..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/IpLocation.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_RegionType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_CityType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_IpLocation_LocateIPRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_IpLocation 
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-iplocation/services/IPLocation?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/IPLocation.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'LocateIPResponseType'  => 'Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType',
-        'IPAddressLocationType' => 'Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType',
-        'RegionType'            => 'Zend_Service_DeveloperGarden_Response_IpLocation_RegionType',
-        'GeoCoordinatesType'    => 'Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType',
-        'CityType'              => 'Zend_Service_DeveloperGarden_Response_IpLocation_CityType',
-    );
-
-    /**
-     * locate the given Ip address or array of addresses
-     *
-     * @param Zend_Service_DeveloperGarden_IpLocation_IpAddress|string $ip
-     * @return Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponse
-     */
-    public function locateIP($ip)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_IpLocation_LocateIPRequest(
-            $this->getEnvironment(),
-            $ip
-        );
-
-        $result = $this->getSoapClient()->locateIP($request);
-
-        $response = new Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponse($result);
-        return $response->parse();
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php b/lib/zend/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
deleted file mode 100644
index 27c42cc38a3..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Validate_Ip
- */
-require_once 'Zend/Validate/Ip.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_IpLocation_IpAddress
-{
-    /**
-     * the ip version
-     * ip v4 = 4
-     * ip v6 = 6
-     *
-     * @var integer
-     */
-    private $_version = 4;
-
-    /**
-     * currently supported versions
-     *
-     * @var array
-     */
-    private $_versionSupported = array(
-        4,
-        //6, not supported yet
-    );
-
-    private $_address = null;
-
-    /**
-     * create ipaddress object
-     *
-     * @param string $ip
-     * @param integer $version
-     *
-     * @return Zend_Service_Developergarde_IpLocation_IpAddress
-     */
-    public function __construct($ip, $version = 4)
-    {
-        $this->setIp($ip)
-             ->setVersion($version);
-    }
-
-    /**
-     * sets new ip address
-     *
-     * @param string $ip
-     * @throws Zend_Service_DeveloperGarden_Exception
-     * @return Zend_Service_DeveloperGarden_IpLocation_IpAddress
-     */
-    public function setIp($ip)
-    {
-        $validator = new Zend_Validate_Ip();
-
-        if (!$validator->isValid($ip)) {
-            $message = $validator->getMessages();
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception($message['notIpAddress']);
-        }
-        $this->_address = $ip;
-        return $this;
-    }
-
-    /**
-     * returns the current address
-     *
-     * @return string
-     */
-    public function getIp()
-    {
-        return $this->_address;
-    }
-
-    /**
-     * sets new ip version
-     *
-     * @param integer $version
-     * @throws Zend_Service_DeveloperGarden_Exception
-     * @return Zend_Service_DeveloperGarden_IpLocation_IpAddress
-     */
-    public function setVersion($version)
-    {
-        if (!in_array($version, $this->_versionSupported)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('Ip Version ' . (int)$version . ' is not supported.');
-        }
-
-        $this->_version = $version;
-        return $this;
-    }
-
-    /**
-     * returns the ip version
-     *
-     * @return integer
-     */
-    public function getVersion()
-    {
-        return $this->_version;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/LocalSearch.php b/lib/zend/Zend/Service/DeveloperGarden/LocalSearch.php
deleted file mode 100644
index f8908d6c70a..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/LocalSearch.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_LocalSearch_LocalSearchRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
- */
-require_once 'Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_LocalSearch
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-localsearch/services/localsearch?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/localsearch.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'LocalSearchResponseType' => 'Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType'
-    );
-
-    /**
-     * localSearch with the given parameters
-     *
-     * @param Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters
-     * @param integer $account
-     * @return Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
-     */
-    public function localSearch(
-        Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters,
-        $account = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_LocalSearch_LocalSearchRequest(
-            $this->getEnvironment(),
-            $searchParameters,
-            $account
-        );
-
-        $result = $this->getSoapClient()->localSearch($request);
-
-        $response = new Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponse($result);
-        return $response->parse();
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php b/lib/zend/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
deleted file mode 100644
index 0abd6deddb9..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-{
-    /**
-     * possible search parameters, incl. default values
-     *
-     * @var array
-     */
-    private $_parameters = array(
-        'what'             => null,
-        'dymwhat'          => null,
-        'dymrelated'       => null,
-        'hits'             => null,
-        'collapse'         => null,
-        'where'            => null,
-        'dywhere'          => null,
-        'radius'           => null,
-        'lx'               => null,
-        'ly'               => null,
-        'rx'               => null,
-        'ry'               => null,
-        'transformgeocode' => null,
-        'sort'             => null,
-        'spatial'          => null,
-        'sepcomm'          => null,
-        'filter'           => null, // can be ONLINER or OFFLINER
-        'openingtime'      => null, // can be now or HH::MM
-        'kategorie'        => null, // @see http://www.suchen.de/kategorie-katalog
-        'site'             => null,
-        'typ'              => null,
-        'name'             => null,
-        'page'             => null,
-        'city'             => null,
-        'plz'              => null,
-        'strasse'          => null,
-        'bundesland'       => null,
-    );
-
-    /**
-     * possible collapse values
-     *
-     * @var array
-     */
-    private $_possibleCollapseValues = array(
-        true,
-        false,
-        'ADDRESS_COMPANY',
-        'DOMAIN'
-    );
-
-    /**
-     * sets a new search word
-     * alias for setWhat
-     *
-     * @param string $searchValue
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setSearchValue($searchValue)
-    {
-        return $this->setWhat($searchValue);
-    }
-
-    /**
-     * sets a new search word
-     *
-     * @param string $searchValue
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setWhat($searchValue)
-    {
-        $this->_parameters['what'] = $searchValue;
-        return $this;
-    }
-
-    /**
-     * enable the did you mean what feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enableDidYouMeanWhat()
-    {
-        $this->_parameters['dymwhat'] = 'true';
-        return $this;
-    }
-
-    /**
-     * disable the did you mean what feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableDidYouMeanWhat()
-    {
-        $this->_parameters['dymwhat'] = 'false';
-        return $this;
-    }
-
-    /**
-     * enable the did you mean where feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enableDidYouMeanWhere()
-    {
-        $this->_parameters['dymwhere'] = 'true';
-        return $this;
-    }
-
-    /**
-     * disable the did you mean where feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableDidYouMeanWhere()
-    {
-        $this->_parameters['dymwhere'] = 'false';
-        return $this;
-    }
-
-    /**
-     * enable did you mean related, if true Kihno will be corrected to Kino
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enableDidYouMeanRelated()
-    {
-        $this->_parameters['dymrelated'] = 'true';
-        return $this;
-    }
-
-    /**
-     * diable did you mean related, if false Kihno will not be corrected to Kino
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableDidYouMeanRelated()
-    {
-        $this->_parameters['dymrelated'] = 'true';
-        return $this;
-    }
-
-    /**
-     * set the max result hits for this search
-     *
-     * @param integer $hits
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setHits($hits = 10)
-    {
-        require_once 'Zend/Validate/Between.php';
-        $validator = new Zend_Validate_Between(0, 1000);
-        if (!$validator->isValid($hits)) {
-            $message = $validator->getMessages();
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
-        }
-        $this->_parameters['hits'] = $hits;
-        return $this;
-    }
-
-    /**
-     * If true, addresses will be collapsed for a single domain, common values
-     * are:
-     * ADDRESS_COMPANY – to collapse by address
-     * DOMAIN – to collapse by domain (same like collapse=true)
-     * false
-     *
-     * @param mixed $value
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setCollapse($value)
-    {
-        if (!in_array($value, $this->_possibleCollapseValues, true)) {
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception('Not a valid value provided.');
-        }
-        $this->_parameters['collapse'] = $value;
-        return $this;
-    }
-
-    /**
-     * set a specific search location
-     * examples:
-     * +47°54’53.10”, 11° 10’ 56.76”
-     * 47°54’53.10;11°10’56.76”
-     * 47.914750,11.182533
-     * +47.914750 ; +11.1824
-     * Darmstadt
-     * Berlin
-     *
-     * @param string $where
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setWhere($where)
-    {
-        require_once 'Zend/Validate/NotEmpty.php';
-
-        $validator = new Zend_Validate_NotEmpty();
-        if (!$validator->isValid($where)) {
-            $message = $validator->getMessages();
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
-        }
-        $this->_parameters['where'] = $where;
-        return $this;
-    }
-
-    /**
-     * returns the defined search location (ie city, country)
-     *
-     * @return string
-     */
-    public function getWhere()
-    {
-        return $this->_parameters['where'];
-    }
-
-    /**
-     * enable the spatial search feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enableSpatial()
-    {
-        $this->_parameters['spatial'] = 'true';
-        return $this;
-    }
-
-    /**
-     * disable the spatial search feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableSpatial()
-    {
-        $this->_parameters['spatial'] = 'false';
-        return $this;
-    }
-
-    /**
-     * sets spatial and the given radius for a circle search
-     *
-     * @param integer $radius
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setRadius($radius)
-    {
-        require_once 'Zend/Validate/Int.php';
-
-        $validator = new Zend_Validate_Int();
-        if (!$validator->isValid($radius)) {
-            $message = $validator->getMessages();
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
-        }
-        $this->_parameters['radius'] = $radius;
-        $this->_parameters['transformgeocode'] = 'false';
-
-        return $this;
-    }
-
-    /**
-     * sets the values for a rectangle search
-     * lx = longitude left top
-     * ly = latitude left top
-     * rx = longitude right bottom
-     * ry = latitude right bottom
-     *
-     * @param $lx
-     * @param $ly
-     * @param $rx
-     * @param $ry
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setRectangle($lx, $ly, $rx, $ry)
-    {
-        $this->_parameters['lx'] = $lx;
-        $this->_parameters['ly'] = $ly;
-        $this->_parameters['rx'] = $rx;
-        $this->_parameters['ry'] = $ry;
-
-        return $this;
-    }
-
-    /**
-     * if set, the service returns the zipcode for the result
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setTransformGeoCode()
-    {
-        $this->_parameters['transformgeocode'] = 'true';
-        $this->_parameters['radius']           = null;
-
-        return $this;
-    }
-
-    /**
-     * sets the sort value
-     * possible values are: 'relevance' and 'distance' (only with spatial enabled)
-     *
-     * @param string $sort
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setSort($sort)
-    {
-        if (!in_array($sort, array('relevance', 'distance'))) {
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception('Not a valid sort value provided.');
-        }
-
-        $this->_parameters['sort'] = $sort;
-        return $this;
-    }
-
-    /**
-     * enable the separation of phone numbers
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enablePhoneSeparation()
-    {
-        $this->_parameters['sepcomm'] = 'true';
-        return $this;
-    }
-
-    /**
-     * disable the separation of phone numbers
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disablePhoneSeparation()
-    {
-        $this->_parameters['sepcomm'] = 'true';
-        return $this;
-    }
-
-    /**
-     * if this filter is set, only results with a website are returned
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setFilterOnliner()
-    {
-        $this->_parameters['filter'] = 'ONLINER';
-        return $this;
-    }
-
-    /**
-     * if this filter is set, only results without a website are returned
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setFilterOffliner()
-    {
-        $this->_parameters['filter'] = 'OFFLINER';
-        return $this;
-    }
-
-
-    /**
-     * removes the filter value
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableFilter()
-    {
-        $this->_parameters['filter'] = null;
-        return $this;
-    }
-
-    /**
-     * set a filter to get just results who are open at the given time
-     * possible values:
-     * now = open right now
-     * HH:MM = at the given time (ie 20:00)
-     *
-     * @param string $time
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setOpeningTime($time = null)
-    {
-        $this->_parameters['openingtime'] = $time;
-        return $this;
-    }
-
-    /**
-     * sets a category filter
-     *
-     * @see http://www.suchen.de/kategorie-katalog
-     * @param $category
-     * @return unknown_type
-     */
-    public function setCategory($category = null)
-    {
-        $this->_parameters['kategorie'] = $category;
-        return $this;
-    }
-
-    /**
-     * sets the site filter
-     * ie: www.developergarden.com
-     *
-     * @param string $site
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setSite($site)
-    {
-        $this->_parameters['site'] = $site;
-        return $this;
-    }
-
-    /**
-     * sets a filter to the given document type
-     * ie: pdf, html
-     *
-     * @param string $type
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setDocumentType($type)
-    {
-        $this->_parameters['typ'] = $type;
-        return $this;
-    }
-
-    /**
-     * sets a filter for the company name
-     * ie: Deutsche Telekom
-     *
-     * @param string $name
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setName($name)
-    {
-        $this->_parameters['name'] = $name;
-        return $this;
-    }
-
-    /**
-     * sets a filter for the zip code
-     *
-     * @param string $zip
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setZipCode($zip)
-    {
-        $this->_parameters['plz'] = $zip;
-        return $this;
-    }
-
-    /**
-     * sets a filter for the street
-     *
-     * @param string $street
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setStreet($street)
-    {
-        $this->_parameters['strasse'] = $street;
-        return $this;
-    }
-
-    /**
-     * sets a filter for the county
-     *
-     * @param string $county
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setCounty($county)
-    {
-        $this->_parameters['bundesland'] = $county;
-        return $this;
-    }
-
-    /**
-     * sets a raw parameter with the value
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return unknown_type
-     */
-    public function setRawParameter($key, $value)
-    {
-        $this->_parameters[$key] = $value;
-        return $this;
-    }
-
-    /**
-     * returns the parameters as an array
-     *
-     * @return array
-     */
-    public function getSearchParameters()
-    {
-        $retVal = array();
-        foreach ($this->_parameters as $key => $value) {
-            if (is_null($value)) {
-                continue;
-            }
-            $param = array(
-                'parameter' => $key,
-                'value' => $value
-            );
-            $retVal[] = $param;
-        }
-        return $retVal;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php b/lib/zend/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php
deleted file mode 100644
index c6dc8a864ee..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool
-{
-    /**
-     * string module id
-     *
-     * @var string
-     */
-    public $moduleId = null;
-
-    /**
-     * integer >= 0 to set new user quota
-     *
-     * @var integer
-     */
-    public $quotaMax = 0;
-
-    /**
-     * constructor give them the module id
-     *
-     * @param string $moduleId
-     * @param integer $quotaMax
-     * @return Zend_Service_Developergarde_Request_ChangeQuotaPool
-     */
-    public function __construct($moduleId = null, $quotaMax = 0)
-    {
-        $this->setModuleId($moduleId)
-             ->setQuotaMax($quotaMax);
-    }
-
-    /**
-     * sets a new moduleId
-     *
-     * @param integer $moduleId
-     * @return Zend_Service_Developergarde_Request_ChangeQuotaPool
-     */
-    public function setModuleId($moduleId = null)
-    {
-        $this->moduleId = $moduleId;
-        return $this;
-    }
-
-    /**
-     * returns the moduleId
-     *
-     * @return string
-     */
-    public function getModuleId()
-    {
-        return $this->moduleId;
-    }
-
-    /**
-     * sets new QuotaMax value
-     *
-     * @param integer $quotaMax
-     * @return Zend_Service_Developergarde_Request_ChangeQuotaPool
-     */
-    public function setQuotaMax($quotaMax = 0)
-    {
-        $this->quotaMax = $quotaMax;
-        return $this;
-    }
-
-    /**
-     * returns the quotaMax value
-     *
-     * @return integer
-     */
-    public function getQuotaMax()
-    {
-        return $this->quotaMax;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php b/lib/zend/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php
deleted file mode 100644
index a1257319127..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_BaseUserService_GetAccountBalance
-{
-    /**
-     * array of accounts
-     *
-     * @var array
-     */
-    public $Account = array();
-
-    /**
-     * constructor give them the account ids or an empty array
-     *
-     * @param array $Account
-     * @return Zend_Service_DeveloperGarden_Request_GetAccountBalance
-     */
-    public function __construct(array $Account = array())
-    {
-        $this->setAccount($Account);
-    }
-
-    /**
-     * sets a new Account array
-     *
-     * @param array $Account
-     * @return Zend_Service_DeveloperGarden_Request_BaseUserService
-     */
-    public function setAccount(array $Account = array())
-    {
-        $this->Account = $Account;
-        return $this;
-    }
-
-    /**
-     * returns the moduleId
-     *
-     * @return string
-     */
-    public function getAccount()
-    {
-        return $this->Account;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php b/lib/zend/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php
deleted file mode 100644
index 016be25cafb..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_BaseUserService_GetQuotaInformation
-{
-    /**
-     * string module id
-     *
-     * @var string
-     */
-    public $moduleId = null;
-
-    /**
-     * constructor give them the module id
-     *
-     * @param string $moduleId
-     * @return Zend_Service_DeveloperGarden_Request_BaseUserService
-     */
-    public function __construct($moduleId = null)
-    {
-        $this->setModuleId($moduleId);
-    }
-
-    /**
-     * sets a new moduleId
-     *
-     * @param integer $moduleId
-     * @return Zend_Service_DeveloperGarden_Request_BaseUserService
-     */
-    public function setModuleId($moduleId = null)
-    {
-        $this->moduleId = $moduleId;
-        return $this;
-    }
-
-    /**
-     * returns the moduleId
-     *
-     * @return string
-     */
-    public function getModuleId()
-    {
-        return $this->moduleId;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php
deleted file mode 100644
index d68daaba1d8..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the participant details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $participant = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     */
-    public function __construct($environment, $templateId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setParticipant($participant);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * sets new participant
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest
-     */
-    public function setParticipant(Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant)
-    {
-        $this->participant = $participant;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php
deleted file mode 100644
index 9a57705673b..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_CommitConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     */
-    public function __construct($environment, $conferenceId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CommitConferenceRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php
deleted file mode 100644
index 22ee0ce89ee..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * account to be used for this conference
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * object with details for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * object with schedule for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public $schedule = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule
-     * @param integer $account
-     */
-    public function __construct($environment, $ownerId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule = null,
-        $account = null
-    ) {
-        parent::__construct($environment);
-        $this->setOwnerId($ownerId)
-             ->setDetail($conferenceDetails)
-             ->setSchedule($conferenceSchedule)
-             ->setAccount($account);
-    }
-
-    /**
-     * sets $schedule
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $schedule
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setSchedule(
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $schedule = null
-    ) {
-        $this->schedule = $schedule;
-        return $this;
-    }
-
-    /**
-     * sets $detail
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setDetail(Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail)
-    {
-        $this->detail = $detail;
-        return $this;
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setOwnerId($ownerId)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-
-    /**
-     * sets $account
-     *
-     * @param $account
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setAccount($account = null)
-    {
-        $this->account = $account;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php
deleted file mode 100644
index cce82b9b51b..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * object with details for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * array with Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail elements
-     *
-     * @var array
-     */
-    public $participants = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param array $conferenceParticipants
-     */
-    public function __construct($environment, $ownerId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails,
-        array $conferenceParticipants = null
-    ) {
-        parent::__construct($environment);
-        $this->setOwnerId($ownerId)
-             ->setDetail($conferenceDetails)
-             ->setParticipants($conferenceParticipants);
-    }
-
-    /**
-     * sets $participants
-     *
-     * @param array $participants
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
-     */
-    public function setParticipants(array $participants = null)
-    {
-        $this->participants = $participants;
-        return $this;
-    }
-
-    /**
-     * sets $detail
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
-     */
-    public function setDetail(Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail)
-    {
-        $this->detail = $detail;
-        return $this;
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
-     */
-    public function setOwnerId($ownerId)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php
deleted file mode 100644
index 769b17b5ac1..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * @var integer
-     */
-    public $what = null;
-
-    /**
-     * possible what values
-     *
-     * @var array
-     */
-    private $_whatValues = array(
-        0 => 'all conferences',
-        1 => 'just ad-hoc conferences',
-        2 => 'just planned conferences',
-        3 => 'just failed conferences',
-    );
-
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param integer $what
-     * @param string $ownerId
-     */
-    public function __construct($environment, $what = 0, $ownerId = null)
-    {
-        parent::__construct($environment);
-        $this->setWhat($what)
-             ->setOwnerId($ownerId);
-    }
-
-    /**
-     * sets $what
-     *
-     * @param integer $what
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest
-     */
-    public function setWhat($what)
-    {
-        if (!array_key_exists($what, $this->_whatValues)) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('What value not allowed.');
-        }
-        $this->what = $what;
-        return $this;
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest
-     */
-    public function setOwnerId($ownerId)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php
deleted file mode 100644
index bea577d1619..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * what
-     *
-     * @var integer
-     */
-    public $what = null;
-
-    /**
-     * possible what values
-     *
-     * @var array
-     */
-    private $_whatValues = array(
-        0 => 'all conferences',
-        1 => 'just detail, acc and startTime',
-        2 => 'just participants',
-        3 => 'just schedule',
-    );
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param integer $what
-     */
-    public function __construct($environment, $conferenceId, $what)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setWhat($what);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * sets $what
-     *
-     * @param integer $what
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest
-     */
-    public function setWhat($what)
-    {
-        if (!array_key_exists($what, $this->_whatValues)) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('What value not allowed.');
-        }
-        $this->what = $what;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php
deleted file mode 100644
index 77485e76c27..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $ownerId
-     */
-    public function __construct($environment, $ownerId = null)
-    {
-        parent::__construct($environment);
-        $this->setOwnerId($ownerId);
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest
-     */
-    public function setOwnerId($ownerId)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php
deleted file mode 100644
index dd5195e359b..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param string $participantId
-     */
-    public function __construct($environment, $templateId, $participantId)
-    {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setParticipantId($participantId);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php
deleted file mode 100644
index 94a04fc444f..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     */
-    public function __construct($environment, $templateId)
-    {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php
deleted file mode 100644
index 88fcbef78d8..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param string $participantId
-     */
-    public function __construct($environment, $conferenceId, $participantId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setParticipantId($participantId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php
deleted file mode 100644
index 3c72a0bef38..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetRunningConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     */
-    public function __construct($environment, $conferenceId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetRunningConferenceRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php
deleted file mode 100644
index f6ba1d673dc..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * conference participant
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $participant = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     */
-    public function __construct($environment, $conferenceId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setParticipant($participant);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * sets new participant
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest
-     */
-    public function setParticipant(Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant)
-    {
-        $this->participant = $participant;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php
deleted file mode 100644
index 635f7422d69..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     */
-    public function __construct($environment, $conferenceId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php
deleted file mode 100644
index 0b68b8589fe..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param string $participantId
-     */
-    public function __construct($environment, $templateId, $participantId)
-    {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setParticipantId($participantId);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php
deleted file mode 100644
index b45eeb9d865..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     */
-    public function __construct($environment, $templateId)
-    {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php
deleted file mode 100644
index ebc0e452df6..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param string $participantId
-     */
-    public function __construct($environment, $conferenceId, $participantId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setParticipantId($participantId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php
deleted file mode 100644
index b6f5bd85c25..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * account to be used for this conference
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * object with details for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * object with schedule for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public $schedule = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule
-     * @param integer $account
-     */
-    public function __construct($environment, $conferenceId, $ownerId = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule = null,
-        $account = null
-    ) {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setOwnerId($ownerId)
-             ->setDetail($conferenceDetails)
-             ->setSchedule($conferenceSchedule)
-             ->setAccount($account);
-    }
-
-    /**
-     * sets $conferenceId
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId= $conferenceId;
-        return $this;
-    }
-
-    /**
-     * sets $schedule
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $schedule
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setSchedule(
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $schedule = null
-    ) {
-        $this->schedule = $schedule;
-        return $this;
-    }
-
-    /**
-     * sets $detail
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setDetail(
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail = null
-    ) {
-        $this->detail = $detail;
-        return $this;
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setOwnerId($ownerId = null)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-
-    /**
-     * sets $account
-     *
-     * @param $account
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setAccount($account = null)
-    {
-        $this->account = $account;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php
deleted file mode 100644
index 4c327f23b24..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * the participant details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $participant = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param string $participantId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     */
-    public function __construct($environment, $templateId, $participantId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setParticipantId($participantId)
-             ->setParticipant($participant);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-
-    /**
-     * sets new participant
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
-     */
-    public function setParticipant(
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-    ) {
-        $this->participant = $participant;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php
deleted file mode 100644
index 2850fcf87b0..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the initiator id
-     *
-     * @var string
-     */
-    public $initiatorId = null;
-
-    /**
-     * the details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param string $initiatorId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     */
-    public function __construct($environment, $templateId, $initiatorId = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails = null
-    ) {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setInitiatorId($initiatorId)
-             ->setDetail($conferenceDetails);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * set the initiator id
-     *
-     * @param string $initiatorId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
-     */
-    public function setInitiatorId($initiatorId)
-    {
-        $this->initiatorId = $initiatorId;
-        return $this;
-    }
-
-    /**
-     * sets $detail
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
-     */
-    public function setDetail(
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail = null
-    ) {
-        $this->detail = $detail;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php
deleted file mode 100644
index 9057bc53d89..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * conference participant
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $participant = null;
-
-    /**
-     * possible action
-     *
-     * @var integer
-     */
-    public $action = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param string $participantId
-     * @param integer $action
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     */
-    public function __construct($environment, $conferenceId, $participantId,
-        $action = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setParticipantId($participantId)
-             ->setAction($action)
-             ->setParticipant($participant);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-
-    /**
-     * sets new action
-     *
-     * @param integer $action
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-     */
-    public function setAction($action = null)
-    {
-        if ($action !== null) {
-            Zend_Service_DeveloperGarden_ConferenceCall::checkParticipantAction($action);
-        }
-        $this->action = $action;
-        return $this;
-    }
-
-    /**
-     * sets new participant
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-     */
-    public function setParticipant(
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        $this->participant = $participant;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/Exception.php b/lib/zend/Zend/Service/DeveloperGarden/Request/Exception.php
deleted file mode 100644
index 291d716f4b8..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * Zend_Service_DeveloperGarden_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_Exception
-    extends Zend_Service_DeveloperGarden_Exception
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php
deleted file mode 100644
index e932634bbaa..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_IpLocation_IpAddress
- */
-require_once 'Zend/Service/DeveloperGarden/IpLocation/IpAddress.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_IpLocation_LocateIPRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the ip addresses to lookup for
-     *
-     * @var Zend_Service_DeveloperGarden_Request_IpLocation_IpAddress
-     */
-    public $address = null;
-
-    /**
-     * the account
-     *
-     * @var string
-     */
-    public $account = null;
-
-    /**
-     * constructor give them the environment
-     *
-     * @param integer $environment
-     * @param Zend_Service_DeveloperGarden_IpLocation_IpAddress|array $ip
-     *
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment, $ip = null)
-    {
-        parent::__construct($environment);
-
-        if ($ip !== null) {
-            $this->setIp($ip);
-        }
-    }
-
-    /**
-     * sets new ip or array of ips
-     *
-     * @param Zend_Service_DeveloperGarden_IpLocation_IpAddress|array $ip
-     *
-     * @return Zend_Service_DeveloperGarden_Request_IpLocation_LocateIPRequest
-     */
-    public function setIp($ip)
-    {
-        if ($ip instanceof Zend_Service_DeveloperGarden_IpLocation_IpAddress) {
-            $this->address[] = array(
-                'ipType'    => $ip->getVersion(),
-                'ipAddress' => $ip->getIp(),
-            );
-            return $this;
-        }
-
-        if (is_array($ip)) {
-            foreach ($ip as $ipObject) {
-                if (!$ipObject instanceof Zend_Service_DeveloperGarden_IpLocation_IpAddress
-                    && !is_string($ipObject)
-                ) {
-                    require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-                    throw new Zend_Service_DeveloperGarden_Request_Exception(
-                        'Not a valid Ip Address object found.'
-                    );
-                }
-                $this->setIp($ipObject);
-            }
-            return $this;
-        }
-
-        if (!is_string($ip)) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('Not a valid Ip Address object found.');
-        }
-
-        return $this->setIp(new Zend_Service_DeveloperGarden_IpLocation_IpAddress($ip));
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php b/lib/zend/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php
deleted file mode 100644
index 58d8c1b3162..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_LocalSearch_LocalSearchRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * array of search parameters
-     *
-     * @var array
-     */
-    public $searchParameters = null;
-
-    /**
-     * original object
-     *
-     * @var Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    private $_searchParameters = null;
-
-    /**
-     * account id
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * constructor give them the environment and the sessionId
-     *
-     * @param integer $environment
-     * @param Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters
-     * @param integer $account
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment, 
-        Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters, 
-        $account = null
-    ) {
-        parent::__construct($environment);
-        $this->setSearchParameters($searchParameters)
-             ->setAccount($account);
-    }
-
-    /**
-     * @param integer $account
-     */
-    public function setAccount($account = null)
-    {
-        $this->account = $account;
-        return $this;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
-
-    /**
-     * @param Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters
-     */
-    public function setSearchParameters(
-        Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters
-    ) {
-        $this->searchParameters  = $searchParameters->getSearchParameters();
-        $this->_searchParameters = $searchParameters;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function getSearchParameters()
-    {
-        return $this->_searchParameters;
-    }
-
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/RequestAbstract.php b/lib/zend/Zend/Service/DeveloperGarden/Request/RequestAbstract.php
deleted file mode 100644
index f45ecfd569b..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/RequestAbstract.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * environment value
-     *
-     * @var integer
-     */
-    public $environment = null;
-
-    /**
-     * constructor give them the environment
-     *
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment)
-    {
-        $this->setEnvironment($environment);
-    }
-
-    /**
-     * sets a new moduleId
-     *
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function setEnvironment($environment)
-    {
-        $this->environment = $environment;
-        return $this;
-    }
-
-    /**
-     * the current configured environment value
-     *
-     * @return integer
-     */
-    public function getEnvironment()
-    {
-        return $this->environment;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php b/lib/zend/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php
deleted file mode 100644
index 9f723ee73b1..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the number or numbers to receive this sms
-     *
-     * @var string
-     */
-    public $number = null;
-
-    /**
-     * the message of this sms
-     *
-     * @var string
-     */
-    public $message = null;
-
-    /**
-     * name of the sender
-     *
-     * @var string
-     */
-    public $originator = null;
-
-    /**
-     * account
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * array of special chars that are used for counting
-     * message length
-     *
-     * @var array
-     */
-    private $_specialChars = array(
-        '|', 
-        '^', 
-        '{', 
-        '}', 
-        '[', 
-        ']', 
-        '~', 
-        '\\', 
-        "\n",
-        // '€', removed because its counted in utf8 correctly
-    );
-
-    /**
-     * what SMS type is it
-     *
-     * 1 = SMS
-     * 2 = FlashSMS
-     *
-     * @var integer
-     */
-    protected $_smsType = 1;
-
-    /**
-     * the counter for increasing message count
-     * if more than this 160 chars we send a 2nd or counting
-     * sms message
-     *
-     * @var integer
-     */
-    protected $_smsLength = 153;
-
-    /**
-     * maximum length of an sms message
-     *
-     * @var integer
-     */
-    protected $_maxLength = 765;
-
-    /**
-     * the maximum numbers to send an sms
-     *
-     * @var integer
-     */
-    protected $_maxNumbers = 10;
-
-    /**
-     * returns the assigned numbers
-     *
-     * @return string $number
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * set a new number(s)
-     *
-     * @param string $number
-     * @throws Zend_Service_DeveloperGarden_Request_Exception
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-        if ($this->getNumberCount() > $this->_maxNumbers) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('The message is too long.');
-        }
-        return $this;
-    }
-
-    /**
-     * returns the current message
-     *
-     * @return string $message
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * sets a new message
-     *
-     * @param string $message
-     * @throws Zend_Service_DeveloperGarden_Request_Exception
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-     */
-    public function setMessage($message)
-    {
-        $this->message = $message;
-        if ($this->getMessageLength() > $this->_maxLength) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('The message is too long.');
-        }
-        return $this;
-    }
-
-    /**
-     * returns the originator
-     *
-     * @return the $originator
-     */
-    public function getOriginator()
-    {
-        return $this->originator;
-    }
-
-    /**
-     * the originator name
-     *
-     * @param string $originator
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-     */
-    public function setOriginator($originator)
-    {
-        $this->originator = $originator;
-        return $this;
-    }
-
-    /**
-     * the account
-     * @return integer $account
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
-
-    /**
-     * sets a new accounts
-     *
-     * @param $account the $account to set
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-     */
-    public function setAccount($account)
-    {
-        $this->account = $account;
-        return $this;
-    }
-
-    /**
-     * returns the calculated message length
-     *
-     * @return integer
-     */
-    public function getMessageLength()
-    {
-        $message = $this->getMessage();
-        $length  = strlen($message);
-
-        foreach ($this->_specialChars as $char) {
-            $c = (substr_count($message, $char) * 2) - 1;
-            if ($c > 0) {
-                $length += $c;
-            }
-        }
-
-        return $length;
-    }
-
-    /**
-     * returns the count of sms messages that would be send
-     *
-     * @return integer
-     */
-    public function getMessageCount()
-    {
-        $smsLength = $this->getMessageLength();
-        $retValue = 1;
-        if ($smsLength > 160) {
-            $retValue = ceil($smsLength / $this->_smsLength);
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns the count of numbers in this sms
-     *
-     * @return integer
-     */
-    public function getNumberCount()
-    {
-        $number   = $this->getNumber();
-        $retValue = 0;
-        if (!empty($number)) {
-            $retValue = count(explode(',', $number));
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns the sms type
-     * currently we have
-     * 1 = Sms
-     * 2 = FlashSms
-     *
-     * @return integer
-     */
-    public function getSmsType()
-    {
-        return $this->_smsType;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php b/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php
deleted file mode 100644
index a0af0b97169..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_SmsValidation_Invalidate
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the number
-     *
-     * @var string
-     */
-    public $number = null;
-
-    /**
-     * create the class for validation a sms keyword
-     *
-     * @param integer $environment
-     * @param string $keyword
-     * @param string $number
-     */
-    public function __construct($environment, $number = null)
-    {
-        parent::__construct($environment);
-        $this->setNumber($number);
-    }
-
-    /**
-     * returns the number
-     *
-     * @return string $number
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * set a new number
-     *
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php b/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php
deleted file mode 100644
index 31b8733c1a8..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_SmsValidation_SendValidationKeyword
-    extends Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php b/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php
deleted file mode 100644
index e5c4358f3a6..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the keyword to be used for validation
-     *
-     * @var string
-     */
-    public $keyword = null;
-
-    /**
-     * the number
-     *
-     * @var string
-     */
-    public $number = null;
-
-    /**
-     * returns the keyword
-     *
-     * @return string $keyword
-     */
-    public function getKeyword ()
-    {
-        return $this->keyword;
-    }
-
-    /**
-     * create the class for validation a sms keyword
-     *
-     * @param integer $environment
-     * @param string $keyword
-     * @param string $number
-     */
-    public function __construct($environment, $keyword = null, $number = null)
-    {
-        parent::__construct($environment);
-        $this->setKeyword($keyword)
-             ->setNumber($number);
-    }
-
-    /**
-     * set a new keyword
-     *
-     * @param string $keyword
-     * @return Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
-     */
-    public function setKeyword($keyword)
-    {
-        $this->keyword = $keyword;
-        return $this;
-    }
-
-    /**
-     * returns the number
-     *
-     * @return string $number
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * set a new number
-     *
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php b/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php
deleted file mode 100644
index 19fc52a51d3..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus
-    extends Zend_Service_DeveloperGarden_Request_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * extend the keep alive for this call
-     *
-     * @var integer
-     */
-    public $keepAlive = null;
-
-    /**
-     * constructor give them the environment and the sessionId
-     *
-     * @param integer $environment
-     * @param string $sessionId
-     * @param integer $keepAlive
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment, $sessionId, $keepAlive = null)
-    {
-        parent::__construct($environment);
-        $this->setSessionId($sessionId)
-             ->setKeepAlive($keepAlive);
-    }
-
-    /**
-     * @return string
-     */
-    public function getSessionId()
-    {
-        return $this->sessionId;
-    }
-
-    /**
-     * sets new sessionId
-     *
-     * @param string $sessionId
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus
-     */
-    public function setSessionId($sessionId)
-    {
-        $this->sessionId = $sessionId;
-        return $this;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getKeepAlive()
-    {
-        return $this->keepAlive;
-    }
-
-    /**
-     * sets new keepAlive flag
-     *
-     * @param integer $keepAlive
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus
-     */
-    public function setKeepAlive($keepAlive)
-    {
-        $this->keepAlive = $keepAlive;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php b/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php
deleted file mode 100644
index 2bd383cc32b..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-    extends Zend_Service_DeveloperGarden_Request_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * the first number to be called
-     *
-     * @var string
-     */
-    public $aNumber = null;
-
-    /**
-     * the second number to be called
-     *
-     * @var string
-     */
-    public $bNumber = null;
-
-    /**
-     * Calling Line Identity Restriction (CLIR) disabled for $aNumber
-     *
-     * @var boolean
-     */
-    public $privacyA = null;
-
-    /**
-     * Calling Line Identity Restriction (CLIR) disabled for $bNumber
-     *
-     * @var boolean
-     */
-    public $privacyB = null;
-
-    /**
-     * time in seconds to wait for $aNumber
-     *
-     * @var integer
-     */
-    public $expiration = null;
-
-    /**
-     * max duration for this call in seconds
-     *
-     * @var integer
-     */
-    public $maxDuration = null;
-
-    /**
-     * param not used right now
-     *
-     * @var string
-     */
-    public $greeter = null;
-
-    /**
-     * Account Id which will be pay for this call
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * @return string
-     */
-    public function getANumber()
-    {
-        return $this->aNumber;
-    }
-
-    /**
-     * @param string $aNumber
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setANumber($aNumber)
-    {
-        $this->aNumber = $aNumber;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBNumber()
-    {
-        return $this->bNumber;
-    }
-
-    /**
-     * @param string $bNumber
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setBNumber($bNumber)
-    {
-        $this->bNumber = $bNumber;
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getPrivacyA()
-    {
-        return $this->privacyA;
-    }
-
-    /**
-     * @param boolean $privacyA
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setPrivacyA($privacyA)
-    {
-        $this->privacyA = $privacyA;
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getPrivacyB()
-    {
-        return $this->privacyB;
-    }
-
-    /**
-     * @param boolean $privacyB
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setPrivacyB($privacyB)
-    {
-        $this->privacyB = $privacyB;
-        return $this;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getExpiration()
-    {
-        return $this->expiration;
-    }
-
-    /**
-     * @param integer $expiration
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setExpiration($expiration)
-    {
-        $this->expiration = $expiration;
-        return $this;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getMaxDuration()
-    {
-        return $this->maxDuration;
-    }
-
-    /**
-     * @param integer $maxDuration
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setMaxDuration($maxDuration)
-    {
-        $this->maxDuration = $maxDuration;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getGreeter()
-    {
-        return $this->greeter;
-    }
-
-    /**
-     * @param string $greeter
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setGreeter($greeter)
-    {
-        $this->greeter = $greeter;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
-
-    /**
-     * @param integer $account
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setAccount($account)
-    {
-        $this->account = $account;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php b/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php
deleted file mode 100644
index 835028f6d26..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_VoiceButler_NewCall
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_VoiceButler_NewCallSequenced
-    extends Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-{
-    /**
-     * array of second numbers to be called sequenced
-     *
-     * @var array
-     */
-    public $bNumber = null;
-
-    /**
-     * max wait value to wait for new number to be called
-     *
-     * @var integer
-     */
-    public $maxWait = null;
-
-    /**
-     * @return array
-     */
-    public function getBNumber()
-    {
-        return $this->bNumber;
-    }
-
-    /**
-     * @param array $bNumber
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    /*public function setBNumber(array $bNumber)
-    {
-        $this->bNumber = $bNumber;
-        return $this;
-    }*/
-
-    /**
-     * returns the max wait value
-     *
-     * @return integer
-     */
-    public function getMaxWait()
-    {
-        return $this->maxWait;
-    }
-
-    /**
-     * sets new max wait value for next number call
-     *
-     * @param integer $maxWait
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCallSequenced
-     */
-    public function setMaxWait($maxWait)
-    {
-        $this->maxWait = $maxWait;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php b/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php
deleted file mode 100644
index cce5c2e0908..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_VoiceButler_TearDownCall
-    extends Zend_Service_DeveloperGarden_Request_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * the session id
-     *
-     * @var string
-     */
-    public $sessionId = null;
-
-    /**
-     * constructor give them the environment and the sessionId
-     *
-     * @param integer $environment
-     * @param string $sessionId
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment, $sessionId)
-    {
-        parent::__construct($environment);
-        $this->setSessionId($sessionId);
-    }
-
-    /**
-     * @return string
-     */
-    public function getSessionId()
-    {
-        return $this->sessionId;
-    }
-
-    /**
-     * sets new sessionId
-     *
-     * @param string $sessionId
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_TearDownCall
-     */
-    public function setSessionId($sessionId)
-    {
-        $this->sessionId = $sessionId;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/BaseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/BaseType.php
deleted file mode 100644
index 2b7615fc99f..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/BaseType.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_BaseType
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * the status code
-     *
-     * @var string
-     */
-    public $statusCode = null;
-
-    /**
-     * the status message
-     *
-     * @var string
-     */
-    public $statusMessage = null;
-
-    /**
-     * parse the result
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return Zend_Service_DeveloperGarden_Response_ResponseAbstract
-     */
-    public function parse()
-    {
-        if ($this->hasError()) {
-            throw new Zend_Service_DeveloperGarden_Response_Exception(
-                $this->getStatusMessage(),
-                $this->getStatusCode()
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * returns the error code
-     *
-     * @return string|null
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getStatusMessage()
-    {
-        return $this->statusMessage;
-    }
-
-    /**
-     * returns true if the errorCode is not null and not 0000
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return ($this->statusCode === null
-             || $this->statusCode == '0000');
-    }
-
-    /**
-     * returns true if we have a error situation
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        return ($this->statusCode !== null
-             && $this->statusCode != '0000');
-    }
-
-    /**
-     * returns the error code (statusCode)
-     *
-     * @return string|null
-     */
-    public function getErrorCode()
-    {
-        if (empty($this->errorCode)) {
-            return $this->statusCode;
-        } else {
-            return $this->errorCode;
-        }
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        if (empty($this->errorMessage)) {
-            return $this->statusMessage;
-        } else {
-            return $this->errorMessage;
-        }
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php
deleted file mode 100644
index d493b38535c..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php
deleted file mode 100644
index a775a1d05c4..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_BaseUserService_GetAccountBalanceResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php
deleted file mode 100644
index adbcdfa3db6..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * System defined limit of quota points per day
-     *
-     * @var integer
-     */
-    public $maxQuota = null;
-
-    /**
-     * User specific limit of quota points per day
-     * cant be more than $maxQuota
-     *
-     * @var integer
-     */
-    public $maxUserQuota = null;
-
-    /**
-     * Used quota points for the current day
-     *
-     * @var integer
-     */
-    public $quotaLevel = null;
-
-    /**
-     * returns the quotaLevel
-     *
-     * @return integer
-     */
-    public function getQuotaLevel()
-    {
-        return $this->quotaLevel;
-    }
-
-    /**
-     * returns the maxUserQuota
-     *
-     * @return integer
-     */
-    public function getMaxUserQuota()
-    {
-        return $this->maxUserQuota;
-    }
-
-    /**
-     * return the maxQuota
-     *
-     * @return integer
-     */
-    public function getMaxQuota()
-    {
-        return $this->maxQuota;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php
deleted file mode 100644
index 35507ed1c22..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType
-     */
-    public $addConferenceTemplateParticipantResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php
deleted file mode 100644
index bca74cdf6cb..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php
deleted file mode 100644
index 897d2516f5e..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CommitConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php
deleted file mode 100644
index e23f55fed85..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * returns the response object or null
-     *
-     * @return mixed
-     */
-    public function getResponse()
-    {
-        $r = new ReflectionClass($this);
-        foreach ($r->getProperties() as $p) {
-            $name = $p->getName();
-            if (strpos($name, 'Response') !== false) {
-                return $p->getValue($this);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * parse the response data and throws exceptions
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return mixed
-     */
-    public function parse()
-    {
-        $retVal = $this->getResponse();
-        if ($retVal === null) {
-            $this->statusCode    = 9999;
-            $this->statusMessage = 'Internal response property not found.';
-        } else {
-            $this->statusCode    = $retVal->getStatusCode();
-            $this->statusMessage = $retVal->getStatusMessage();
-        }
-        parent::parse();
-        return $retVal;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php
deleted file mode 100644
index 7be2b8a4d33..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType
-     */
-    public $createConferenceResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php
deleted file mode 100644
index 0dbcfc44b8a..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * the conference Id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * return the conference id
-     *
-     * @return string
-     */
-    public function getConferenceId()
-    {
-        return $this->conferenceId;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php
deleted file mode 100644
index fbedac28273..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType
-     */
-    public $createConferenceTemplateResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php
deleted file mode 100644
index f85a90b67a4..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType
-     */
-    public $getConferenceListResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php
deleted file mode 100644
index 6c2c1cc98a6..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * array with conferences ids
-     *
-     * @var array
-     */
-    public $conferenceIds = array();
-
-    /**
-     * array with conference ids
-     *
-     * @return array
-     */
-    public function getConferenceIds()
-    {
-        return (array) $this->conferenceIds;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php
deleted file mode 100644
index febe57ca924..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType
-     */
-    public $getConferenceStatusResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php
deleted file mode 100644
index 1026462c141..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * conference starttime
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public $schedule = null;
-
-    /**
-     * the starttime as longint
-     *
-     * @var integer
-     */
-    public $startTime = null;
-
-    /**
-     * array of Zend_Service_DeveloperGarden_ConferenceCall_Participant
-     *
-     * @var array
-     */
-    public $participants = null;
-
-    /**
-     * the account object
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount
-     */
-    public $acc = null;
-
-    /**
-     * returns the details object
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function getDetail()
-    {
-        return $this->detail;
-    }
-
-    /**
-     * returns the starttime
-     *
-     * @return integer
-     */
-    public function getStartTime()
-    {
-        return $this->startTime;
-    }
-
-    /**
-     * returns the schedule object
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function getSchedule()
-    {
-        return $this->schedule;
-    }
-
-    /**
-     * returns array with all participants
-     * Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     *
-     * @return array of Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getParticipants()
-    {
-        if ($this->participants instanceof Zend_Service_DeveloperGarden_ConferenceCall_Participant) {
-            $this->participants = array(
-                $this->participants
-            );
-        }
-        return $this->participants;
-    }
-
-    /**
-     * returns the participant object if found in the response
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getParticipantById($participantId)
-    {
-        $participants = $this->getParticipants();
-        if ($participants !== null) {
-            foreach ($participants as $participant) {
-                if (strcmp($participant->getParticipantId(), $participantId) == 0) {
-                    return $participant;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * returns the conference account details
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount
-     */
-    public function getAccount()
-    {
-        return $this->acc;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php
deleted file mode 100644
index 001628dcdc8..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType
-     */
-    public $getConferenceTemplateListResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php
deleted file mode 100644
index db3418c5153..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * array with template ids
-     *
-     * @var array
-     */
-    public $templateIds = array();
-
-    /**
-     * array with template ids
-     *
-     * @return array
-     */
-    public function getTemplateIds()
-    {
-        return (array)$this->templateIds;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php
deleted file mode 100644
index 2c903697c1d..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType
-     */
-    public $getConferenceTemplateParticipantResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php
deleted file mode 100644
index e41c728df71..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * the participant
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_Participant
-     */
-    public $participant = null;
-
-    /**
-     * returns the participant details
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getParticipant()
-    {
-        return $this->participant;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php
deleted file mode 100644
index 087038c8a36..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType
-     */
-    public $getConferenceTemplateResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php
deleted file mode 100644
index f167fbfa26a..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * array of Zend_Service_DeveloperGarden_ConferenceCall_Participant
-     *
-     * @var array
-     */
-    public $participants = null;
-
-    /**
-     * returns the details object
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function getDetail()
-    {
-        return $this->detail;
-    }
-
-    /**
-     * returns array with all participants
-     * Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     *
-     * @return array of Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getParticipants()
-    {
-        if ($this->participants instanceof Zend_Service_DeveloperGarden_ConferenceCall_Participant) {
-            $this->participants = array(
-                $this->participants
-            );
-        }
-        return $this->participants;
-    }
-
-    /**
-     * returns the participant object if found in the response
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_Participant
-     */
-    public function getParticipantById($participantId)
-    {
-        $participants = $this->getParticipants();
-        if ($participants !== null) {
-            foreach ($participants as $participant) {
-                if (strcmp($participant->getParticipantId(), $participantId) == 0) {
-                    return $participant;
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php
deleted file mode 100644
index 8212cb03ded..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType
-     */
-    public $getParticipantStatusResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php
deleted file mode 100644
index 0f064f7d29c..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * @var array
-     */
-    public $status = null;
-
-    /**
-     * returns the status array
-     * a array of
-     * Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-     *
-     * @return array
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php
deleted file mode 100644
index cfc6a84fb5f..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType
-     */
-    public $getRunningConferenceResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php
deleted file mode 100644
index 881a9434477..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType
-     */
-    public $newParticipantResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php
deleted file mode 100644
index 1fce9771cfe..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * the participant Id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * return the participant id
-     *
-     * @return string
-     */
-    public function getParticipantId()
-    {
-        return $this->participantId;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php
deleted file mode 100644
index 8a2f24206aa..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php
deleted file mode 100644
index 495731e1f08..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php
deleted file mode 100644
index c7f45ed35be..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php
deleted file mode 100644
index 75c61ca5dbe..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php
deleted file mode 100644
index 36eb4baf3e7..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php
deleted file mode 100644
index 0759ebf3f60..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php
deleted file mode 100644
index 8cec26b4773..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php
deleted file mode 100644
index 9caf999809c..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/Exception.php b/lib/zend/Zend/Service/DeveloperGarden/Response/Exception.php
deleted file mode 100644
index 3dafa50c6fc..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * Zend_Service_DeveloperGarden_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_Exception
-    extends Zend_Service_DeveloperGarden_Exception
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php
deleted file mode 100644
index 27868db460c..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * @var Zend_Service_DeveloperGarden_Response_IpLocation_RegionType
-     */
-    public $isInRegion = null;
-
-    /**
-     * @var Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType
-     */
-    public $isInGeo = null;
-
-    /**
-     * @var Zend_Service_DeveloperGarden_Response_IpLocation_CityType
-     */
-    public $isInCity = null;
-
-    /**
-     * @var integer
-     */
-    public $ipType = null;
-
-    /**
-     * @var string
-     */
-    public $ipAddress = null;
-
-    /**
-     * @var integer
-     */
-    public $radius = 0;
-
-    /**
-     * @return Zend_Service_DeveloperGarden_Response_IpLocation_RegionType
-     */
-    public function getRegion()
-    {
-        return $this->isInRegion;
-    }
-
-    /**
-     * @return Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType
-     */
-    public function getGeoCoordinates()
-    {
-        return $this->isInGeo;
-    }
-
-    /**
-     * @return Zend_Service_DeveloperGarden_Response_IpLocation_CityType
-     */
-    public function getCity()
-    {
-        return $this->isInCity;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getIpType()
-    {
-        return $this->ipType;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIpAddress()
-    {
-        return $this->ipAddress;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getRadius()
-    {
-        return $this->radius;
-    }
-
-    /**
-     * implement parsing
-     *
-     */
-    public function parse()
-    {
-        parent::parse();
-        if ($this->isInCity === null) {
-            require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php';
-            $this->isInCity = new Zend_Service_DeveloperGarden_Response_IpLocation_CityType();
-        }
-
-        if ($this->isInRegion === null) {
-            require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php';
-            $this->isInRegion = new Zend_Service_DeveloperGarden_Response_IpLocation_RegionType();
-        }
-
-        if ($this->isInGeo === null) {
-            require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php';
-            $this->isInGeo = new Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType();
-        }
-
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php
deleted file mode 100644
index fa1c4826d43..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * internal data object array of
-     * elements
-     *
-     * @var array
-     */
-    public $ipAddressLocation = array();
-
-    /**
-     * constructor
-     *
-     * @param Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType $response
-     */
-    public function __construct(
-        Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType $response
-    ) {
-        if ($response->ipAddressLocation instanceof Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType) {
-            if (is_array($response->ipAddressLocation)) {
-                foreach ($response->ipAddressLocation as $location) {
-                    $this->ipAddressLocation[] = $location;
-                }
-
-            } else {
-                $this->ipAddressLocation[] = $response->ipAddressLocation;
-            }
-        } elseif (is_array($response->ipAddressLocation)) {
-            $this->ipAddressLocation = $response->ipAddressLocation;
-        }
-
-        $this->errorCode     = $response->getErrorCode();
-        $this->errorMessage  = $response->getErrorMessage();
-        $this->statusCode    = $response->getStatusCode();
-        $this->statusMessage = $response->getStatusMessage();
-    }
-
-    /**
-     * implement own parsing mechanism to fix broken wsdl implementation
-     */
-    public function parse()
-    {
-        parent::parse();
-        if (is_array($this->ipAddressLocation)) {
-            foreach ($this->ipAddressLocation as $address) {
-                $address->parse();
-            }
-        } elseif ($this->ipAddressLocation instanceof Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType) {
-            $this->ipAddressLocation->parse();
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getIpAddressLocation()
-    {
-        return $this->ipAddressLocation;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php
deleted file mode 100644
index 34d8c92e17b..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * internal data object array of
-     * elements
-     *
-     * @var array|Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType
-     */
-    public $ipAddressLocation = array();
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php b/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php
deleted file mode 100644
index 2da4e630b11..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_RegionType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * country code
-     * @var string
-     */
-    public $countryCode = null;
-
-    /**
-     * region code
-     * @var string
-     */
-    public $regionCode = null;
-
-    /**
-     * region Name
-     * @var string
-     */
-    public $regionName = null;
-
-    /**
-     * @return string
-     */
-    public function getCountryCode()
-    {
-        return $this->countryCode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRegionCode()
-    {
-        return $this->regionCode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRegionName()
-    {
-        return $this->regionName;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php
deleted file mode 100644
index cb9a188c1f8..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     *
-     * @var Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
-     */
-    public $searchResult = null;
-
-    /**
-     * constructor
-     *
-     * @param Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType $response
-     * @todo implement special result methods
-     */
-    public function __construct(
-        Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType $response
-    ) {
-        $this->errorCode     = $response->getErrorCode();
-        $this->errorMessage  = $response->getErrorMessage();
-        $this->statusCode    = $response->getStatusCode();
-        $this->statusMessage = $response->getStatusMessage();
-        $this->searchResult  = $response;
-    }
-
-    /**
-     * returns the raw search result
-     *
-     * @return Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
-     */
-    public function getSearchResult()
-    {
-        return $this->searchResult;
-    }
-
-    /**
-     * overwrite hasError to not handle 0103 error (empty result)
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        $result = parent::hasError();
-        if (!$result && $this->statusCode == '0103') {
-            $result = false;
-        }
-        return $result;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php b/lib/zend/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php
deleted file mode 100644
index b92d4402370..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Response/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * errorCode
-     *
-     * @var string
-     */
-    public $errorCode = null;
-
-    /**
-     * errorMessage
-     *
-     * @var string
-     */
-    public $errorMessage = null;
-
-    /**
-     * parse the token data and throws exceptions
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return Zend_Service_DeveloperGarden_Response_ResponseAbstract
-     */
-    public function parse()
-    {
-        if ($this->hasError()) {
-            throw new Zend_Service_DeveloperGarden_Response_Exception(
-                $this->getErrorMessage(),
-                $this->getErrorCode()
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * returns the error code
-     *
-     * @return string|null
-     */
-    public function getErrorCode()
-    {
-        return $this->errorCode;
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        return $this->errorMessage;
-    }
-
-    /**
-     * returns true if the errorCode is not null and not 0000
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return ($this->errorCode === null
-             || $this->errorCode == '0000');
-    }
-
-    /**
-     * returns true if we have a error situation
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        return ($this->errorCode !== null
-                && $this->errorCode != '0000');
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php
deleted file mode 100644
index 358cef7e9bf..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * Zend_Service_Response_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Response/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Exception
-    extends Zend_Service_DeveloperGarden_Response_Exception
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php
deleted file mode 100644
index ff50c089b8f..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-    implements Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
-{
-    /**
-     * the security token
-     * @var Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse
-     */
-    public $securityToken = null;
-
-    /**
-     * returns the security token
-     *
-     * @return string
-     */
-    public function getTokenData()
-    {
-        return $this->getSecurityToken();
-    }
-
-    /**
-     * returns the security token
-     *
-     * @return string
-     */
-    public function getSecurityToken()
-    {
-        if (!$this->securityToken instanceof Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse) {
-            require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Exception(
-                'No valid securityToken found.'
-            );
-        }
-        return $this->securityToken->getTokenData();
-    }
-
-    /**
-     * returns true if the stored token data is valid
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        /**
-         * @todo implement the true token validation check
-         */
-        if (isset($this->securityToken)
-            && !empty($this->securityToken->tokenData)
-        ) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php
deleted file mode 100644
index f70bc99c005..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-    implements Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
-{
-    /**
-     * the token format, should be saml20
-     *
-     * @var string
-     */
-    public $tokenFormat = null;
-
-    /**
-     * the token encoding, should be text/xml
-     *
-     * @var string
-     */
-    public $tokenEncoding = null;
-
-    /**
-     * the tokenData should be a valid Assertion value
-     *
-     * @var unknown_type
-     */
-    public $tokenData = null;
-
-    /**
-     * returns the tokenData
-     *
-     * @return string
-     */
-    public function getTokenData()
-    {
-        if (empty($this->tokenData)) {
-            require_once 'Zend/Services/DeveloperGarden/Response/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Response_Exception('No valid tokenData found.');
-        }
-
-        return $this->tokenData;
-    }
-
-    /**
-     * returns the token format value
-     *
-     * @return string
-     */
-    public function getTokenFormat()
-    {
-        return $this->tokenFormat;
-    }
-
-    /**
-     * returns the token encoding
-     *
-     * @return string
-     */
-    public function getTokenEncoding()
-    {
-        return $this->tokenEncoding;
-    }
-
-    /**
-     * returns true if the stored token data is valid
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        /**
-         * @todo implement the true token validation check
-         */
-        if (!empty($this->securityTokenData)) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php
deleted file mode 100644
index 69c79c8cc9d..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SendSms_SendFlashSMSResponse
-    extends Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php
deleted file mode 100644
index bab71108a68..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SendSms_SendSMSResponse
-    extends Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php
deleted file mode 100644
index cf1fea56529..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * the return from the sms request
-     *
-     * @var stdClass
-     */
-    public $return = null;
-
-    /**
-     * parse the response data and throws exceptions
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return Zend_Service_DeveloperGarden_Response_ResponseAbstract
-     */
-    public function parse()
-    {
-        if ($this->hasError()) {
-            require_once 'Zend/Service/DeveloperGarden/Response/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Response_Exception(
-                $this->getErrorMessage(),
-                $this->getErrorCode()
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * returns the error code
-     *
-     * @return string|null
-     */
-    public function getErrorCode()
-    {
-        $retValue = null;
-        if ($this->return instanceof stdClass) {
-            $retValue = $this->return->status;
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        $retValue = null;
-        if ($this->return instanceof stdClass) {
-            $retValue = $this->return->description;
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns true if the errorCode is not null and not 0000
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return ($this->return === null
-                || $this->return->status == '0000');
-    }
-
-    /**
-     * returns true if we have a error situation
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        $retValue = false;
-        if ($this->return instanceof stdClass
-            && $this->return->status != '0000'
-        ) {
-            $retValue = true;
-        }
-        return $retValue;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php
deleted file mode 100644
index 7dd40c2c412..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_GetValidatedNumbersResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * array of validated numbers
-     *
-     * @var array of Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber
-     */
-    public $validatedNumbers = null;
-
-    /**
-     * returns the internal array of validated numbers
-     *
-     * @return array of Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber
-     */
-    public function getNumbers()
-    {
-        return (array) $this->validatedNumbers;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php
deleted file mode 100644
index 91d0e937c64..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_ValidateResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php
deleted file mode 100644
index 1f81f90b4fc..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_SendValidationKeywordResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php
deleted file mode 100644
index bea46a6912b..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_InvalidateResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php b/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php
deleted file mode 100644
index 4482b8e5d93..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatus2Response
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
-{
-    /**
-     * returns the phone number of the second participant, who was called.
-     *
-     * @return string
-     */
-    public function getBe164()
-    {
-        return $this->getBNumber();
-    }
-
-    /**
-     * returns the phone number of the second participant, who was called.
-     *
-     * @return string
-     */
-    public function getBNumber()
-    {
-        if (isset($this->return->be164)) {
-            return $this->return->be164;
-        }
-        return null;
-    }
-
-    /**
-     * Index of the phone number of the second participant (B), who was called. The value 0 means
-     * the first B party phone number which was called, 1 means the second B party phone number
-     * which was called etc.
-     *
-     * @return integer
-     */
-    public function getBNumberIndex()
-    {
-        return $this->getBIndex();
-    }
-
-    /**
-     * Index of the phone number of the second participant (B), who was called. The value 0 means
-     * the first B party phone number which was called, 1 means the second B party phone number
-     * which was called etc.
-     *
-     * @return integer
-     */
-    public function getBIndex()
-    {
-        if (isset($this->return->bindex)) {
-            return $this->return->bindex;
-        }
-        return null;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php
deleted file mode 100644
index bdb39354e98..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * returns the session id
-     * @return string
-     */
-    public function getSessionId()
-    {
-        if (isset($this->return->sessionId)) {
-            return $this->return->sessionId;
-        }
-        return null;
-    }
-
-    /**
-     * returns the connection time for participant a
-     *
-     * @return integer
-     */
-    public function getConnectionTimeA()
-    {
-        if (isset($this->return->connectiontimea)) {
-            return $this->return->connectiontimea;
-        }
-        return null;
-    }
-
-    /**
-     * returns the connection time for participant b
-     *
-     * @return integer
-     */
-    public function getConnectionTimeB()
-    {
-        if (isset($this->return->connectiontimeb)) {
-            return $this->return->connectiontimeb;
-        }
-        return null;
-    }
-
-    /**
-     * returns the description time for participant a
-     *
-     * @return string
-     */
-    public function getDescriptionA()
-    {
-        if (isset($this->return->descriptiona)) {
-            return $this->return->descriptiona;
-        }
-        return null;
-    }
-
-    /**
-     * returns the description time for participant b
-     *
-     * @return string
-     */
-    public function getDescriptionB()
-    {
-        if (isset($this->return->descriptionb)) {
-            return $this->return->descriptionb;
-        }
-        return null;
-    }
-
-    /**
-     * returns the reason time for participant a
-     *
-     * @return integer
-     */
-    public function getReasonA()
-    {
-        if (isset($this->return->reasona)) {
-            return $this->return->reasona;
-        }
-        return null;
-    }
-
-    /**
-     * returns the reason time for participant b
-     *
-     * @return integer
-     */
-    public function getReasonB()
-    {
-        if (isset($this->return->reasonb)) {
-            return $this->return->reasonb;
-        }
-        return null;
-    }
-
-    /**
-     * returns the state time for participant a
-     *
-     * @return string
-     */
-    public function getStateA()
-    {
-        if (isset($this->return->statea)) {
-            return $this->return->statea;
-        }
-        return null;
-    }
-
-    /**
-     * returns the state time for participant b
-     *
-     * @return string
-     */
-    public function getStateB()
-    {
-        if (isset($this->return->stateb)) {
-            return $this->return->stateb;
-        }
-        return null;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php b/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php
deleted file mode 100644
index 4549b7db45d..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallSequencedResponse
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
-{
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php b/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php
deleted file mode 100644
index 31a06bfa5e9..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * the return from the sms request
-     *
-     * @var stdClass
-     */
-    public $return = null;
-
-    /**
-     * returns the return object
-     *
-     * @return stdClass
-     */
-    public function getReturn()
-    {
-        return $this->return;
-    }
-
-    /**
-     * parse the response data and throws exceptions
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return Zend_Service_DeveloperGarden_Response_ResponseAbstract
-     */
-    public function parse()
-    {
-        if ($this->hasError()) {
-            throw new Zend_Service_DeveloperGarden_Response_Exception(
-                $this->getErrorMessage(),
-                $this->getErrorCode()
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * returns the error code
-     *
-     * @return string|null
-     */
-    public function getErrorCode()
-    {
-        $retValue = null;
-        if ($this->return instanceof stdClass) {
-            $retValue = $this->return->status;
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        $retValue = null;
-        if ($this->return instanceof stdClass) {
-            $retValue = $this->return->err_msg;
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns true if the errorCode is not null and not 0000
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return ($this->return === null
-                || $this->return->status == '0000');
-    }
-
-    /**
-     * returns true if we have a error situation
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        $retValue = false;
-        if ($this->return instanceof stdClass
-            && $this->return->status != '0000'
-        ) {
-            $retValue = true;
-        }
-        return $retValue;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/SecurityTokenServer.php b/lib/zend/Zend/Service/DeveloperGarden/SecurityTokenServer.php
deleted file mode 100644
index a92a504d69a..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/SecurityTokenServer.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_SecurityTokenServer_Cache
- */
-require_once 'Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_SecurityTokenServer
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://sts.idm.telekom.com/TokenService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/TokenService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'SecurityTokenResponse' => 'Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse',
-        'getTokensResponse'     => 'Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse'
-    );
-
-    /**
-     * does the login and return the specific response
-     *
-     * @return Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse
-     */
-    public function getLoginToken()
-    {
-        $token = Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::getTokenFromCache(
-            'securityToken'
-        );
-
-        if ($token === null
-            || !$token->isValid()
-        ) {
-            $token = $this->getSoapClient()->login('login');
-            Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::setTokenToCache(
-                'securityToken',
-                $token
-            );
-        }
-
-        return $token;
-    }
-
-    /**
-     * returns the fetched token from token server
-     *
-     * @return Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse
-     */
-    public function getTokens()
-    {
-        $token = Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::getTokenFromCache(
-            'getTokens'
-        );
-
-        if ($token === null
-            || !$token->isValid()
-        ) {
-            $token = $this->getSoapClient()->getTokens(array(
-                'serviceId' => $this->_serviceAuthId
-            ));
-            Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::setTokenToCache(
-                'getTokens',
-                $token
-            );
-        }
-        return $token;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php b/lib/zend/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php
deleted file mode 100644
index abd09261d16..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_SecurityTokenServer_Cache
-{
-    /**
-     * array with stored tokens
-     *
-     * @var array
-     */
-    protected static $_storedToken = array(
-        'securityToken' => null,
-        'getTokens' => null
-    );
-
-    /**
-     * Internal cache for token values
-     *
-     * @var Zend_Cache_Core
-     * @access private
-     */
-    private static $_cache = null;
-
-    /**
-     * PHP SOAP wsdl cache constant
-     *
-     * @var integer
-     */
-    private static $_wsdlCache = null;
-
-// @codeCoverageIgnoreStart
-    /**
-     * Constructor overriding - make sure that a developer cannot instantiate
-     */
-    protected function __construct()
-    {
-    }
-// @codeCoverageIgnoreEnd
-
-    /**
-     * returns stored token from cache or null
-     *
-     * @param string $tokenId
-     * @throws Zend_Service_DeveloperGarden_Exception
-     * @return Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface|null
-     */
-    public static function getTokenFromCache($tokenId)
-    {
-        if (!array_key_exists($tokenId, self::$_storedToken)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception(
-                'tokenID ' . $tokenId . ' unknown.'
-            );
-        }
-
-        if (self::hasCache() && self::$_storedToken[$tokenId] === null) {
-            $cache = self::getCache();
-            $token = $cache->load(md5($tokenId));
-            if ($token !== false) {
-                self::$_storedToken[$tokenId] = $token;
-            }
-        }
-
-        return self::$_storedToken[$tokenId];
-    }
-
-    /**
-     * set new value for the given tokenId
-     *
-     * @param string $tokenId
-     * @throws Zend_Service_DeveloperGarden_Exception
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface $tokenValue
-     * @return void
-     */
-    public static function setTokenToCache($tokenId,
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface $tokenValue
-    ) {
-        if (!array_key_exists($tokenId, self::$_storedToken)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception(
-                'tokenID ' . $tokenId . ' unknown.'
-            );
-        }
-
-        if (self::hasCache()) {
-            $cache = self::getCache();
-            $cache->save($tokenValue, md5($tokenId));
-        }
-
-        self::$_storedToken[$tokenId] = $tokenValue;
-    }
-
-    /**
-     * reset the internal cache structure
-     *
-     * @return void
-     */
-    public static function resetTokenCache()
-    {
-        foreach (self::$_storedToken as $key => $value) {
-            $value = null;
-            self::$_storedToken[$key] = $value;
-        }
-    }
-
-    /**
-     * Returns the cache
-     *
-     * @return Zend_Cache_Core
-     */
-    public static function getCache()
-    {
-        return self::$_cache;
-    }
-
-    /**
-     * Set a cache for token
-     *
-     * @param Zend_Cache_Core $cache A cache frontend
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        self::$_cache = $cache;
-    }
-
-    /**
-     * Returns true when a cache is set
-     *
-     * @return boolean
-     */
-    public static function hasCache()
-    {
-        return (self::$_cache !== null);
-    }
-
-    /**
-     * Removes any cache
-     *
-     * @return void
-     */
-    public static function removeCache()
-    {
-        self::$_cache = null;
-    }
-
-    /**
-     * Clears all cache data
-     *
-     * @return void
-     */
-    public static function clearCache()
-    {
-        $cache = self::getCache();
-        if (method_exists($cache, 'clean')) {
-            $cache->clean();
-        }
-        self::$_wsdlCache = null;
-    }
-
-    /**
-     * Returns the wsdl cache
-     *
-     * @return integer
-     */
-    public static function getWsdlCache()
-    {
-        return self::$_wsdlCache;
-    }
-
-    /**
-     * Set a cache for wsdl file
-     *
-     * @param integer $cache
-     * @return void
-     */
-    public static function setWsdlCache($cache = null)
-    {
-        self::$_wsdlCache = $cache;
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/SendSms.php b/lib/zend/Zend/Service/DeveloperGarden/SendSms.php
deleted file mode 100644
index ceb40ea2c83..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/SendSms.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SendSms_SendSMSResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SendSms_SendFlashSMSResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendSMS
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendFlashSMS
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_SendSms
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-sms/services/SmsService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/SmsService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'sendSMSResponse'      => 'Zend_Service_DeveloperGarden_Response_SendSms_SendSMSResponse',
-        'sendFlashSMSResponse' => 'Zend_Service_DeveloperGarden_Response_SendSms_SendFlashSMSResponse'
-    );
-
-    /**
-     * this function creates the raw sms object that can be used to send an sms
-     * or as flash sms
-     *
-     * @param string $number
-     * @param string $message
-     * @param string $originator
-     * @param integer $account
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSMS
-     */
-    public function createSms($number = null, $message = null, $originator = null, $account = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SendSms_SendSMS($this->getEnvironment());
-        $request->setNumber($number)
-                ->setMessage($message)
-                ->setOriginator($originator)
-                ->setAccount($account);
-        return $request;
-    }
-
-    /**
-     * this function creates the raw sms object that can be used to send an sms
-     * or as flash sms
-     *
-     * @param string $number
-     * @param string $message
-     * @param string $originator
-     * @param integer $account
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendFlashSMS
-     */
-    public function createFlashSms($number = null, $message = null, $originator = null, $account = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SendSms_SendFlashSMS($this->getEnvironment());
-        $request->setNumber($number)
-                ->setMessage($message)
-                ->setOriginator($originator)
-                ->setAccount($account);
-        return $request;
-    }
-
-    /**
-     * sends an sms with the given parameters
-     *
-     * @param Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract $sms
-     *
-     * @return Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
-     */
-    public function send(Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract $sms)
-    {
-        $client = $this->getSoapClient();
-        $request = array(
-            'request' => $sms
-        );
-        switch ($sms->getSmsType()) {
-            // Sms
-            case 1 :
-                $response = $client->sendSms($request);
-                break;
-            // flashSms
-            case 2 :
-                $response = $client->sendFlashSms($request);
-                break;
-            default : {
-                require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-                throw new Zend_Service_DeveloperGarden_Client_Exception('Unknown SMS Type');
-            }
-        }
-
-        return $response->parse();
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/SmsValidation.php b/lib/zend/Zend/Service/DeveloperGarden/SmsValidation.php
deleted file mode 100644
index e29fc5855b8..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/SmsValidation.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SmsValidation_GetValidatedNumbers
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_GetValidatedNumbersResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SmsValidation_SendValidationKeyword
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_SendValidationKeywordResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_ValidateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SmsValidation_Invalidate
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_InvalidateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_SmsValidation extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-// @codeCoverageIgnoreStart
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-sms-validation/services/SmsValidationUserService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/SmsValidationUserService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'getValidatedNumbersResponse'   => 'Zend_Service_DeveloperGarden_Response_SmsValidation_GetValidatedNumbersResponse',
-        'ValidatedNumber'               => 'Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber',
-        'sendValidationKeywordResponse' => 'Zend_Service_DeveloperGarden_Response_SmsValidation_SendValidationKeywordResponse',
-        'validateResponse'              => 'Zend_Service_DeveloperGarden_Response_SmsValidation_ValidateResponse',
-        'invalidateResponse'            => 'Zend_Service_DeveloperGarden_Response_SmsValidation_InvalidateResponse',
-    );
-
-    /**
-     * validate the given number with the keyword
-     *
-     * @param string $keyword
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_Response_SmsValidation_ValidateResponse
-     */
-    public function validate($keyword = null, $number = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SmsValidation_Validate(
-            $this->getEnvironment(),
-            $keyword,
-            $number
-        );
-
-        return $this->getSoapClient()
-                    ->validate($request)
-                    ->parse();
-    }
-
-    /**
-     * invalidate the given number
-     *
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_Response_SmsValidation_InvalidateResponse
-     */
-    public function inValidate($number = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SmsValidation_Invalidate(
-            $this->getEnvironment(),
-            $number
-        );
-
-        return $this->getSoapClient()
-                    ->invalidate($request)
-                    ->parse();
-    }
-
-    /**
-     * this function sends the validation sms to the given number,
-     * if message is provided it should have to placeholder:
-     * #key# = the validation key
-     * #validUntil# = the valid until date
-     *
-     * @param string $number
-     * @param string $message
-     * @param string $originator
-     * @param integer $account
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SmsValidation_SendValidationKeywordResponse
-     */
-    public function sendValidationKeyword($number = null, $message = null, $originator = null, $account = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SmsValidation_SendValidationKeyword(
-            $this->getEnvironment()
-        );
-        $request->setNumber($number)
-                ->setMessage($message)
-                ->setOriginator($originator)
-                ->setAccount($account);
-
-        return $this->getSoapClient()
-                    ->sendValidationKeyword($request)
-                    ->parse();
-    }
-
-    /**
-     * returns a list of validated numbers
-     *
-     * @return Zend_Service_DeveloperGarden_Response_SmsValidation_GetValidatedNumbersResponse
-     */
-    public function getValidatedNumbers()
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SmsValidation_GetValidatedNumbers(
-            $this->getEnvironment()
-        );
-        return $this->getSoapClient()
-                    ->getValidatedNumbers($request)
-                    ->parse();
-    }
-// @codeCoverageIgnoreEnd
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/VoiceCall.php b/lib/zend/Zend/Service/DeveloperGarden/VoiceCall.php
deleted file mode 100644
index 6513f03d5ac..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/VoiceCall.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_VoiceButler_NewCallSequenced
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_VoiceButler_TearDownCall
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallSequencedResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_TearDownCallResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatus2Response
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_VoiceCall
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-voicebutler/services/VoiceButlerService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/VoiceButlerService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'newCallResponse'          => 'Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse',
-        'newCallSequencedResponse' => 'Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallSequencedResponse',
-        'tearDownCallResponse'     => 'Zend_Service_DeveloperGarden_Response_VoiceButler_TearDownCallResponse',
-        'callStatusResponse'       => 'Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse',
-        'callStatus2Response'      => 'Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatus2Response'
-    );
-
-    /**
-     * init a new call with the given params
-     *
-     * @param string $aNumber
-     * @param string $bNumber
-     * @param integer $expiration
-     * @param integer $maxDuration
-     * @param integer $account
-     * @param boolean $privacyA
-     * @param boolean $privacyB
-     * @param string $greeter
-     * @return Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
-     */
-    public function newCall($aNumber, $bNumber, $expiration, $maxDuration,
-        $account = null, $privacyA = null, $privacyB = null, $greeter = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall(
-                $this->getEnvironment()
-        );
-        $request->setANumber($aNumber)
-                ->setBNumber($bNumber)
-                ->setPrivacyA($privacyA)
-                ->setPrivacyB($privacyB)
-                ->setExpiration($expiration)
-                ->setMaxDuration($maxDuration)
-                ->setGreeter($greeter)
-                ->setAccount($account);
-        $result = $this->getSoapClient()->newCall(array(
-            'request' => $request
-        ));
-
-        return $result->parse();
-    }
-
-
-    /**
-     * init a new call with the given params but specially here,
-     * you can define a set of numbers to be called if the first number
-     * isnt reachable (ie: bNumber = +4930-111111,+4930-222222,+4930-333333)
-     *
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @param string $aNumber
-     * @param array $bNumber
-     * @param integer $expiration
-     * @param integer $maxDuration
-     * @param integer $maxWait
-     * @param integer $account
-     * @param boolean $privacyA
-     * @param boolean $privacyB
-     * @param string $greeter
-     * @return Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallSequencedResponse
-     */
-    public function newCallSequenced($aNumber, $bNumber, $expiration, $maxDuration,
-        $maxWait, $account = null, $privacyA = null, $privacyB = null, $greeter = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_VoiceButler_NewCallSequenced(
-                $this->getEnvironment()
-        );
-        $request->setANumber($aNumber)
-                ->setBNumber($bNumber)
-                ->setPrivacyA($privacyA)
-                ->setPrivacyB($privacyB)
-                ->setExpiration($expiration)
-                ->setMaxDuration($maxDuration)
-                ->setMaxWait($maxWait)
-                ->setGreeter($greeter)
-                ->setAccount($account);
-        $result = $this->getSoapClient()->newCallSequenced(array(
-            'request' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * This tear down the call with the given sessionId
-     *
-     * @param string $sessionId
-     * @return Zend_Service_DeveloperGarden_Response_VoiceButler_TearDownCallResponse
-     */
-    public function tearDownCall($sessionId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_VoiceButler_TearDownCall(
-            $this->getEnvironment(),
-            $sessionId
-        );
-        $result = $this->getSoapClient()->tearDownCall(array(
-            'request' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * checks the callStatus and updates the keepAlive if provided
-     *
-     * @param string $sessionId
-     * @param integer $keepAlive
-     * @return Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
-     */
-    public function callStatus($sessionId, $keepAlive = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus(
-            $this->getEnvironment(),
-            $sessionId,
-            $keepAlive
-        );
-
-        $result = $this->getSoapClient()->callStatus2(array(
-            'request' => $request
-        ));
-
-        return $result->parse();
-    }
-}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/IPLocation.wsdl b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/IPLocation.wsdl
deleted file mode 100644
index 00ae436d318..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/IPLocation.wsdl
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:schema="http://iplocation.developer.telekom.com/schema/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" xmlns:tns="http://iplocation.developer.telekom.com/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="iplocation" targetNamespace="http://iplocation.developer.telekom.com/wsdl/">
-	<wsdl:documentation>
-IP Location </wsdl:documentation>
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://iplocation.developer.telekom.com/wsdl/">
-			<xsd:import namespace="http://iplocation.developer.telekom.com/schema/" schemaLocation="IPLocation.xsd"/>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="locateIPRequest">
-		<wsdl:part name="parameters" element="schema:LocateIPRequest"/>
-	</wsdl:message>
-	<wsdl:message name="locateIPResponse">
-		<wsdl:part name="parameters" element="schema:LocateIPResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="IPLocationPortType">
-		<wsdl:operation name="locateIP">
-			<wsdl:input message="tns:locateIPRequest"/>
-			<wsdl:output message="tns:locateIPResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="IPLocationHttpBinding" type="tns:IPLocationPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsp:PolicyReference URI="#TransportBindingPolicy"/>
-		<wsdl:operation name="locateIP">
-			<soap:operation soapAction="http://iplocation.developer.telekom.com/locateIP"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="IPLocation">
-		<wsdl:port name="IPLocation" binding="tns:IPLocationHttpBinding">
-			<soap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-iplocation/services/IPLocation"/>
-		</wsdl:port>
-	</wsdl:service>
-	<wsp:Policy wsu:Id="TransportBindingPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/>
-				<sp:TransportBinding>
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false"/>
-							</wsp:Policy>
-						</sp:TransportToken>
-						<sp:Layout>
-							<wsp:Policy>
-								<sp:Strict/>
-							</wsp:Policy>
-						</sp:Layout>
-						<sp:IncludeTimestamp/>
-						<sp:AlgorithmSuite>
-							<wsp:Policy>
-								<sp:Basic256/>
-							</wsp:Policy>
-						</sp:AlgorithmSuite>
-					</wsp:Policy>
-				</sp:TransportBinding>
-				<sp:Wss11/>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="STSTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:SamlToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssSamlV20Token11/>
-							</wsp:Policy>
-						</sp:SamlToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-</wsdl:definitions>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/IPLocation.xsd b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/IPLocation.xsd
deleted file mode 100644
index 26284b3e8f6..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/IPLocation.xsd
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:tns="http://iplocation.developer.telekom.com/schema/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://iplocation.developer.telekom.com/schema/" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.0">
-	<xsd:simpleType name="EnvironmentType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="1"/>
-			<xsd:maxInclusive value="3"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="IPType">
-		<xsd:restriction base="xsd:integer">
-			<xsd:enumeration value="4"/>
-			<xsd:enumeration value="6"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="IPAddressType">
-		<xsd:sequence>
-			<xsd:element name="ipType" type="tns:IPType" nillable="false"/>
-			<xsd:element name="ipAddress" type="xsd:string" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="CityType">
-		<xsd:sequence>
-			<xsd:element name="countryCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="cityCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="city" type="xsd:string" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="RegionType">
-		<xsd:sequence>
-			<xsd:element name="countryCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="regionCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="regionName" type="xsd:string" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="GeoCoordinatesType">
-		<xsd:sequence>
-			<xsd:element name="geoLatitude" type="xsd:decimal" nillable="false"/>
-			<xsd:element name="geoLongitude" type="xsd:decimal" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="IPAddressLocationType">
-		<xsd:sequence>
-			<xsd:element name="isInRegion" type="tns:RegionType" nillable="true" minOccurs="0"/>
-			<xsd:element name="isInGeo" type="tns:GeoCoordinatesType" nillable="true" minOccurs="0"/>
-			<xsd:element name="isInCity" type="tns:CityType" nillable="true" minOccurs="0"/>
-			<xsd:element name="ipType" type="tns:IPType" nillable="false"/>
-			<xsd:element name="ipAddress" type="xsd:string" nillable="false"/>
-			<xsd:element name="radius" type="xsd:integer" nillable="false"/>
-			<xsd:element name="statusCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="statusMessage" type="xsd:string" nillable="true" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="LocateIPRequestType">
-		<xsd:sequence>
-			<xsd:element name="environment" type="tns:EnvironmentType"  nillable="false" />
-			<xsd:element name="account" type="xsd:string"  nillable="true" minOccurs="0"/>
-			<xsd:element name="address" type="tns:IPAddressType" nillable="false" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="LocateIPResponseType">
-		<xsd:sequence>
-			<xsd:element name="statusCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="statusMessage" type="xsd:string" nillable="true" minOccurs="0"/>
-			<xsd:element name="ipAddressLocation" type="tns:IPAddressLocationType" nillable="false" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:element name="LocateIPRequest" type="tns:LocateIPRequestType"/>
-	<xsd:element name="LocateIPResponse" type="tns:LocateIPResponseType"/>
-</xsd:schema>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl
deleted file mode 100644
index c20b49238dc..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://odg.tonline.de/ODGBaseUserService/" 
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ODGBaseUserService"
-	targetNamespace="http://odg.tonline.de/ODGBaseUserService/">
-	<wsdl:types>
-		<xsd:schema
-			targetNamespace="http://odg.tonline.de/ODGBaseUserService/"
-			elementFormDefault="unqualified"
-			attributeFormDefault="unqualified">
-			<xsd:include schemaLocation="ODGBaseUserService.xsd" />			
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="changeQuotaPool">
-		<wsdl:part name="request" element="tns:changeQuotaPool"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="changeQuotaPoolResponse">
-		<wsdl:part name="response" 
-			element="tns:changeQuotaPoolResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getQuotaInformation">
-		<wsdl:part name="request" element="tns:getQuotaInformation"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getQuotaInformationResponse">
-		<wsdl:part name="response" 
-			element="tns:getQuotaInformationResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getAccountBalance">
-		<wsdl:part name="request" element="tns:getAccountBalance"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getAccountBalanceResponse">
-		<wsdl:part name="response" element="tns:getAccountBalanceResponse"></wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="ODGBaseUserService">
-		<wsdl:operation name="changeQuotaPool">
-			<wsdl:input message="tns:changeQuotaPool"></wsdl:input>
-			<wsdl:output message="tns:changeQuotaPoolResponse"></wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getQuotaInformation">
-			<wsdl:input message="tns:getQuotaInformation"></wsdl:input>
-			<wsdl:output message="tns:getQuotaInformationResponse"></wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getAccountBalance">
-			<wsdl:input message="tns:getAccountBalance"></wsdl:input>
-			<wsdl:output message="tns:getAccountBalanceResponse"></wsdl:output>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="ODGBaseUserServiceSOAP" 
-		type="tns:ODGBaseUserService">
-
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="changeQuotaPool">
-
-			<soap:operation
-				soapAction="http://odg.tonline.de/ODGBaseUserService/changeQuotaPool" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getQuotaInformation">
-
-			<soap:operation
-				soapAction="http://odg.tonline.de/ODGBaseUserService/getQuotaInformation" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getAccountBalance">
-
-			<soap:operation
-				soapAction="http://odg.tonline.de/ODGBaseUserService/getAccountBalance" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="ODGBaseUserService">
-		<wsdl:port name="ODGBaseUserService"
-			binding="tns:ODGBaseUserServiceSOAP">
-			<soap:address
-				location="https://gateway.developer.telekom.com/p3gw-mod-odg-admin/services/ODGBaseUserService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd
deleted file mode 100644
index a2a8901ce86..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema 
-	xmlns="http://odg.tonline.de/ODGBaseUserService/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	xmlns:tns="http://odg.tonline.de/ODGBaseUserService/"
-	targetNamespace="http://odg.tonline.de/ODGBaseUserService/"
-	elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" version="1.1">
-	
-	
-	
-	
-	
-	<xsd:complexType name="AccountBalance">
-		<xsd:sequence>
-			<xsd:element name="Account" type="xsd:string"></xsd:element>
-			<xsd:element name="Credits" type="xsd:int"></xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:element name="getAccountBalance">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="Account" type="xsd:string" maxOccurs="unbounded" minOccurs="0"></xsd:element>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="getAccountBalanceResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="Account" type="tns:AccountBalance" maxOccurs="unbounded" minOccurs="1"></xsd:element>
-				<xsd:element name="errorCode" type="xsd:string" />
-                <xsd:element name="errorMessage" type="xsd:string" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="changeQuotaPool">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="moduleId" type="xsd:string"></xsd:element>
-				<xsd:element name="quotaMax" type="xsd:nonNegativeInteger" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="changeQuotaPoolResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="errorCode" type="xsd:string"></xsd:element>
-				<xsd:element name="errorMessage" type="xsd:string"></xsd:element>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="getQuotaInformation">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="moduleId" type="xsd:string"></xsd:element>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="getQuotaInformationResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="errorCode" type="xsd:string" />
-				<xsd:element name="errorMessage" type="xsd:string" />
-				<xsd:element name="maxQuota" type="xsd:int" />
-				<xsd:element name="maxUserQuota" type="xsd:int"	nillable="true" minOccurs="0" maxOccurs="1" />
-				<xsd:element name="quotaLevel" type="xsd:int" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-</xsd:schema>
-
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/SmsService.wsdl b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/SmsService.wsdl
deleted file mode 100644
index f6d57290b46..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/SmsService.wsdl
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://webservice.sms.odg.tonline.de" xmlns:intf="http://webservice.sms.odg.tonline.de" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://webservice.sms.odg.tonline.de">
-	<wsdl:types>
-		<schema targetNamespace="http://webservice.sms.odg.tonline.de" xmlns="http://www.w3.org/2001/XMLSchema">
-			<complexType name="SmsRequest">
-				<sequence>
-					<element name="environment" type="xsd:int"/>
-				</sequence>
-			</complexType>
-			<complexType name="sendSMSRequestBase">
-				<complexContent>
-					<extension base="impl:SmsRequest">
-						<sequence>
-							<element name="number" type="xsd:string"/>
-							<element name="message" type="xsd:string"/>
-							<element name="originator" type="xsd:string"/>
-							<element maxOccurs="1" minOccurs="0" name="account" type="xsd:string"/>
-						</sequence>
-					</extension>
-				</complexContent>
-			</complexType>
-			<complexType name="sendSMSRequest">
-				<complexContent>
-					<extension base="impl:sendSMSRequestBase">
-						<sequence/>
-					</extension>
-				</complexContent>
-			</complexType>
-			<element name="sendSMS">
-				<complexType>
-					<sequence>
-						<element maxOccurs="1" minOccurs="0" name="request" type="impl:sendSMSRequest"/>
-					</sequence>
-				</complexType>
-			</element>
-			<complexType name="SmsResult">
-				<sequence>
-					<element maxOccurs="1" minOccurs="0" name="description" nillable="true" type="xsd:string"/>
-					<element name="status" type="xsd:string"/>
-				</sequence>
-			</complexType>
-			<element name="sendSMSResponse">
-				<complexType>
-					<sequence>
-						<element maxOccurs="1" minOccurs="0" name="return" nillable="true" type="impl:SmsResult"/>
-					</sequence>
-				</complexType>
-			</element>
-			<complexType name="sendFlashSMSRequest">
-				<complexContent>
-					<extension base="impl:sendSMSRequestBase">
-						<sequence/>
-					</extension>
-				</complexContent>
-			</complexType>
-			<element name="sendFlashSMS">
-				<complexType>
-					<sequence>
-						<element name="request" type="impl:sendFlashSMSRequest"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="sendFlashSMSResponse">
-				<complexType>
-					<sequence>
-						<element name="return" nillable="true" type="impl:SmsResult"/>
-					</sequence>
-				</complexType>
-			</element>
-		</schema>
-	</wsdl:types>
-	<wsdl:message name="sendSMSRequest">
-		<wsdl:part name="sendSMS" element="impl:sendSMS"/>
-	</wsdl:message>
-	<wsdl:message name="sendFlashSMSRequest">
-		<wsdl:part name="sendFlashSMS" element="impl:sendFlashSMS"/>
-	</wsdl:message>
-	<wsdl:message name="sendFlashSMSResponse">
-		<wsdl:part name="sendFlashSMSResponse" element="impl:sendFlashSMSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="sendSMSResponse">
-		<wsdl:part name="sendSMSResponse" element="impl:sendSMSResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="SmsServicePortType">
-		<wsdl:operation name="sendSMS" parameterOrder="sendSMS">
-			<wsdl:input name="sendSMSRequest" message="impl:sendSMSRequest"/>
-			<wsdl:output name="sendSMSResponse" message="impl:sendSMSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="sendFlashSMS" parameterOrder="sendFlashSMS">
-			<wsdl:input name="sendFlashSMSRequest" message="impl:sendFlashSMSRequest"/>
-			<wsdl:output name="sendFlashSMSResponse" message="impl:sendFlashSMSResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="SmsServiceSoapBinding" type="impl:SmsServicePortType">
-		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="sendSMS">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/sendSMS"/>
-			<wsdl:input name="sendSMSRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="sendSMSResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="sendFlashSMS">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/sendFlashSMS"/>
-			<wsdl:input name="sendFlashSMSRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="sendFlashSMSResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="SmsService">
-		<wsdl:port name="SmsService" binding="impl:SmsServiceSoapBinding">
-			<wsdlsoap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-sms/services/SmsService"/>
-		</wsdl:port>
-	</wsdl:service>
-	<!--WSDL created by Apache Axis version: 1.4
-Built on Apr 22, 2006 (06:55:48 PDT)-->
-</wsdl:definitions>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/SmsValidationUserService.wsdl b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/SmsValidationUserService.wsdl
deleted file mode 100644
index 18c2c7cda7d..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/SmsValidationUserService.wsdl
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://webservice.sms.odg.tonline.de" xmlns:intf="http://webservice.sms.odg.tonline.de" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://webservice.sms.odg.tonline.de">
-	<wsdl:types>
-		<schema targetNamespace="http://webservice.sms.odg.tonline.de" xmlns="http://www.w3.org/2001/XMLSchema">
-			<element name="sendValidationKeywordRequest">
-				<complexType>
-					<sequence>
-						<element maxOccurs="1" minOccurs="0" name="message" type="xsd:string"/>
-						<element name="number" type="xsd:string"/>
-						<element maxOccurs="1" minOccurs="0" name="originator" type="xsd:string"/>
-						<element name="environment" type="xsd:string"/>
-						<element maxOccurs="1" minOccurs="0" name="account" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="sendValidationKeywordResponse">
-				<complexType>
-					<sequence>
-						<element name="statusCode" type="xsd:string"/>
-						<element name="statusMessage" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="validateRequest">
-				<complexType>
-					<sequence>
-						<element name="keyword" type="xsd:string"/>
-						<element name="number" type="xsd:string"/>
-						<element name="environment" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="validateResponse">
-				<complexType>
-					<sequence>
-						<element name="statusCode" type="xsd:string"/>
-						<element name="statusMessage" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="invalidateRequest">
-				<complexType>
-					<sequence>
-						<element name="number" type="xsd:string"/>
-						<element name="environment" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="invalidateResponse">
-				<complexType>
-					<sequence>
-						<element name="statusCode" type="xsd:string"/>
-						<element name="statusMessage" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="getValidatedNumbersRequest">
-				<complexType>
-					<sequence>
-						<element name="environment" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<complexType name="ValidatedNumber">
-				<sequence>
-					<element name="number" type="xsd:string"/>
-					<element maxOccurs="1" minOccurs="0" name="validUntil" type="xsd:dateTime"/>
-				</sequence>
-			</complexType>
-			<element name="getValidatedNumbersResponse">
-				<complexType>
-					<sequence>
-						<element name="statusCode" type="xsd:string"/>
-						<element name="statusMessage" type="xsd:string"/>
-						<element maxOccurs="unbounded" minOccurs="0" name="validatedNumbers" type="impl:ValidatedNumber"/>
-					</sequence>
-				</complexType>
-			</element>
-		</schema>
-	</wsdl:types>
-	<wsdl:message name="sendValidationKeywordRequest">
-		<wsdl:part name="sendValidationKeywordRequest" element="impl:sendValidationKeywordRequest"/>
-	</wsdl:message>
-	<wsdl:message name="getValidatedNumbersResponse">
-		<wsdl:part name="getValidatedNumbersResponse" element="impl:getValidatedNumbersResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getValidatedNumbersRequest">
-		<wsdl:part name="getValidatedNumbersRequest" element="impl:getValidatedNumbersRequest"/>
-	</wsdl:message>
-	<wsdl:message name="invalidateRequest">
-		<wsdl:part name="invalidateRequest" element="impl:invalidateRequest"/>
-	</wsdl:message>
-	<wsdl:message name="validateRequest">
-		<wsdl:part name="validateRequest" element="impl:validateRequest"/>
-	</wsdl:message>
-	<wsdl:message name="sendValidationKeywordResponse">
-		<wsdl:part name="sendValidationKeywordResponse" element="impl:sendValidationKeywordResponse"/>
-	</wsdl:message>
-	<wsdl:message name="validateResponse">
-		<wsdl:part name="validateResponse" element="impl:validateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="invalidateResponse">
-		<wsdl:part name="invalidateResponse" element="impl:invalidateResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="SmsValidationUserServicePortType">
-		<wsdl:operation name="sendValidationKeyword" parameterOrder="sendValidationKeywordRequest">
-			<wsdl:input name="sendValidationKeywordRequest" message="impl:sendValidationKeywordRequest"/>
-			<wsdl:output name="sendValidationKeywordResponse" message="impl:sendValidationKeywordResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="validate" parameterOrder="validateRequest">
-			<wsdl:input name="validateRequest" message="impl:validateRequest"/>
-			<wsdl:output name="validateResponse" message="impl:validateResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="invalidate" parameterOrder="invalidateRequest">
-			<wsdl:input name="invalidateRequest" message="impl:invalidateRequest"/>
-			<wsdl:output name="invalidateResponse" message="impl:invalidateResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getValidatedNumbers" parameterOrder="getValidatedNumbersRequest">
-			<wsdl:input name="getValidatedNumbersRequest" message="impl:getValidatedNumbersRequest"/>
-			<wsdl:output name="getValidatedNumbersResponse" message="impl:getValidatedNumbersResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="SmsValidationUserServiceSoapBinding" type="impl:SmsValidationUserServicePortType">
-		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="sendValidationKeyword">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/sendValidationKeyword"/>
-			<wsdl:input name="sendValidationKeywordRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="sendValidationKeywordResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="validate">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/validate"/>
-			<wsdl:input name="validateRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="validateResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="invalidate">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/invalidate"/>
-			<wsdl:input name="invalidateRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="invalidateResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getValidatedNumbers">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/getValidatedNumbers"/>
-			<wsdl:input name="getValidatedNumbersRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="getValidatedNumbersResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="SmsValidationUserService">
-		<wsdl:port name="SmsValidationUserService" binding="impl:SmsValidationUserServiceSoapBinding">
-			<wsdlsoap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-sms-validation/services/SmsValidationUserService"/>
-		</wsdl:port>
-	</wsdl:service>
-	<!--WSDL created by Apache Axis version: 1.4
-Built on Apr 22, 2006 (06:55:48 PDT)-->
-</wsdl:definitions>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/TokenService.wsdl b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/TokenService.wsdl
deleted file mode 100644
index 04d03ee45e8..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/TokenService.wsdl
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:schema="http://sts.idm.telekom.com/schema/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" xmlns:tns="http://sts.idm.telekom.com/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="sts" targetNamespace="http://sts.idm.telekom.com/wsdl/">
-	<wsdl:types>
-		<xsd:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://sts.idm.telekom.com/schema/" version="0.1" xmlns:tns="http://sts.idm.telekom.com/schema/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:complexType name="FaultResponse">
-				<xsd:sequence>
-					<xsd:element maxOccurs="1" minOccurs="1" name="code" nillable="false" type="xsd:string"/>
-					<xsd:element maxOccurs="1" minOccurs="1" name="msg" nillable="false" type="xsd:string"/>
-					<xsd:element maxOccurs="1" minOccurs="0" name="lockedUntil" nillable="true" type="xsd:dateTime"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:simpleType name="SecurityTokenFormatId">
-				<xsd:annotation>
-					<xsd:documentation>
-
-					Telekom specific format id, e.g. there will be multiple
-					different token formats derived from SAML 2.0 Assertions
-				     </xsd:documentation>
-				</xsd:annotation>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="saml20"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-			<xsd:simpleType name="SecurityTokenEncodingId">
-				<xsd:annotation>
-					<xsd:documentation>
-
-					Telekom specific encoding id - there can be different
-					encoding formats for the same token format, e.g. SAML
-					Assertions can be encoded as plain XML or in
-					base64-encoding
-				     </xsd:documentation>
-				</xsd:annotation>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="text/xml"/>
-					<xsd:enumeration value="text/base64"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-			<xsd:complexType name="SecurityTokenResponse">
-				<xsd:sequence>
-					<xsd:element maxOccurs="1" minOccurs="1" name="tokenFormat" type="tns:SecurityTokenFormatId">
-						<xsd:annotation>
-							<xsd:documentation>
-
-							format of the token carried by the response,
-							determines syntax and processing rules for token
-						       </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element maxOccurs="1" minOccurs="0" name="tokenEncoding" type="tns:SecurityTokenEncodingId">
-						<xsd:annotation>
-							<xsd:documentation>
-
-							encoding of the token carried by the response,
-							determines syntax and processing rules for token
-						       </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element maxOccurs="1" minOccurs="1" name="tokenData" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-
-							contains the string representation of the
-							security token - no further token format identifier
-						       </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="login">
-				<xsd:sequence/>
-			</xsd:complexType>
-			<xsd:complexType name="getTokens">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="serviceId" type="xsd:string">
-
-				     </xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="getTokensResponse">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="securityToken" type="tns:SecurityTokenResponse">
-
-				     </xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="getTokensForSession">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="serviceId" type="xsd:string">
-
-				     </xsd:element>
-					<xsd:element maxOccurs="1" minOccurs="1" name="ssid" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-
-							valid SAM Session Id
-						       </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:simpleType name="IDType">
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="guid"/>
-					<xsd:enumeration value="anid"/>
-					<xsd:enumeration value="alia"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-			<xsd:complexType name="getTokensForUserId">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="serviceId" type="xsd:string">
-
-				     </xsd:element>
-					<xsd:element name="uid" type="xsd:string"/>
-					<xsd:element name="idx" type="tns:IDType"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="authn" type="xsd:string"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="getTokensForUserIdAndProfile">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="serviceId" type="xsd:string">
-
-				     </xsd:element>
-					<xsd:element name="uid" type="xsd:string"/>
-					<xsd:element name="idx" type="tns:IDType"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="authn" type="xsd:string"/>
-					<xsd:element maxOccurs="1" minOccurs="1" name="profileId" type="xsd:string">
-
-				     </xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:element name="FaultResponse" type="tns:FaultResponse"/>
-			<xsd:element name="login" type="tns:login"/>
-			<xsd:element name="loginResponse" type="tns:SecurityTokenResponse"/>
-			<xsd:element name="getTokens" type="tns:getTokens"/>
-			<xsd:element name="getTokensResponse" type="tns:getTokensResponse"/>
-			<xsd:element name="getTokensForSessionResponse" type="tns:getTokensResponse"/>
-			<xsd:element name="getTokensForUserIdResponse" type="tns:getTokensResponse"/>
-			<xsd:element name="getTokensForUserIdAndProfileResponse" type="tns:getTokensResponse"/>
-			<xsd:element name="getTokensForSession" type="tns:getTokensForSession"/>
-			<xsd:element name="getTokensForUserId" type="tns:getTokensForUserId"/>
-			<xsd:element name="getTokensForUserIdAndProfile" type="tns:getTokensForUserIdAndProfile"/>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="FaultResponse">
-		<wsdl:part name="fault" element="schema:FaultResponse"/>
-	</wsdl:message>
-	<wsdl:message name="loginRequest">
-		<wsdl:part name="parameters" element="schema:login"/>
-	</wsdl:message>
-	<wsdl:message name="loginResponse">
-		<wsdl:part name="parameters" element="schema:loginResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getTokensRequest">
-		<wsdl:part name="parameters" element="schema:getTokens"/>
-	</wsdl:message>
-	<wsdl:message name="getTokensResponse">
-		<wsdl:part name="getTokensResponse" element="schema:getTokensResponse">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForSessionRequest">
-		<wsdl:part name="parameters" element="schema:getTokensForSession">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForSessionResponse">
-		<wsdl:part name="getTokensForSessionResponse" element="schema:getTokensForSessionResponse">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForUserIdRequest">
-		<wsdl:part name="parameters" element="schema:getTokensForUserId">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForUserIdResponse">
-		<wsdl:part name="getTokensForUserIdResponse" element="schema:getTokensForUserIdResponse">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForUserIdAndProfileRequest">
-		<wsdl:part name="parameters" element="schema:getTokensForUserIdAndProfile">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForUserIdAndProfileResponse">
-		<wsdl:part name="getTokensForUserIdAndProfileResponse" element="schema:getTokensForUserIdAndProfileResponse">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="SecurityTokenServiceWS">
-		<wsdl:operation name="login">
-			<wsdl:input message="tns:loginRequest"/>
-			<wsdl:output message="tns:loginResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getTokens">
-			<wsdl:input message="tns:getTokensRequest"/>
-			<wsdl:output message="tns:getTokensResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForSession">
-			<wsdl:input message="tns:getTokensForSessionRequest"/>
-			<wsdl:output message="tns:getTokensForSessionResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForUserId">
-			<wsdl:input message="tns:getTokensForUserIdRequest"/>
-			<wsdl:output message="tns:getTokensForUserIdResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForUserIdAndProfile">
-			<wsdl:input message="tns:getTokensForUserIdAndProfileRequest">
-
-         </wsdl:input>
-			<wsdl:output message="tns:getTokensForUserIdAndProfileResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="SecurityTokenServiceSOAPBinding" type="tns:SecurityTokenServiceWS">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsp:PolicyReference URI="#TransportBindingPolicy"/>
-		<wsdl:operation name="login">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/login"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#UsernameTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getTokens">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/getTokens"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#SAMLTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForSession">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/getTokensForSession"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#SAMLTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForUserId">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/getTokensForUserId"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#SAMLTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForUserIdAndProfile">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/getTokensForUserIdAndProfile"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#SAMLTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="SecurityTokenService">
-		<wsdl:port name="TokenService" binding="tns:SecurityTokenServiceSOAPBinding">
-			<soap:address location="https://sts.idm.telekom.com/TokenService"/>
-		</wsdl:port>
-	</wsdl:service>
-	<wsp:Policy wsu:Id="TransportBindingPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/>
-				<sp:TransportBinding>
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false"/>
-							</wsp:Policy>
-						</sp:TransportToken>
-						<sp:Layout>
-							<wsp:Policy>
-								<sp:Strict/>
-							</wsp:Policy>
-						</sp:Layout>
-						<sp:IncludeTimestamp/>
-						<sp:AlgorithmSuite>
-							<wsp:Policy>
-								<sp:Basic256/>
-							</wsp:Policy>
-						</sp:AlgorithmSuite>
-					</wsp:Policy>
-				</sp:TransportBinding>
-				<sp:Wss11/>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="UsernameTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssUsernameToken11/>
-							</wsp:Policy>
-						</sp:UsernameToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="SAMLTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:SamlToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssSamlV20Token11/>
-							</wsp:Policy>
-						</sp:SamlToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-</wsdl:definitions>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl
deleted file mode 100644
index c17a50ffd8a..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions
-	targetNamespace="http://webservice.voicebutler.odg.tonline.de"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:tns="http://webservice.voicebutler.odg.tonline.de"
-	xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-	xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsd"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-	<wsdl:documentation>VoiceButlerService</wsdl:documentation>
-	<wsdl:types> 
-		<xsd:schema 
-			targetNamespace="http://webservice.voicebutler.odg.tonline.de"
-			elementFormDefault="unqualified"
-			attributeFormDefault="unqualified">
-			<xsd:include schemaLocation="VoiceButlerService.xsd" />
-			
-		</xsd:schema>
-	</wsdl:types>
-
-	<wsdl:message name="callStatusRequest">
-		<wsdl:part name="parameters" element="tns:callStatus" />
-	</wsdl:message>
-	<wsdl:message name="callStatusResponse">
-		<wsdl:part name="parameters" element="tns:callStatusResponse" />
-	</wsdl:message>
-    <wsdl:message name="callStatus2Request">
-      <wsdl:part name="parameters" element="tns:callStatus2" />
-    </wsdl:message>
-    <wsdl:message name="callStatus2Response">
-      <wsdl:part name="parameters" element="tns:callStatus2Response" />
-    </wsdl:message>
-	<wsdl:message name="tearDownCallRequest">
-		<wsdl:part name="parameters" element="tns:tearDownCall" />
-	</wsdl:message>
-	<wsdl:message name="tearDownCallResponse">
-		<wsdl:part name="parameters" element="tns:tearDownCallResponse" />
-	</wsdl:message>
-	<wsdl:message name="newCallRequest">
-		<wsdl:part name="parameters" element="tns:newCall" />
-	</wsdl:message>
- 	<wsdl:message name="newCallResponse">
-		<wsdl:part name="parameters" element="tns:newCallResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="newCallSequencedRequest">
-		<wsdl:part name="parameters" element="tns:newCallSequenced"/>
-	</wsdl:message>
-	<wsdl:message name="newCallSequencedResponse">
-		<wsdl:part name="parameters" element="tns:newCallSequencedResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="VoiceButlerServicePortType">
-		<wsdl:operation name="callStatus">
-			<wsdl:input message="tns:callStatusRequest"
-				wsaw:Action="urn:callStatus" />
-			<wsdl:output message="tns:callStatusResponse"
-				wsaw:Action="urn:callStatusResponse" />
-		</wsdl:operation>
-        <wsdl:operation name="callStatus2">
-          <wsdl:input message="tns:callStatus2Request"
-            wsaw:Action="urn:callStatus2" />
-          <wsdl:output message="tns:callStatus2Response"
-            wsaw:Action="urn:callStatus2Response" />
-        </wsdl:operation>
-		<wsdl:operation name="tearDownCall">
-			<wsdl:input message="tns:tearDownCallRequest"
-				wsaw:Action="urn:tearDownCall" />
-			<wsdl:output message="tns:tearDownCallResponse"
-				wsaw:Action="urn:tearDownCallResponse" />
-		</wsdl:operation>
-		<wsdl:operation name="newCall">
-			<wsdl:input message="tns:newCallRequest"
-				wsaw:Action="urn:newCall" />
-			<wsdl:output message="tns:newCallResponse"
-				wsaw:Action="urn:newCallResponse" />
-		</wsdl:operation>
-		<wsdl:operation name="newCallSequenced">
-		<wsdl:input message="tns:newCallSequencedRequest"
-        wsaw:Action="urn:newCallSequence" />
-      <wsdl:output message="tns:newCallSequencedResponse"
-        wsaw:Action="urn:newCallSequenceResponse" />
-		</wsdl:operation>
-	</wsdl:portType>
- 
-	<wsdl:binding name="VoiceButlerServiceHttpBinding"
-		type="tns:VoiceButlerServicePortType">
-
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="callStatus">
-
-			<soap:operation
-				soapAction="http://webservice.voicebutler.odg.tonline.de/callStatus" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-      <wsdl:operation name="callStatus2">
-  
-        <soap:operation
-          soapAction="http://webservice.voicebutler.odg.tonline.de/callStatus2" />
-        <wsdl:input>
-  
-          <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-  
-          <soap:body use="literal" />
-        </wsdl:output>
-      </wsdl:operation>
-		<wsdl:operation name="tearDownCall">
-
-			<soap:operation
-				soapAction="http://webservice.voicebutler.odg.tonline.de/tearDownCall" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="newCall">
-
-			<soap:operation
-				soapAction="http://webservice.voicebutler.odg.tonline.de/newCall" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="newCallSequenced">
-			<soap:operation
-				soapAction="http://webservice.voicebutler.odg.tonline.de/newCallSequence" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="VoiceButlerService">
-
-		<wsdl:port name="VoiceButlerService"
-			binding="tns:VoiceButlerServiceHttpBinding">
-
-			<soap:address
-				location="https://gateway.developer.telekom.com/p3gw-mod-odg-voicebutler/services/VoiceButlerService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd
deleted file mode 100644
index ef724672dd9..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<xsd:schema xmlns="http://webservice.voicebutler.odg.tonline.de"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://webservice.voicebutler.odg.tonline.de"
-	elementFormDefault="unqualified" attributeFormDefault="unqualified"
-	version="1.1">
-
-	<xsd:simpleType name="EnvironmentType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="1" />
-			<xsd:maxInclusive value="3" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="NumberType">
-		<xsd:restriction base="xsd:string">
-			<xsd:minLength value="7" />
-			<xsd:maxLength value="24" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="SessionIDType">
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="[0-9A-Z]{8}\-[0-9A-Z]{16}\-[0-9A-Z]{8}" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="KeepAliveType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="0" />
-			<xsd:maxInclusive value="1" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="MaxDurationType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="0" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="ExpirationType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="0" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:element name="callStatus">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="request" nillable="false"
-					type="VoiceButlerCallStatusRequest" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-  <xsd:element name="callStatus2">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element minOccurs="0" name="request" nillable="false"
-          type="VoiceButlerCallStatusRequest" />
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-	<xsd:complexType name="VoiceButlerCallStatusRequest">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerRequest">
-				<xsd:sequence>
-					<xsd:element minOccurs="1" maxOccurs="1" name="keepAlive"
-						nillable="false" type="KeepAliveType" />
-					<xsd:element minOccurs="1" maxOccurs="1" name="sessionId"
-						nillable="false" type="SessionIDType" />
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:element name="newCall">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="request" nillable="false"
-					type="VoiceButlerNewCallRequest" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="VoiceButlerNewCallRequest">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerNewCallRequestBase">
-				<xsd:sequence>
-					<xsd:element minOccurs="1" maxOccurs="1"
-						name="bNumber" nillable="false" type="NumberType" />
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<!-- newCall { -->
-	<xsd:element name="newCallSequenced">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="request" nillable="false"
-					type="VoiceButlerNewCallSequencedRequest" />
-
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="newCallSequencedResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="return" type="VoiceButlerResult"></xsd:element>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<!-- newCall } -->
-
-	<xsd:element name="tearDownCall">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="request" nillable="false"
-					type="VoiceButlerTeardownCallRequest" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:complexType name="VoiceButlerTeardownCallRequest">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerRequest">
-				<xsd:sequence minOccurs="1" maxOccurs="1">
-					<xsd:element name="sessionId" type="SessionIDType" />
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:element name="callStatusResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="return" nillable="false"
-					type="VoiceButlerCallStatusResult" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:complexType name="VoiceButlerCallStatusResult">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerResult">
-				<xsd:sequence minOccurs="0" maxOccurs="1">
-					<xsd:element minOccurs="0" name="connectiontimea" type="xsd:int" />
-					<xsd:element minOccurs="0" name="connectiontimeb" type="xsd:int" />
-					<xsd:element minOccurs="0" name="descriptiona"
-						nillable="true" type="xsd:string" />
-					<xsd:element minOccurs="0" name="descriptionb"
-						nillable="true" type="xsd:string" />
-					<xsd:element minOccurs="0" name="reasona" type="xsd:int" />
-					<xsd:element minOccurs="0" name="reasonb" type="xsd:int" />
-					<xsd:element minOccurs="0" name="statea" type="xsd:string" />
-					<xsd:element minOccurs="0" name="stateb" type="xsd:string" />
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-    <xsd:element name="callStatus2Response">
-      <xsd:complexType>
-        <xsd:sequence>
-          <xsd:element minOccurs="0" name="return" nillable="false"
-            type="VoiceButlerCallStatus2Result" />
-        </xsd:sequence>
-      </xsd:complexType>
-    </xsd:element>
-    <xsd:complexType name="VoiceButlerCallStatus2Result">
-      <xsd:complexContent>
-        <xsd:extension base="VoiceButlerResult">
-          <xsd:sequence minOccurs="0" maxOccurs="1">
-            <xsd:element minOccurs="0" name="connectiontimea" type="xsd:int" />
-            <xsd:element minOccurs="0" name="connectiontimeb" type="xsd:int" />
-            <xsd:element minOccurs="0" name="descriptiona"
-              nillable="true" type="xsd:string" />
-            <xsd:element minOccurs="0" name="descriptionb"
-              nillable="true" type="xsd:string" />
-            <xsd:element minOccurs="0" name="reasona" type="xsd:int" />
-            <xsd:element minOccurs="0" name="reasonb" type="xsd:int" />
-            <xsd:element minOccurs="0" name="statea" type="xsd:string" />
-            <xsd:element minOccurs="0" name="stateb" type="xsd:string" />
-            
-            <xsd:element minOccurs="0" name="be164" type="xsd:string" 
-              nillable="true"/>
-            <xsd:element minOccurs="0" name="bindex" type="xsd:int" 
-              nillable="true"/>
-          </xsd:sequence>
-        </xsd:extension>
-      </xsd:complexContent>
-    </xsd:complexType>
-	<xsd:element name="newCallResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="return" nillable="false"
-					type="VoiceButlerResult" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="tearDownCallResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="1" name="return" nillable="false"
-					type="VoiceButlerResult" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="VoiceButlerRequest">
-		<xsd:sequence>
-			<xsd:element minOccurs="1" maxOccurs="1" name="environment"
-				nillable="false" type="EnvironmentType" />
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="VoiceButlerResult">
-		<xsd:sequence>
-			<xsd:element minOccurs="0" name="err_msg" nillable="true"
-				type="xsd:string" />
-			<xsd:element minOccurs="0" name="sessionId" nillable="true"
-				type="xsd:string" />
-			<xsd:element minOccurs="1" name="status" type="xsd:string" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="VoiceButlerNewCallSequencedRequest">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerNewCallRequestBase">
-				<xsd:sequence>
-					<xsd:element minOccurs="1" maxOccurs="unbounded"
-						name="bNumber" nillable="false" type="NumberType" />
-					<xsd:element name="maxWait" type="xsd:int" maxOccurs="1" minOccurs="1"></xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="VoiceButlerNewCallRequestBase">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerRequest">
-				<xsd:sequence>
-					<xsd:element minOccurs="1" maxOccurs="1"
-						name="aNumber" nillable="false" type="NumberType" />
-					<xsd:element minOccurs="1" maxOccurs="1"
-						name="expiration" nillable="false" type="ExpirationType" />
-					<xsd:element minOccurs="1" maxOccurs="1"
-						name="maxDuration" nillable="false" type="MaxDurationType" />
-					<xsd:element name="account" type="xsd:string"
-						maxOccurs="1" minOccurs="0">
-					</xsd:element>
-					<xsd:element name="privacyA" type="xsd:boolean"
-						maxOccurs="1" minOccurs="0">
-					</xsd:element>
-                    <xsd:element name="privacyB" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
-                    <xsd:element name="greeter" type="xsd:string"
-						maxOccurs="1" minOccurs="0">
-					</xsd:element>
-
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-</xsd:schema>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ccsPort.wsdl b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ccsPort.wsdl
deleted file mode 100644
index 07d9ed9424a..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ccsPort.wsdl
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/" xmlns:schema="http://ccs.developer.telekom.com/schema/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" xmlns:tns="http://ccs.developer.telekom.com/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ccs" targetNamespace="http://ccs.developer.telekom.com/wsdl/">
-	<wsdl:documentation>
-CCS </wsdl:documentation>
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://ccs.developer.telekom.com/wsdl/">
-			<xsd:import namespace="http://ccs.developer.telekom.com/schema/" schemaLocation="ccsPort.xsd"/>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="createConferenceIn">
-		<wsdl:part name="parameters" element="schema:createConference"/>
-	</wsdl:message>
-	<wsdl:message name="createConferenceOut">
-		<wsdl:part name="parameters" element="schema:createConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="commitConferenceIn">
-		<wsdl:part name="parameters" element="schema:commitConference"/>
-	</wsdl:message>
-	<wsdl:message name="commitConferenceOut">
-		<wsdl:part name="parameters" element="schema:commitConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceStatusIn">
-		<wsdl:part name="parameters" element="schema:getConferenceStatus"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceStatusOut">
-		<wsdl:part name="parameters" element="schema:getConferenceStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getRunningConferenceIn">
-		<wsdl:part name="parameters" element="schema:getRunningConference"/>
-	</wsdl:message>
-	<wsdl:message name="getRunningConferenceOut">
-		<wsdl:part name="parameters" element="schema:getRunningConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceIn">
-		<wsdl:part name="parameters" element="schema:removeConference"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceOut">
-		<wsdl:part name="parameters" element="schema:removeConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceListIn">
-		<wsdl:part name="parameters" element="schema:getConferenceList"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceListOut">
-		<wsdl:part name="parameters" element="schema:getConferenceListResponse"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceIn">
-		<wsdl:part name="parameters" element="schema:updateConference"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceOut">
-		<wsdl:part name="parameters" element="schema:updateConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="newParticipantIn">
-		<wsdl:part name="parameters" element="schema:newParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="newParticipantOut">
-		<wsdl:part name="parameters" element="schema:newParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="removeParticipantIn">
-		<wsdl:part name="parameters" element="schema:removeParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="removeParticipantOut">
-		<wsdl:part name="parameters" element="schema:removeParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="updateParticipantIn">
-		<wsdl:part name="parameters" element="schema:updateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="updateParticipantOut">
-		<wsdl:part name="parameters" element="schema:updateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getParticipantStatusIn">
-		<wsdl:part name="parameters" element="schema:getParticipantStatus"/>
-	</wsdl:message>
-	<wsdl:message name="getParticipantStatusOut">
-		<wsdl:part name="parameters" element="schema:getParticipantStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="createConferenceTemplateIn">
-		<wsdl:part name="parameters" element="schema:createConferenceTemplate"/>
-	</wsdl:message>
-	<wsdl:message name="createConferenceTemplateOut">
-		<wsdl:part name="parameters" element="schema:createConferenceTemplateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateIn">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplate"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateOut">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceTemplateIn">
-		<wsdl:part name="parameters" element="schema:updateConferenceTemplate"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceTemplateOut">
-		<wsdl:part name="parameters" element="schema:updateConferenceTemplateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceTemplateIn">
-		<wsdl:part name="parameters" element="schema:removeConferenceTemplate"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceTemplateOut">
-		<wsdl:part name="parameters" element="schema:removeConferenceTemplateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateListIn">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateList"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateListOut">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateListResponse"/>
-	</wsdl:message>
-	<wsdl:message name="addConferenceTemplateParticipantIn">
-		<wsdl:part name="parameters" element="schema:addConferenceTemplateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="addConferenceTemplateParticipantOut">
-		<wsdl:part name="parameters" element="schema:addConferenceTemplateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateParticipantIn">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateParticipantOut">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceTemplateParticipantIn">
-		<wsdl:part name="parameters" element="schema:updateConferenceTemplateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceTemplateParticipantOut">
-		<wsdl:part name="parameters" element="schema:updateConferenceTemplateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceTemplateParticipantIn">
-		<wsdl:part name="parameters" element="schema:removeConferenceTemplateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceTemplateParticipantOut">
-		<wsdl:part name="parameters" element="schema:removeConferenceTemplateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="ccsPortType">
-		<wsdl:operation name="createConference">
-			<wsdl:input message="tns:createConferenceIn"/>
-			<wsdl:output message="tns:createConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="commitConference">
-			<wsdl:input message="tns:commitConferenceIn"/>
-			<wsdl:output message="tns:commitConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="updateConference">
-			<wsdl:input message="tns:updateConferenceIn"/>
-			<wsdl:output message="tns:updateConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceStatus">
-			<wsdl:input message="tns:getConferenceStatusIn"/>
-			<wsdl:output message="tns:getConferenceStatusOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getRunningConference">
-			<wsdl:input message="tns:getRunningConferenceIn"/>
-			<wsdl:output message="tns:getRunningConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getParticipantStatus">
-			<wsdl:input message="tns:getParticipantStatusIn"/>
-			<wsdl:output message="tns:getParticipantStatusOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="newParticipant">
-			<wsdl:input message="tns:newParticipantIn"/>
-			<wsdl:output message="tns:newParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="removeParticipant">
-			<wsdl:input message="tns:removeParticipantIn"/>
-			<wsdl:output message="tns:removeParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="updateParticipant">
-			<wsdl:input message="tns:updateParticipantIn"/>
-			<wsdl:output message="tns:updateParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="removeConference">
-			<wsdl:input message="tns:removeConferenceIn"/>
-			<wsdl:output message="tns:removeConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceList">
-			<wsdl:input message="tns:getConferenceListIn"/>
-			<wsdl:output message="tns:getConferenceListOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="createConferenceTemplate">
-			<wsdl:input message="tns:createConferenceTemplateIn"/>
-			<wsdl:output message="tns:createConferenceTemplateOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplate">
-			<wsdl:input message="tns:getConferenceTemplateIn"/>
-			<wsdl:output message="tns:getConferenceTemplateOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="updateConferenceTemplate">
-			<wsdl:input message="tns:updateConferenceTemplateIn"/>
-			<wsdl:output message="tns:updateConferenceTemplateOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="removeConferenceTemplate">
-			<wsdl:input message="tns:removeConferenceTemplateIn"/>
-			<wsdl:output message="tns:removeConferenceTemplateOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplateList">
-			<wsdl:input message="tns:getConferenceTemplateListIn"/>
-			<wsdl:output message="tns:getConferenceTemplateListOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="addConferenceTemplateParticipant">
-			<wsdl:input message="tns:addConferenceTemplateParticipantIn"/>
-			<wsdl:output message="tns:addConferenceTemplateParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplateParticipant">
-			<wsdl:input message="tns:getConferenceTemplateParticipantIn"/>
-			<wsdl:output message="tns:getConferenceTemplateParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="updateConferenceTemplateParticipant">
-			<wsdl:input message="tns:updateConferenceTemplateParticipantIn"/>
-			<wsdl:output message="tns:updateConferenceTemplateParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="removeConferenceTemplateParticipant">
-			<wsdl:input message="tns:removeConferenceTemplateParticipantIn"/>
-			<wsdl:output message="tns:removeConferenceTemplateParticipantOut"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="ccsHttpBinding" type="tns:ccsPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsp:PolicyReference URI="#TransportBindingPolicy"/>
-		<wsdl:operation name="createConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/createConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="commitConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/commitConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceStatus">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceStatus"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getRunningConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getRunningConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="updateConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/updateConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getParticipantStatus">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getParticipantStatus"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="newParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/newParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="removeParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/removeParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="updateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/updateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="removeConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/removeConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceList">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceList"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="createConferenceTemplate">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/createConferenceTemplate"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplate">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceTemplate"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="updateConferenceTemplate">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/updateConferenceTemplate"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="removeConferenceTemplate">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/removeConferenceTemplate"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplateList">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceTemplateList"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="addConferenceTemplateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/addConferenceTemplateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceTemplateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="updateConferenceTemplateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/updateConferenceTemplateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="removeConferenceTemplateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/removeConferenceTemplateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="ccs">
-		<wsdl:port name="ccsPort" binding="tns:ccsHttpBinding">
-			<soap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-ccs/services/ccsPort"/>
-		</wsdl:port>
-	</wsdl:service>
-	<wsp:Policy wsu:Id="TransportBindingPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:TransportBinding>
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false"/>
-							</wsp:Policy>
-						</sp:TransportToken>
-						<sp:Layout>
-							<wsp:Policy>
-								<sp:Strict/>
-							</wsp:Policy>
-						</sp:Layout>
-						<sp:IncludeTimestamp/>
-						<sp:AlgorithmSuite>
-							<wsp:Policy>
-								<sp:Basic256/>
-							</wsp:Policy>
-						</sp:AlgorithmSuite>
-					</wsp:Policy>
-				</sp:TransportBinding>
-				<sp:Wss11/>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="STSTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:SamlToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssSamlV20Token11/>
-							</wsp:Policy>
-						</sp:SamlToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-</wsdl:definitions>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd
deleted file mode 100644
index d9c30670da0..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd
+++ /dev/null
@@ -1,736 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:tns="http://ccs.developer.telekom.com/schema/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://ccs.developer.telekom.com/schema/" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.0">
-
-
-	<!-- CCS header -->
-
-	<xsd:simpleType name="EnvironmentType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="1"/>
-			<xsd:maxInclusive value="3"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:complexType name="CCSRequestType" abstract="true">
-		<xsd:sequence>
-			<xsd:element name="environment" type="tns:EnvironmentType"  nillable="false" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="CCSResponseType">
-		<xsd:sequence>
-			<xsd:element name="statusCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="statusMessage" type="xsd:string" nillable="true" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<!-- Participant Structures -->
-
-	<xsd:complexType name="ParticipantStatusStruct">
-		<xsd:sequence>
-			<xsd:element name="name" type="xsd:string"/>
-			<xsd:element name="value" type="xsd:string"/>
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="ParticipantDetailStruct">
-		<xsd:sequence>
-			<xsd:element name="firstName" type="xsd:string"/>
-			<xsd:element name="lastName" type="xsd:string"/>
-			<xsd:element name="number" type="xsd:string"/>
-			<xsd:element name="email" type="xsd:string"/>
-			<xsd:element name="flags" type="xsd:int" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="ParticipantStruct">
-		<xsd:sequence>
-			<xsd:element name="participantId" type="xsd:string"/>
-			<xsd:element name="detail" type="tns:ParticipantDetailStruct"/>
-			<xsd:element name="status" type="tns:ParticipantStatusStruct" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<!-- Conference Structures -->
-
-	<xsd:complexType name="ConferenceDetailStruct">
-		<xsd:sequence>
-			<xsd:element name="name" type="xsd:string"/>
-			<xsd:element name="description" type="xsd:string" />
-			<xsd:element name="duration" type="xsd:int" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="ConferenceAccStruct">
-		<xsd:sequence>
-			<xsd:element name="billingtype" type="xsd:string" />
-			<xsd:element name="account" type="xsd:string" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="ScheduleStruct">
-		<xsd:sequence>
-			<xsd:element name="minute" type="xsd:int"/>
-			<xsd:element name="hour" type="xsd:int" />
-			<xsd:element name="dayOfMonth" type="xsd:int" />
-			<xsd:element name="month" type="xsd:int" />
-			<xsd:element name="year" type="xsd:int" />
-			<xsd:element name="recurring" type="xsd:int" />
-			<xsd:element name="notify" type="xsd:int" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<!-- Request and Response Types -->
-	<xsd:complexType name="createConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="account" type="xsd:string"  nillable="true" minOccurs="0" maxOccurs="1" />
-				<xsd:element name="ownerId" type="xsd:string"/>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct"/>
-				<xsd:element name="schedule" type="tns:ScheduleStruct" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="createConferenceResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"  minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="commitConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceStatusRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="what" type="xsd:int" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="getConferenceStatusResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="acc" type="tns:ConferenceAccStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="startTime" type="xsd:long" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="participants" type="tns:ParticipantStruct" minOccurs="0" maxOccurs="unbounded" nillable="true" />
-				<xsd:element name="schedule" type="tns:ScheduleStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getRunningConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="getRunningConferenceResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="removeConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceListRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="what" type="xsd:int" />
-				<xsd:element name="ownerId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="getConferenceListResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="conferenceIds" type="xsd:string" minOccurs="0" maxOccurs="unbounded" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="updateConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="account" type="xsd:string"  nillable="true" minOccurs="0" maxOccurs="1" />
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="initiatorId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="schedule" type="tns:ScheduleStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="newParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="newParticipantResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="participantId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="removeParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="updateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-				<xsd:element name="action" type="xsd:int"  minOccurs="0" maxOccurs="1"  nillable="true" />
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct" minOccurs="0" maxOccurs="1"  nillable="true"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getParticipantStatusRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getParticipantStatusResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="status" type="tns:ParticipantStatusStruct" minOccurs="0" maxOccurs="unbounded" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-
-
-	<xsd:complexType name="createConferenceTemplateRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="ownerId" type="xsd:string"/>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct"/>
-				<xsd:element name="participants" type="tns:ParticipantDetailStruct" minOccurs="0" maxOccurs="unbounded" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="createConferenceTemplateResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-
-
-
-	<xsd:complexType name="getConferenceTemplateRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceTemplateResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct" minOccurs="0" maxOccurs="1" nillable="true" />
-				<xsd:element name="participants" type="tns:ParticipantStruct" minOccurs="0" maxOccurs="unbounded" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-
-
-	<xsd:complexType name="updateConferenceTemplateRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="initiatorId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true" />
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="removeConferenceTemplateRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceTemplateListRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="ownerId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceTemplateListResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="templateIds" type="xsd:string" minOccurs="0" maxOccurs="unbounded" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="addConferenceTemplateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="addConferenceTemplateParticipantResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="participantId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceTemplateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="getConferenceTemplateParticipantResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="updateConferenceTemplateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="removeConferenceTemplateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-  <xsd:element name="createConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="createConferenceRequest" type="tns:createConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="createConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="createConferenceResponse" type="tns:createConferenceResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="commitConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="commitConferenceRequest" type="tns:commitConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="commitConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceStatus">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceStatusRequest" type="tns:getConferenceStatusRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceStatusResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceStatusResponse" type="tns:getConferenceStatusResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getRunningConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getRunningConferenceRequest" type="tns:getRunningConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getRunningConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getRunningConferenceResponse" type="tns:getRunningConferenceResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="removeConferenceRequest" type="tns:removeConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceList">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceListRequest" type="tns:getConferenceListRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceListResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceListResponse" type="tns:getConferenceListResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="updateConferenceRequest" type="tns:updateConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="newParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="newParticipantRequest" type="tns:newParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="newParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="newParticipantResponse" type="tns:newParticipantResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="removeParticipantRequest" type="tns:removeParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="updateParticipantRequest" type="tns:updateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getParticipantStatus">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getParticipantStatusRequest" type="tns:getParticipantStatusRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getParticipantStatusResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getParticipantStatusResponse" type="tns:getParticipantStatusResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="createConferenceTemplate">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="createConferenceTemplateRequest" type="tns:createConferenceTemplateRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="createConferenceTemplateResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="createConferenceTemplateResponse" type="tns:createConferenceTemplateResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplate">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateRequest" type="tns:getConferenceTemplateRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateResponse" type="tns:getConferenceTemplateResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceTemplate">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="updateConferenceTemplateRequest" type="tns:updateConferenceTemplateRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceTemplateResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceTemplate">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="removeConferenceTemplateRequest" type="tns:removeConferenceTemplateRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceTemplateResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateList">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateListRequest" type="tns:getConferenceTemplateListRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateListResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateListResponse" type="tns:getConferenceTemplateListResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="addConferenceTemplateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="addConferenceTemplateParticipantRequest" type="tns:addConferenceTemplateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="addConferenceTemplateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="addConferenceTemplateParticipantResponse" type="tns:addConferenceTemplateParticipantResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateParticipantRequest" type="tns:getConferenceTemplateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateParticipantResponse" type="tns:getConferenceTemplateParticipantResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceTemplateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="updateConferenceTemplateParticipantRequest" type="tns:updateConferenceTemplateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceTemplateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceTemplateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="removeConferenceTemplateParticipantRequest" type="tns:removeConferenceTemplateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceTemplateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-</xsd:schema>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/localsearch.wsdl b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/localsearch.wsdl
deleted file mode 100644
index 5258bfc7b5a..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/localsearch.wsdl
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/" xmlns:schema="http://localsearch.developer.telekom.com/schema/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" xmlns:tns="http://localsearch.developer.telekom.com/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="localsearch" targetNamespace="http://localsearch.developer.telekom.com/wsdl/">
-	<wsdl:documentation>
-Local Search </wsdl:documentation>
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://localsearch.developer.telekom.com/wsdl/">
-			<xsd:import namespace="http://localsearch.developer.telekom.com/schema/" schemaLocation="localsearch.xsd"/>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="localSearchRequest">
-		<wsdl:part name="parameters" element="schema:LocalSearchRequest"/>
-	</wsdl:message>
-	<wsdl:message name="localSearchResponse">
-		<wsdl:part name="parameters" element="schema:LocalSearchResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="localsearchPortType">
-		<wsdl:operation name="localSearch">
-			<wsdl:input message="tns:localSearchRequest"/>
-			<wsdl:output message="tns:localSearchResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="localsearchHttpBinding" type="tns:localsearchPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsp:PolicyReference URI="#TransportBindingPolicy"/>
-		<wsdl:operation name="localSearch">
-			<soap:operation soapAction="http://localsearch.developer.telekom.com/localSearch"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="localsearch">
-		<wsdl:port name="localsearch" binding="tns:localsearchHttpBinding">
-			<soap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-localsearch/services/localsearch"/>
-		</wsdl:port>
-	</wsdl:service>
-	<wsp:Policy wsu:Id="TransportBindingPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:TransportBinding>
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false"/>
-							</wsp:Policy>
-						</sp:TransportToken>
-						<sp:Layout>
-							<wsp:Policy>
-								<sp:Strict/>
-							</wsp:Policy>
-						</sp:Layout>
-						<sp:IncludeTimestamp/>
-						<sp:AlgorithmSuite>
-							<wsp:Policy>
-								<sp:Basic256/>
-							</wsp:Policy>
-						</sp:AlgorithmSuite>
-					</wsp:Policy>
-				</sp:TransportBinding>
-				<sp:Wss11/>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="STSTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:SamlToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssSamlV20Token11/>
-							</wsp:Policy>
-						</sp:SamlToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-</wsdl:definitions>
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/localsearch.xsd b/lib/zend/Zend/Service/DeveloperGarden/Wsdl/localsearch.xsd
deleted file mode 100644
index 51684be499c..00000000000
--- a/lib/zend/Zend/Service/DeveloperGarden/Wsdl/localsearch.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:tns="http://localsearch.developer.telekom.com/schema/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://localsearch.developer.telekom.com/schema/" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.0">
-	<xsd:simpleType name="EnvironmentType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="1"/>
-			<xsd:maxInclusive value="3"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="ParameterType">
-		<xsd:sequence>
-			<xsd:element name="parameter" type="xsd:string" nillable="false"/>
-			<xsd:element name="value" type="xsd:string" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="LocalSearchRequestType">
-		<xsd:sequence>
-			<xsd:element name="environment" type="tns:EnvironmentType"  nillable="false" />
-			<xsd:element name="account" type="xsd:string"  nillable="true" minOccurs="0"/>
-			<xsd:element name="searchParameters" type="tns:ParameterType" nillable="false" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="LocalSearchResponseType">
-		<xsd:sequence>
-			<xsd:element name="statusCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="statusMessage" type="xsd:string" nillable="true" minOccurs="0"/>
-			<xsd:element name="searchResult" type="xsd:anyType" nillable="true" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:element name="LocalSearchRequest" type="tns:LocalSearchRequestType"/>
-	<xsd:element name="LocalSearchResponse" type="tns:LocalSearchResponseType"/>
-</xsd:schema>
diff --git a/lib/zend/Zend/Service/Ebay/Abstract.php b/lib/zend/Zend/Service/Ebay/Abstract.php
new file mode 100644
index 00000000000..640475b33a8
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Abstract.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Abstract.php 22824 2010-08-09 18:59:54Z renanbr $
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Service_Ebay_Abstract
+{
+    const OPTION_APP_ID    = 'app_id';
+    const OPTION_GLOBAL_ID = 'global_id';
+
+    /**
+     * @var array
+     */
+    protected $_options = array();
+
+    /**
+     * @var mixed
+     */
+    protected $_client;
+
+    /**
+     * @param  Zend_Config|array $options
+     * @return void
+     */
+    public function __construct($options = null)
+    {
+        $options = self::optionsToArray($options);
+        $this->setOption($options);
+    }
+
+    /**
+     * @param  string|Zend_Config|array $name
+     * @param  mixed                    $value
+     * @return Zend_Service_Ebay_Abstract Provides a fluent interface
+     */
+    public function setOption($name, $value = null)
+    {
+        if ($name instanceof Zend_Config) {
+            $name = $name->toArray();
+        }
+        if (is_array($name)) {
+            $this->_options = $name + $this->_options;
+        } else {
+            $this->_options[$name] = $value;
+        }
+        return $this;
+    }
+
+    /**
+     * @param  string $name
+     * @return mixed
+     */
+    public function getOption($name = null)
+    {
+        if (null === $name) {
+            return $this->_options;
+        }
+        if ($this->hasOption($name)) {
+            return $this->_options[$name];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $name
+     * @return boolean
+     */
+    public function hasOption($name)
+    {
+        return array_key_exists($name, $this->_options);
+    }
+
+    /**
+     * @param  mixed $client
+     * @return Zend_Service_Ebay_Abstract Provides a fluent interface
+     */
+    abstract public function setClient($client);
+
+    /**
+     * @return mixed
+     */
+    abstract public function getClient();
+
+    /**
+     * @param  Zend_Config|array $options
+     * @throws Zend_Service_Ebay_Finding_Exception When $options is not an array neither a Zend_Config object
+     * @return array
+     */
+    public static function optionsToArray($options)
+    {
+        if (null === $options) {
+            $options = array();
+        } else if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        }
+
+        if (!is_array($options)) {
+            /**
+             * @see Zend_Service_Ebay_Exception
+             */
+            require_once 'Zend/Service/Ebay/Exception.php';
+            throw new Zend_Service_Ebay_Exception('Invalid options provided.');
+        }
+
+        return $options;
+    }
+
+    /**
+     * Implements Name-value Syntax translator.
+     *
+     * Example:
+     *
+     * array(
+     *     'paginationInput' => array(
+     *         'entriesPerPage' => 5,
+     *         'pageNumber'     => 2
+     *     ),
+     *     'itemFilter' => array(
+     *         array(
+     *             'name'       => 'MaxPrice',
+     *             'value'      => 25,
+     *             'paramName'  => 'Currency',
+     *             'paramValue' => 'USD'
+     *         ),
+     *         array(
+     *             'name'  => 'FreeShippingOnly',
+     *             'value' => true
+     *         ),
+     *         array(
+     *             'name'  => 'ListingType',
+     *             'value' => array(
+     *                 'AuctionWithBIN',
+     *                 'FixedPrice',
+     *                 'StoreInventory'
+     *             )
+     *         )
+     *     ),
+     *     'productId' => array(
+     *         ''     => 123,
+     *         'type' => 'UPC'
+     *     )
+     * )
+     *
+     * this above is translated to
+     *
+     * array(
+     *     'paginationInput.entriesPerPage' => '5',
+     *     'paginationInput.pageNumber'     => '2',
+     *     'itemFilter(0).name'             => 'MaxPrice',
+     *     'itemFilter(0).value'            => '25',
+     *     'itemFilter(0).paramName'        => 'Currency',
+     *     'itemFilter(0).paramValue'       => 'USD',
+     *     'itemFilter(1).name'             => 'FreeShippingOnly',
+     *     'itemFilter(1).value'            => '1',
+     *     'itemFilter(2).name'             => 'ListingType',
+     *     'itemFilter(2).value(0)'         => 'AuctionWithBIN',
+     *     'itemFilter(2).value(1)'         => 'FixedPrice',
+     *     'itemFilter(2).value(2)'         => 'StoreInventory',
+     *     'productId'                      => '123',
+     *     'productId.@type'                => 'UPC'
+     * )
+     *
+     * @param  Zend_Config|array $options
+     * @link   http://developer.ebay.com/DevZone/finding/Concepts/MakingACall.html#nvsyntax
+     * @return array A simple array of strings
+     */
+    protected function _optionsToNameValueSyntax($options)
+    {
+        $options  = self::optionsToArray($options);
+        ksort($options);
+        $new      = array();
+        $runAgain = false;
+        foreach ($options as $name => $value) {
+            if (is_array($value)) {
+                // parse an array value, check if it is associative
+                $keyRaw    = array_keys($value);
+                $keyNumber = range(0, count($value) - 1);
+                $isAssoc   = count(array_diff($keyRaw, $keyNumber)) > 0;
+                // check for tag representation, like <name att="sometinhg"></value>
+                // empty key refers to text value
+                // when there is a root tag, attributes receive flags
+                $hasAttribute = array_key_exists('', $value);
+                foreach ($value as $subName => $subValue) {
+                    // generate new key name
+                    if ($isAssoc) {
+                        // named keys
+                        $newName = $name;
+                        if ($subName !== '') {
+                            // when $subName is empty means that current value
+                            // is the main value for the main key
+                            $glue     = $hasAttribute ? '.@' : '.';
+                            $newName .= $glue . $subName;
+                        }
+                    } else {
+                        // numeric keys
+                        $newName = $name . '(' . $subName . ')';
+                    }
+                    // save value
+                    if (is_array($subValue)) {
+                        // it is necessary run this again, value is an array
+                        $runAgain = true;
+                    } else {
+                        // parse basic type
+                        $subValue = self::toEbayValue($subValue);
+                    }
+                    $new[$newName] = $subValue;
+                }
+            } else {
+                // parse basic type
+                $new[$name] = self::toEbayValue($value);
+            }
+        }
+        if ($runAgain) {
+            // this happens if any $subValue found is an array
+            $new = $this->_optionsToNameValueSyntax($new);
+        }
+        return $new;
+    }
+
+    /**
+     * Translate native PHP values format to ebay format for request.
+     *
+     * Boolean is translated to "0" or "1", date object generates ISO 8601,
+     * everything else is translated to string.
+     *
+     * @param  mixed $value
+     * @return string
+     */
+    public static function toEbayValue($value)
+    {
+        if (is_bool($value)) {
+            $value = $value ? '1' : '0';
+        } else if ($value instanceof Zend_Date) {
+            $value = $value->getIso();
+        } else if ($value instanceof DateTime) {
+            $value = $value->format(DateTime::ISO8601);
+        } else {
+            $value = (string) $value;
+        }
+        return $value;
+    }
+
+    /**
+     * Translate an ebay value format to native PHP type.
+     *
+     * @param  string $value
+     * @param  string $type
+     * @see    http://developer.ebay.com/DevZone/finding/CallRef/types/simpleTypes.html
+     * @throws Zend_Service_Ebay_Finding_Exception When $type is not valid
+     * @return mixed
+     */
+    public static function toPhpValue($value, $type)
+    {
+        switch ($type) {
+            // cast for: boolean
+            case 'boolean':
+                $value = (string) $value == 'true';
+                break;
+
+            // cast for: Amount, decimal, double, float, MeasureType
+            case 'float':
+                $value = floatval((string) $value);
+                break;
+
+            // cast for: int, long
+            // integer type generates a string value, because 32 bit systems
+            // have an integer range of -2147483648 to 2147483647
+            case 'integer':
+                // break intentionally omitted
+
+            // cast for: anyURI, base64Binary, dateTime, duration, string, token
+            case 'string':
+                $value = (string) $value;
+                break;
+
+            default:
+                /**
+                 * @see Zend_Service_Ebay_Exception
+                 */
+                require_once 'Zend/Service/Ebay/Exception.php';
+                throw new Zend_Service_Ebay_Exception("Invalid type '{$type}'.");
+        }
+        return $value;
+    }
+}
diff --git a/lib/zend/Zend/Service/Technorati/Exception.php b/lib/zend/Zend/Service/Ebay/Exception.php
similarity index 71%
rename from lib/zend/Zend/Service/Technorati/Exception.php
rename to lib/zend/Zend/Service/Ebay/Exception.php
index 88a34cd4db7..58577da8a5c 100644
--- a/lib/zend/Zend/Service/Technorati/Exception.php
+++ b/lib/zend/Zend/Service/Ebay/Exception.php
@@ -14,26 +14,24 @@
  *
  * @category   Zend
  * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $
  */
 
-
 /**
  * @see Zend_Service_Exception
  */
 require_once 'Zend/Service/Exception.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Exception
  */
-class Zend_Service_Technorati_Exception extends Zend_Service_Exception
-{
-}
+class Zend_Service_Ebay_Exception extends Zend_Service_Exception
+{}
diff --git a/lib/zend/Zend/Service/Ebay/Finding.php b/lib/zend/Zend/Service/Ebay/Finding.php
new file mode 100644
index 00000000000..a5fd4ae64f5
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding.php
@@ -0,0 +1,424 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Finding.php 22824 2010-08-09 18:59:54Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Abstract
+ */
+require_once 'Zend/Service/Ebay/Abstract.php';
+
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Abstract
+ */
+class Zend_Service_Ebay_Finding extends Zend_Service_Ebay_Abstract
+{
+    const SERVICE_NAME         = 'FindingService';
+    const SERVICE_VERSION      = '1.0.0';
+    const RESPONSE_DATA_FORMAT = 'XML';
+
+    const ENDPOINT_URI  = 'http://svcs.ebay.com';
+    const ENDPOINT_PATH = 'services/search/FindingService/v1';
+
+    const XMLNS_FINDING = 'e';
+    const XMLNS_MS      = 'ms';
+
+    /**
+     * @var array
+     */
+    protected static $_xmlNamespaces = array(
+        self::XMLNS_FINDING => 'http://www.ebay.com/marketplace/search/v1/services',
+        self::XMLNS_MS      => 'http://www.ebay.com/marketplace/services'
+    );
+
+    /**
+     *
+     * @var array
+     */
+    protected $_options = array(
+        self::OPTION_GLOBAL_ID => 'EBAY-US'
+    );
+
+    /**
+     * @return array
+     */
+    public static function getXmlNamespaces()
+    {
+        return self::$_xmlNamespaces;
+    }
+
+    /**
+     * @param  Zend_Config|array|string $options Application Id or array of options
+     * @throws Zend_Service_Ebay_Finding_Exception When application id is missing
+     * @return void
+     */
+    public function __construct($options)
+    {
+        // prepare options
+        if (is_string($options)) {
+            // application id was given
+            $options = array(self::OPTION_APP_ID => $options);
+        } else {
+            // check application id
+            $options = parent::optionsToArray($options);
+            if (!array_key_exists(self::OPTION_APP_ID, $options)) {
+                /**
+                 * @see Zend_Service_Ebay_Finding_Exception
+                 */
+                require_once 'Zend/Service/Ebay/Finding/Exception.php';
+                throw new Zend_Service_Ebay_Finding_Exception(
+                    'Application Id is missing.');
+            }
+        }
+
+        // load options
+        parent::setOption($options);
+    }
+
+    /**
+     * @param  Zend_Rest_Client $client
+     * @return Zend_Service_Ebay_Finding Provides a fluent interface
+     */
+    public function setClient($client)
+    {
+        if (!$client instanceof Zend_Rest_Client) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Exception
+             */
+            require_once 'Zend/Service/Ebay/Finding/Exception.php';
+            throw new Zend_Service_Ebay_Finding_Exception(
+                'Client object must extend Zend_Rest_Client.');
+        }
+        $this->_client = $client;
+
+        return $this;
+    }
+
+    /**
+     * @return Zend_Rest_Client
+     */
+    public function getClient()
+    {
+        if (!$this->_client instanceof Zend_Rest_Client) {
+            /**
+             * @see Zend_Rest_Client
+             */
+            require_once 'Zend/Rest/Client.php';
+            $this->_client = new Zend_Rest_Client();
+        }
+        return $this->_client;
+    }
+
+    /**
+     * Finds items by a keyword query and/or category and allows searching
+     * within item descriptions.
+     *
+     * @param  string            $keywords
+     * @param  boolean           $descriptionSearch
+     * @param  integer           $categoryId
+     * @param  Zend_Config|array $options
+     * @link   http://developer.ebay.com/DevZone/finding/CallRef/findItemsAdvanced.html
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function findItemsAdvanced($keywords, $descriptionSearch = true, $categoryId = null, $options = null)
+    {
+        // prepare options
+        $options                      = parent::optionsToArray($options);
+        $options['keywords']          = $keywords;
+        $options['descriptionSearch'] = $descriptionSearch;
+        if (!empty($categoryId)) {
+            $options['categoryId'] = $categoryId;
+        }
+
+        // do request
+        return $this->_findItems($options, 'findItemsAdvanced');
+    }
+
+    /**
+     * Finds items in a specific category. Results can be filtered and sorted.
+     *
+     * @param  integer           $categoryId
+     * @param  Zend_Config|array $options
+     * @link   http://developer.ebay.com/DevZone/finding/CallRef/findItemsByCategory.html
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function findItemsByCategory($categoryId, $options = null)
+    {
+        // prepare options
+        $options               = parent::optionsToArray($options);
+        $options['categoryId'] = $categoryId;
+
+        // do request
+        return $this->_findItems($options, 'findItemsByCategory');
+    }
+
+    /**
+     * Finds items on eBay based upon a keyword query and returns details for
+     * matching items.
+     *
+     * @param  string            $keywords
+     * @param  Zend_Config|array $options
+     * @link   http://developer.ebay.com/DevZone/finding/CallRef/findItemsByKeywords.html
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function findItemsByKeywords($keywords, $options = null)
+    {
+        // prepare options
+        $options             = parent::optionsToArray($options);
+        $options['keywords'] = $keywords;
+
+        // do request
+        return $this->_findItems($options, 'findItemsByKeywords');
+    }
+
+    /**
+     * Finds items based upon a product ID, such as an ISBN, UPC, EAN, or ePID.
+     *
+     * @param  integer           $productId
+     * @param  string            $productIdType Default value is ReferenceID
+     * @param  Zend_Config|array $options
+     * @link   http://developer.ebay.com/DevZone/finding/CallRef/findItemsByProduct.html
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function findItemsByProduct($productId, $productIdType = null, $options = null)
+    {
+        if (null == $productIdType) {
+            $productIdType = 'ReferenceID';
+        }
+
+        // prepare options
+        $options              = parent::optionsToArray($options);
+        $options['productId'] = array(''     => $productId,
+                                      'type' => $productIdType);
+
+        // do request
+        return $this->_findItems($options, 'findItemsByProduct');
+    }
+
+    /**
+     * Finds items in eBay stores. Can search a specific store or can search all
+     * stores with a keyword query.
+     *
+     * @param  string            $storeName
+     * @param  Zend_Config|array $options
+     * @link   http://developer.ebay.com/DevZone/finding/CallRef/findItemsIneBayStores.html
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function findItemsInEbayStores($storeName, $options = null)
+    {
+        // prepare options
+        $options              = parent::optionsToArray($options);
+        $options['storeName'] = $storeName;
+
+        // do request
+        return $this->_findItems($options, 'findItemsIneBayStores');
+    }
+
+    /**
+     * @param  array  $options
+     * @param  string $operation
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    protected function _findItems(array $options, $operation)
+    {
+        // set default output selector value
+        if (!array_key_exists('outputSelector', $options)) {
+            $options['outputSelector'] = array('AspectHistogram',
+                                               'CategoryHistogram',
+                                               'SellerInfo',
+                                               'StoreInfo');
+        }
+
+        // do request
+        $dom = $this->_request($operation, $options);
+
+        /**
+         * @see Zend_Service_Ebay_Finding_Response_Items
+         */
+        require_once 'Zend/Service/Ebay/Finding/Response/Items.php';
+        $response = new Zend_Service_Ebay_Finding_Response_Items($dom->firstChild);
+        return $response->setOperation($operation)
+                        ->setOption($options);
+    }
+
+    /**
+     * Gets category and/or aspect metadata for the specified category.
+     *
+     * @param  integer           $categoryId
+     * @param  Zend_Config|array $options
+     * @link   http://developer.ebay.com/DevZone/finding/CallRef/getHistograms.html
+     * @return Zend_Service_Ebay_Finding_Response_Histograms
+     */
+    public function getHistograms($categoryId, $options = null)
+    {
+        // prepare options
+        $options               = parent::optionsToArray($options);
+        $options['categoryId'] = $categoryId;
+
+        // do request
+        $operation = 'getHistograms';
+        $dom       = $this->_request($operation, $options);
+
+        /**
+         * @see Zend_Service_Ebay_Finding_Response_Histograms
+         */
+        require_once 'Zend/Service/Ebay/Finding/Response/Histograms.php';
+        $response = new Zend_Service_Ebay_Finding_Response_Histograms($dom->firstChild);
+        return $response->setOperation($operation)
+                        ->setOption($options);
+    }
+
+    /**
+     * Checks specified keywords and returns correctly spelled keywords for best
+     * search results.
+     *
+     * @param  string            $keywords
+     * @param  Zend_Config|array $options
+     * @link   http://developer.ebay.com/DevZone/finding/CallRef/getSearchKeywordsRecommendation.html
+     * @return Zend_Service_Ebay_Finding_Response_Keywords
+     */
+    public function getSearchKeywordsRecommendation($keywords, $options = null)
+    {
+        // prepare options
+        $options             = parent::optionsToArray($options);
+        $options['keywords'] = $keywords;
+
+        // do request
+        $operation = 'getSearchKeywordsRecommendation';
+        $dom       = $this->_request($operation, $options);
+
+        /**
+         * @see Zend_Service_Ebay_Finding_Response_Keywords
+         */
+        require_once 'Zend/Service/Ebay/Finding/Response/Keywords.php';
+        $response = new Zend_Service_Ebay_Finding_Response_Keywords($dom->firstChild);
+        return $response->setOperation($operation)
+                        ->setOption($options);
+    }
+
+    /**
+     * @param  string $operation
+     * @param  array  $options
+     * @link   http://developer.ebay.com/DevZone/finding/Concepts/MakingACall.html#StandardURLParameters
+     * @return DOMDocument
+     */
+    protected function _request($operation, array $options = null)
+    {
+        // generate default options
+        // constructor load global-id and application-id values
+        $default = array('OPERATION-NAME'       => $operation,
+                         'SERVICE-NAME'         => self::SERVICE_NAME,
+                         'SERVICE-VERSION'      => self::SERVICE_VERSION,
+                         'GLOBAL-ID'            => $this->getOption(self::OPTION_GLOBAL_ID),
+                         'SECURITY-APPNAME'     => $this->getOption(self::OPTION_APP_ID),
+                         'RESPONSE-DATA-FORMAT' => self::RESPONSE_DATA_FORMAT,
+                         'REST-PAYLOAD'         => '');
+
+        // prepare options to ebay syntax
+        $options = $default + $this->_optionsToNameValueSyntax($options);
+
+        // do request
+        $client = $this->getClient();
+        $client->getHttpClient()->resetParameters();
+        $response = $client->setUri(self::ENDPOINT_URI)
+                           ->restGet(self::ENDPOINT_PATH, $options);
+
+        return $this->_parseResponse($response);
+    }
+
+    /**
+     * Search for error from request.
+     *
+     * If any error is found a DOMDocument is returned, this object contains a
+     * DOMXPath object as "ebayFindingXPath" attribute.
+     *
+     * @param  Zend_Http_Response $response
+     * @link   http://developer.ebay.com/DevZone/finding/CallRef/types/ErrorSeverity.html
+     * @see    Zend_Service_Ebay_Finding_Abstract::_initXPath()
+     * @throws Zend_Service_Ebay_Finding_Exception When any error occurrs during request
+     * @return DOMDocument
+     */
+    protected function _parseResponse(Zend_Http_Response $response)
+    {
+        // error message
+        $message = '';
+
+        // first trying, loading XML
+        $dom = new DOMDocument();
+        if (!$dom = @Zend_Xml_Security::scan($response->getBody(), $dom)) {
+            $message = 'It was not possible to load XML returned.';
+        }
+
+        // second trying, check request status
+        if ($response->isError()) {
+            $message = $response->getMessage()
+                     . ' (HTTP status code #' . $response->getStatus() . ')';
+        }
+
+        // third trying, search for error message into XML response
+        // only first error that contains severiry=Error is read
+        $xpath = new DOMXPath($dom);
+        foreach (self::$_xmlNamespaces as $alias => $uri) {
+            $xpath->registerNamespace($alias, $uri);
+        }
+        $ns           = self::XMLNS_FINDING;
+        $nsMs         = self::XMLNS_MS;
+        $expression   = "//$nsMs:errorMessage[1]/$ns:error/$ns:severity[.='Error']";
+        $severityNode = $xpath->query($expression)->item(0);
+        if ($severityNode) {
+            $errorNode = $severityNode->parentNode;
+            // ebay message
+            $messageNode = $xpath->query("//$ns:message[1]", $errorNode)->item(0);
+            if ($messageNode) {
+                $message = 'eBay error: ' . $messageNode->nodeValue;
+            } else {
+                $message = 'eBay error: unknown';
+            }
+            // ebay error id
+            $errorIdNode = $xpath->query("//$ns:errorId[1]", $errorNode)->item(0);
+            if ($errorIdNode) {
+                $message .= ' (#' . $errorIdNode->nodeValue . ')';
+            }
+        }
+
+        // throw exception when an error was detected
+        if (strlen($message) > 0) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Exception
+             */
+            require_once 'Zend/Service/Ebay/Finding/Exception.php';
+            throw new Zend_Service_Ebay_Finding_Exception($message);
+        }
+
+        // add xpath to dom document
+        // it allows service_ebay_finding classes use this
+        $dom->ebayFindingXPath = $xpath;
+
+        return $dom;
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Abstract.php b/lib/zend/Zend/Service/Ebay/Finding/Abstract.php
new file mode 100644
index 00000000000..be025a817b8
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Abstract.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Abstract.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Abstract
+ */
+require_once 'Zend/Service/Ebay/Abstract.php';
+
+/**
+ * @see Zend_Service_Ebay_Finding
+ */
+require_once 'Zend/Service/Ebay/Finding.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * @var DOMElement
+     */
+    protected $_dom;
+
+    /**
+     * @var DOMXPath
+     */
+    protected $_xPath;
+
+    /**
+     * @var array
+     */
+    protected $_attributes = array();
+
+    /**
+     * @param  DOMElement $dom
+     * @return void
+     */
+    public function __construct(DOMElement $dom)
+    {
+        $this->_dom = $dom;
+        $this->_initXPath();
+        $this->_init();
+    }
+
+    /**
+     * @param  string $tag
+     * @param  string $attribute
+     * @return mixed
+     */
+    public function attributes($tag, $attribute = null)
+    {
+        if (null === $attribute) {
+            // all attributes
+            if (array_key_exists($tag, $this->_attributes)) {
+                return $this->_attributes[$tag];
+            }
+            return array();
+        }
+
+        // a specific attribute
+        if (isset($this->_attributes[$tag][$attribute])) {
+            return $this->_attributes[$tag][$attribute];
+        }
+        return null;
+    }
+
+    /**
+     * Initialize object.
+     *
+     * Post construct logic, classes must read their members here. Called from
+     * {@link __construct()} as final step of object initialization.
+     *
+     * @return void
+     */
+    protected function _init()
+    {
+    }
+
+    /**
+     * Load DOMXPath for current DOM object.
+     *
+     * @see    Zend_Service_Ebay_Finding::_parseResponse()
+     * @return void
+     */
+    protected function _initXPath()
+    {
+        $document = $this->_dom->ownerDocument;
+        if (!isset($document->ebayFindingXPath)) {
+            $xpath = new DOMXPath($document);
+            foreach (Zend_Service_Ebay_Finding::getXmlNamespaces() as $alias => $uri) {
+                $xpath->registerNamespace($alias, $uri);
+            }
+            $document->ebayFindingXPath = $xpath;
+        }
+        $this->_xPath = $document->ebayFindingXPath;
+    }
+
+    /**
+     * @return DOMElement
+     */
+    public function getDom()
+    {
+        return $this->_dom;
+    }
+
+    /**
+     * @return DOMXPath
+     */
+    public function getXPath()
+    {
+        return $this->_xPath;
+    }
+
+    /**
+     * @param  string $path
+     * @param  string $type
+     * @param  string $array When true means it expects more than one node occurence
+     * @return mixed
+     */
+    protected function _query($path, $type, $array = false)
+    {
+        // find values
+        $values = array();
+        $nodes  = $this->_xPath->query($path, $this->_dom);
+        foreach ($nodes as $node) {
+            $value    = (string) $node->nodeValue;
+            $values[] = Zend_Service_Ebay_Abstract::toPhpValue($value, $type);
+            if (!$array) {
+                break;
+            }
+        }
+
+        // array
+        if ($array) {
+            return $values;
+        }
+
+        // single value
+        if (count($values)) {
+            return reset($values);
+        }
+
+        // no nodes fount
+        return null;
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Aspect.php b/lib/zend/Zend/Service/Ebay/Finding/Aspect.php
new file mode 100644
index 00000000000..df1b66bc0f0
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Aspect.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Aspect.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_Aspect extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * Container that returns the name of the respective aspect value and the
+     * histogram (the number of available items) that share that item
+     * characteristic.
+     *
+     * @var Zend_Service_Ebay_Finding_Aspect_Histogram_Value_Set
+     */
+    public $valueHistogram;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->_attributes['valueHistogram'] = array(
+            'valueName' => $this->_query(".//$ns:valueHistogram/@valueName", 'string', true)
+        );
+
+        $nodes = $this->_xPath->query(".//$ns:valueHistogram", $this->_dom);
+        if ($nodes->length > 0) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Aspect_Histogram_Value_Set
+             */
+            require_once 'Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php';
+            $this->valueHistogram = new Zend_Service_Ebay_Finding_Aspect_Histogram_Value_Set($nodes);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php b/lib/zend/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php
new file mode 100644
index 00000000000..862e53430ef
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Container.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_Aspect_Histogram_Container extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * A characteristic of an item in a domain.
+     *
+     * For example, "Optical Zoom", "Brand", and "Megapixels" could be aspects
+     * of the Digital Cameras domain. Aspects are well-known, standardized
+     * characteristics of a domain, and they vary from domain to domain (the
+     * aspects of "Men's Shoes" are different from those of "Digital Cameras").
+     * A search request on the eBay site will often display aspects and their
+     * respective aspect values on the left-had side of a query response.
+     *
+     * Aspects are extracted from item listing properties (such as item titles
+     * and subtitles), and represent the characteristics of active items. Values
+     * returned in the Aspect container can be used as inputs to the
+     * aspectFilter fields in a query to distill the items returned by the
+     * query. eBay generates aspects dynamically from the items currently
+     * listed; aspects provide a view into what is currently available on eBay.
+     * Because of this, aspect values returned one day cannot be guaranteed to
+     * be valid the next day.
+     *
+     * @var Zend_Service_Ebay_Finding_Aspect_Set
+     */
+    public $aspect;
+
+    /**
+     * A buy-side group of items, for example "Shoes.".
+     *
+     * Domains are extracted from item listing properties, such as the title,
+     * descriptions, and so on.
+     *
+     * @var string
+     */
+    public $domainDisplayName;
+
+    /**
+     * A buy-side group of items that share aspects, but not necessarily an eBay
+     * category.
+     *
+     * For example "Women's Dresses" or "Digital Cameras" could be domains. You
+     * can use a domainName to label a set of aspects that you display.
+     *
+     * @var string
+     */
+    public $domainName;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->domainDisplayName = $this->_query(".//$ns:domainDisplayName[1]", 'string');
+        $this->domainName        = $this->_query(".//$ns:domainName[1]", 'string');
+
+        $this->_attributes['aspect'] = array(
+            'name' => $this->_query(".//$ns:aspect/@name", 'string', true)
+        );
+
+        $nodes = $this->_xPath->query(".//$ns:aspect", $this->_dom);
+        if ($nodes->length > 0) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Aspect_Set
+             */
+            require_once 'Zend/Service/Ebay/Finding/Aspect/Set.php';
+            $this->aspect = new Zend_Service_Ebay_Finding_Aspect_Set($nodes);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php b/lib/zend/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php
similarity index 50%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php
rename to lib/zend/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php
index 5593ca9e630..8ca1ce35a08 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php
+++ b/lib/zend/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php
@@ -14,42 +14,43 @@
  *
  * @category   Zend
  * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: Value.php 22791 2010-08-04 16:11:47Z renanbr $
  */
 
 /**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
+ * @see Zend_Service_Ebay_Finding_Abstract
  */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
 
 /**
  * @category   Zend
  * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
  */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
+class Zend_Service_Ebay_Finding_Aspect_Histogram_Value extends Zend_Service_Ebay_Finding_Abstract
 {
     /**
-     * the participant Id
+     * Number of items that share the characteristic the respective aspect
+     * value.
      *
-     * @var string
+     * @var integer
      */
-    public $participantId = null;
+    public $count;
 
     /**
-     * return the participant id
-     *
-     * @return string
+     * @return void
      */
-    public function getParticipantId()
+    protected function _init()
     {
-        return $this->participantId;
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->count = $this->_query(".//$ns:count[1]", 'integer');
     }
 }
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php b/lib/zend/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php
new file mode 100644
index 00000000000..7b236267cd6
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Set_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Set/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Set_Abstract
+ */
+class Zend_Service_Ebay_Finding_Aspect_Histogram_Value_Set extends Zend_Service_Ebay_Finding_Set_Abstract
+{
+    /**
+     * Implement SeekableIterator::current()
+     *
+     * @return Zend_Service_Ebay_Finding_Aspect_Histogram_Value
+     */
+    public function current()
+    {
+        // check node
+        $node = $this->_nodes->item($this->_key);
+        if (!$node) {
+            return null;
+        }
+
+        /**
+         * @see Zend_Service_Ebay_Finding_Aspect_Histogram_Value
+         */
+        require_once 'Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php';
+        return new Zend_Service_Ebay_Finding_Aspect_Histogram_Value($node);
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Aspect/Set.php b/lib/zend/Zend/Service/Ebay/Finding/Aspect/Set.php
new file mode 100644
index 00000000000..1ba41bf70a1
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Aspect/Set.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Set_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Set/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Set_Abstract
+ */
+class Zend_Service_Ebay_Finding_Aspect_Set extends Zend_Service_Ebay_Finding_Set_Abstract
+{
+    /**
+     * Implement SeekableIterator::current()
+     *
+     * @return Zend_Service_Ebay_Finding_Aspect
+     */
+    public function current()
+    {
+        // check node
+        $node = $this->_nodes->item($this->_key);
+        if (!$node) {
+            return null;
+        }
+
+        /**
+         * @see Zend_Service_Ebay_Finding_Aspect
+         */
+        require_once 'Zend/Service/Ebay/Finding/Aspect.php';
+        return new Zend_Service_Ebay_Finding_Aspect($node);
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Category.php b/lib/zend/Zend/Service/Ebay/Finding/Category.php
new file mode 100644
index 00000000000..f16e35a8c13
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Category.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Category.php 22824 2010-08-09 18:59:54Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_Category extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * The unique ID of a category on the specified eBay site.
+     *
+     * @var string
+     */
+    public $categoryId;
+
+    /**
+     * Display name of a category as it appears on the eBay Web site.
+     *
+     * @var string
+     */
+    public $categoryName;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->categoryId   = $this->_query(".//$ns:categoryId[1]", 'string');
+        $this->categoryName = $this->_query(".//$ns:categoryName[1]", 'string');
+    }
+
+    /**
+     * @param  Zend_Service_Ebay_Finding $proxy
+     * @param  Zend_Config|array         $options
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function findItems(Zend_Service_Ebay_Finding $proxy, $options = null)
+    {
+        return $proxy->findItemsByCategory($this->categoryId, $options);
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Category/Histogram.php b/lib/zend/Zend/Service/Ebay/Finding/Category/Histogram.php
new file mode 100644
index 00000000000..f126242bf46
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Category/Histogram.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Histogram.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Category.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Category
+ */
+class Zend_Service_Ebay_Finding_Category_Histogram extends Zend_Service_Ebay_Finding_Category
+{
+    /**
+     * Container for histogram information pertaining to a child of the category
+     * specified in the request.
+     *
+     * Histograms return data on up to 10 children. Histograms are only a single
+     * level deep. That is, a given category histogram contains only immediate
+     * children.
+     *
+     * @var Zend_Service_Ebay_Finding_Category_Histogram_Set
+     */
+    public $childCategoryHistogram;
+
+    /**
+     * The total number of items in the associated category that match the
+     * search criteria.
+     *
+     * @var integer
+     */
+    public $count;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->count = $this->_query(".//$ns:count[1]", 'integer');
+
+        $nodes = $this->_xPath->query(".//$ns:childCategoryHistogram", $this->_dom);
+        if ($nodes->length > 0) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Category_Histogram_Set
+             */
+            require_once 'Zend/Service/Ebay/Finding/Category/Histogram/Set.php';
+            $this->childCategoryHistogram = new Zend_Service_Ebay_Finding_Category_Histogram_Set($nodes);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Category/Histogram/Container.php b/lib/zend/Zend/Service/Ebay/Finding/Category/Histogram/Container.php
new file mode 100644
index 00000000000..41a26bb1104
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Category/Histogram/Container.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Container.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_Category_Histogram_Container extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * Response container for category histograms.
+     *
+     * This container is returned only when the specified category has children
+     * categories.
+     *
+     * @var Zend_Service_Ebay_Finding_Category_Histogram_Set
+     */
+    public $categoryHistogram;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+
+        $nodes = $this->_xPath->query(".//$ns:categoryHistogram", $this->_dom);
+        if ($nodes->length > 0) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Category_Histogram_Set
+             */
+            require_once 'Zend/Service/Ebay/Finding/Category/Histogram/Set.php';
+            $this->categoryHistogram = new Zend_Service_Ebay_Finding_Category_Histogram_Set($nodes);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Category/Histogram/Set.php b/lib/zend/Zend/Service/Ebay/Finding/Category/Histogram/Set.php
new file mode 100644
index 00000000000..1415bc3b91d
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Category/Histogram/Set.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Set_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Set/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Set_Abstract
+ */
+class Zend_Service_Ebay_Finding_Category_Histogram_Set extends Zend_Service_Ebay_Finding_Set_Abstract
+{
+    /**
+     * Implement SeekableIterator::current()
+     *
+     * @return Zend_Service_Ebay_Finding_Category_Histogram
+     */
+    public function current()
+    {
+        // check node
+        $node = $this->_nodes->item($this->_key);
+        if (!$node) {
+            return null;
+        }
+
+        /**
+         * @see Zend_Service_Ebay_Finding_Category_Histogram
+         */
+        require_once 'Zend/Service/Ebay/Finding/Category/Histogram.php';
+        return new Zend_Service_Ebay_Finding_Category_Histogram($node);
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Error/Data.php b/lib/zend/Zend/Service/Ebay/Finding/Error/Data.php
new file mode 100644
index 00000000000..977d86afadb
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Error/Data.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Data.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_Error_Data extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * There are three categories of errors: request errors, application errors,
+     * and system errors.
+     *
+     * @var string
+     */
+    public $category;
+
+    /**
+     * Name of the domain in which the error occurred.
+     *
+     * Domain values
+     *
+     * Marketplace: A business or validation error occurred in the service.
+     *
+     * SOA: An exception occurred in the Service Oriented Architecture (SOA)
+     * framework.
+     *
+     * @var string
+     */
+    public $domain;
+
+    /**
+     * A unique code that identifies the particular error condition that
+     * occurred. Your application can use error codes as identifiers in your
+     * customized error-handling algorithms.
+     *
+     * @var integer
+     */
+    public $errorId;
+
+    /**
+     * Unique identifier for an exception associated with an error.
+     *
+     * @var string
+     */
+    public $exceptionId;
+
+    /**
+     * A detailed description of the condition that caused in the error.
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * Various warning and error messages return one or more variables that
+     * contain contextual information about the error. This is often the field
+     * or value that triggered the error.
+     *
+     * @var string[]
+     */
+    public $parameter;
+
+    /**
+     * Indicates whether the reported problem is fatal (an error) or is
+     * less-severe (a warning). Review the error message details for information
+     * on the cause.
+     *
+     * This API throws an exception when a fatal error occurs. Only warning
+     * problems can fill this attribute. See more about error parsing at
+     * {@Zend_Service_Ebay_Finding::_parseResponse()}.
+     *
+     * If the request fails and the application is the source of the error (for
+     * example, a required element is missing), update the application before
+     * you retry the request. If the problem is due to incorrect user data,
+     * alert the end-user to the problem and provide the means for them to
+     * correct the data. Once the problem in the application or data is
+     * resolved, re-send the request to eBay.
+     *
+     * If the source of the problem is on eBay's side, you can retry the request
+     * a reasonable number of times (eBay recommends you try the request twice).
+     * If the error persists, contact Developer Technical Support. Once the
+     * problem has been resolved, you can resend the request in its original
+     * form.
+     *
+     * If a warning occurs, warning information is returned in addition to the
+     * business data. Normally, you do not need to resend the request (as the
+     * original request was successful). However, depending on the cause of the
+     * warning, you might need to contact the end user, or eBay, to effect a
+     * long term solution to the problem.
+     *
+     * @var string
+     */
+    public $severity;
+
+    /**
+     * Name of the subdomain in which the error occurred.
+     *
+     * Subdomain values
+     *
+     * Finding: The error is specific to the Finding service.
+     *
+     * MarketplaceCommon: The error is common to all Marketplace services.
+     *
+     * @var string
+     */
+    public $subdomain;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->category    = $this->_query(".//$ns:category[1]", 'string');
+        $this->domain      = $this->_query(".//$ns:domain[1]", 'string');
+        $this->errorId     = $this->_query(".//$ns:errorId[1]", 'integer');
+        $this->exceptionId = $this->_query(".//$ns:exceptionId[1]", 'string');
+        $this->message     = $this->_query(".//$ns:message[1]", 'string');
+        $this->parameter   = $this->_query(".//$ns:parameter", 'string', true);
+        $this->severity    = $this->_query(".//$ns:severity[1]", 'string');
+        $this->subdomain   = $this->_query(".//$ns:subdomain[1]", 'string');
+
+        $this->_attributes['parameter'] = array(
+            'name' => $this->_query(".//$ns:parameter/@name", 'string', true)
+        );
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Error/Data/Set.php b/lib/zend/Zend/Service/Ebay/Finding/Error/Data/Set.php
new file mode 100644
index 00000000000..5bafbf31585
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Error/Data/Set.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Set_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Set/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Set_Abstract
+ */
+class Zend_Service_Ebay_Finding_Error_Data_Set extends Zend_Service_Ebay_Finding_Set_Abstract
+{
+    /**
+     * Implement SeekableIterator::current()
+     *
+     * @return Zend_Service_Ebay_Finding_Error_Data
+     */
+    public function current()
+    {
+        // check node
+        $node = $this->_nodes->item($this->_key);
+        if (!$node) {
+            return null;
+        }
+
+        /**
+         * @see Zend_Service_Ebay_Finding_Error_Data
+         */
+        require_once 'Zend/Service/Ebay/Finding/Error/Data.php';
+        return new Zend_Service_Ebay_Finding_Error_Data($node);
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Error/Message.php b/lib/zend/Zend/Service/Ebay/Finding/Error/Message.php
new file mode 100644
index 00000000000..24128ec7418
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Error/Message.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Message.php 22802 2010-08-07 19:27:37Z ramon $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_Error_Message extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * A container for error details.
+     *
+     * @var Zend_Service_Ebay_Finding_Error_Data_Set
+     */
+    public $error;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+        $nodes = $this->_xPath->query(".//$ns:error", $this->_dom);
+        if ($nodes->length > 0) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Error_Data_Set
+             */
+            require_once 'Zend/Service/Ebay/Finding/Error/Data/Set.php';
+            $this->error = new Zend_Service_Ebay_Finding_Error_Data_Set($nodes);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/LocalSearch/Exception.php b/lib/zend/Zend/Service/Ebay/Finding/Exception.php
similarity index 63%
rename from lib/zend/Zend/Service/DeveloperGarden/LocalSearch/Exception.php
rename to lib/zend/Zend/Service/Ebay/Finding/Exception.php
index 6c667406dbf..403a9d38b96 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/LocalSearch/Exception.php
+++ b/lib/zend/Zend/Service/Ebay/Finding/Exception.php
@@ -14,25 +14,24 @@
  *
  * @category   Zend
  * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $
  */
 
 /**
- * Zend_Service_Exception
+ * @see Zend_Service_Exception
  */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
+require_once 'Zend/Service/Ebay/Exception.php';
 
 /**
  * @category   Zend
  * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Exception
  */
-class Zend_Service_DeveloperGarden_LocalSearch_Exception extends Zend_Service_DeveloperGarden_Exception
-{
-}
+class Zend_Service_Ebay_Finding_Exception extends Zend_Service_Ebay_Exception
+{}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/ListingInfo.php b/lib/zend/Zend/Service/Ebay/Finding/ListingInfo.php
new file mode 100644
index 00000000000..c99dfff651c
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/ListingInfo.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: ListingInfo.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_ListingInfo extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * Shows whether or not the seller will accept a best offer for the
+     * associated item.
+     *
+     * Best Offer allows a buyer to make a lower-priced binding offer on a fixed
+     * price item. Buyers cannot see how many offers have been made (only the
+     * seller can see this information). To make a best offer on a listing, use
+     * the eBay Web site.
+     *
+     * @var boolean
+     */
+    public $bestOfferEnabled;
+
+    /**
+     * Used with competitive-bid auctions, the associated item includes a Buy It
+     * Now option if this value returns true.
+     *
+     * Buy It Now lets a user purchase the item at a fixed price, effectively
+     * ending the auction. On most sites, the Buy It Now option is removed (and
+     * this value returns false) once a valid bid is made on the associated item
+     * (a valid bid could be a bid above the reserve price).
+     *
+     * @var boolean
+     */
+    public $buyItNowAvailable;
+
+    /**
+     * The Buy It Now Price of the item (if any), in the currency of the site on
+     * which the item was listed.
+     *
+     * You can use this field to determine if the item was originally listed
+     * with Buy It Now, even if the Buy It Now option is no longer available for
+     * the item.
+     *
+     * For Basic Fixed-Price (FixedPrice), Store Inventory (StoreInventory), and
+     * Ad Format (AdFormat) listings, currentPrice is the current fixed price.
+     *
+     * Only returned if an item was listed with Buy It Now.
+     *
+     * @var float
+     */
+    public $buyItNowPrice;
+
+    /**
+     * The listing's Buy It Now Price (if any), converted into the currency of
+     * the site to which you sent your search request.
+     *
+     * For active items, refresh this value every 24 hours to pick up changes in
+     * conversion rates (if this value has been converted).
+     *
+     * Price fields are returned as doubles, not necessarily in the traditional
+     * monetary format of the site's country. For example, a US Dollar value
+     * might be returned as 3.880001 instead of 3.88.
+     *
+     * Only returned if an item was listed with Buy It Now.
+     *
+     * @var float
+     */
+    public $convertedBuyItNowPrice;
+
+    /**
+     * Time stamp specifying when the listing is scheduled to end, or the actual
+     * end time if the item listing has ended.
+     *
+     * This value is returned in GMT, the ISO 8601 date and time format
+     * (YYYY-MM-DDTHH:MM:SS.SSSZ). See the "dateTime" type for information about
+     * the time format, and for details on converting to and from the GMT time
+     * zone.
+     *
+     * @var integer
+     */
+    public $endTime;
+
+    /**
+     * If true, a generic gift icon displays next the listing's title in search
+     * and browse pages.
+     *
+     * @var boolean
+     */
+    public $gift;
+
+    /**
+     * The format of the listing, such as online auction, fixed price, or
+     * advertisement.
+     *
+     * Applicable values:
+     *
+     *     AdFormat
+     *     Advertisement to solicit inquiries on listings such as real estate.
+     *     Permits no bidding on that item, service, or property. To express
+     *     interest, a buyer fills out a contact form that eBay forwards to the
+     *     seller as a lead. This format does not enable buyers and sellers to
+     *     transact online through eBay and eBay Feedback is not available for
+     *     ad format listings.
+     *
+     *     Auction
+     *     Competitive-bid online auction format. Buyers engage in competitive
+     *     bidding, although Buy It Now may be offered as long as no valid bids
+     *     have been placed. Online auctions are listed on eBay.com; they can
+     *     also be listed in a seller's eBay Store if the seller is a Store
+     *     owner.
+     *
+     *     AuctionWithBIN
+     *     Same as Auction format, but Buy It Now is enabled. AuctionWithBIN
+     *     changes to Auction if a valid bid has been placed on the item. Valid
+     *     bids include bids that are equal to or above any specified reserve
+     *     price.
+     *
+     *     Classified
+     *     Classified Ads connect buyers and sellers, who then complete the sale
+     *     outside of eBay. This format does not enable buyers and sellers to
+     *     transact online through eBay and eBay Feedback is not available for
+     *     these listing types.
+     *
+     *     FixedPrice
+     *     A fixed-price listing. Auction-style bidding is not allowed. On some
+     *     sites, this auction format is also known as "Buy It Now Only" (not to
+     *     be confused with the Buy It Now option available with
+     *     competitive-bidding auctions). Fixed-price listings appear on
+     *     eBay.com; they can also be listed in a seller's eBay Store if the
+     *     seller is a Store owner.
+     *
+     *     StoreInventory
+     *     A fixed-price format for eBay Store sellers. Store Inventory listings
+     *     appear after other listings in regular browse and search item
+     *     listings on eBay. Store items have a lower Insertion Fee and longer
+     *     listing durations. This selling type can only be specified by sellers
+     *     who have an eBay Store. Store Inventory listings are listed on
+     *     eBay.com as well as in the seller's eBay Store.
+     *
+     * @var string
+     */
+    public $listingType;
+
+    /**
+     * Time stamp that eBay recorded as the moment the listing was made
+     * available.
+     *
+     * This value is returned in GMT, the ISO 8601 date and time format
+     * (YYYY-MM-DDTHH:MM:SS.SSSZ). See the "dateTime" type for information about
+     * the time format, and for details on converting to and from the GMT time
+     * zone. Note that it is possible for startTime to be different from the
+     * value returned by GetSingleItem.
+     *
+     * @var integer
+     */
+    public $startTime;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->bestOfferEnabled       = $this->_query(".//$ns:bestOfferEnabled[1]", 'boolean');
+        $this->buyItNowAvailable      = $this->_query(".//$ns:buyItNowAvailable[1]", 'boolean');
+        $this->buyItNowPrice          = $this->_query(".//$ns:buyItNowPrice[1]", 'float');
+        $this->convertedBuyItNowPrice = $this->_query(".//$ns:convertedBuyItNowPrice[1]", 'float');
+        $this->endTime                = $this->_query(".//$ns:endTime[1]", 'string');
+        $this->gift                   = $this->_query(".//$ns:gift[1]", 'boolean');
+        $this->listingType            = $this->_query(".//$ns:listingType[1]", 'string');
+        $this->startTime              = $this->_query(".//$ns:startTime[1]", 'string');
+
+        $this->_attributes['buyItNowPrice'] = array(
+            'currencyId' => $this->_query(".//$ns:buyItNowPrice[1]/@currencyId[1]", 'string')
+        );
+
+        $this->_attributes['convertedBuyItNowPrice'] = array(
+            'currencyId' => $this->_query(".//$ns:convertedBuyItNowPrice[1]/@currencyId[1]", 'string')
+        );
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/PaginationOutput.php b/lib/zend/Zend/Service/Ebay/Finding/PaginationOutput.php
new file mode 100644
index 00000000000..325474f04ef
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/PaginationOutput.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: PaginationOutput.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_PaginationOutput extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * The maximum number of items that can be returned in the response.
+     *
+     * This number is always equal to the value input for
+     * paginationInput.entriesPerPage. The end of the result set has been
+     * reached if the number specified for entriesPerPage is greater than the
+     * number of items found on the specified pageNumber. In this case, there
+     * will be fewer items returned than the number specified in entriesPerPage.
+     * This can be determined by comparing the entriesPerPage value with the
+     * value returned in the count attribute for the searchResult field.
+     *
+     * @var integer
+     */
+    public $entriesPerPage;
+
+    /**
+     * The subset of item data returned in the current response.
+     *
+     * Search results are divided into sets, or "pages," of item data. The
+     * number of pages is equal to the total number of items matching the search
+     * criteria divided by the value specified for entriesPerPage in the
+     * request. The response for a request contains one "page" of item data.
+     *
+     * This returned value indicates the page number of item data returned (a
+     * subset of the complete result set). If this field contains 1, the
+     * response contains the first page of item data (the default). If the value
+     * returned in totalEntries is less than the value for entriesPerPage,
+     * pageNumber returns 1 and the response contains the entire result set.
+     *
+     * The value of pageNumber is normally equal to the value input for
+     * paginationInput.pageNumber. However, if the number input for pageNumber
+     * is greater than the total possible pages of output, eBay returns the last
+     * page of item data in the result set, and the value for pageNumber is set
+     * to the respective (last) page number.
+     *
+     * @var integer
+     */
+    public $pageNumber;
+
+    /**
+     * The total number of items found that match the search criteria in your
+     * request.
+     *
+     * Depending on the input value for entriesPerPage, the response might
+     * include only a portion (a page) of the entire result set. A value of "0"
+     * is returned if eBay does not find any items that match the search
+     * criteria.
+     *
+     * @var integer
+     */
+    public $totalEntries;
+
+    /**
+     * The total number of pages of data that could be returned by repeated
+     * search requests.
+     *
+     * Note that if you modify the value of inputPagination.entriesPerPage in a
+     * request, the value output for totalPages will change. A value of "0" is
+     * returned if eBay does not find any items that match the search criteria.
+     *
+     * @var integer
+     */
+    public $totalPages;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->entriesPerPage = $this->_query(".//$ns:entriesPerPage[1]", 'integer');
+        $this->pageNumber     = $this->_query(".//$ns:pageNumber[1]", 'integer');
+        $this->totalEntries   = $this->_query(".//$ns:totalEntries[1]", 'integer');
+        $this->totalPages     = $this->_query(".//$ns:totalPages[1]", 'integer');
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Response/Abstract.php b/lib/zend/Zend/Service/Ebay/Finding/Response/Abstract.php
new file mode 100644
index 00000000000..bd7cb7c4896
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Response/Abstract.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Abstract.php 22824 2010-08-09 18:59:54Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+abstract class Zend_Service_Ebay_Finding_Response_Abstract extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * Indicates whether or not errors or warnings were generated during the
+     * processing of the request.
+     *
+     * Applicable values:
+     *
+     *     Failure
+     *     eBay encountered a fatal error during the processing of the request,
+     *     causing the request to fail. When a serious application-level error
+     *     occurs, the error is returned instead of the business data.
+     *
+     *     PartialFailure
+     *     eBay successfully processed the request, but one or more non-fatal
+     *     errors occurred during the processing. For best results, requests
+     *     should return without warning messages. Inspect the message details
+     *     and resolve any problems before resubmitting the request.
+     *
+     *     Success
+     *     eBay successfully processed the request and the business data is
+     *     returned in the response. Note that it is possible for a response to
+     *     return Success, but still not contain the expected data in the result.
+     *
+     *     Warning
+     *     The request was successfully processed, but eBay encountered a
+     *     non-fatal error during the processing. For best results, requests
+     *     should return without warnings. Inspect the warning details and
+     *     resolve the problem before resubmitting the request.
+     *
+     * @var string
+     */
+    public $ack;
+
+    /**
+     * Information regarding an error or warning that occurred when eBay
+     * processed the request.
+     *
+     * Not returned when the ack value is Success. Run-time errors are not
+     * reported here.
+     *
+     * @var Zend_Service_Ebay_Finding_Error_Message
+     */
+    public $errorMessage;
+
+    /**
+     * This value represents the date and time when eBay processed the request.
+     *
+     * This value is returned in GMT, the ISO 8601 date and time format
+     * (YYYY-MM-DDTHH:MM:SS.SSSZ). See the "dateTime" type for information about
+     * the time format, and for details on converting to and from the GMT time
+     * zone.
+     *
+     * @var string
+     */
+    public $timestamp;
+
+    /**
+     * The release version that eBay used to process the request.
+     *
+     * Developer Technical Support may ask you for the version value if you work
+     * with them to troubleshoot issues.
+     *
+     * @var string
+     */
+    public $version;
+
+    /**
+     * @var string
+     */
+    protected $_operation;
+
+    /**
+     * @var array
+     */
+    protected $_options = array();
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->ack       = $this->_query(".//$ns:ack[1]", 'string');
+        $this->timestamp = $this->_query(".//$ns:timestamp[1]", 'string');
+        $this->version   = $this->_query(".//$ns:version[1]", 'string');
+
+        $node = $this->_xPath->query(".//$ns:errorMessage[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Error_Message
+             */
+            require_once 'Zend/Service/Ebay/Finding/Error/Message.php';
+            $this->errorMessage = new Zend_Service_Ebay_Finding_Error_Message($node);
+        }
+    }
+
+    /**
+     * @param  string $operation
+     * @return Zend_Service_Ebay_Finding_Response_Abstract Provides a fluent interface
+     */
+    public function setOperation($operation)
+    {
+        $this->_operation = (string) $operation;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOperation()
+    {
+        return $this->_operation;
+    }
+
+    /**
+     * @param  string|Zend_Config|array $name
+     * @param  mixed                    $value
+     * @return Zend_Service_Ebay_Finding_Response_Abstract Provides a fluent interface
+     */
+    public function setOption($name, $value = null)
+    {
+        if ($name instanceof Zend_Config) {
+            $name = $name->toArray();
+        }
+        if (is_array($name)) {
+            $this->_options = $name;
+        } else {
+            $this->_options[$name] = $value;
+        }
+        return $this;
+    }
+
+    /**
+     * @param  string $name
+     * @return mixed
+     */
+    public function getOption($name = null)
+    {
+        if (null === $name) {
+            return $this->_options;
+        }
+        if (array_key_exists($name, $this->_options)) {
+            return $this->_options[$name];
+        }
+        return null;
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Response/Histograms.php b/lib/zend/Zend/Service/Ebay/Finding/Response/Histograms.php
new file mode 100644
index 00000000000..1e87b598916
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Response/Histograms.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Histograms.php 22804 2010-08-08 05:08:05Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Response_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Response/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Response_Abstract
+ */
+class Zend_Service_Ebay_Finding_Response_Histograms extends Zend_Service_Ebay_Finding_Response_Abstract
+{
+    /**
+     * Response container for aspect histograms.
+     *
+     * Aspect histograms are returned for categories that have been mapped to
+     * domains only. In most cases, just leaf categories are mapped to domains,
+     * but there are exceptions.
+     *
+     * @var Zend_Service_Ebay_Finding_Aspect_Histogram_Container
+     */
+    public $aspectHistogramContainer;
+
+    /**
+     * Response container for category histograms.
+     *
+     * This container is returned only when the specified category has children
+     * categories.
+     *
+     * @var Zend_Service_Ebay_Finding_Category_Histogram_Container
+     */
+    public $categoryHistogramContainer;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+
+        $node = $this->_xPath->query(".//$ns:aspectHistogramContainer[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Aspect_Histogram_Container
+             */
+            require_once 'Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php';
+            $this->aspectHistogramContainer = new Zend_Service_Ebay_Finding_Aspect_Histogram_Container($node);
+        }
+
+        $node = $this->_xPath->query(".//$ns:categoryHistogramContainer[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Category_Histogram_Container
+             */
+            require_once 'Zend/Service/Ebay/Finding/Category/Histogram/Container.php';
+            $this->categoryHistogramContainer = new Zend_Service_Ebay_Finding_Category_Histogram_Container($node);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Response/Items.php b/lib/zend/Zend/Service/Ebay/Finding/Response/Items.php
new file mode 100644
index 00000000000..cb6108985b5
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Response/Items.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Items.php 22804 2010-08-08 05:08:05Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Response_Histograms
+ */
+require_once 'Zend/Service/Ebay/Finding/Response/Histograms.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Response_Histograms
+ */
+class Zend_Service_Ebay_Finding_Response_Items extends Zend_Service_Ebay_Finding_Response_Histograms
+{
+    /**
+     * @link http://developer.ebay.com/DevZone/finding/CallRef/types/PaginationInput.html
+     */
+    const PAGE_MAX_DEFAULT  = 100;
+    const PAGE_MAX_INFINITY = 0;
+
+    /**
+     * Indicates the pagination of the result set.
+     *
+     * Child elements indicate the page number that is returned, the maximum
+     * number of item listings to return per page, total number of pages that
+     * can be returned, and the total number of listings that match the search
+     * criteria.
+     *
+     * @var Zend_Service_Ebay_Finding_PaginationOutput
+     */
+    public $paginationOutput;
+
+    /**
+     * Container for the item listings that matched the search criteria.
+     *
+     * The data for each item is returned in individual containers, if any
+     * matches were found.
+     *
+     * @var Zend_Service_Ebay_Finding_Search_Result
+     */
+    public $searchResult;
+
+    /**
+     * @var Zend_Service_Ebay_Finding_Response_Items[]
+     */
+    protected static $_pageCache = array();
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->_attributes['searchResult'] = array(
+            'count' => $this->_query(".//$ns:searchResult[1]/@count[1]", 'string')
+        );
+
+        $node = $this->_xPath->query(".//$ns:searchResult[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Search_Result
+             */
+            require_once 'Zend/Service/Ebay/Finding/Search/Result.php';
+            $this->searchResult = new Zend_Service_Ebay_Finding_Search_Result($node);
+        }
+
+        $node = $this->_xPath->query(".//$ns:paginationOutput[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_PaginationOutput
+             */
+            require_once 'Zend/Service/Ebay/Finding/PaginationOutput.php';
+            $this->paginationOutput = new Zend_Service_Ebay_Finding_PaginationOutput($node);
+        }
+    }
+
+    /**
+     * @param  Zend_Service_Ebay_Finding $proxy
+     * @param  integer                   $number
+     * @throws Zend_Service_Ebay_Finding_Exception When $number is invalid
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function page(Zend_Service_Ebay_Finding $proxy, $number)
+    {
+        // check page number
+        if ($number < 1 || $number > $this->paginationOutput->totalPages) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Exception
+             */
+            require_once 'Zend/Service/Ebay/Finding/Exception.php';
+            throw new Zend_Service_Ebay_Finding_Exception(
+                "Page number '{$number}' is out of range.");
+        }
+
+        // prepare arguments
+        $arguments = array();
+        switch ($this->_operation) {
+            case 'findItemsAdvanced':
+                $arguments[] = $this->getOption('keywords');
+                $arguments[] = $this->getOption('descriptionSearch');
+                $arguments[] = $this->getOption('categoryId');
+                break;
+
+            case 'findItemsByCategory':
+                $arguments[] = $this->getOption('categoryId');
+                break;
+
+            case 'findItemsByKeywords':
+                $arguments[] = $this->getOption('keywords');
+                break;
+
+            case 'findItemsByProduct':
+                $productId = $this->getOption('productId');
+                if (!is_array($productId)) {
+                    $productId = array('' => $productId);
+                }
+                $arguments[] = array_key_exists('', $productId)
+                             ? $productId['']
+                             : null;
+                $arguments[] = array_key_exists('type', $productId)
+                             ? $productId['type']
+                             : null;
+                break;
+
+            case 'findItemsIneBayStores':
+                $arguments[] = $this->getOption('storeName');
+                break;
+
+            default:
+                /**
+                 * @see Zend_Service_Ebay_Finding_Exception
+                 */
+                require_once 'Zend/Service/Ebay/Finding/Exception.php';
+                throw new Zend_Service_Ebay_Finding_Exception(
+                    "Invalid operation '{$this->_operation}'.");
+        }
+
+        // prepare options
+        // remove every pagination entry from current option list
+        $options = $this->_options;
+        foreach (array_keys($options) as $optionName) {
+            if (substr($optionName, 0, 15) == 'paginationInput') {
+                unset($options[$optionName]);
+            }
+        }
+
+        // set new pagination values
+        // see more at http://developer.ebay.com/DevZone/finding/CallRef/types/PaginationInput.html
+        $entriesPerPage             = $this->paginationOutput->entriesPerPage;
+        $options['paginationInput'] = array('entriesPerPage' => $entriesPerPage,
+                                            'pageNumber'     => $number);
+
+        // add current options as last argument
+        ksort($options);
+        $arguments[] = $options;
+
+        // verify cache
+        $id = serialize($arguments);
+        if (!array_key_exists($id, self::$_pageCache)) {
+            if ($number == $this->paginationOutput->pageNumber) {
+                // add itself to cache
+                $new = $this;
+            } else {
+                // request new page
+                $callback = array($proxy, $this->_operation);
+                $new      = call_user_func_array($callback, $arguments);
+            }
+            self::$_pageCache[$id] = $new;
+        }
+
+        return self::$_pageCache[$id];
+    }
+
+    /**
+     * @param  Zend_Service_Ebay_Finding $proxy
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function pageFirst(Zend_Service_Ebay_Finding $proxy)
+    {
+        return $this->page($proxy, 1);
+    }
+
+    /**
+     * @param  Zend_Service_Ebay_Finding $proxy
+     * @param  integer                   $max
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function pageLast(Zend_Service_Ebay_Finding $proxy, $max = self::PAGE_MAX_DEFAULT)
+    {
+        $last = $this->paginationOutput->totalPages;
+        if ($max > 0 && $last > $max) {
+            $last = $max;
+        }
+        return $this->page($proxy, $last);
+    }
+
+    /**
+     * @param  Zend_Service_Ebay_Finding $proxy
+     * @param  integer                   $max
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function pageNext(Zend_Service_Ebay_Finding $proxy, $max = self::PAGE_MAX_DEFAULT)
+    {
+        $next = $this->paginationOutput->pageNumber + 1;
+        $last = $this->paginationOutput->totalPages;
+        if (($max > 0 && $next > $max) || $next > $last) {
+            return null;
+        }
+        return $this->page($proxy, $next);
+    }
+
+    /**
+     * @param  Zend_Service_Ebay_Finding $proxy
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function pagePrevious(Zend_Service_Ebay_Finding $proxy)
+    {
+        $previous = $this->paginationOutput->pageNumber - 1;
+        if ($previous < 1) {
+            return null;
+        }
+        return $this->page($proxy, $previous);
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Response/Keywords.php b/lib/zend/Zend/Service/Ebay/Finding/Response/Keywords.php
new file mode 100644
index 00000000000..7e992a50212
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Response/Keywords.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Keywords.php 22824 2010-08-09 18:59:54Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Response_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Response/Abstract.php';
+
+/**
+ * @see Zend_Service_Ebay_Finding
+ */
+require_once 'Zend/Service/Ebay/Finding.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Response_Abstract
+ */
+class Zend_Service_Ebay_Finding_Response_Keywords extends Zend_Service_Ebay_Finding_Response_Abstract
+{
+    /**
+     * Contains a spell-checked version of the submitted keywords. If no
+     * recommended spelling can be identified for the submitted keywords, the
+     * response contains a warning to that effect and an empty keywords field
+     * is returned.
+     *
+     * @var string
+     */
+    public $keywords;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->keywords = $this->_query(".//$ns:keywords[1]", 'string');
+    }
+
+    /**
+     * @param  Zend_Service_Ebay_Finding $proxy
+     * @param  Zend_Config|array         $options
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function findItems(Zend_Service_Ebay_Finding $proxy, $options = null)
+    {
+        // prepare options
+        $options = Zend_Service_Ebay_Abstract::optionsToArray($options);
+        $options = $options + $this->_options;
+
+        // find items
+        return $proxy->findItemsByKeywords($this->keywords, $options);
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Search/Item.php b/lib/zend/Zend/Service/Ebay/Finding/Search/Item.php
new file mode 100644
index 00000000000..55c62e2c8a6
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Search/Item.php
@@ -0,0 +1,394 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http:framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http:framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Item.php 22824 2010-08-09 18:59:54Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http:framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_Search_Item extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * If true, the seller requires immediate payment for the item. If false (or
+     * not specified), immediate payment is not requested. Buyers must have a
+     * PayPal account to purchase items that require immediate payment.
+     *
+     * A seller can choose to require immediate payment for Fixed Price and Buy
+     * It Now listings, including eBay Stores Inventory listings. If a Buy It
+     * Now item ends as an auction (that is, if the Buy It Now option is removed
+     * due to bids being placed on the listing), the immediate payment
+     * requirement does not apply.
+     *
+     * @var boolean
+     */
+    public $autoPay;
+
+    /**
+     * A unique identification number assigned by eBay to registered nonprofit
+     * charity organizations.
+     *
+     * @var integer
+     */
+    public $charityId;
+
+    /**
+     * Two-letter ISO 3166 country code to indicate the country where the item
+     * is located.
+     *
+     * @link http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_names_and_code_elements.htm
+     * @var  string
+     */
+    public $country;
+
+    /**
+     * The distance that the item is from the buyer, calculated usin
+     *  buyerPostalCode.
+     *
+     *  The unit for distance varies by site, and is either miles or kilometers.
+     *  If the country whose site you are searching uses kilometers to measure
+     *  distance (for example, India/EBAY-IN), the unit is kilometers. If the
+     *  site is either the US or UK, the distance unit is miles.
+     *
+     *  This value is only returned for distance-based searches. You must
+     *  specify a buyerPostalCode and either sort by Distance, or use a
+     *  combination of the MaxDistance LocalSearch itemFilters.
+     *
+     * @var float
+     */
+    public $distance;
+
+    /**
+     * URL for the Gallery Plus image.
+     *
+     * The size of Gallery Plus images (up to 400 x 400 pixels) is bigger than
+     * the size of standard gallery images. In site search results, you can view
+     * the Gallery Plus image by hovering over or clicking the Enlarge link or
+     * magifying glass icon. The image uses one of the following graphics
+     * formats: JPEG, BMP, TIFF, or GIF. This field is only returned when the
+     * seller has opted for the Gallery Plus option for the given item.
+     *
+     * @var string[]
+     */
+    public $galleryPlusPictureURL;
+
+    /**
+     * URL for the Gallery thumbnail image.
+     *
+     * The image must be provided in one of the following graphics formats:
+     * JPEG, BMP, TIF, or GIF. Returned only if the seller chose to show a
+     * gallery image.
+     *
+     * @var string
+     */
+    public $galleryURL;
+
+    /**
+     * The identifier for the site on which the item is listed.
+     *
+     * Returns a Global ID, which is a unique identifier that specifies the
+     * combination of the site, language, and territory. In other eBay APIs
+     * (such as the Shopping API), this value is know as the site ID.
+     *
+     * @link http://developer.ebay.com/DevZone/finding/CallRef/Enums/GlobalIdList.html
+     * @var  string
+     */
+    public $globalId;
+
+    /**
+     * The ID that uniquely identifies the item listing.
+     *
+     * eBay generates this ID when an item is listed. ID values are unique
+     * across all eBay sites.
+     *
+     * @var string
+     */
+    public $itemId;
+
+    /**
+     * The format type of the listing, such as online auction, fixed price, or
+     * advertisement.
+     *
+     * @var Zend_Service_Ebay_Finding_ListingInfo
+     */
+    public $listingInfo;
+
+    /**
+     * Physical location of the item, as specified by the seller.
+     *
+     * This gives a general indication from where the item will be shipped (or
+     * delivered).
+     *
+     * @var string
+     */
+    public $location;
+
+    /**
+     * Identifies the payment method (or methods) the seller will accept for the
+     * item (such as PayPal).
+     *
+     *  Payment methods are not applicable to eBay Real Estate advertisement
+     *  listings or other Classified Ad listing formats.
+     *
+     * @link http://developer.ebay.com/DevZone/shopping/docs/CallRef/types/BuyerPaymentMethodCodeType.html
+     * @var  string[]
+     */
+    public $paymentMethod;
+
+    /**
+     * The postal code where the listed item is located.
+     *
+     * This field is returned only if a postal code has been specified by the
+     * seller. eBay proximity and local search behavior can use the combination
+     * of buyerPostalCode and postalCode values.
+     *
+     * @var string
+     */
+    public $postalCode;
+
+    /**
+     * Details about the first (or only) category in which the item is listed.
+     *
+     * Note that items can be listed in more than a single category.
+     *
+     * @var Zend_Service_Ebay_Finding_Category
+     */
+    public $primaryCategory;
+
+    /**
+     * Unique identifier for the eBay catalog product with which the item was
+     * listed.
+     *
+     * An eBay catalog product consists of pre-filled Item Specifics, additional
+     * descriptive information, plus a stock photo (if available). These product
+     * details are used to pre-fill item information, which is used to describe
+     * the item and can also help surface the item in searches.
+     *
+     * eBay supports the following types of product ID types: ISBN, UPC, EAN,
+     * and ReferenceID (ePID, also known as an eBay Product Reference ID).
+     * ReferenceID values are returned when available. A UPC, ISBN, or EAN
+     * product identifier will be returned only when a ReferenceID is not
+     * available.
+     *
+     * This productId value can be used as input with findItemsByProduct to
+     * retrieve items that were listed with the specified eBay catalog product.
+     *
+     * This field is only returned when a product was used to list the item.
+     *
+     * @var string
+     */
+    public $productId;
+
+    /**
+     * Details about the second category in which the item is listed.
+     *
+     * This element is not returned if the seller did not specify a secondary
+     * category.
+     *
+     * @var Zend_Service_Ebay_Finding_Category
+     */
+    public $secondaryCategory;
+
+    /**
+     * Information about the item's seller.
+     *
+     * Only returned if SellerInfo is specified in the outputSelector field in
+     * the request.
+     *
+     * @var Zend_Service_Ebay_Finding_SellerInfo
+     */
+    public $sellerInfo;
+
+    /**
+     * Specifies the item's selling status with regards to eBay's processing
+     * workflow.
+     *
+     * @var Zend_Service_Ebay_Finding_SellingStatus
+     */
+    public $sellingStatus;
+
+    /**
+     * Container for data about a listing's shipping details.
+     *
+     * @var Zend_Service_Ebay_Finding_ShippingInfo
+     */
+    public $shippingInfo;
+
+    /**
+     * Information about the eBay store in which the item is listed.
+     *
+     * Only returned if the item is listed in a store and StoreInfo is specified
+     * in the outputSelector field in the request.
+     *
+     * @var Zend_Service_Ebay_Finding_Storefront
+     */
+    public $storeInfo;
+
+    /**
+     * Subtitle of the item.
+     *
+     * Only returned if the seller included a subtitle for the listing.
+     *
+     * @var string
+     */
+    public $subtitle;
+
+    /**
+     * Name of the item as it appears in the listing title, or in search and
+     * browse results.
+     *
+     * @var string
+     */
+    public $title;
+
+    /**
+     * The URL to view this specific listing on eBay.
+     *
+     * The returned URL is optimized to support natural search. That is, the URL
+     * is designed to make items on eBay easier to find via popular internet
+     * search engines. The URL includes the item title along with other
+     * optimizations. To note, "?" (question mark) optimizes to "_W0QQ", "&"
+     * (ampersand) optimizes to "QQ", and "=" (equals sign) optimizes to "Z".
+     *
+     * Do not modify the returned URLs in your application queries (for example,
+     * eBay won't recognize the URL if you change QQ to &). In the Sandbox
+     * environment (and on the Hong Kong site), the data returned in this field
+     * is a standard ViewItem URL rather than the ViewItemURL for natural
+     * search.
+     *
+     * @var string
+     */
+    public $viewItemURL;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->autoPay               = $this->_query(".//$ns:autoPay[1]", 'boolean');
+        $this->charityId             = $this->_query(".//$ns:charityId[1]", 'integer');
+        $this->country               = $this->_query(".//$ns:country[1]", 'string');
+        $this->distance              = $this->_query(".//$ns:distance[1]", 'float');
+        $this->galleryPlusPictureURL = $this->_query(".//$ns:galleryPlusPictureURL", 'string', true);
+        $this->galleryURL            = $this->_query(".//$ns:galleryURL[1]", 'string');
+        $this->globalId              = $this->_query(".//$ns:globalId[1]", 'string');
+        $this->itemId                = $this->_query(".//$ns:itemId[1]", 'string');
+        $this->location              = $this->_query(".//$ns:location[1]", 'string');
+        $this->paymentMethod         = $this->_query(".//$ns:paymentMethod", 'string', true);
+        $this->postalCode            = $this->_query(".//$ns:postalCode[1]", 'string');
+        $this->productId             = $this->_query(".//$ns:productId[1]", 'string');
+        $this->subtitle              = $this->_query(".//$ns:subtitle[1]", 'string');
+        $this->title                 = $this->_query(".//$ns:title[1]", 'string');
+        $this->viewItemURL           = $this->_query(".//$ns:viewItemURL[1]", 'string');
+
+        $this->_attributes['distance'] = array(
+            'unit' => $this->_query(".//$ns:distance[1]/@unit[1]", 'string')
+        );
+        $this->_attributes['productId'] = array(
+            'type' => $this->_query(".//$ns:productId[1]/@type[1]", 'string')
+        );
+
+        $node = $this->_xPath->query(".//$ns:listingInfo[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_ListingInfo
+             */
+            require_once 'Zend/Service/Ebay/Finding/ListingInfo.php';
+            $this->listingInfo = new Zend_Service_Ebay_Finding_ListingInfo($node);
+        }
+
+        $node = $this->_xPath->query(".//$ns:primaryCategory[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Category
+             */
+            require_once 'Zend/Service/Ebay/Finding/Category.php';
+            $this->primaryCategory = new Zend_Service_Ebay_Finding_Category($node);
+        }
+
+        $node = $this->_xPath->query(".//$ns:secondaryCategory[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Category
+             */
+            require_once 'Zend/Service/Ebay/Finding/Category.php';
+            $this->secondaryCategory = new Zend_Service_Ebay_Finding_Category($node);
+        }
+
+        $node = $this->_xPath->query(".//$ns:sellerInfo[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_SellerInfo
+             */
+            require_once 'Zend/Service/Ebay/Finding/SellerInfo.php';
+            $this->sellerInfo = new Zend_Service_Ebay_Finding_SellerInfo($node);
+        }
+
+        $node = $this->_xPath->query(".//$ns:sellingStatus[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_SellingStatus
+             */
+            require_once 'Zend/Service/Ebay/Finding/SellingStatus.php';
+            $this->sellingStatus = new Zend_Service_Ebay_Finding_SellingStatus($node);
+        }
+
+        $node = $this->_xPath->query("./$ns:shippingInfo", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_ShippingInfo
+             */
+            require_once 'Zend/Service/Ebay/Finding/ShippingInfo.php';
+            $this->shippingInfo = new Zend_Service_Ebay_Finding_ShippingInfo($node);
+        }
+
+        $node = $this->_xPath->query(".//$ns:storeInfo[1]", $this->_dom)->item(0);
+        if ($node) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Storefront
+             */
+            require_once 'Zend/Service/Ebay/Finding/Storefront.php';
+            $this->storeInfo = new Zend_Service_Ebay_Finding_Storefront($node);
+        }
+    }
+
+    /**
+     * @param  Zend_Service_Ebay_Finding $proxy
+     * @param  Zend_Config|array         $options
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function findItemsByProduct(Zend_Service_Ebay_Finding $proxy, $options = null)
+    {
+        $type = $this->attributes('productId', 'type');
+        return $proxy->findItemsByProduct($this->productId, $type, $options);
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Search/Item/Set.php b/lib/zend/Zend/Service/Ebay/Finding/Search/Item/Set.php
new file mode 100644
index 00000000000..57a3727fe52
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Search/Item/Set.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Set_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Set/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Set_Abstract
+ */
+class Zend_Service_Ebay_Finding_Search_Item_Set extends Zend_Service_Ebay_Finding_Set_Abstract
+{
+    /**
+     * Implement SeekableIterator::current()
+     *
+     * @return Zend_Service_Ebay_Finding_Search_Item
+     */
+    public function current()
+    {
+        // check node
+        $node = $this->_nodes->item($this->_key);
+        if (!$node) {
+            return null;
+        }
+
+        /**
+         * @see Zend_Service_Ebay_Finding_Search_Item
+         */
+        require_once 'Zend/Service/Ebay/Finding/Search/Item.php';
+        return new Zend_Service_Ebay_Finding_Search_Item($node);
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Search/Result.php b/lib/zend/Zend/Service/Ebay/Finding/Search/Result.php
new file mode 100644
index 00000000000..9509b99625a
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Search/Result.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Result.php 22804 2010-08-08 05:08:05Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_Search_Result extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * Container for the data of a single item that matches the search criteria.
+     *
+     * @var Zend_Service_Ebay_Finding_Search_Item_Set
+     */
+    public $item;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+
+        $nodes = $this->_xPath->query(".//$ns:item", $this->_dom);
+        if ($nodes) {
+            /**
+             * @see Zend_Service_Ebay_Finding_Search_Item_Set
+             */
+            require_once 'Zend/Service/Ebay/Finding/Search/Item/Set.php';
+            $this->item = new Zend_Service_Ebay_Finding_Search_Item_Set($nodes);
+        }
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/SellerInfo.php b/lib/zend/Zend/Service/Ebay/Finding/SellerInfo.php
new file mode 100644
index 00000000000..4e7081ebdd5
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/SellerInfo.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: SellerInfo.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_SellerInfo extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * Visual indicator of user's feedback score.
+     *
+     * Applicable values:
+     *
+     *     None
+     *     No graphic displayed, feedback score 0-9.
+     *
+     *     Yellow
+     *     Yellow Star, feedback score 10-49.
+     *
+     *     Blue
+     *     Blue Star, feedback score 50-99.
+     *
+     *     Turquoise
+     *     Turquoise Star, feedback score 100-499.
+     *
+     *     Purple
+     *     Purple Star, feedback score 500-999.
+     *
+     *     Red
+     *     Red Star, feedback score 1,000-4,999.
+     *
+     *     Green
+     *     Green Star, feedback score 5,000-9,999.
+     *
+     *     YellowShooting
+     *     Yellow Shooting Star, feedback score 10,000-24,999.
+     *
+     *     TurquoiseShooting
+     *     Turquoise Shooting Star, feedback score 25,000-49,999.
+     *
+     *     PurpleShooting
+     *     Purple Shooting Star, feedback score 50,000-99,999.
+     *
+     *     RedShooting
+     *     Red Shooting Star, feedback score 100,000-499,000 and above.
+     *
+     *     GreenShooting
+     *     Green Shooting Star, feedback score 500,000-999,000 and above.
+     *
+     *     SilverShooting
+     *     Silver Shooting Star, feedback score 1,000,000 or more.
+     *
+     * @var string
+     */
+    public $feedbackRatingStar;
+
+    /**
+     * The aggregate feedback score of the seller.
+     *
+     * A seller's feedback score is their net positive feedback minus their net
+     * negative feedback. Feedback scores are a quantitative expression of the
+     * desirability of dealing with a seller in a transaction.
+     *
+     * @var integer
+     */
+    public $feedbackScore;
+
+    /**
+     * The percentage value of a user's positive feedback (their positive
+     * feedbackScore divided by their total positive plus negative feedback).
+     *
+     * @var float
+     */
+    public $positiveFeedbackPercent;
+
+    /**
+     * The seller's eBay user name; a unique value.
+     *
+     * @var string
+     */
+    public $sellerUserName;
+
+    /**
+     * Indicates whether the seller of the item is top-rated.
+     *
+     * A top-rated seller:
+     *     - Consistently receives highest buyers' ratings
+     *     - Ships items quickly
+     *     - Has earned a track record of excellent service
+     *
+     * eBay regularly reviews the performance of these sellers to confirm they
+     * continue to meet the program's requirements.
+     *
+     * This field is returned for the following sites only: US (EBAY-US), Motors
+     * (EBAY-MOTOR), DE (EBAY-DE), AT (EBAY-AT), and CH (EBAY-CH).
+     *
+     * @var boolean
+     */
+    public $topRatedSeller;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->feedbackRatingStar      = $this->_query(".//$ns:feedbackRatingStar[1]", 'string');
+        $this->feedbackScore           = $this->_query(".//$ns:feedbackScore[1]", 'integer');
+        $this->positiveFeedbackPercent = $this->_query(".//$ns:positiveFeedbackPercent[1]", 'float');
+        $this->sellerUserName          = $this->_query(".//$ns:sellerUserName[1]", 'string');
+        $this->topRatedSeller          = $this->_query(".//$ns:topRatedSeller[1]", 'boolean');
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/SellingStatus.php b/lib/zend/Zend/Service/Ebay/Finding/SellingStatus.php
new file mode 100644
index 00000000000..a6a3295607b
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/SellingStatus.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: SellingStatus.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_SellingStatus extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * The number of bids that have been placed on the item.
+     *
+     * @var integer
+     */
+    public $bidCount;
+
+    /**
+     * The listing's current price converted to the currency of the site
+     * specified in the find request (globalId).
+     *
+     * @var float
+     */
+    public $convertedCurrentPrice;
+
+    /**
+     * The current price of the item given in the currency of the site on which
+     * the item is listed.
+     *
+     * That is, currentPrice is returned in the original listing currency.
+     *
+     * For competitive-bid item listings, currentPrice is the current minimum
+     * bid price if the listing has no bids, or the current high bid if the
+     * listing has bids. A Buy It Now price has no effect on currentPrice.
+     *
+     * For Basic Fixed-Price (FixedPrice), Store Inventory (StoreInventory), and
+     * Ad Format (AdFormat) listings, currentPrice is the current fixed price.
+     *
+     * @var float
+     */
+    public $currentPrice;
+
+    /**
+     * Specifies the listing's status in eBay's processing workflow.
+     *
+     * If an item's EndTime is in the past, but there are no details about the
+     * buyer or high bidder (and the user is not anonymous), you can use
+     * sellingState information to determine whether eBay has finished
+     * processing the listing.
+     *
+     * Applicable values:
+     *
+     *     Active
+     *     The listing is still live. It is also possible that the auction has
+     *     recently ended, but eBay has not completed the final processing
+     *     (e.g., the high bidder is still being determined).
+     *
+     *     Canceled
+     *     The listing has been canceled by either the seller or eBay.
+     *
+     *     Ended
+     *     The listing has ended and eBay has completed the processing of the
+     *     sale (if any).
+     *
+     * @var string
+     */
+    public $sellingState;
+
+    /**
+     * Time left before the listing ends.
+     *
+     * The duration is represented in the ISO 8601 duration format
+     * (PnYnMnDTnHnMnS). For listings that have ended, the time left is PT0S
+     * (zero seconds). See the "duration" type for information about this time
+     * format.
+     *
+     * @var string
+     */
+    public $timeLeft;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->bidCount              = $this->_query(".//$ns:bidCount[1]", 'integer');
+        $this->convertedCurrentPrice = $this->_query(".//$ns:convertedCurrentPrice[1]", 'float');
+        $this->currentPrice          = $this->_query(".//$ns:currentPrice[1]", 'float');
+        $this->sellingState          = $this->_query(".//$ns:sellingState[1]", 'string');
+        $this->timeLeft              = $this->_query(".//$ns:timeLeft[1]", 'string');
+
+        $this->_attributes['convertedCurrentPrice'] = array(
+            'currencyId' => $this->_query(".//$ns:convertedCurrentPrice[1]/@currencyId[1]", 'string')
+        );
+
+        $this->_attributes['currentPrice'] = array(
+            'currencyId' => $this->_query(".//$ns:currentPrice[1]/@currencyId[1]", 'string')
+        );
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Set/Abstract.php b/lib/zend/Zend/Service/Ebay/Finding/Set/Abstract.php
new file mode 100644
index 00000000000..08abf109f90
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Set/Abstract.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Abstract.php 20166 2010-01-09 19:00:17Z bkarwin $
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Service_Ebay_Finding_Set_Abstract implements SeekableIterator, Countable
+{
+    /**
+     * @var DOMNodeList
+     */
+    protected $_nodes;
+
+    /**
+     * @var integer
+     */
+    protected $_key = 0;
+
+    /**
+     * @param  DOMNodeList $nodes
+     * @return void
+     */
+    public function __construct(DOMNodeList $nodes)
+    {
+        $this->_nodes = $nodes;
+        $this->_init();
+    }
+
+    /**
+     * Initialize object.
+     *
+     * Called from {@link __construct()} as final step of object initialization.
+     *
+     * @return void
+     */
+    protected function _init()
+    {
+    }
+
+    /**
+     * Implement SeekableIterator::seek()
+     *
+     * @param  integer $key
+     * @throws OutOfBoundsException When $key is not seekable
+     * @return void
+     */
+    public function seek($key)
+    {
+        if ($key < 0 || $key >= $this->count()) {
+            $message = "Position '{$key}' is not seekable.";
+            throw new OutOfBoundsException($message);
+        }
+        $this->_key = $key;
+    }
+
+    /**
+     * Implement Iterator::key()
+     *
+     * @return integer
+     */
+    public function key()
+    {
+        return $this->_key;
+    }
+
+    /**
+     * Implement Iterator::next()
+     *
+     * @return void
+     */
+    public function next()
+    {
+        $this->_key++;
+    }
+
+    /**
+     * Implement Iterator::rewind()
+     *
+     * @return void
+     */
+    public function rewind()
+    {
+        $this->_key = 0;
+    }
+
+    /**
+     * Implement Iterator::valid()
+     *
+     * @return boolean
+     */
+    public function valid()
+    {
+        return $this->_key >= 0 && $this->_key < $this->count();
+    }
+
+    /**
+     * Implement Countable::current()
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return $this->_nodes ? $this->_nodes->length : 0;
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/ShippingInfo.php b/lib/zend/Zend/Service/Ebay/Finding/ShippingInfo.php
new file mode 100644
index 00000000000..a31257a0353
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/ShippingInfo.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: ShippingInfo.php 22791 2010-08-04 16:11:47Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_ShippingInfo extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * The basic shipping cost of the item.
+     *
+     * @var float
+     */
+    public $shippingServiceCost;
+
+    /**
+     * The shipping method that was used for determining the cost of shipping.
+     *
+     * For example: flat rate, calculated, or free. The seller specifies the
+     * available shipping services when they list the item.
+     *
+     * Applicable values:
+     *
+     *     Calculated
+     *     The calculated shipping model: The posted cost of shipping is based
+     *     on the buyer-selected shipping service, chosen by the buyer from the
+     *     different shipping services offered by the seller. The shipping costs
+     *     are calculated by eBay and the shipping carrier, based on the buyer's
+     *     address. Any packaging and handling costs established by the seller
+     *     are automatically rolled into the total.
+     *
+     *     CalculatedDomesticFlatInternational
+     *     The seller specified one or more calculated domestic shipping
+     *     services and one or more flat international shipping services.
+     *
+     *     Flat
+     *     The flat-rate shipping model: The seller establishes the cost of
+     *     shipping and any shipping insurance, regardless of what any
+     *     buyer-selected shipping service might charge the seller.
+     *
+     *     FlatDomesticCalculatedInternational
+     *     The seller specified one or more flat domestic shipping services and
+     *     one or more calculated international shipping services.
+     *
+     *     Free
+     *     Free is used when the seller has declared that shipping is free for
+     *     the buyer.
+     *
+     *     FreePickup
+     *     No shipping available, the buyer must pick up the item from the
+     *     seller.
+     *
+     *     Freight
+     *     The freight shipping model: the cost of shipping is determined by a
+     *     third party, FreightQuote.com, based on the buyer's address (postal
+     *     code).
+     *
+     *     FreightFlat
+     *     The flat rate shipping model: the seller establishes the cost of
+     *     freight shipping and freight insurance, regardless of what any
+     *     buyer-selected shipping service might charge the seller.
+     *
+     *     NotSpecified
+     *     The seller did not specify the shipping type.
+     *
+     * @var string
+     */
+    public $shippingType;
+
+    /**
+     * An international location or region to which the seller is willing to
+     * ship the item.
+     *
+     * Returned only for items that have shipToLocations specified.
+     *
+     * @link http://developer.ebay.com/DevZone/finding/CallRef/Enums/shipToLocationList.html
+     * @var  string[]
+     */
+    public $shipToLocations;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->shippingServiceCost = $this->_query(".//$ns:shippingServiceCost[1]", 'float');
+        $this->shippingType        = $this->_query(".//$ns:shippingType[1]", 'string');
+        $this->shipToLocations     = $this->_query(".//$ns:shipToLocations", 'string', true);
+
+        $this->_attributes['shippingServiceCost'] = array(
+            'currencyId' => $this->_query(".//$ns:shippingServiceCost[1]/@currencyId[1]", 'string')
+        );
+    }
+}
diff --git a/lib/zend/Zend/Service/Ebay/Finding/Storefront.php b/lib/zend/Zend/Service/Ebay/Finding/Storefront.php
new file mode 100644
index 00000000000..a32ffb9be83
--- /dev/null
+++ b/lib/zend/Zend/Service/Ebay/Finding/Storefront.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Storefront.php 22824 2010-08-09 18:59:54Z renanbr $
+ */
+
+/**
+ * @see Zend_Service_Ebay_Finding_Abstract
+ */
+require_once 'Zend/Service/Ebay/Finding/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Ebay
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @uses       Zend_Service_Ebay_Finding_Abstract
+ */
+class Zend_Service_Ebay_Finding_Storefront extends Zend_Service_Ebay_Finding_Abstract
+{
+    /**
+     * The name of the seller's eBay Store.
+     *
+     * @var string
+     */
+    public $storeName;
+
+    /**
+     * The URL of the seller's eBay Store page.
+     *
+     * @var string
+     */
+    public $storeURL;
+
+    /**
+     * @return void
+     */
+    protected function _init()
+    {
+        parent::_init();
+        $ns = Zend_Service_Ebay_Finding::XMLNS_FINDING;
+
+        $this->storeName = $this->_query(".//$ns:storeName[1]", 'string');
+        $this->storeURL  = $this->_query(".//$ns:storeURL[1]", 'string');
+    }
+
+    /**
+     * @param  Zend_Service_Ebay_Finding $proxy
+     * @param  Zend_Config|array         $options
+     * @return Zend_Service_Ebay_Finding_Response_Items
+     */
+    public function findItems(Zend_Service_Ebay_Finding $proxy, $options = null)
+    {
+        return $proxy->findItemsInEbayStores($this->storeName, $options);
+    }
+}
diff --git a/lib/zend/Zend/Service/Exception.php b/lib/zend/Zend/Service/Exception.php
index 6421b7b78f0..15beef5cc1c 100644
--- a/lib/zend/Zend/Service/Exception.php
+++ b/lib/zend/Zend/Service/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Exception.php';
 /**
  * @category   Zend
  * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Exception extends Zend_Exception
diff --git a/lib/zend/Zend/Service/Flickr.php b/lib/zend/Zend/Service/Flickr.php
index af185f0ad18..a748ed4820a 100644
--- a/lib/zend/Zend/Service/Flickr.php
+++ b/lib/zend/Zend/Service/Flickr.php
@@ -16,17 +16,19 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Flickr
@@ -34,7 +36,7 @@ class Zend_Service_Flickr
     /**
      * Base URI for the REST client
      */
-    const URI_BASE = 'http://www.flickr.com';
+    const URI_BASE = 'https://www.flickr.com';
 
     /**
      * Your Flickr API key
@@ -62,10 +64,6 @@ class Zend_Service_Flickr
      */
     public function __construct($apiKey)
     {
-        iconv_set_encoding('output_encoding', 'UTF-8');
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
-
         $this->apiKey = (string) $apiKey;
     }
 
@@ -118,8 +116,7 @@ class Zend_Service_Flickr
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -182,8 +179,7 @@ class Zend_Service_Flickr
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -237,8 +233,7 @@ class Zend_Service_Flickr
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -287,7 +282,7 @@ class Zend_Service_Flickr
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
         $xpath = new DOMXPath($dom);
         return (string) $xpath->query('//user')->item(0)->getAttribute('id');
@@ -331,7 +326,7 @@ class Zend_Service_Flickr
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
         $xpath = new DOMXPath($dom);
         return (string) $xpath->query('//user')->item(0)->getAttribute('id');
@@ -364,7 +359,7 @@ class Zend_Service_Flickr
         $response = $restClient->restGet('/services/rest/', $options);
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         $xpath = new DOMXPath($dom);
         self::_checkErrors($dom);
         $retval = array();
diff --git a/lib/zend/Zend/Service/Flickr/Image.php b/lib/zend/Zend/Service/Flickr/Image.php
index fcf3063f8fc..197f9533990 100644
--- a/lib/zend/Zend/Service/Flickr/Image.php
+++ b/lib/zend/Zend/Service/Flickr/Image.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Flickr_Image
diff --git a/lib/zend/Zend/Service/Flickr/Result.php b/lib/zend/Zend/Service/Flickr/Result.php
index 8fcea0812d4..8fad69a28a0 100644
--- a/lib/zend/Zend/Service/Flickr/Result.php
+++ b/lib/zend/Zend/Service/Flickr/Result.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Flickr_Result
diff --git a/lib/zend/Zend/Service/Flickr/ResultSet.php b/lib/zend/Zend/Service/Flickr/ResultSet.php
index 2368627552e..31dd41050c5 100644
--- a/lib/zend/Zend/Service/Flickr/ResultSet.php
+++ b/lib/zend/Zend/Service/Flickr/ResultSet.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Flickr/Result.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Flickr_ResultSet implements SeekableIterator
diff --git a/lib/zend/Zend/Service/LiveDocx.php b/lib/zend/Zend/Service/LiveDocx.php
index 02521327e89..7df6ebc44a1 100644
--- a/lib/zend/Zend/Service/LiveDocx.php
+++ b/lib/zend/Zend/Service/LiveDocx.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @since      LiveDocx 1.0
  */
@@ -34,7 +34,7 @@ class Zend_Service_LiveDocx
      * LiveDocx service version
      * @since LiveDocx 1.0
      */
-    const VERSION = '1.2';
+    const VERSION = '2.0';
 
     /**
      * SOAP client used to connect to LiveDocx service
@@ -42,37 +42,37 @@ class Zend_Service_LiveDocx
      * @since LiveDocx 1.0
      */
     protected $_soapClient;
-        
+
     /**
      * WSDL of LiveDocx web service
      * @var   string
      * @since LiveDocx 1.0
      */
     protected $_wsdl;
-        
+
     /**
      * Array of credentials (username and password) to log into backend server
      * @var   array
      * @since LiveDocx 1.2
      */
     protected $_credentials;
-    
+
     /**
      * Set to true, when session is logged into backend server
      * @var   boolean
      * @since LiveDocx 1.2
      */
     protected $_loggedIn;
-    
+
     /**
      * Constructor
      *
      * Optionally, pass an array of options (or Zend_Config object).
-     * 
-     * If an option with the key 'soapClient' is provided, that value will be 
+     *
+     * If an option with the key 'soapClient' is provided, that value will be
      * used to set the internal SOAP client used to connect to the LiveDocx
      * service.
-     * 
+     *
      * Use 'soapClient' in the case that you have a dedicated or (locally
      * installed) licensed LiveDocx server. For example:
      *
@@ -85,7 +85,7 @@ class Zend_Service_LiveDocx
      *     )
      * );
      * {code}
-     * 
+     *
      * Replace the URI of the WSDL in the constructor of Zend_Soap_Client with
      * that of your dedicated or licensed LiveDocx server.
      *
@@ -100,54 +100,54 @@ class Zend_Service_LiveDocx
      *     )
      * );
      * {code}
-     * 
+     *
      * If you prefer to not pass the username and password through the
      * constructor, you can also call the following methods:
-     * 
+     *
      * {code}
      * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge();
-     * 
+     *
      * $phpLiveDocx->setUsername('myUsername')
      *             ->setPassword('myPassword');
      * {/code}
-     * 
+     *
      * Or, if you want to specify your own SoapClient:
-     * 
+     *
      * {code}
      * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge();
-     * 
+     *
      * $phpLiveDocx->setUsername('myUsername')
      *             ->setPassword('myPassword');
-     * 
+     *
      * $phpLiveDocx->setSoapClient(
      *     new Zend_Soap_Client('https://api.example.com/path/mailmerge.asmx?WSDL')
      * );
-     * {/code} 
+     * {/code}
      *
      * @param  array|Zend_Config $options
      * @return void
      * @throws Zend_Service_LiveDocx_Exception
      * @since  LiveDocx 1.0
-     */    
+     */
     public function __construct($options = null)
     {
         $this->_credentials = array();
         $this->_loggedIn = false;
-        
+
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         }
-        
+
         if (is_array($options)) {
             $this->setOptions($options);
         }
     }
-    
+
     /**
      * Set options
      * One or more of username, password, soapClient
-     * 
-     * @param  $options
+     *
+     * @param  array $options
      * @return Zend_Service_LiveDocx
      * @since  LiveDocx 1.2
      */
@@ -159,10 +159,10 @@ class Zend_Service_LiveDocx
                 $this->$method($value);
             }
         }
-        
+
         return $this;
     }
-        
+
     /**
      * Clean up and log out of LiveDocx service
      *
@@ -173,7 +173,7 @@ class Zend_Service_LiveDocx
     {
         return $this->logOut();
     }
-    
+
     /**
      * Init Soap client - connect to SOAP service
      *
@@ -187,13 +187,13 @@ class Zend_Service_LiveDocx
         try {
             require_once 'Zend/Soap/Client.php';
             $this->_soapClient = new Zend_Soap_Client();
-            $this->_soapClient->setWsdl($endpoint);                
+            $this->_soapClient->setWsdl($endpoint);
         } catch (Zend_Soap_Client_Exception $e) {
             require_once 'Zend/Service/LiveDocx/Exception.php';
             throw new Zend_Service_LiveDocx_Exception('Cannot connect to LiveDocx service at ' . $endpoint, 0, $e);
-        }            
+        }
     }
-    
+
     /**
      * Get SOAP client
      *
@@ -204,7 +204,7 @@ class Zend_Service_LiveDocx
     {
         return $this->_soapClient;
     }
-    
+
     /**
      * Set SOAP client
      *
@@ -237,18 +237,18 @@ class Zend_Service_LiveDocx
                     'Username has not been set. To set username specify the options array in the constructor or call setUsername($username) after instantiation'
                 );
             }
-            
+
             if (null === $this->getPassword()) {
                 require_once 'Zend/Service/LiveDocx/Exception.php';
                 throw new Zend_Service_LiveDocx_Exception(
                     'Password has not been set. To set password specify the options array in the constructor or call setPassword($password) after instantiation'
                 );
             }
-            
+
             if (null === $this->getSoapClient()) {
                 $this->_initSoapClient($this->_wsdl);
-            }            
-            
+            }
+
             try {
                 $this->getSoapClient()->LogIn(array(
                     'username' => $this->getUsername(),
@@ -260,9 +260,9 @@ class Zend_Service_LiveDocx
                 throw new Zend_Service_LiveDocx_Exception(
                     'Cannot login into LiveDocx service - username and/or password are invalid', 0, $e
                 );
-            }            
+            }
         }
-        
+
         return $this->_loggedIn;
     }
 
@@ -284,15 +284,15 @@ class Zend_Service_LiveDocx
                 throw new Zend_Service_LiveDocx_Exception(
                     'Cannot log out of LiveDocx service', 0, $e
                 );
-            }            
+            }
         }
-        
+
         return $this->_loggedIn;
     }
-    
+
     /**
      * Return true, if session is currently logged into the backend server
-     * 
+     *
      * @return boolean
      * @since  LiveDocx 1.2
      */
@@ -300,10 +300,10 @@ class Zend_Service_LiveDocx
     {
         return $this->_loggedIn;
     }
-    
+
     /**
      * Set username
-     * 
+     *
      * @return Zend_Service_LiveDocx
      * @since  LiveDocx 1.0
      */
@@ -312,13 +312,13 @@ class Zend_Service_LiveDocx
         $this->_credentials['username'] = $username;
         return $this;
     }
-    
+
     /**
      * Set password
-     * 
+     *
      * @return Zend_Service_LiveDocx
      * @since  LiveDocx 1.0
-     */    
+     */
     public function setPassword($password)
     {
         $this->_credentials['password'] = $password;
@@ -327,19 +327,19 @@ class Zend_Service_LiveDocx
 
     /**
      * Set WSDL of LiveDocx web service
-     * 
+     *
      * @return Zend_Service_LiveDocx
      * @since  LiveDocx 1.0
-     */      
-    public function setWsdl($wsdl) 
+     */
+    public function setWsdl($wsdl)
     {
         $this->_wsdl = $wsdl;
         return $this;
     }
-      
+
     /**
      * Return current username
-     * 
+     *
      * @return string|null
      * @since  LiveDocx 1.0
      */
@@ -348,35 +348,35 @@ class Zend_Service_LiveDocx
         if (isset($this->_credentials['username'])) {
             return $this->_credentials['username'];
         }
-        
+
         return null;
     }
-    
+
     /**
      * Return current password
-     * 
+     *
      * @return string|null
      * @since  LiveDocx 1.0
-     */    
+     */
     public function getPassword()
     {
         if (isset($this->_credentials['password'])) {
             return $this->_credentials['password'];
         }
-        
-        return null; 
+
+        return null;
     }
-    
+
     /**
      * Return WSDL of LiveDocx web service
-     * 
+     *
      * @return Zend_Service_LiveDocx
      * @since  LiveDocx 1.0
-     */      
-    public function getWsdl() 
+     */
+    public function getWsdl()
     {
         return $this->_wsdl;
-    }    
+    }
 
     /**
      * Return the document format (extension) of a filename
@@ -389,7 +389,7 @@ class Zend_Service_LiveDocx
     {
         return strtolower(substr(strrchr($filename, '.'), 1));
     }
-    
+
     /**
      * Return the current API version
      *
@@ -400,7 +400,7 @@ class Zend_Service_LiveDocx
     {
         return self::VERSION;
     }
-    
+
     /**
      * Compare the current API version with another version
      *
@@ -412,4 +412,4 @@ class Zend_Service_LiveDocx
     {
         return version_compare($version, $this->getVersion());
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Service/LiveDocx/Exception.php b/lib/zend/Zend/Service/LiveDocx/Exception.php
index a410e56bc25..53610c4afce 100644
--- a/lib/zend/Zend/Service/LiveDocx/Exception.php
+++ b/lib/zend/Zend/Service/LiveDocx/Exception.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,10 +30,10 @@ require_once 'Zend/Service/Exception.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @since      LiveDocx 1.0
  */
 class Zend_Service_LiveDocx_Exception extends Zend_Service_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Service/LiveDocx/MailMerge.php b/lib/zend/Zend/Service/LiveDocx/MailMerge.php
index 487730ef47c..0287e73f890 100644
--- a/lib/zend/Zend/Service/LiveDocx/MailMerge.php
+++ b/lib/zend/Zend/Service/LiveDocx/MailMerge.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,17 +30,18 @@ require_once 'Zend/Service/LiveDocx.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @since      LiveDocx 1.0 
+ * @since      LiveDocx 1.0
  */
 class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
 {
     /**
      * URI of LiveDocx.MailMerge WSDL
-     * @since LiveDocx 1.0 
+     * @since LiveDocx 1.0
      */
-    const WSDL = 'https://api.livedocx.com/1.2/mailmerge.asmx?WSDL';
+    //const WSDL = 'https://api.livedocx.com/1.2/mailmerge.asmx?WSDL';
+    const WSDL = 'https://api.livedocx.com/2.0/mailmerge.asmx?WSDL';
 
     /**
      * Field values
@@ -70,7 +71,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
         $this->_wsdl             = self::WSDL;
         $this->_fieldValues      = array();
         $this->_blockFieldValues = array();
-        
+
         parent::__construct($options);
     }
 
@@ -85,8 +86,14 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
      */
     public function setLocalTemplate($filename)
     {
+        if (!is_readable($filename)) {
+            throw new Zend_Service_LiveDocx_Exception(
+                'Cannot read local template from disk.'
+            );
+        }
+
         $this->logIn();
-        
+
         try {
             $this->getSoapClient()->SetLocalTemplate(array(
                 'template' => base64_encode(file_get_contents($filename)),
@@ -114,7 +121,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function setRemoteTemplate($filename)
     {
         $this->logIn();
-        
+
         try {
             $this->getSoapClient()->SetRemoteTemplate(array(
                 'filename' => $filename,
@@ -140,7 +147,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function setFieldValues($values)
     {
         $this->logIn();
-        
+
         foreach ($values as $value) {
             if (is_array($value)) {
                 $method = 'multiAssocArrayToArrayOfArrayOfString';
@@ -149,7 +156,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
             }
             break;
         }
-        
+
         try {
             $this->getSoapClient()->SetFieldValues(array(
                 'fieldValues' => self::$method($values),
@@ -177,7 +184,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function setFieldValue($field, $value)
     {
         $this->_fieldValues[$field] = $value;
-        
+
         return $this;
     }
 
@@ -194,7 +201,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function setBlockFieldValues($blockName, $blockFieldValues)
     {
         $this->logIn();
-        
+
         try {
             $this->getSoapClient()->SetBlockFieldValues(array(
                 'blockName'        => $blockName,
@@ -243,9 +250,9 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
 
     /**
      * Set a password to open to document
-     * 
+     *
      * This method can only be used for PDF documents
-     * 
+     *
      * @param  string  $password
      * @return Zend_Service_LiveDocx_MailMerge
      * @throws Zend_Service_LiveDocx_Exception
@@ -254,7 +261,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function setDocumentPassword($password)
     {
         $this->logIn();
-        
+
         try {
             $this->getSoapClient()->SetDocumentPassword(array(
                 'password' => $password
@@ -265,18 +272,18 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
                 'Cannot set document password. This method can be used on PDF files only.', 0, $e
             );
         }
-        
-        return $this;        
+
+        return $this;
     }
-    
+
     /**
      * Set a master password for document and determine which security features
      * are accessible without using the master password.
-     * 
+     *
      * As default, nothing is allowed. To allow a security setting,
      * explicatively set it using one of he DOCUMENT_ACCESS_PERMISSION_* class
-     * constants. 
-     * 
+     * constants.
+     *
      * {code}
      * $phpLiveDocx->setDocumentAccessPermissions(
      *     array (
@@ -286,10 +293,10 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
      *     'myDocumentAccessPassword'
      * );
      * {code}
-     * 
+     *
      * This method can only be used for PDF documents
-     * 
-     * @param  array  $permissions 
+     *
+     * @param  array  $permissions
      * @param  string $password
      * @return Zend_Service_LiveDocx_MailMerge
      * @throws Zend_Service_LiveDocx_Exception
@@ -298,7 +305,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function setDocumentAccessPermissions($permissions, $password)
     {
         $this->logIn();
-        
+
         try {
             $this->getSoapClient()->SetDocumentAccessPermissions(array(
                 'permissions' => $permissions,
@@ -310,10 +317,10 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
                 'Cannot set document access permissions', 0, $e
             );
         }
-        
-        return $this;        
-    }    
-    
+
+        return $this;
+    }
+
     /**
      * Merge assigned data with template to generate document
      *
@@ -324,7 +331,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function createDocument()
     {
         $this->logIn();
-        
+
         if (count($this->_fieldValues) > 0) {
             $this->setFieldValues($this->_fieldValues);
         }
@@ -354,9 +361,9 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function retrieveDocument($format)
     {
         $this->logIn();
-        
+
         $format = strtolower($format);
-        
+
         try {
             $result = $this->getSoapClient()->RetrieveDocument(array(
                 'format' => $format,
@@ -383,7 +390,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function getMetafiles($fromPage, $toPage)
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetMetafiles(array(
             'fromPage' => (integer) $fromPage,
@@ -415,7 +422,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function getAllMetafiles()
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetAllMetafiles();
 
@@ -432,8 +439,8 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
         }
 
         return $ret;
-    }    
-    
+    }
+
     /**
      * Return graphical bitmap data for specified page range of created document
      * Return array contains bitmap data (binary) - array key is page number
@@ -444,13 +451,13 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
      * @param  string  $format
      * @return array
      * @since  LiveDocx 1.2
-     */    
+     */
     public function getBitmaps($fromPage, $toPage, $zoomFactor, $format)
     {
         $this->logIn();
-        
+
         $ret = array();
-        
+
         $result = $this->getSoapClient()->GetBitmaps(array(
             'fromPage'   => (integer) $fromPage,
             'toPage'     => (integer) $toPage,
@@ -470,9 +477,9 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
             }
         }
 
-        return $ret;        
+        return $ret;
     }
-    
+
     /**
      * Return graphical bitmap data for all pages of created document
      * Return array contains bitmap data (binary) - array key is page number
@@ -481,11 +488,11 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
      * @param  string  $format
      * @return array
      * @since  LiveDocx 1.2
-     */    
+     */
     public function getAllBitmaps($zoomFactor, $format)
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetAllBitmaps(array(
             'zoomFactor' => (integer) $zoomFactor,
@@ -504,8 +511,8 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
             }
         }
 
-        return $ret;        
-    }    
+        return $ret;
+    }
 
     /**
      * Return all the fields in the template
@@ -516,7 +523,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function getFieldNames()
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetFieldNames();
 
@@ -541,7 +548,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function getBlockFieldNames($blockName)
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetBlockFieldNames(array(
             'blockName' => $blockName
@@ -567,7 +574,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function getBlockNames()
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetBlockNames();
 
@@ -593,7 +600,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function uploadTemplate($filename)
     {
         $this->logIn();
-        
+
         try {
             $this->getSoapClient()->UploadTemplate(array(
                 'template' => base64_encode(file_get_contents($filename)),
@@ -618,7 +625,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function downloadTemplate($filename)
     {
         $this->logIn();
-        
+
         try {
             $result = $this->getSoapClient()->DownloadTemplate(array(
                 'filename' => basename($filename),
@@ -644,7 +651,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function deleteTemplate($filename)
     {
         $this->logIn();
-        
+
         $this->getSoapClient()->DeleteTemplate(array(
             'filename' => basename($filename),
         ));
@@ -654,12 +661,12 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
      * List all templates stored on LiveDocx service
      *
      * @return array
-     * @since  LiveDocx 1.0 
+     * @since  LiveDocx 1.0
      */
     public function listTemplates()
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->ListTemplates();
 
@@ -680,7 +687,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function templateExists($filename)
     {
         $this->logIn();
-        
+
         $result = $this->getSoapClient()->TemplateExists(array(
             'filename' => basename($filename),
         ));
@@ -697,7 +704,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function shareDocument()
     {
         $this->logIn();
-        
+
         $ret    = null;
         $result = $this->getSoapClient()->ShareDocument();
 
@@ -717,7 +724,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function listSharedDocuments()
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->ListSharedDocuments();
 
@@ -740,7 +747,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function deleteSharedDocument($filename)
     {
         $this->logIn();
-        
+
         $this->getSoapClient()->DeleteSharedDocument(array(
             'filename' => basename($filename),
         ));
@@ -757,7 +764,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function downloadSharedDocument($filename)
     {
         $this->logIn();
-        
+
         try {
             $result = $this->getSoapClient()->DownloadSharedDocument(array(
                 'filename' => basename($filename),
@@ -782,11 +789,11 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function sharedDocumentExists($filename)
     {
         $this->logIn();
-        
+
         $ret             = false;
         $sharedDocuments = $this->listSharedDocuments();
         foreach ($sharedDocuments as $shareDocument) {
-            if (isset($shareDocument['filename']) 
+            if (isset($shareDocument['filename'])
                 && (basename($filename) === $shareDocument['filename'])
             ) {
                 $ret = true;
@@ -806,7 +813,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function getTemplateFormats()
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetTemplateFormats();
 
@@ -827,7 +834,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function getDocumentFormats()
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetDocumentFormats();
 
@@ -838,28 +845,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
 
         return $ret;
     }
-    
-    /*
-     * Return supported image formats (lowercase)
-     *
-     * @return array
-     * @since  LiveDocx 1.2
-     */
-    public function getImageFormats()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetImageFormats();
 
-        if (isset($result->GetImageFormatsResult->string)) {
-            $ret = $result->GetImageFormatsResult->string;
-            $ret = array_map('strtolower', $ret);
-        }
-
-        return $ret;
-    }
-        
     /**
      * Return the names of all fonts that are installed on backend server
      *
@@ -869,7 +855,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function getFontNames()
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetFontNames();
 
@@ -878,8 +864,8 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
         }
 
         return $ret;
-    }    
-    
+    }
+
     /**
      * Return supported document access options
      *
@@ -889,7 +875,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     public function getDocumentAccessOptions()
     {
         $this->logIn();
-        
+
         $ret    = array();
         $result = $this->getSoapClient()->GetDocumentAccessOptions();
 
@@ -898,19 +884,190 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
         }
 
         return $ret;
-    }    
+    }
+
+    /**
+     * Return supported image formats from which can be imported (lowercase)
+     *
+     * @return array
+     * @since  LiveDocx 2.0
+     */
+    public function getImageImportFormats()
+    {
+        $this->logIn();
+
+        $ret    = array();
+        $result = $this->getSoapClient()->GetImageImportFormats();
+
+        if (isset($result->GetImageImportFormatsResult->string)) {
+            $ret = $result->GetImageImportFormatsResult->string;
+            $ret = array_map('strtolower', $ret);
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Return supported image formats to which can be exported (lowercase)
+     *
+     * @return array
+     * @since  LiveDocx 2.0
+     */
+    public function getImageExportFormats()
+    {
+        $this->logIn();
+
+        $ret    = array();
+        $result = $this->getSoapClient()->GetImageExportFormats();
+
+        if (isset($result->GetImageExportFormatsResult->string)) {
+            $ret = $result->GetImageExportFormatsResult->string;
+            $ret = array_map('strtolower', $ret);
+        }
+
+        return $ret;
+    }
+
+    /*
+     * Return supported image formats (lowercase)
+     *
+     * @return array
+     * @since  LiveDocx 1.2
+     * @deprecated since LiveDocx 2.0
+     */
+    public function getImageFormats()
+    {
+        $replacement = 'getImageExportFormats';
+
+        /*
+        $errorMessage = sprintf(
+                        "%s::%s is deprecated as of LiveDocx 2.0. "
+                      . "It has been replaced by %s::%s() (drop in replacement)",
+                        __CLASS__, __FUNCTION__, __CLASS__, $replacement);
+
+        trigger_error($errorMessage, E_USER_NOTICE);
+        */
+
+        return $this->$replacement();
+    }
+
+    /**
+     * Upload an image file to LiveDocx service
+     *
+     * @param  string $filename
+     * @return void
+     * @throws Zend_Service_LiveDocx_Exception
+     * @since  LiveDocx 2.0
+     */
+    public function uploadImage($filename)
+    {
+        $this->logIn();
+
+        try {
+            $this->getSoapClient()->UploadImage(array(
+                'image'    => base64_encode(file_get_contents($filename)),
+                'filename' => basename($filename),
+            ));
+        } catch (Exception $e) {
+            require_once 'Zend/Service/LiveDocx/Exception.php';
+            throw new Zend_Service_LiveDocx_Exception(
+                'Cannot upload image', 0, $e
+            );
+        }
+    }
+
+    /**
+     * Download an image file from LiveDocx service
+     *
+     * @param  string $filename
+     * @return void
+     * @throws Zend_Service_LiveDocx_Exception
+     * @since  LiveDocx 2.0
+     */
+    public function downloadImage($filename)
+    {
+        $this->logIn();
+
+        try {
+            $result = $this->getSoapClient()->DownloadImage(array(
+                'filename' => basename($filename),
+            ));
+        } catch (Exception $e) {
+            require_once 'Zend/Service/LiveDocx/Exception.php';
+            throw new Zend_Service_LiveDocx_Exception(
+                'Cannot download image', 0, $e
+            );
+        }
+
+        return base64_decode($result->DownloadImageResult);
+    }
+
+    /**
+     * List all images stored on LiveDocx service
+     *
+     * @return array
+     * @since  LiveDocx 2.0
+     */
+    public function listImages()
+    {
+        $this->logIn();
+
+        $ret    = array();
+        $result = $this->getSoapClient()->ListImages();
+
+        if (isset($result->ListImagesResult)) {
+            $ret = $this->_backendListArrayToMultiAssocArray($result->ListImagesResult);
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Delete an image file from LiveDocx service
+     *
+     * @param  string $filename
+     * @return void
+     * @throws Zend_Service_LiveDocx_Exception
+     * @since  LiveDocx 2.0
+     */
+    public function deleteImage($filename)
+    {
+        $this->logIn();
+
+        $this->getSoapClient()->DeleteImage(array(
+            'filename' => basename($filename),
+        ));
+    }
+
+    /**
+     * Check whether an image file is available on LiveDocx service
+     *
+     * @param  string $filename
+     * @return boolean
+     * @since  LiveDocx 2.0
+     */
+    public function imageExists($filename)
+    {
+        $this->logIn();
+
+        $result = $this->getSoapClient()->ImageExists(array(
+            'filename' => basename($filename),
+        ));
+
+        return (boolean) $result->ImageExistsResult;
+    }
 
     /**
      * Convert LiveDocx service return value from list methods to consistent PHP array
      *
      * @param  array $list
      * @return array
-     * @since  LiveDocx 1.0 
+     * @since  LiveDocx 1.0
      */
     protected function _backendListArrayToMultiAssocArray($list)
     {
         $this->logIn();
-        
+
         $ret = array();
         if (isset($list->ArrayOfString)) {
            foreach ($list->ArrayOfString as $a) {
@@ -951,7 +1108,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
     {
         $arrayKeys   = array_keys($assoc);
         $arrayValues = array_values($assoc);
-        
+
         return array($arrayKeys, $arrayValues);
     }
 
@@ -975,4 +1132,7 @@ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
 
         return array_merge($arrayKeys, $arrayValues);
     }
-}
\ No newline at end of file
+
+    // -------------------------------------------------------------------------
+
+}
diff --git a/lib/zend/Zend/Service/Nirvanix.php b/lib/zend/Zend/Service/Nirvanix.php
deleted file mode 100644
index a63075d6999..00000000000
--- a/lib/zend/Zend/Service/Nirvanix.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * This class allows Nirvanix authentication credentials to be specified
- * in one place and provides a factory for returning convenience wrappers
- * around the Nirvanix web service namespaces.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix
-{
-    /**
-     * Options to pass to namespace proxies
-     * @param array
-     */
-    protected $_options;
-
-    /**
-     * Class constructor.  Authenticates with Nirvanix to receive a
-     * sessionToken, which is then passed to each future request.
-     *
-     * @param  array  $authParams  Authentication POST parameters.  This
-     *                             should have keys "username", "password",
-     *                             and "appKey".
-     * @param  array  $options     Options to pass to namespace proxies
-     */
-    public function __construct($authParams, $options = array())
-    {
-        // merge options with default options
-        $defaultOptions = array('defaults'   => array(),
-                                'httpClient' => new Zend_Http_Client(),
-                                'host'       => 'http://services.nirvanix.com');
-        $this->_options = array_merge($defaultOptions, $options);
-
-        // login and save sessionToken to default POST params
-        $resp = $this->getService('Authentication')->login($authParams);
-        $this->_options['defaults']['sessionToken'] = (string)$resp->SessionToken;
-    }
-
-    /**
-     * Nirvanix divides its service into namespaces, with each namespace
-     * providing different functionality.  This is a factory method that
-     * returns a preconfigured Zend_Service_Nirvanix_Namespace_Base proxy.
-     *
-     * @param  string  $namespace  Name of the namespace
-     * @return Zend_Service_Nirvanix_Namespace_Base
-     */
-    public function getService($namespace, $options = array())
-    {
-        switch ($namespace) {
-            case 'IMFS':
-                $class = 'Zend_Service_Nirvanix_Namespace_Imfs';
-                break;
-            default:
-                $class = 'Zend_Service_Nirvanix_Namespace_Base';
-        }
-
-        $options['namespace'] = ucfirst($namespace);
-        $options = array_merge($this->_options, $options);
-
-        if (!class_exists($class)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($class);
-        }
-        return new $class($options);
-    }
-
-    /**
-     * Get the configured options.
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Nirvanix/Namespace/Base.php b/lib/zend/Zend/Service/Nirvanix/Namespace/Base.php
deleted file mode 100644
index a7bc1d0f98f..00000000000
--- a/lib/zend/Zend/Service/Nirvanix/Namespace/Base.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Service_Nirvanix_Response
- */
-require_once 'Zend/Service/Nirvanix/Response.php';
-
-/**
- * The Nirvanix web services are split into namespaces.  This is a proxy class
- * representing one namespace.  It allows calls to the namespace to be made by
- * PHP object calls rather than by having to construct HTTP client requests.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Namespace_Base
-{
-    /**
-     * HTTP client instance that will be used to make calls to
-     * the Nirvanix web services.
-     * @var Zend_Http_Client
-     */
-    protected $_httpClient;
-
-    /**
-     * Host to use for calls to this Nirvanix namespace.  It is possible
-     * that the user will wish to use different hosts for different namespaces.
-     * @var string
-     */
-    protected $_host = 'http://services.nirvanix.com';
-
-    /**
-     * Name of this namespace as used in the URL.
-     * @var string
-     */
-    protected $_namespace = '';
-
-    /**
-     * Defaults for POST parameters.  When a request to the service is to be
-     * made, the POST parameters are merged into these.  This is a convenience
-     * feature so parameters that are repeatedly required like sessionToken
-     * do not need to be supplied again and again by the user.
-     *
-     * @param array
-     */
-    protected $_defaults = array();
-
-    /**
-     * Class constructor.
-     *
-     * @param  $options  array  Options and dependency injection
-     */
-    public function __construct($options = array())
-    {
-        if (isset($options['baseUrl'])) {
-            $this->_host = $options['baseUrl'];
-        }
-
-        if (isset($options['namespace'])) {
-            $this->_namespace = $options['namespace'];
-        }
-
-        if (isset($options['defaults'])) {
-            $this->_defaults = $options['defaults'];
-        }
-
-        if (! isset($options['httpClient'])) {
-            $options['httpClient'] = new Zend_Http_Client();
-        }
-        $this->_httpClient = $options['httpClient'];
-    }
-
-    /**
-     * When a method call is made against this proxy, convert it to
-     * an HTTP request to make against the Nirvanix REST service.
-     *
-     * $imfs->DeleteFiles(array('filePath' => 'foo'));
-     *
-     * Assuming this object was proxying the IMFS namespace, the
-     * method call above would call the DeleteFiles command.  The
-     * POST parameters would be filePath, merged with the
-     * $this->_defaults (containing the sessionToken).
-     *
-     * @param  string  $methodName  Name of the command to call
-     *                              on this namespace.
-     * @param  array   $args        Only the first is used and it must be
-     *                              an array.  It contains the POST params.
-     *
-     * @return Zend_Service_Nirvanix_Response
-     */
-    public function __call($methodName, $args)
-    {
-        $uri = $this->_makeUri($methodName);
-        $this->_httpClient->setUri($uri);
-
-        if (!isset($args[0]) || !is_array($args[0])) {
-            $args[0] = array();
-        }
-
-        $params = array_merge($this->_defaults, $args[0]);
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setParameterPost($params);
-
-        $httpResponse = $this->_httpClient->request(Zend_Http_Client::POST);
-        return $this->_wrapResponse($httpResponse);
-    }
-
-    /**
-     * Return the HTTP client used for this namespace.  This is useful
-     * for inspecting the last request or directly interacting with the
-     * HTTP client.
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient()
-    {
-        return $this->_httpClient;
-    }
-
-    /**
-     * Make a complete URI from an RPC method name.  All Nirvanix REST
-     * service URIs use the same format.
-     *
-     * @param  string  $methodName  RPC method name
-     * @return string
-     */
-    protected function _makeUri($methodName)
-    {
-        $methodName = ucfirst($methodName);
-        return "{$this->_host}/ws/{$this->_namespace}/{$methodName}.ashx";
-    }
-
-    /**
-     * All Nirvanix REST service calls return an XML payload.  This method
-     * makes a Zend_Service_Nirvanix_Response from that XML payload.
-     *
-     * @param  Zend_Http_Response  $httpResponse  Raw response from Nirvanix
-     * @return Zend_Service_Nirvanix_Response     Wrapped response
-     */
-    protected function _wrapResponse($httpResponse)
-    {
-        return new Zend_Service_Nirvanix_Response($httpResponse->getBody());
-    }
-}
diff --git a/lib/zend/Zend/Service/Nirvanix/Namespace/Imfs.php b/lib/zend/Zend/Service/Nirvanix/Namespace/Imfs.php
deleted file mode 100644
index 86907ad323f..00000000000
--- a/lib/zend/Zend/Service/Nirvanix/Namespace/Imfs.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Nirvanix_Namespace_Base
- */
-require_once 'Zend/Service/Nirvanix/Namespace/Base.php';
-
-/**
- * Namespace proxy with additional convenience methods for the IMFS namespace.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Namespace_Imfs extends Zend_Service_Nirvanix_Namespace_Base
-{
-    /**
-     * Convenience function to get the contents of a file on
-     * the Nirvanix IMFS.  Analog to PHP's file_get_contents().
-     *
-     * @param  string  $filePath    Remote path and filename
-     * @param  integer $expiration  Number of seconds that Nirvanix
-     *                              make the file available for download.
-     * @return string               Contents of file
-     */
-    public function getContents($filePath, $expiration = 3600)
-    {
-        // get url to download the file
-        $params = array('filePath'   => $filePath,
-                        'expiration' => $expiration);
-        $resp = $this->getOptimalUrls($params);
-        $url = (string)$resp->Download->DownloadURL;
-
-        // download the file
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setUri($url);
-        $resp = $this->_httpClient->request(Zend_Http_Client::GET);
-
-        return $resp->getBody();
-    }
-
-    /**
-     * Convenience function to put the contents of a string into
-     * the Nirvanix IMFS.  Analog to PHP's file_put_contents().
-     *
-     * @param  string  $filePath    Remote path and filename
-     * @param  integer $data        Data to store in the file
-     * @param  string  $mimeType    Mime type of data
-     * @return Zend_Service_Nirvanix_Response
-     */
-    public function putContents($filePath, $data, $mimeType = null)
-    {
-        // get storage node for upload
-        $params = array('sizeBytes' => strlen($data));
-        $resp = $this->getStorageNode($params);
-        $host        = (string)$resp->GetStorageNode->UploadHost;
-        $uploadToken = (string)$resp->GetStorageNode->UploadToken;
-
-        // http upload data into remote file
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setUri("http://{$host}/Upload.ashx");
-        $this->_httpClient->setParameterPost('uploadToken', $uploadToken);
-        $this->_httpClient->setParameterPost('destFolderPath', str_replace('\\', '/',dirname($filePath)));
-        $this->_httpClient->setFileUpload(basename($filePath), 'uploadFile', $data, $mimeType);
-        $response = $this->_httpClient->request(Zend_Http_Client::POST);
-
-        return new Zend_Service_Nirvanix_Response($response->getBody());
-    }
-
-    /**
-     * Convenience function to remove a file from the Nirvanix IMFS.
-     * Analog to PHP's unlink().
-     *
-     * @param  string  $filePath  Remove path and filename
-     * @return Zend_Service_Nirvanix_Response
-     */
-    public function unlink($filePath)
-    {
-        $params = array('filePath' => $filePath);
-        return $this->deleteFiles($params);
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Nirvanix/Response.php b/lib/zend/Zend/Service/Nirvanix/Response.php
deleted file mode 100644
index b1de6422f7a..00000000000
--- a/lib/zend/Zend/Service/Nirvanix/Response.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * This class decorates a SimpleXMLElement parsed from a Nirvanix web service
- * response.  It is primarily exists to provide a convenience feature that
- * throws an exception when <ResponseCode> contains an error.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Response
-{
-    /**
-     * SimpleXMLElement parsed from Nirvanix web service response.
-     *
-     * @var SimpleXMLElement
-     */
-    protected $_sxml;
-
-    /**
-     * Class constructor.  Parse the XML response from a Nirvanix method
-     * call into a decorated SimpleXMLElement element.
-     *
-     * @param string $xml  XML response string from Nirvanix
-     * @throws Zend_Service_Nirvanix_Exception
-     */
-    public function __construct($xml)
-    {
-        $this->_sxml = @simplexml_load_string($xml);
-
-        if (! $this->_sxml instanceof SimpleXMLElement) {
-            $this->_throwException("XML could not be parsed from response: $xml");
-        }
-
-        $name = $this->_sxml->getName();
-        if ($name != 'Response') {
-            $this->_throwException("Expected XML element Response, got $name");
-        }
-
-        $code = (int)$this->_sxml->ResponseCode;
-        if ($code != 0) {
-            $msg = (string)$this->_sxml->ErrorMessage;
-            $this->_throwException($msg, $code);
-        }
-    }
-
-    /**
-     * Return the SimpleXMLElement representing this response
-     * for direct access.
-     *
-     * @return SimpleXMLElement
-     */
-    public function getSxml()
-    {
-        return $this->_sxml;
-    }
-
-    /**
-     * Delegate undefined properties to the decorated SimpleXMLElement.
-     *
-     * @param  string  $offset  Undefined property name
-     * @return mixed
-     */
-    public function __get($offset)
-    {
-        return $this->_sxml->$offset;
-    }
-
-    /**
-     * Delegate undefined methods to the decorated SimpleXMLElement.
-     *
-     * @param  string  $offset  Underfined method name
-     * @param  array   $args    Method arguments
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->_sxml, $method), $args);
-    }
-
-    /**
-     * Throw an exception.  This method exists to only contain the
-     * lazy-require() of the exception class.
-     *
-     * @param  string   $message  Error message
-     * @param  integer  $code     Error code
-     * @throws Zend_Service_Nirvanix_Exception
-     * @return void
-     */
-    protected function _throwException($message, $code = null)
-    {
-        /**
-         * @see Zend_Service_Nirvanix_Exception
-         */
-        require_once 'Zend/Service/Nirvanix/Exception.php';
-
-        throw new Zend_Service_Nirvanix_Exception($message, $code);
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Rackspace/Abstract.php b/lib/zend/Zend/Service/Rackspace/Abstract.php
new file mode 100644
index 00000000000..afec6a4e5db
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Abstract.php
@@ -0,0 +1,392 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Rackspace
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Http/Client.php';
+
+abstract class Zend_Service_Rackspace_Abstract
+{
+    const VERSION                = 'v1.0';
+    const US_AUTH_URL            = 'https://auth.api.rackspacecloud.com';
+    const UK_AUTH_URL            = 'https://lon.auth.api.rackspacecloud.com';
+    const API_FORMAT             = 'json';
+    const USER_AGENT             = 'Zend_Service_Rackspace';
+    const STORAGE_URL            = "X-Storage-Url";
+    const AUTHTOKEN              = "X-Auth-Token";
+    const AUTHUSER_HEADER        = "X-Auth-User";
+    const AUTHKEY_HEADER         = "X-Auth-Key";
+    const AUTHUSER_HEADER_LEGACY = "X-Storage-User";
+    const AUTHKEY_HEADER_LEGACY  = "X-Storage-Pass";
+    const AUTHTOKEN_LEGACY       = "X-Storage-Token";
+    const CDNM_URL               = "X-CDN-Management-Url";
+    const MANAGEMENT_URL         = "X-Server-Management-Url";
+    /**
+     * Rackspace Key
+     *
+     * @var string
+     */
+    protected $key;
+    /**
+     * Rackspace account name
+     *
+     * @var string
+     */
+    protected $user;
+    /**
+     * Token of authentication
+     *
+     * @var string
+     */
+    protected $token;
+    /**
+     * Authentication URL
+     *
+     * @var string
+     */
+    protected $authUrl;
+    /**
+     * @var Zend_Http_Client
+     */
+    protected $httpClient;
+    /**
+     * Error Msg
+     *
+     * @var string
+     */
+    protected $errorMsg;
+    /**
+     * HTTP error code
+     *
+     * @var string
+     */
+    protected $errorCode;
+    /**
+     * Storage URL
+     *
+     * @var string
+     */
+    protected $storageUrl;
+    /**
+     * CDN URL
+     *
+     * @var string
+     */
+    protected $cdnUrl;
+    /**
+     * Server management URL
+     * 
+     * @var string 
+     */
+    protected $managementUrl;
+    /**
+     * Do we use ServiceNet?
+     * 
+     * @var boolean
+     */
+    protected $useServiceNet = false;
+    /**
+     * Constructor
+     *
+     * You must pass the account and the Rackspace authentication key.
+     * Optional: the authentication url (default is US)
+     *
+     * @param string $user
+     * @param string $key
+     * @param string $authUrl
+     */
+    public function __construct($user, $key, $authUrl=self::US_AUTH_URL)
+    {
+        if (!isset($user)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("The user cannot be empty");
+        }
+        if (!isset($key)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("The key cannot be empty");
+        }
+        if (!in_array($authUrl, array(self::US_AUTH_URL, self::UK_AUTH_URL))) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("The authentication URL should be valid");
+        }
+        $this->setUser($user);
+        $this->setKey($key);
+        $this->setAuthUrl($authUrl);
+    }
+    /**
+     * Get User account
+     *
+     * @return string
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+    /**
+     * Get user key
+     *
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+    /**
+     * Get authentication URL
+     *
+     * @return string
+     */
+    public function getAuthUrl()
+    {
+        return $this->authUrl;
+    }
+    /**
+     * Get the storage URL
+     *
+     * @return string|boolean
+     */
+    public function getStorageUrl() 
+    {
+        if (empty($this->storageUrl)) {
+            if (!$this->authenticate()) {
+                return false;
+            }
+        }
+        return $this->storageUrl;
+    }
+    /**
+     * Get the CDN URL
+     *
+     * @return string|boolean
+     */
+    public function getCdnUrl() 
+    {
+        if (empty($this->cdnUrl)) {
+            if (!$this->authenticate()) {
+                return false;
+            }
+        }
+        return $this->cdnUrl;
+    }
+    /**
+     * Get the management server URL
+     * 
+     * @return string|boolean
+     */     
+    public function getManagementUrl()
+    {
+        if (empty($this->managementUrl)) {
+            if (!$this->authenticate()) {
+                return false;
+            }
+        }
+        return $this->managementUrl;
+    }
+    /**
+     * Set the user account
+     *
+     * @param string $user
+     * @return void
+     */
+    public function setUser($user)
+    {
+        if (!empty($user)) {
+            $this->user = $user;
+        }
+    }
+    /**
+     * Set the authentication key
+     *
+     * @param string $key
+     * @return void
+     */
+    public function setKey($key)
+    {
+        if (!empty($key)) {
+            $this->key = $key;
+        }
+    }
+    /**
+     * Set the Authentication URL
+     *
+     * @param string $url
+     * @return void
+     */
+    public function setAuthUrl($url)
+    {
+        if (!empty($url) && in_array($url, array(self::US_AUTH_URL, self::UK_AUTH_URL))) {
+            $this->authUrl = $url;
+        } else {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("The authentication URL is not valid");
+        }
+    }
+    
+    /**
+     * Sets whether to use ServiceNet
+     * 
+     * ServiceNet is Rackspace's internal network. Bandwidth on ServiceNet is
+     * not charged.
+     * 
+     * @param boolean $useServiceNet
+     */
+    public function setServiceNet($useServiceNet = true)
+    {
+        $this->useServiceNet = $useServiceNet;
+        return $this;
+    }
+
+    /**
+     * Get whether we're using ServiceNet
+     * 
+     * @return boolean
+     */
+    public function getServiceNet()
+    {
+        return $this->useServiceNet;
+    }
+
+    /**
+     * Get the authentication token
+     *
+     * @return string
+     */
+    public function getToken()
+    {
+        if (empty($this->token)) {
+            if (!$this->authenticate()) {
+                return false;
+            }
+        }
+        return $this->token;
+    }
+    /**
+     * Get the error msg of the last HTTP call
+     *
+     * @return string
+     */
+    public function getErrorMsg() 
+    {
+        return $this->errorMsg;
+    }
+    /**
+     * Get the error code of the last HTTP call
+     * 
+     * @return strig 
+     */
+    public function getErrorCode() 
+    {
+        return $this->errorCode;
+    }
+    /**
+     * get the HttpClient instance
+     *
+     * @return Zend_Http_Client
+     */
+    public function getHttpClient()
+    {
+        if (empty($this->httpClient)) {
+            $this->httpClient = new Zend_Http_Client();
+        }
+        return $this->httpClient;
+    }
+    /**
+     * Return true is the last call was successful
+     * 
+     * @return boolean 
+     */
+    public function isSuccessful()
+    {
+        return ($this->errorMsg=='');
+    }
+    /**
+     * HTTP call
+     *
+     * @param string $url
+     * @param string $method
+     * @param array $headers
+     * @param array $get
+     * @param string $body
+     * @return Zend_Http_Response
+     */
+    protected function httpCall($url,$method,$headers=array(),$data=array(),$body=null)
+    {
+        $client = $this->getHttpClient();
+        $client->resetParameters(true);
+        if ($method == 'PUT' && empty($body)) {
+            // if left at NULL a PUT request will always have 
+            // Content-Type: x-url-form-encoded, which breaks copyObject()
+            $client->setEncType(''); 
+        }
+        if (empty($headers[self::AUTHUSER_HEADER])) {
+            $headers[self::AUTHTOKEN]= $this->getToken();
+        } 
+        $client->setMethod($method);
+        if (empty($data['format'])) {
+            $data['format']= self::API_FORMAT;
+        }
+        $client->setParameterGet($data);    
+        if (!empty($body)) {
+            $client->setRawData($body);
+            if (!isset($headers['Content-Type'])) {
+                $headers['Content-Type']= 'application/json';
+            }
+        }
+        $client->setHeaders($headers);
+        $client->setUri($url);
+        $this->errorMsg='';
+        $this->errorCode='';
+        return $client->request();
+    }
+    /**
+     * Authentication
+     *
+     * @return boolean
+     */
+    public function authenticate()
+    {
+        if (empty($this->user)) {
+            /**
+             * @see Zend_Service_Rackspace_Exception
+             */
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("User has not been set");
+        }
+
+        $headers = array (
+            self::AUTHUSER_HEADER => $this->user,
+            self::AUTHKEY_HEADER => $this->key
+        );
+        $result = $this->httpCall($this->authUrl.'/'.self::VERSION,'GET', $headers);
+        if ($result->getStatus()==204) {
+            $this->token = $result->getHeader(self::AUTHTOKEN);
+            $this->cdnUrl = $result->getHeader(self::CDNM_URL);
+            $this->managementUrl = $result->getHeader(self::MANAGEMENT_URL);
+            $storageUrl = $result->getHeader(self::STORAGE_URL);
+            if ($this->useServiceNet) {
+                $storageUrl = preg_replace('|(.*)://([^/]*)(.*)|', '$1://snet-$2$3', $storageUrl);
+            }
+            $this->storageUrl = $storageUrl;
+            return true;
+        }
+        $this->errorMsg = $result->getBody();
+        $this->errorCode = $result->getStatus();
+        return false;
+    } 
+}
diff --git a/lib/zend/Zend/Service/Nirvanix/Exception.php b/lib/zend/Zend/Service/Rackspace/Exception.php
similarity index 78%
rename from lib/zend/Zend/Service/Nirvanix/Exception.php
rename to lib/zend/Zend/Service/Rackspace/Exception.php
index d81d4d13ba4..3074fff06af 100644
--- a/lib/zend/Zend/Service/Nirvanix/Exception.php
+++ b/lib/zend/Zend/Service/Rackspace/Exception.php
@@ -14,8 +14,8 @@
  *
  * @category   Zend
  * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @subpackage Rackspace
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,9 +28,9 @@ require_once 'Zend/Service/Exception.php';
 /**
  * @category   Zend
  * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @subpackage Rackspace
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_Nirvanix_Exception extends Zend_Service_Exception
+class Zend_Service_Rackspace_Exception extends Zend_Service_Exception
 {}
diff --git a/lib/zend/Zend/Service/Rackspace/Files.php b/lib/zend/Zend/Service/Rackspace/Files.php
new file mode 100644
index 00000000000..fd4bc6036a9
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Files.php
@@ -0,0 +1,727 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Rackspace
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Abstract.php';
+require_once 'Zend/Service/Rackspace/Files/ContainerList.php';
+require_once 'Zend/Service/Rackspace/Files/ObjectList.php';
+require_once 'Zend/Service/Rackspace/Files/Container.php';
+require_once 'Zend/Service/Rackspace/Files/Object.php';
+
+/**
+ * Zend_Service_Rackspace_Files
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Rackspace
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Rackspace_Files extends Zend_Service_Rackspace_Abstract
+{
+    const ERROR_CONTAINER_NOT_EMPTY            = 'The container is not empty, I cannot delete it.';
+    const ERROR_CONTAINER_NOT_FOUND            = 'The container was not found.';
+    const ERROR_OBJECT_NOT_FOUND               = 'The object was not found.';
+    const ERROR_OBJECT_MISSING_PARAM           = 'Missing Content-Length or Content-Type header in the request';
+    const ERROR_OBJECT_CHECKSUM                = 'Checksum of the file content failed';
+    const ERROR_CONTAINER_EXIST                = 'The container already exists';
+    const ERROR_PARAM_NO_NAME_CONTAINER        = 'You must specify the container name';
+    const ERROR_PARAM_NO_NAME_OBJECT           = 'You must specify the object name';
+    const ERROR_PARAM_NO_CONTENT               = 'You must specify the content of the object';
+    const ERROR_PARAM_NO_NAME_SOURCE_CONTAINER = 'You must specify the source container name';
+    const ERROR_PARAM_NO_NAME_SOURCE_OBJECT    = 'You must specify the source object name';
+    const ERROR_PARAM_NO_NAME_DEST_CONTAINER   = 'You must specify the destination container name';
+    const ERROR_PARAM_NO_NAME_DEST_OBJECT      = 'You must specify the destination object name';
+    const ERROR_PARAM_NO_METADATA              = 'You must specify the metadata array';
+    const ERROR_CDN_TTL_OUT_OF_RANGE           = 'TTL must be a number in seconds, min is 900 sec and maximum is 1577836800 (50 years)';
+    const ERROR_PARAM_UPDATE_CDN               = 'You must specify at least one the parameters: ttl, cdn_enabled or log_retention';
+    const HEADER_CONTENT_TYPE                  = 'Content-Type';
+    const HEADER_HASH                          = 'Etag';
+    const HEADER_LAST_MODIFIED                 = 'Last-Modified';
+    const HEADER_CONTENT_LENGTH                = 'Content-Length';
+    const HEADER_COPY_FROM                     = 'X-Copy-From';
+    const METADATA_OBJECT_HEADER               = "X-Object-Meta-";
+    const METADATA_CONTAINER_HEADER            = "X-Container-Meta-";
+    const CDN_URI                              = "X-CDN-URI";
+    const CDN_SSL_URI                          = "X-CDN-SSL-URI";
+    const CDN_ENABLED                          = "X-CDN-Enabled";
+    const CDN_LOG_RETENTION                    = "X-Log-Retention";
+    const CDN_ACL_USER_AGENT                   = "X-User-Agent-ACL";
+    const CDN_ACL_REFERRER                     = "X-Referrer-ACL";
+    const CDN_TTL                              = "X-TTL";
+    const CDN_TTL_MIN                          = 900;
+    const CDN_TTL_MAX                          = 1577836800;
+    const CDN_EMAIL                            = "X-Purge-Email";
+    const ACCOUNT_CONTAINER_COUNT              = "X-Account-Container-Count";
+    const ACCOUNT_BYTES_USED                   = "X-Account-Bytes-Used";
+    const ACCOUNT_OBJ_COUNT                    = "X-Account-Object-Count";
+    const CONTAINER_OBJ_COUNT                  = "X-Container-Object-Count";
+    const CONTAINER_BYTES_USE                  = "X-Container-Bytes-Used";
+    const MANIFEST_OBJECT_HEADER               = "X-Object-Manifest";
+
+    /**
+     * Return the total count of containers
+     *
+     * @return int
+     */
+    public function getCountContainers()
+    {
+        $data= $this->getInfoAccount();
+        return $data['tot_containers'];
+    }
+    /**
+     * Return the size in bytes of all the containers
+     *
+     * @return int
+     */
+    public function getSizeContainers()
+    {
+        $data= $this->getInfoAccount();
+        return $data['size_containers'];
+    }
+    /**
+     * Return the count of objects contained in all the containers
+     *
+     * @return int
+     */
+    public function getCountObjects()
+    {
+        $data= $this->getInfoAccount();
+        return $data['tot_objects'];
+    }
+    /**
+     * Get all the containers
+     *
+     * @param  array $options
+     * @return Zend_Service_Rackspace_Files_ContainerList|bool
+     */
+    public function getContainers($options=array())
+    {
+        $result= $this->httpCall($this->getStorageUrl(),'GET',null,$options);
+        if ($result->isSuccessful()) {
+            return new Zend_Service_Rackspace_Files_ContainerList($this,json_decode($result->getBody(),true));
+        }
+        return false;
+    }
+    /**
+     * Get all the CDN containers
+     *
+     * @param array $options
+     * @return array|bool
+     */
+    public function getCdnContainers($options=array())
+    {
+        $options['enabled_only']= true;
+        $result= $this->httpCall($this->getCdnUrl(),'GET',null,$options);
+        if ($result->isSuccessful()) {
+            return new Zend_Service_Rackspace_Files_ContainerList($this,json_decode($result->getBody(),true));
+        }
+        return false;
+    }
+    /**
+     * Get the metadata information of the accounts:
+     * - total count containers
+     * - size in bytes of all the containers
+     * - total objects in all the containers
+     * 
+     * @return array|bool
+     */
+    public function getInfoAccount()
+    {
+        $result= $this->httpCall($this->getStorageUrl(),'HEAD');
+        if ($result->isSuccessful()) {
+            $output= array(
+                'tot_containers'  => $result->getHeader(self::ACCOUNT_CONTAINER_COUNT),
+                'size_containers' => $result->getHeader(self::ACCOUNT_BYTES_USED),
+                'tot_objects'     => $result->getHeader(self::ACCOUNT_OBJ_COUNT)
+            );
+            return $output;
+        }
+        return false;
+    }
+
+    /**
+     * Get all the objects of a container
+     *
+     * Returns a maximum of 10,000 object names.
+     *
+     * @param  string $container
+     * @param  array  $options
+     * @return bool|Zend_Service_Rackspace_Files_ObjectList
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function getObjects($container,$options=array())
+    {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container),'GET',null,$options);
+        if ($result->isSuccessful()) {
+            return new Zend_Service_Rackspace_Files_ObjectList($this,json_decode($result->getBody(),true),$container);
+        }
+        return false;
+    }
+
+    /**
+     * Create a container
+     *
+     * @param  string $container
+     * @param  array  $metadata
+     * @return bool|Zend_Service_Rackspace_Files_Container
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function createContainer($container,$metadata=array())
+    {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        $headers=array();
+        if (!empty($metadata)) {
+            foreach ($metadata as $key => $value) {
+                $headers[self::METADATA_CONTAINER_HEADER.rawurlencode(strtolower($key))]= rawurlencode($value);
+            }
+        }
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container),'PUT',$headers);
+        $status= $result->getStatus();
+        switch ($status) {
+            case '201': // break intentionally omitted
+                $data= array(
+                    'name' => $container
+                );
+                return new Zend_Service_Rackspace_Files_Container($this,$data);
+            case '202':
+                $this->errorMsg= self::ERROR_CONTAINER_EXIST;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Delete a container (only if it's empty)
+     *
+     * @param  string $container
+     * @return bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function deleteContainer($container)
+    {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container),'DELETE');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '204': // break intentionally omitted
+                return true;
+            case '409':
+                $this->errorMsg= self::ERROR_CONTAINER_NOT_EMPTY;
+                break;
+            case '404':
+                $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Get the metadata of a container
+     *
+     * @param  string $container
+     * @return array|bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function getMetadataContainer($container)
+    {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container),'HEAD');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '204': // break intentionally omitted
+                $headers= $result->getHeaders();
+                $count= strlen(self::METADATA_CONTAINER_HEADER);
+                // Zend_Http_Response alters header name in array key, so match our header to what will be in the headers array
+                $headerName = ucwords(strtolower(self::METADATA_CONTAINER_HEADER)); 
+                $metadata= array();
+                foreach ($headers as $type => $value) {
+                    if (strpos($type,$headerName)!==false) {
+                        $metadata[strtolower(substr($type, $count))]= $value;
+                    }
+                }
+                $data= array (
+                    'name'     => $container,
+                    'count'    => $result->getHeader(self::CONTAINER_OBJ_COUNT),
+                    'bytes'    => $result->getHeader(self::CONTAINER_BYTES_USE),
+                    'metadata' => $metadata
+                );
+                return $data;
+            case '404':
+                $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get a container
+     * 
+     * @param  string $container
+     * @return Zend_Service_Rackspace_Files_Container|bool
+     */
+    public function getContainer($container) {
+        $result= $this->getMetadataContainer($container);
+        if (!empty($result)) {
+            return new Zend_Service_Rackspace_Files_Container($this,$result);
+        }
+        return false;
+    }
+
+    /**
+     * Get an object in a container
+     *
+     * @param  string $container
+     * @param  string $object
+     * @param  array  $headers
+     * @return bool|Zend_Service_Rackspace_Files_Object
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function getObject($container,$object,$headers=array())
+    {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        if (empty($object)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT);
+        }
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'GET',$headers);
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200': // break intentionally omitted
+                $data= array(
+                    'name'          => $object,
+                    'container'     => $container,
+                    'hash'          => $result->getHeader(self::HEADER_HASH),
+                    'bytes'         => $result->getHeader(self::HEADER_CONTENT_LENGTH),
+                    'last_modified' => $result->getHeader(self::HEADER_LAST_MODIFIED),
+                    'content_type'  => $result->getHeader(self::HEADER_CONTENT_TYPE),
+                    'content'       => $result->getBody()
+                );
+                return new Zend_Service_Rackspace_Files_Object($this,$data);
+            case '404':
+                $this->errorMsg= self::ERROR_OBJECT_NOT_FOUND;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Store a file in a container
+     *
+     * @param  string $container
+     * @param  string $object
+     * @param  string $content
+     * @param  array  $metadata
+     * @param  string $content_type
+     * @return bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function storeObject($container,$object,$content,$metadata=array(),$content_type=null) {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        if (empty($object)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT);
+        }
+        if (empty($content)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_CONTENT);
+        }
+        if (!empty($content_type)) {
+           $headers[self::HEADER_CONTENT_TYPE]= $content_type;
+        }
+        if (!empty($metadata) && is_array($metadata)) {
+            foreach ($metadata as $key => $value) {
+                $headers[self::METADATA_OBJECT_HEADER.$key]= $value;
+            }
+        }
+        $headers[self::HEADER_HASH]= md5($content);
+        $headers[self::HEADER_CONTENT_LENGTH]= strlen($content);
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'PUT',$headers,null,$content);
+        $status= $result->getStatus();
+        switch ($status) {
+            case '201': // break intentionally omitted
+                return true;
+            case '412':
+                $this->errorMsg= self::ERROR_OBJECT_MISSING_PARAM;
+                break;
+            case '422':
+                $this->errorMsg= self::ERROR_OBJECT_CHECKSUM;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Delete an object in a container
+     *
+     * @param  string $container
+     * @param  string $object
+     * @return bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function deleteObject($container,$object) {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        if (empty($object)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT);
+        }
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'DELETE');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '204': // break intentionally omitted
+                return true;
+            case '404':
+                $this->errorMsg= self::ERROR_OBJECT_NOT_FOUND;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Copy an object from a container to another
+     *
+     * @param  string $container_source
+     * @param  string $obj_source
+     * @param  string $container_dest
+     * @param  string $obj_dest
+     * @param  array  $metadata
+     * @param  string $content_type
+     * @return bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function copyObject($container_source,$obj_source,$container_dest,$obj_dest,$metadata=array(),$content_type=null) {
+        if (empty($container_source)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_SOURCE_CONTAINER);
+        }
+        if (empty($obj_source)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_SOURCE_OBJECT);
+        }
+        if (empty($container_dest)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_DEST_CONTAINER);
+        }
+        if (empty($obj_dest)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_DEST_OBJECT);
+        }
+        $headers= array(
+            self::HEADER_COPY_FROM => '/'.rawurlencode($container_source).'/'.rawurlencode($obj_source),
+            self::HEADER_CONTENT_LENGTH => 0
+        );
+        if (!empty($content_type)) {
+            $headers[self::HEADER_CONTENT_TYPE]= $content_type;
+        }
+        if (!empty($metadata) && is_array($metadata)) {
+            foreach ($metadata as $key => $value) {
+                $headers[self::METADATA_OBJECT_HEADER.$key]= $value;
+            }
+        }
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container_dest).'/'.rawurlencode($obj_dest),'PUT',$headers);
+        $status= $result->getStatus();
+        switch ($status) {
+            case '201': // break intentionally omitted
+                return true;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Get the metadata of an object
+     *
+     * @param  string $container
+     * @param  string $object
+     * @return array|bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function getMetadataObject($container,$object) {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        if (empty($object)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT);
+        }
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'HEAD');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200': // break intentionally omitted
+                $headers= $result->getHeaders();
+                $count= strlen(self::METADATA_OBJECT_HEADER);
+                // Zend_Http_Response alters header name in array key, so match our header to what will be in the headers array
+                $headerName = ucwords(strtolower(self::METADATA_OBJECT_HEADER)); 
+                $metadata= array();
+                foreach ($headers as $type => $value) {
+                    if (strpos($type,$headerName)!==false) {
+                        $metadata[strtolower(substr($type, $count))]= $value;
+                    }
+                }
+                $data= array (
+                    'name'          => $object,
+                    'container'     => $container,
+                    'hash'          => $result->getHeader(self::HEADER_HASH),
+                    'bytes'         => $result->getHeader(self::HEADER_CONTENT_LENGTH),
+                    'content_type'  => $result->getHeader(self::HEADER_CONTENT_TYPE),
+                    'last_modified' => $result->getHeader(self::HEADER_LAST_MODIFIED),
+                    'metadata'      => $metadata
+                );
+                return $data;
+            case '404':
+                $this->errorMsg= self::ERROR_OBJECT_NOT_FOUND;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Set the metadata of a object in a container
+     * The old metadata values are replaced with the new one
+     *
+     * @param  string $container
+     * @param  string $object
+     * @param  array  $metadata
+     * @return bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function setMetadataObject($container,$object,$metadata)
+    {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        if (empty($object)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT);
+        }
+        if (empty($metadata) || !is_array($metadata)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_OBJECT);
+        }
+        $headers=array();
+        foreach ($metadata as $key => $value) {
+            $headers[self::METADATA_OBJECT_HEADER.$key]= $value;
+        }
+        $result= $this->httpCall($this->getStorageUrl().'/'.rawurlencode($container).'/'.rawurlencode($object),'POST',$headers);
+        $status= $result->getStatus();
+        switch ($status) {
+            case '202': // break intentionally omitted
+                return true;
+            case '404':
+                $this->errorMsg= self::ERROR_OBJECT_NOT_FOUND;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Enable the CDN for a container
+     *
+     * @param  string $container
+     * @param  int    $ttl
+     * @return array|bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function enableCdnContainer ($container,$ttl=self::CDN_TTL_MIN) {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        $headers=array();
+        if (is_numeric($ttl) && ($ttl>=self::CDN_TTL_MIN) && ($ttl<=self::CDN_TTL_MAX)) {
+            $headers[self::CDN_TTL]= $ttl;
+        } else {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_CDN_TTL_OUT_OF_RANGE);
+        }
+        $result= $this->httpCall($this->getCdnUrl().'/'.rawurlencode($container),'PUT',$headers);
+        $status= $result->getStatus();
+        switch ($status) {
+            case '201':
+            case '202': // break intentionally omitted
+                $data= array (
+                    'cdn_uri'     => $result->getHeader(self::CDN_URI),
+                    'cdn_uri_ssl' => $result->getHeader(self::CDN_SSL_URI)
+                );
+                return $data;
+            case '404':
+                $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Update the attribute of a CDN container
+     *
+     * @param  string $container
+     * @param  int    $ttl
+     * @param  bool   $cdn_enabled
+     * @param  bool   $log
+     * @return bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function updateCdnContainer($container,$ttl=null,$cdn_enabled=null,$log=null)
+    {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        if (empty($ttl) && (!isset($cdn_enabled)) && (!isset($log))) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_UPDATE_CDN);
+        }
+        $headers=array();
+        if (isset($ttl)) {
+            if (is_numeric($ttl) && ($ttl>=self::CDN_TTL_MIN) && ($ttl<=self::CDN_TTL_MAX)) {
+                $headers[self::CDN_TTL]= $ttl;
+            } else {
+                require_once 'Zend/Service/Rackspace/Exception.php';
+                throw new Zend_Service_Rackspace_Exception(self::ERROR_CDN_TTL_OUT_OF_RANGE);
+            }
+        }
+        if (isset($cdn_enabled)) {
+            if ($cdn_enabled===true) {
+                $headers[self::CDN_ENABLED]= 'true';
+            } else {
+                $headers[self::CDN_ENABLED]= 'false';
+            }
+        }
+        if (isset($log)) {
+            if ($log===true) {
+                $headers[self::CDN_LOG_RETENTION]= 'true';
+            } else  {
+                $headers[self::CDN_LOG_RETENTION]= 'false';
+            }
+        }
+        $result= $this->httpCall($this->getCdnUrl().'/'.rawurlencode($container),'POST',$headers);
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200':
+            case '202': // break intentionally omitted
+                return true;
+            case '404':
+                $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+
+    /**
+     * Get the information of a Cdn container
+     *
+     * @param  string $container
+     * @return array|bool
+     * @throws Zend_Service_Rackspace_Exception
+     */
+    public function getInfoCdnContainer($container) {
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
+        }
+        $result= $this->httpCall($this->getCdnUrl().'/'.rawurlencode($container),'HEAD');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '204': // break intentionally omitted
+                $data= array (
+                    'ttl'         => $result->getHeader(self::CDN_TTL),
+                    'cdn_uri'     => $result->getHeader(self::CDN_URI),
+                    'cdn_uri_ssl' => $result->getHeader(self::CDN_SSL_URI)
+                );
+                $data['cdn_enabled']= (strtolower($result->getHeader(self::CDN_ENABLED))!=='false');
+                $data['log_retention']= (strtolower($result->getHeader(self::CDN_LOG_RETENTION))!=='false');
+                return $data;
+            case '404':
+                $this->errorMsg= self::ERROR_CONTAINER_NOT_FOUND;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Files/Container.php b/lib/zend/Zend/Service/Rackspace/Files/Container.php
new file mode 100644
index 00000000000..da6b7046237
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Files/Container.php
@@ -0,0 +1,405 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Files.php';
+
+class Zend_Service_Rackspace_Files_Container
+{
+    const ERROR_PARAM_FILE_CONSTRUCT = 'The Zend_Service_Rackspace_Files passed in construction is not valid';
+
+    const ERROR_PARAM_ARRAY_CONSTRUCT = 'The array passed in construction is not valid';
+
+    const ERROR_PARAM_NO_NAME = 'The container name is empty';
+
+    /**
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Construct
+     *
+     * @param Zend_Service_Rackspace_Files $service
+     * @param                              $data
+     *
+     * @throws Zend_Service_Rackspace_Files_Exception
+     */
+    public function __construct($service, $data)
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Files)) {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception(
+                self::ERROR_PARAM_FILE_CONSTRUCT
+            );
+        }
+        if (!is_array($data)) {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception(
+                self::ERROR_PARAM_ARRAY_CONSTRUCT
+            );
+        }
+        if (!array_key_exists('name', $data)) {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception(
+                self::ERROR_PARAM_NO_NAME
+            );
+        }
+        $this->service = $service;
+        $this->name    = $data['name'];
+    }
+
+    /**
+     * Get the name of the container
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the size in bytes of the container
+     *
+     * @return integer|bool
+     */
+    public function getSize()
+    {
+        $data = $this->getInfo();
+        if (isset($data['bytes'])) {
+            return $data['bytes'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the total count of objects in the container
+     *
+     * @return integer|bool
+     */
+    public function getObjectCount()
+    {
+        $data = $this->getInfo();
+        if (isset($data['count'])) {
+            return $data['count'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Return true if the container is CDN enabled
+     *
+     * @return bool
+     */
+    public function isCdnEnabled()
+    {
+        $data = $this->getCdnInfo();
+        if (isset($data['cdn_enabled'])) {
+            return $data['cdn_enabled'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the TTL of the CDN
+     *
+     * @return integer|bool
+     */
+    public function getCdnTtl()
+    {
+        $data = $this->getCdnInfo();
+        if (isset($data['ttl'])) {
+            return $data['ttl'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Return true if the log retention is enabled for the CDN
+     *
+     * @return bool
+     */
+    public function isCdnLogEnabled()
+    {
+        $data = $this->getCdnInfo();
+        if (isset($data['log_retention'])) {
+            return $data['log_retention'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the CDN URI
+     *
+     * @return string|bool
+     */
+    public function getCdnUri()
+    {
+        $data = $this->getCdnInfo();
+        if (isset($data['cdn_uri'])) {
+            return $data['cdn_uri'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the CDN URI SSL
+     *
+     * @return string|bool
+     */
+    public function getCdnUriSsl()
+    {
+        $data = $this->getCdnInfo();
+        if (isset($data['cdn_uri_ssl'])) {
+            return $data['cdn_uri_ssl'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the metadata of the container
+     *
+     * If $key is empty return the array of metadata
+     *
+     * @param string $key
+     *
+     * @return array|string|bool
+     */
+    public function getMetadata($key = null)
+    {
+        $result = $this->service->getMetadataContainer($this->getName());
+        if (!empty($result) && is_array($result)) {
+            if (empty($key)) {
+                return $result['metadata'];
+            } else {
+                if (isset ($result['metadata'][$key])) {
+                    return $result['metadata'][$key];
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the information of the container (total of objects, total size)
+     *
+     * @return array|bool
+     */
+    public function getInfo()
+    {
+        $result = $this->service->getMetadataContainer($this->getName());
+        if (!empty($result) && is_array($result)) {
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get all the object of the container
+     *
+     * @return Zend_Service_Rackspace_Files_ObjectList
+     */
+    public function getObjects()
+    {
+        return $this->service->getObjects($this->getName());
+    }
+
+    /**
+     * Get an object of the container
+     *
+     * @param string $name
+     * @param array  $headers
+     *
+     * @return Zend_Service_Rackspace_Files_Object|bool
+     */
+    public function getObject($name, $headers = array())
+    {
+        return $this->service->getObject($this->getName(), $name, $headers);
+    }
+
+    /**
+     * Add an object in the container
+     *
+     * @param string $name
+     * @param string $file the content of the object
+     * @param array  $metadata
+     *
+     * @return bool
+     */
+    public function addObject($name, $file, $metadata = array())
+    {
+        return $this->service->storeObject(
+            $this->getName(), $name, $file, $metadata
+        );
+    }
+
+    /**
+     * Delete an object in the container
+     *
+     * @param string $obj
+     *
+     * @return bool
+     */
+    public function deleteObject($obj)
+    {
+        return $this->service->deleteObject($this->getName(), $obj);
+    }
+
+    /**
+     * Copy an object to another container
+     *
+     * @param string $obj_source
+     * @param string $container_dest
+     * @param string $obj_dest
+     * @param array  $metadata
+     * @param string $content_type
+     *
+     * @return bool
+     */
+    public function copyObject(
+        $obj_source, $container_dest, $obj_dest, $metadata = array(),
+        $content_type = null
+    )
+    {
+        return $this->service->copyObject(
+            $this->getName(),
+            $obj_source,
+            $container_dest,
+            $obj_dest,
+            $metadata,
+            $content_type
+        );
+    }
+
+    /**
+     * Get the metadata of an object in the container
+     *
+     * @param string $object
+     *
+     * @return array
+     */
+    public function getMetadataObject($object)
+    {
+        return $this->service->getMetadataObject($this->getName(), $object);
+    }
+
+    /**
+     * Set the metadata of an object in the container
+     *
+     * @param string $object
+     * @param array  $metadata
+     *
+     * @return bool
+     */
+    public function setMetadataObject($object, $metadata = array())
+    {
+        return $this->service->setMetadataObject(
+            $this->getName(), $object, $metadata
+        );
+    }
+
+    /**
+     * Enable the CDN for the container
+     *
+     * @param integer $ttl
+     *
+     * @return array|bool
+     */
+    public function enableCdn($ttl = Zend_Service_Rackspace_Files::CDN_TTL_MIN)
+    {
+        return $this->service->enableCdnContainer($this->getName(), $ttl);
+    }
+
+    /**
+     * Disable the CDN for the container
+     *
+     * @return bool
+     */
+    public function disableCdn()
+    {
+        $result =
+            $this->service->updateCdnContainer($this->getName(), null, false);
+
+        return ($result !== false);
+    }
+
+    /**
+     * Change the TTL for the CDN container
+     *
+     * @param integer $ttl
+     *
+     * @return bool
+     */
+    public function changeTtlCdn($ttl)
+    {
+        $result = $this->service->updateCdnContainer($this->getName(), $ttl);
+
+        return ($result !== false);
+    }
+
+    /**
+     * Enable the log retention for the CDN
+     *
+     * @return bool
+     */
+    public function enableLogCdn()
+    {
+        $result = $this->service->updateCdnContainer(
+            $this->getName(), null, null, true
+        );
+
+        return ($result !== false);
+    }
+
+    /**
+     * Disable the log retention for the CDN
+     *
+     * @return bool
+     */
+    public function disableLogCdn()
+    {
+        $result = $this->service->updateCdnContainer(
+            $this->getName(), null, null, false
+        );
+
+        return ($result !== false);
+    }
+
+    /**
+     * Get the CDN information
+     *
+     * @return array|bool
+     */
+    public function getCdnInfo()
+    {
+        return $this->service->getInfoCdnContainer($this->getName());
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Files/ContainerList.php b/lib/zend/Zend/Service/Rackspace/Files/ContainerList.php
new file mode 100644
index 00000000000..f0650232fb8
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Files/ContainerList.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Files/Container.php';
+require_once 'Zend/Service/Rackspace/Files.php';
+
+/**
+ * List of servers retrived from the Rackspace web service
+ *
+ * @uses       ArrayAccess
+ * @uses       Countable
+ * @uses       Iterator
+ * @uses       OutOfBoundsException
+ * @uses       Zend_Service_Rackspace_Files_Container
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Rackspace_Files_ContainerList implements Countable, Iterator, ArrayAccess
+{
+    /**
+     * @var array Array of Zend_Service_Rackspace_Files_Container
+     */
+    protected $objects = array();
+    /**
+     * @var int Iterator key
+     */
+    protected $iteratorKey = 0;
+    /**
+     * @var RackspaceFiles
+     */
+    protected $service;
+    /**
+     * Constructor
+     *
+     * @param  array $list
+     * @return boolean
+     */
+    public function __construct($service,$list = array())
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Files ) || !is_array($list)) {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception("You must pass a Zend_Service_Rackspace_Files_Exception object and an array");
+        }
+        $this->service= $service;
+        $this->_constructFromArray($list);
+    }
+    /**
+     * Transforms the Array to array of container
+     *
+     * @param  array $list
+     * @return void
+     */
+    private function _constructFromArray(array $list)
+    {
+        foreach ($list as $container) {
+            $this->_addObject(new Zend_Service_Rackspace_Files_Container($this->service,$container));
+        }
+    }
+    /**
+     * Add an object
+     *
+     * @param  Zend_Service_Rackspace_Files_Container $obj
+     * @return Zend_Service_Rackspace_Files_ContainerList
+     */
+    protected function _addObject (Zend_Service_Rackspace_Files_Container $obj)
+    {
+        $this->objects[] = $obj;
+        return $this;
+    }
+    /**
+     * Return number of servers
+     *
+     * Implement Countable::count()
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->objects);
+    }
+    /**
+     * Return the current element
+     *
+     * Implement Iterator::current()
+     *
+     * @return Zend_Service_Rackspace_Files_Container
+     */
+    public function current()
+    {
+        return $this->objects[$this->iteratorKey];
+    }
+    /**
+     * Return the key of the current element
+     *
+     * Implement Iterator::key()
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->iteratorKey;
+    }
+    /**
+     * Move forward to next element
+     *
+     * Implement Iterator::next()
+     *
+     * @return void
+     */
+    public function next()
+    {
+        $this->iteratorKey += 1;
+    }
+    /**
+     * Rewind the Iterator to the first element
+     *
+     * Implement Iterator::rewind()
+     *
+     * @return void
+     */
+    public function rewind()
+    {
+        $this->iteratorKey = 0;
+    }
+    /**
+     * Check if there is a current element after calls to rewind() or next()
+     *
+     * Implement Iterator::valid()
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        $numItems = $this->count();
+        if ($numItems > 0 && $this->iteratorKey < $numItems) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    /**
+     * Whether the offset exists
+     *
+     * Implement ArrayAccess::offsetExists()
+     *
+     * @param   int     $offset
+     * @return  bool
+     */
+    public function offsetExists($offset)
+    {
+        return ($offset < $this->count());
+    }
+    /**
+     * Return value at given offset
+     *
+     * Implement ArrayAccess::offsetGet()
+     *
+     * @param   int     $offset
+     * @throws  Zend_Service_Rackspace_Files_Exception
+     * @return  Zend_Service_Rackspace_Files_Container
+     */
+    public function offsetGet($offset)
+    {
+        if ($this->offsetExists($offset)) {
+            return $this->objects[$offset];
+        } else {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception('Illegal index');
+        }
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetSet()
+     *
+     * @param   int     $offset
+     * @param   string  $value
+     * @throws  Zend_Service_Rackspace_Files_Exception
+     */
+    public function offsetSet($offset, $value)
+    {
+        require_once 'Zend/Service/Rackspace/Files/Exception.php';
+        throw new Zend_Service_Rackspace_Files_Exception('You are trying to set read-only property');
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetUnset()
+     *
+     * @param   int     $offset
+     * @throws  Zend_Service_Rackspace_Files_Exception
+     */
+    public function offsetUnset($offset)
+    {
+        require_once 'Zend/Service/Rackspace/Files/Exception.php';
+        throw new Zend_Service_Rackspace_Files_Exception('You are trying to unset read-only property');
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Exception.php b/lib/zend/Zend/Service/Rackspace/Files/Exception.php
similarity index 63%
rename from lib/zend/Zend/Service/DeveloperGarden/Exception.php
rename to lib/zend/Zend/Service/Rackspace/Files/Exception.php
index 63a8a09e4fa..bd1c7ae72a7 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Exception.php
+++ b/lib/zend/Zend/Service/Rackspace/Files/Exception.php
@@ -13,26 +13,24 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * Zend_Service_Exception
+ * @see Zend_Service_Rackspace_Exception
  */
-require_once 'Zend/Service/Exception.php';
+require_once 'Zend/Service/Rackspace/Exception.php';
 
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Exception extends Zend_Service_Exception
-{
-}
+class Zend_Service_Rackspace_Files_Exception extends Zend_Service_Rackspace_Exception
+{}
diff --git a/lib/zend/Zend/Service/Rackspace/Files/Object.php b/lib/zend/Zend/Service/Rackspace/Files/Object.php
new file mode 100644
index 00000000000..4b2714ba279
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Files/Object.php
@@ -0,0 +1,312 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Files.php';
+
+class Zend_Service_Rackspace_Files_Object
+{
+    /**
+     * The service that has created the object
+     *
+     * @var Zend_Service_Rackspace_Files
+     */
+    protected $service;
+
+    /**
+     * Name of the object
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * MD5 value of the object's content
+     *
+     * @var string
+     */
+    protected $hash;
+
+    /**
+     * Size in bytes of the object's content
+     *
+     * @var integer
+     */
+    protected $size;
+
+    /**
+     * Content type of the object's content
+     *
+     * @var string
+     */
+    protected $contentType;
+
+    /**
+     * Date of the last modified of the object
+     *
+     * @var string
+     */
+    protected $lastModified;
+
+    /**
+     * Object content
+     *
+     * @var string
+     */
+    protected $content;
+
+    /**
+     * Name of the container where the object is stored
+     *
+     * @var string
+     */
+    protected $container;
+
+    /**
+     * Constructor
+     *
+     * You must pass the Zend_Service_Rackspace_Files object of the caller and an associative
+     * array with the keys "name", "container", "hash", "bytes", "content_type",
+     * "last_modified", "file" where:
+     * name= name of the object
+     * container= name of the container where the object is stored
+     * hash= the MD5 of the object's content
+     * bytes= size in bytes of the object's content
+     * content_type= content type of the object's content
+     * last_modified= date of the last modified of the object
+     * content= content of the object
+     *
+     * @param Zend_Service_Rackspace_Files $service
+     * @param array                        $data
+     * @throws Zend_Service_Rackspace_Files_Exception
+     */
+    public function __construct($service, $data)
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Files) || !is_array($data)) {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception(
+                'You must pass a RackspaceFiles and an array'
+            );
+        }
+        if (!array_key_exists('container', $data)) {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception(
+                'You must pass the container of the object in the array (container)'
+            );
+        }
+        if (array_key_exists('name', $data)) {
+            if (!array_key_exists('hash', $data)) {
+                require_once 'Zend/Service/Rackspace/Files/Exception.php';
+                throw new Zend_Service_Rackspace_Files_Exception(
+                    'You must pass the hash of the object in the array (hash)'
+                );
+            }
+            if (!array_key_exists('bytes', $data)) {
+                require_once 'Zend/Service/Rackspace/Files/Exception.php';
+                throw new Zend_Service_Rackspace_Files_Exception(
+                    'You must pass the byte size of the object in the array (bytes)'
+                );
+            }
+            if (!array_key_exists('content_type', $data)) {
+                require_once 'Zend/Service/Rackspace/Files/Exception.php';
+                throw new Zend_Service_Rackspace_Files_Exception(
+                    'You must pass the content type of the object in the array (content_type)'
+                );
+            }
+            if (!array_key_exists('last_modified', $data)) {
+                require_once 'Zend/Service/Rackspace/Files/Exception.php';
+                throw new Zend_Service_Rackspace_Files_Exception(
+                    'You must pass the last modified data of the object in the array (last_modified)'
+                );
+            }
+
+            $this->name         = $data['name'];
+            $this->hash         = $data['hash'];
+            $this->size         = $data['bytes'];
+            $this->contentType  = $data['content_type'];
+            $this->lastModified = $data['last_modified'];
+
+            if (!empty($data['content'])) {
+                $this->content = $data['content'];
+            }
+        } elseif (array_key_exists('subdir', $data)) {
+            $this->name = $data['subdir'];
+        } else {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception(
+                'You must pass the name of the object in the array (name)'
+            );
+        }
+
+        $this->container = $data['container'];
+        $this->service   = $service;
+    }
+
+    /**
+     * Get name
+     *
+     * @return string
+     */
+    public function getName() 
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the name of the container
+     *
+     * @return string
+     */
+    public function getContainer() 
+    {
+        return $this->container;
+    }
+
+    /**
+     * Get the MD5 of the object's content
+     *
+     * @return string|boolean
+     */
+    public function getHash() 
+    {
+        return $this->hash;
+    }
+
+    /**
+     * Get the size (in bytes) of the object's content
+     *
+     * @return integer|boolean
+     */
+    public function getSize() 
+    {
+        return $this->size;
+    }
+
+    /**
+     * Get the content type of the object's content
+     *
+     * @return string
+     */
+    public function getContentType() 
+    {
+        return $this->contentType;
+    }
+
+    /**
+     * Get the data of the last modified of the object
+     *
+     * @return string
+     */
+    public function getLastModified() 
+    {
+        return $this->lastModified;
+    }
+
+    /**
+     * Get the content of the object
+     *
+     * @return string
+     */
+    public function getContent() 
+    {
+        return $this->content;
+    }
+
+    /**
+     * Get the metadata of the object
+     * If you don't pass the $key it returns the entire array of metadata value
+     *
+     * @param  string $key
+     * @return string|array|boolean
+     */
+    public function getMetadata($key=null) 
+    {
+        $result= $this->service->getMetadataObject($this->container,$this->name);
+        if (!empty($result)) {
+            if (empty($key)) {
+                return $result['metadata'];
+            }
+            if (isset($result['metadata'][$key])) {
+                return $result['metadata'][$key];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Set the metadata value
+     * The old metadata values are replaced with the new one
+     * 
+     * @param array $metadata
+     * @return boolean
+     */
+    public function setMetadata($metadata) 
+    {
+        return $this->service->setMetadataObject($this->container,$this->name,$metadata);
+    }
+
+    /**
+     * Copy the object to another container
+     * You can add metadata information to the destination object, change the
+     * content_type and the name of the object
+     *
+     * @param  string $container_dest
+     * @param  string $name_dest
+     * @param  array $metadata
+     * @param  string $content_type
+     * @return boolean
+     */
+    public function copyTo($container_dest,$name_dest,$metadata=array(),$content_type=null) 
+    {
+        return $this->service->copyObject($this->container,$this->name,$container_dest,$name_dest,$metadata,$content_type);
+    }
+
+    /**
+     * Get the CDN URL of the object
+     *
+     * @return string
+     */
+    public function getCdnUrl() 
+    {
+        $result= $this->service->getInfoCdnContainer($this->container);
+        if ($result!==false) {
+            if ($result['cdn_enabled']) {
+                return $result['cdn_uri'].'/'.$this->name;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get the CDN SSL URL of the object
+     *
+     * @return string
+     */
+    public function getCdnUrlSsl() 
+    {
+        $result= $this->service->getInfoCdnContainer($this->container);
+        if ($result!==false) {
+            if ($result['cdn_enabled']) {
+                return $result['cdn_uri_ssl'].'/'.$this->name;
+            }
+        }
+        return false;
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Files/ObjectList.php b/lib/zend/Zend/Service/Rackspace/Files/ObjectList.php
new file mode 100644
index 00000000000..99abcb1c453
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Files/ObjectList.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Files/Object.php';
+require_once 'Zend/Service/Rackspace/Files.php';
+
+/**
+ * List of servers retrived from the GoGrid web service
+ *
+ * @uses       ArrayAccess
+ * @uses       Countable
+ * @uses       Iterator
+ * @uses       OutOfBoundsException
+ * @uses       Zend_Service_Rackspace_Files
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Rackspace_Files_ObjectList implements Countable, Iterator, ArrayAccess
+{
+    /**
+     * @var array of Zend_Service_Rackspace_Files_Object
+     */
+    protected $objects = array();
+    /**
+     * @var int Iterator key
+     */
+    protected $iteratorKey = 0;
+    /**
+     * @var RackspaceFiles
+     */
+    protected $service;
+    /**
+     * The container name of the object list
+     * 
+     * @var string
+     */
+    protected $container;
+    /**
+     * Construct
+     *
+     * @param  array $list
+     * @return boolean
+     */
+    public function __construct($service,$list,$container)
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Files)) {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception("You must pass a Zend_Service_Rackspace_Files object");
+        }
+        if (!is_array($list)) {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception("You must pass an array of data objects");
+        }
+        if (empty($container)) {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception("You must pass the container of the object list");
+        }
+        $this->service= $service;
+        $this->container= $container;
+        $this->_constructFromArray($list);
+    }
+    /**
+     * Transforms the Array to array of container
+     *
+     * @param  array $list
+     * @return void
+     */
+    private function _constructFromArray(array $list)
+    {
+        foreach ($list as $obj) {
+            $obj['container']= $this->container;
+            $this->_addObject(new Zend_Service_Rackspace_Files_Object($this->service,$obj));
+        }
+    }
+    /**
+     * Add an object
+     *
+     * @param  Zend_Service_Rackspace_Files_Object $obj
+     * @return Zend_Service_Rackspace_Files_ObjectList
+     */
+    protected function _addObject (Zend_Service_Rackspace_Files_Object $obj)
+    {
+        $this->objects[] = $obj;
+        return $this;
+    }
+    /**
+     * Return number of servers
+     *
+     * Implement Countable::count()
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->objects);
+    }
+    /**
+     * Return the current element
+     *
+     * Implement Iterator::current()
+     *
+     * @return Zend_Service_Rackspace_Files_Object
+     */
+    public function current()
+    {
+        return $this->objects[$this->iteratorKey];
+    }
+    /**
+     * Return the key of the current element
+     *
+     * Implement Iterator::key()
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->iteratorKey;
+    }
+    /**
+     * Move forward to next element
+     *
+     * Implement Iterator::next()
+     *
+     * @return void
+     */
+    public function next()
+    {
+        $this->iteratorKey += 1;
+    }
+    /**
+     * Rewind the Iterator to the first element
+     *
+     * Implement Iterator::rewind()
+     *
+     * @return void
+     */
+    public function rewind()
+    {
+        $this->iteratorKey = 0;
+    }
+    /**
+     * Check if there is a current element after calls to rewind() or next()
+     *
+     * Implement Iterator::valid()
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        $numItems = $this->count();
+        if ($numItems > 0 && $this->iteratorKey < $numItems) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    /**
+     * Whether the offset exists
+     *
+     * Implement ArrayAccess::offsetExists()
+     *
+     * @param   int     $offset
+     * @return  bool
+     */
+    public function offsetExists($offset)
+    {
+        return ($offset < $this->count());
+    }
+    /**
+     * Return value at given offset
+     *
+     * Implement ArrayAccess::offsetGet()
+     *
+     * @param   int     $offset
+     * @throws  Zend_Service_Rackspace_Files_Exception
+     * @return  Zend_Service_Rackspace_Files_Object
+     */
+    public function offsetGet($offset)
+    {
+        if ($this->offsetExists($offset)) {
+            return $this->objects[$offset];
+        } else {
+            require_once 'Zend/Service/Rackspace/Files/Exception.php';
+            throw new Zend_Service_Rackspace_Files_Exception('Illegal index');
+        }
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetSet()
+     *
+     * @param   int     $offset
+     * @param   string  $value
+     * @throws  Zend_Service_Rackspace_Files_Exception
+     */
+    public function offsetSet($offset, $value)
+    {
+        require_once 'Zend/Service/Rackspace/Files/Exception.php';
+        throw new Zend_Service_Rackspace_Files_Exception('You are trying to set read-only property');
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetUnset()
+     *
+     * @param   int     $offset
+     * @throws  Zend_Service_Rackspace_Files_Exception
+     */
+    public function offsetUnset($offset)
+    {
+        require_once 'Zend/Service/Rackspace/Files/Exception.php';
+        throw new Zend_Service_Rackspace_Files_Exception('You are trying to unset read-only property');
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Servers.php b/lib/zend/Zend/Service/Rackspace/Servers.php
new file mode 100644
index 00000000000..f76b7dde0e0
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Servers.php
@@ -0,0 +1,1281 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Rackspace
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Abstract.php';
+require_once 'Zend/Service/Rackspace/Servers/Server.php';
+require_once 'Zend/Service/Rackspace/Servers/ServerList.php';
+require_once 'Zend/Service/Rackspace/Servers/Image.php';
+require_once 'Zend/Service/Rackspace/Servers/ImageList.php';
+require_once 'Zend/Service/Rackspace/Servers/SharedIpGroup.php';
+require_once 'Zend/Service/Rackspace/Servers/SharedIpGroupList.php';
+require_once 'Zend/Validate/Ip.php';
+
+class Zend_Service_Rackspace_Servers extends Zend_Service_Rackspace_Abstract
+{
+    const LIMIT_FILE_SIZE           = 10240;
+    const LIMIT_NUM_FILE            = 5;
+    const ERROR_SERVICE_UNAVAILABLE = 'The service is unavailable';
+    const ERROR_UNAUTHORIZED        = 'Unauthorized';
+    const ERROR_OVERLIMIT           = 'You reached the limit of requests, please wait some time before retry';
+    const ERROR_PARAM_NO_ID         = 'You must specify the item\'s id';
+    const ERROR_PARAM_NO_NAME       = 'You must specify the name';
+    const ERROR_PARAM_NO_SERVERID   = 'You must specify the server Id';
+    const ERROR_PARAM_NO_IMAGEID    = 'You must specify the server\'s image ID';
+    const ERROR_PARAM_NO_FLAVORID   = 'You must specify the server\'s flavor ID';
+    const ERROR_PARAM_NO_ARRAY      = 'You must specify an array of parameters';
+    const ERROR_PARAM_NO_WEEKLY     = 'You must specify a weekly backup schedule';
+    const ERROR_PARAM_NO_DAILY      = 'You must specify a daily backup schedule';
+    const ERROR_ITEM_NOT_FOUND      = 'The item specified doesn\'t exist.';
+    const ERROR_NO_FILE_EXISTS      = 'The file specified doesn\'t exist';
+    const ERROR_LIMIT_FILE_SIZE     = 'You reached the size length of a file';
+    const ERROR_IN_PROGRESS         = 'The item specified is still in progress';
+    const ERROR_BUILD_IN_PROGRESS   = 'The build is still in progress';
+    const ERROR_RESIZE_NOT_ALLOWED  = 'The resize is not allowed';
+    /**
+     * Get the list of the servers
+     * If $details is true returns detail info
+     * 
+     * @param  boolean $details
+     * @return Zend_Service_Rackspace_Servers_ServerList|boolean
+     */
+    public function listServers($details=false)
+    {
+        $url= '/servers';
+        if ($details) {
+            $url.= '/detail';
+        } 
+        $result= $this->httpCall($this->getManagementUrl().$url,'GET');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200' : 
+            case '203' : // break intentionally omitted   
+                $servers= json_decode($result->getBody(),true);
+                return new Zend_Service_Rackspace_Servers_ServerList($this,$servers['servers']);
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get the specified server
+     * 
+     * @param  string $id 
+     * @return Zend_Service_Rackspace_Servers_Server
+     */
+    public function getServer($id) 
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        $result= $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id),'GET');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200' : 
+            case '203' : // break intentionally omitted   
+                $server = json_decode($result->getBody(),true);
+                return new Zend_Service_Rackspace_Servers_Server($this,$server['server']);
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Create a new server
+     * 
+     * The required parameters are specified in $data (name, imageId, falvorId)
+     * The $files is an associative array with 'serverPath' => 'localPath'
+     * 
+     * @param  array $data 
+     * @param  array $metadata
+     * @param  array $files
+     * @return Zend_Service_Rackspace_Servers_Server|boolean
+     */
+    public function createServer(array $data, $metadata=array(),$files=array())
+    {
+        if (empty($data) || !is_array($data) || !is_array($metadata) || !is_array($files)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ARRAY);
+        }
+        if (!isset($data['name'])) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME);
+        }
+        if (!isset($data['flavorId'])) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_FLAVORID);
+        }
+        if (!isset($data['imageId'])) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_IMAGEID);
+        }
+        if (count($files)>self::LIMIT_NUM_FILE) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You can attach '.self::LIMIT_NUM_FILE.' files maximum');
+        }
+        if (!empty($metadata)) {
+            $data['metadata']= $metadata;
+        }
+        $data['flavorId']= (integer) $data['flavorId'];
+        $data['imageId']= (integer) $data['imageId'];
+        if (!empty($files)) {
+            foreach ($files as $serverPath => $filePath) {
+                if (!file_exists($filePath)) {
+                    require_once 'Zend/Service/Rackspace/Exception.php';
+                    throw new Zend_Service_Rackspace_Exception(
+                            sprintf("The file %s doesn't exist",$filePath));
+                }
+                $content= file_get_contents($filePath);
+                if (strlen($content) > self::LIMIT_FILE_SIZE) {
+                    require_once 'Zend/Service/Rackspace/Exception.php';
+                    throw new Zend_Service_Rackspace_Exception(
+                            sprintf("The size of the file %s is greater than the max size of %d bytes",
+                                    $filePath,self::LIMIT_FILE_SIZE));
+                }
+                $data['personality'][] = array (
+                    'path'     => $serverPath,
+                    'contents' => base64_encode(file_get_contents($filePath))
+                );
+            }
+        }
+        $result = $this->httpCall($this->getManagementUrl().'/servers','POST',
+                null,null,json_encode(array ('server' => $data)));
+        $status = $result->getStatus();
+        switch ($status) {
+            case '200' :
+            case '202' : // break intentionally omitted   
+                $server = json_decode($result->getBody(),true);
+                return new Zend_Service_Rackspace_Servers_Server($this,$server['server']);
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Change the name or the admin password for a server
+     * 
+     * @param  string $id
+     * @param  string $name
+     * @param  string $password
+     * @return boolean 
+     */
+    protected function updateServer($id,$name=null,$password=null)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You must specify the ID of the server');
+        }
+        if (empty($name) && empty($password)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("You must specify the new name or password of server");
+        }
+        $data= array();
+        if (!empty($name)) {
+            $data['name']= $name;
+        }
+        if (!empty($password)) {
+            $data['adminPass']= $password;
+        }
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id),'PUT',
+                null,null,json_encode(array('server' => $data)));
+        $status = $result->getStatus();
+        switch ($status) {
+            case '204' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Change the server's name
+     * 
+     * @param  string $id
+     * @param  string $name
+     * @return boolean 
+     */
+    public function changeServerName($id,$name)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You must specify the ID of the server');
+        }
+        if (empty($name)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("You must specify the new name of the server");
+        }
+        return $this->updateServer($id, $name);
+    }
+    /**
+     * Change the admin password of the server
+     * 
+     * @param  string $id
+     * @param  string $password
+     * @return boolean 
+     */
+    public function changeServerPassword($id,$password)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You must specify the ID of the server');
+        }
+        if (empty($password)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("You must specify the new password of the server");
+        }
+        return $this->updateServer($id, null,$password);
+    }
+    /**
+     * Delete a server
+     * 
+     * @param  string $id
+     * @return boolean 
+     */
+    public function deleteServer($id)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You must specify the ID of the server');
+        }
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id),'DELETE');
+        $status = $result->getStatus();
+        switch ($status) {
+            case '202' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get the server's IPs (public and private)
+     * 
+     * @param  string $id
+     * @return array|boolean 
+     */
+    public function getServerIp($id)
+    {
+        $result= $this->getServer($id);
+        if ($result===false) {
+            return false;
+        }
+        $result= $result->toArray();
+        return $result['addresses'];
+    }
+    /**
+     * Get the Public IPs of a server
+     * 
+     * @param  string $id
+     * @return array|boolean
+     */
+    public function getServerPublicIp($id)
+    {
+        $addresses= $this->getServerIp($id);
+        if ($addresses===false) {
+            return false;
+        }
+        return $addresses['public'];
+    }
+    /**
+     * Get the Private IPs of a server
+     * 
+     * @param  string $id
+     * @return array|boolean
+     */
+    public function getServerPrivateIp($id)
+    {
+        $addresses= $this->getServerIp($id);
+        if ($addresses===false) {
+            return false;
+        }
+        return $addresses['private'];
+    }
+    /**
+     * Share an ip address for a server (id)
+     * 
+     * @param  string $id server
+     * @param  string $ip 
+     * @param  string $groupId
+     * @return boolean
+     */
+    public function shareIpAddress($id,$ip,$groupId,$configure=true)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server');
+        }
+        if (empty($ip)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the IP address to share');
+        }
+        $validator = new Zend_Validate_Ip();
+        if (!$validator->isValid($ip)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("The parameter $ip specified is not a valid IP address");
+        }
+        if (empty($groupId)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the group id to use');
+        }
+        $data= array (
+            'sharedIpGroupId' => (integer) $groupId,
+            'configureServer' => $configure
+        );
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/ips/public/'.rawurlencode($ip),'PUT',
+                null,null,json_encode(array('shareIp' => $data)));
+        $status = $result->getStatus();
+        switch ($status) {
+            case '202' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Unshare IP address for a server ($id)
+     * 
+     * @param  string $id
+     * @param  string $ip
+     * @return boolean 
+     */
+    public function unshareIpAddress($id,$ip)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server');
+        }
+        if (empty($ip)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the IP address to share');
+        }
+        $validator = new Zend_Validate_Ip();
+        if (!$validator->isValid($ip)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception("The parameter $ip specified is not a valid IP address");
+        }
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/ips/public/'.rawurlencode($ip),
+                'DELETE');
+        $status = $result->getStatus();
+        switch ($status) {
+            case '202' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Reboot a server
+     * 
+     * $hard true is the equivalent of power cycling the server
+     * $hard false is a graceful shutdown
+     * 
+     * @param  string $id
+     * @param  boolean $hard 
+     * @return boolean
+     */
+    public function rebootServer($id,$hard=false)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server');
+        }
+        if (!$hard) {
+            $type= 'SOFT';
+        } else {
+            $type= 'HARD';
+        }
+        $data= array (
+            'reboot' => array (
+                'type' => $type
+            )
+        );
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action',
+                                  'POST', null, null, json_encode($data));
+        $status = $result->getStatus();
+        switch ($status) {
+            case '200' :
+            case '202' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Rebuild a server
+     * 
+     * The rebuild function removes all data on the server and replaces it with the specified image,
+     * serverId and IP addresses will remain the same.
+     * 
+     * @param  string $id
+     * @param  string $imageId
+     * @return boolean
+     */
+    public function rebuildServer($id,$imageId)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server');
+        }
+        if (empty($imageId)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the new imageId of the server');
+        }
+        $data= array (
+            'rebuild' => array (
+                'imageId' => (integer) $imageId
+            )
+        );
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action',
+                                  'POST', null, null, json_encode($data));
+        $status = $result->getStatus();
+        switch ($status) {
+            case '202' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Resize a server
+     * 
+     * The resize function converts an existing server to a different flavor, in essence, scaling the
+     * server up or down. The original server is saved for a period of time to allow rollback if there
+     * is a problem. All resizes should be tested and explicitly confirmed, at which time the original
+     * server is removed. All resizes are automatically confirmed after 24 hours if they are not
+     * explicitly confirmed or reverted.
+     * 
+     * @param  string $id
+     * @param  string $flavorId
+     * @return boolean
+     */
+    public function resizeServer($id,$flavorId)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server');
+        }
+        if (empty($flavorId)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the new flavorId of the server');
+        }
+        $data= array (
+            'resize' => array (
+                'flavorId' => (integer) $flavorId
+            )
+        );
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action',
+                                  'POST', null, null, json_encode($data));
+        $status = $result->getStatus();
+        switch ($status) {
+            case '202' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '403' :
+                $this->errorMsg= self::ERROR_RESIZE_NOT_ALLOWED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Confirm resize of a server
+     * 
+     * During a resize operation, the original server is saved for a period of time to allow roll
+     * back if there is a problem. Once the newly resized server is tested and has been confirmed
+     * to be functioning properly, use this operation to confirm the resize. After confirmation,
+     * the original server is removed and cannot be rolled back to. All resizes are automatically
+     * confirmed after 24 hours if they are not explicitly confirmed or reverted.
+     *
+     * @param  string $id
+     * @return boolean 
+     */
+    public function confirmResizeServer($id)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server');
+        }
+        $data= array (
+            'confirmResize' => null
+        );
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action',
+                                  'POST', null, null, json_encode($data));
+        $status = $result->getStatus();
+        switch ($status) {
+            case '204' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '403' :
+                $this->errorMsg= self::ERROR_RESIZE_NOT_ALLOWED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Revert resize of a server
+     * 
+     * During a resize operation, the original server is saved for a period of time to allow for roll
+     * back if there is a problem. If you determine there is a problem with a newly resized server,
+     * use this operation to revert the resize and roll back to the original server. All resizes are
+     * automatically confirmed after 24 hours if they have not already been confirmed explicitly or
+     * reverted.
+     *
+     * @param  string $id
+     * @return boolean 
+     */
+    public function revertResizeServer($id)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the ID of the server');
+        }
+        $data= array (
+            'revertResize' => null
+        );
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action',
+                                  'POST', null, null, json_encode($data));
+        $status = $result->getStatus();
+        switch ($status) {
+            case '202' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '403' :
+                $this->errorMsg= self::ERROR_RESIZE_NOT_ALLOWED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get the list of the flavors
+     * 
+     * If $details is true returns detail info
+     * 
+     * @param  boolean $details
+     * @return array|boolean
+     */
+    public function listFlavors($details=false)
+    {
+        $url= '/flavors';
+        if ($details) {
+            $url.= '/detail';
+        } 
+        $result= $this->httpCall($this->getManagementUrl().$url,'GET');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200' : 
+            case '203' : // break intentionally omitted   
+                $flavors= json_decode($result->getBody(),true);
+                return $flavors['flavors'];
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get the detail of a flavor
+     * 
+     * @param  string $flavorId
+     * @return array|boolean
+     */
+    public function getFlavor($flavorId)
+    {
+        if (empty($flavorId)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception('You didn\'t specified the new flavorId of the server');
+        }
+        $result= $this->httpCall($this->getManagementUrl().'/flavors/'.rawurlencode($flavorId),'GET');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200' : 
+            case '203' : // break intentionally omitted   
+                $flavor= json_decode($result->getBody(),true);
+                return $flavor['flavor'];
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get the list of the images
+     * 
+     * @param  boolean $details
+     * @return Zend_Service_Rackspace_Servers_ImageList|boolean 
+     */
+    public function listImages($details=false)
+    {
+        $url= '/images';
+        if ($details) {
+            $url.= '/detail';
+        } 
+        $result= $this->httpCall($this->getManagementUrl().$url,'GET');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200' : 
+            case '203' : // break intentionally omitted   
+                $images= json_decode($result->getBody(),true);
+                return new Zend_Service_Rackspace_Servers_ImageList($this,$images['images']);
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get detail about an image
+     * 
+     * @param  string $id
+     * @return Zend_Service_Rackspace_Servers_Image|boolean
+     */
+    public function getImage($id)
+    {
+        $result= $this->httpCall($this->getManagementUrl().'/images/'.rawurlencode($id),'GET');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200' : 
+            case '203' : // break intentionally omitted   
+                $image= json_decode($result->getBody(),true);
+                return new Zend_Service_Rackspace_Servers_Image($this,$image['image']);
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                 $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Create an image for a serverId
+     * 
+     * @param  string $serverId
+     * @param  string $name 
+     * @return Zend_Service_Rackspace_Servers_Image
+     */
+    public function createImage($serverId,$name)
+    {
+        if (empty($serverId)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_SERVERID);
+        }
+        if (empty($name)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME);
+        }
+        $data = array(
+            'image' => array (
+                'serverId' => (integer) $serverId,
+                'name'     => $name
+            )
+        );
+        $result = $this->httpCall($this->getManagementUrl().'/images', 'POST',
+                                  null, null, json_encode($data));
+        $status = $result->getStatus();
+        switch ($status) {
+            case '202' : // break intentionally omitted   
+                $image= json_decode($result->getBody(),true);
+                return new Zend_Service_Rackspace_Servers_Image($this,$image['image']);
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '403' :
+                $this->errorMsg= self::ERROR_RESIZE_NOT_ALLOWED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Delete an image
+     * 
+     * @param  string $id
+     * @return boolean 
+     */
+    public function deleteImage($id)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        $result = $this->httpCall($this->getManagementUrl().'/images/'.rawurlencode($id),'DELETE');
+        $status = $result->getStatus();
+        switch ($status) {
+            case '204' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get the backup schedule of a server
+     * 
+     * @param  string $id server's Id
+     * @return array|boolean 
+     */
+    public function getBackupSchedule($id)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        $result= $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/backup_schedule',
+                                 'GET');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200' : 
+            case '203' : // break intentionally omitted   
+                $backup = json_decode($result->getBody(),true);
+                return $backup['backupSchedule'];
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Change the backup schedule of a server
+     * 
+     * @param  string $id server's Id
+     * @param  string $weekly
+     * @param  string $daily
+     * @return boolean 
+     */
+    public function changeBackupSchedule($id,$weekly,$daily)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        if (empty($weekly)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_WEEKLY);
+        }
+        if (empty($daily)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_DAILY);
+        }
+        $data = array (
+            'backupSchedule' => array (
+                'enabled' => true,
+                'weekly'  => $weekly,
+                'daily'   => $daily
+            )
+        );
+        $result= $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/backup_schedule',
+                                 'POST',null,null,json_encode($data));
+        $status= $result->getStatus();
+        switch ($status) {
+            case '204' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Disable the backup schedule for a server
+     * 
+     * @param  string $id server's Id
+     * @return boolean
+     */
+    public function disableBackupSchedule($id)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/backup_schedule',
+                                  'DELETE');
+        $status = $result->getStatus();
+        switch ($status) {
+            case '204' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '409' :
+                $this->errorMsg= self::ERROR_BUILD_IN_PROGRESS;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get the list of shared IP groups
+     * 
+     * @param  boolean $details
+     * @return Zend_Service_Rackspace_Servers_SharedIpGroupList|boolean 
+     */
+    public function listSharedIpGroups($details=false)
+    {
+        $url= '/shared_ip_groups';
+        if ($details) {
+            $url.= '/detail';
+        } 
+        $result= $this->httpCall($this->getManagementUrl().$url,'GET');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200' : 
+            case '203' : // break intentionally omitted   
+                $groups= json_decode($result->getBody(),true);
+                return new Zend_Service_Rackspace_Servers_SharedIpGroupList($this,$groups['sharedIpGroups']);
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Get the shared IP group
+     * 
+     * @param  integer $id
+     * @return Zend_Service_Rackspace_Servers_SharedIpGroup|boolean 
+     */
+    public function getSharedIpGroup($id)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        $result= $this->httpCall($this->getManagementUrl().'/shared_ip_groups/'.rawurlencode($id),'GET');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '200' : 
+            case '203' : // break intentionally omitted   
+                $group= json_decode($result->getBody(),true);
+                return new Zend_Service_Rackspace_Servers_SharedIpGroup($this,$group['sharedIpGroup']);
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Create a shared Ip group
+     * 
+     * @param  string $name
+     * @param  string $serverId
+     * @return array|boolean 
+     */
+    public function createSharedIpGroup($name,$serverId)
+    {
+        if (empty($name)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME);
+        }
+        if (empty($serverId)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        $data = array (
+            'sharedIpGroup' => array (
+                'name'   => $name,
+                'server' => (integer) $serverId
+            )
+        );
+        $result= $this->httpCall($this->getManagementUrl().'/shared_ip_groups',
+                                 'POST',null,null,json_encode($data));
+        $status= $result->getStatus();
+        switch ($status) {
+            case '201' : // break intentionally omitted   
+                $group = json_decode($result->getBody(),true);
+                return new Zend_Service_Rackspace_Servers_SharedIpGroup($this,$group['sharedIpGroup']);
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+    /**
+     * Delete a Shared Ip Group
+     * 
+     * @param  integer $id 
+     * @return boolean
+     */
+    public function deleteSharedIpGroup($id)
+    {
+        if (empty($id)) {
+            require_once 'Zend/Service/Rackspace/Exception.php';
+            throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        $result= $this->httpCall($this->getManagementUrl().'/shared_ip_groups/'.rawurlencode($id),'DELETE');
+        $status= $result->getStatus();
+        switch ($status) {
+            case '204' : // break intentionally omitted   
+                return true;
+            case '503' :
+                $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
+                break;
+            case '401' :
+                $this->errorMsg= self::ERROR_UNAUTHORIZED;
+                break;
+            case '404' :
+                $this->errorMsg= self::ERROR_ITEM_NOT_FOUND;
+                break;
+            case '413' :
+                $this->errorMsg= self::ERROR_OVERLIMIT;
+                break;
+            default:
+                $this->errorMsg= $result->getBody();
+                break;
+        }
+        $this->errorCode= $status;
+        return false;
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Servers/Exception.php b/lib/zend/Zend/Service/Rackspace/Servers/Exception.php
new file mode 100644
index 00000000000..70de0889e5c
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Servers/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Service_Rackspace_Exception
+ */
+require_once 'Zend/Service/Rackspace/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Files
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Rackspace_Servers_Exception extends Zend_Service_Rackspace_Exception
+{}
diff --git a/lib/zend/Zend/Service/Rackspace/Servers/Image.php b/lib/zend/Zend/Service/Rackspace/Servers/Image.php
new file mode 100644
index 00000000000..8605510d577
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Servers/Image.php
@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Servers
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Servers.php';
+
+class Zend_Service_Rackspace_Servers_Image
+{
+    const ERROR_PARAM_CONSTRUCT = 'You must pass a Zend_Service_Rackspace_Servers object and an array';
+    const ERROR_PARAM_NO_NAME   = 'You must pass the image\'s name in the array (name)';
+    const ERROR_PARAM_NO_ID     = 'You must pass the image\'s id in the array (id)';
+    /**
+     * Name of the image
+     * 
+     * @var string 
+     */
+    protected $name;
+    /**
+     * Id of the image
+     * 
+     * @var string 
+     */
+    protected $id;
+    /**
+     * Server Id of the image
+     * 
+     * @var string 
+     */
+    protected $serverId;
+    /**
+     * Updated data
+     * 
+     * @var string 
+     */
+    protected $updated;
+    /**
+     * Created data
+     * 
+     * @var string 
+     */
+    protected $created;
+    /**
+     * Status
+     * 
+     * @var string 
+     */
+    protected $status;
+    /**
+     * Status progress
+     * 
+     * @var integer 
+     */
+    protected $progress;
+    /**
+     * The service that has created the image object
+     *
+     * @var Zend_Service_Rackspace_Servers
+     */
+    protected $service;
+    /**
+     * Construct
+     * 
+     * @param array $data
+     * @return void
+     */
+    public function __construct($service, $data)
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($data)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_CONSTRUCT);
+        }
+        if (!array_key_exists('name', $data)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_NAME);
+        }
+        if (!array_key_exists('id', $data)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        $this->service= $service;
+        $this->name = $data['name'];
+        $this->id = $data['id'];
+        if (isset($data['serverId'])) {
+            $this->serverId= $data['serverId'];
+        }
+        if (isset($data['updated'])) {
+            $this->updated= $data['updated'];
+        }
+        if (isset($data['created'])) {
+            $this->created= $data['created'];
+        }
+        if (isset($data['status'])) {
+            $this->status= $data['status'];
+        }
+        if (isset($data['progress'])) {
+            $this->progress= $data['progress'];
+        }
+    }
+    /**
+     * Get the name of the image
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+    /**
+     * Get the image's id
+     * 
+     * @return string 
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+    /**
+     * Get the server's id of the image
+     * 
+     * @return string 
+     */
+    public function getServerId()
+    {
+        return $this->serverId;
+    }
+    /**
+     * Get the updated data
+     * 
+     * @return string 
+     */
+    public function getUpdated()
+    {
+        return $this->updated;
+    }
+    /**
+     * Get the created data
+     * 
+     * @return string 
+     */
+    public function getCreated()
+    {
+        return $this->created;
+    }
+    /**
+     * Get the image's status
+     * 
+     * @return string|boolean
+     */
+    public function getStatus()
+    {
+        $data= $this->service->getImage($this->id);
+        if ($data!==false) {
+            $data= $data->toArray();
+            $this->status= $data['status'];
+            return $this->status;
+        }
+        return false;
+    }
+    /**
+     * Get the progress's status
+     * 
+     * @return integer|boolean
+     */
+    public function getProgress()
+    {
+        $data= $this->service->getImage($this->id);
+        if ($data!==false) {
+            $data= $data->toArray();
+            $this->progress= $data['progress'];
+            return $this->progress;
+        }
+        return false;
+    }
+    /**
+     * To Array
+     * 
+     * @return array 
+     */
+    public function toArray()
+    {
+        return array (
+            'name'     => $this->name,
+            'id'       => $this->id,
+            'serverId' => $this->serverId,
+            'updated'  => $this->updated,
+            'created'  => $this->created,
+            'status'   => $this->status,
+            'progress' => $this->progress
+        );
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Servers/ImageList.php b/lib/zend/Zend/Service/Rackspace/Servers/ImageList.php
new file mode 100644
index 00000000000..2d7848567b1
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Servers/ImageList.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Servers
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Servers.php';
+require_once 'Zend/Service/Rackspace/Servers/Image.php';
+
+/**
+ * List of images of Rackspace
+ *
+ * @uses       ArrayAccess
+ * @uses       Countable
+ * @uses       Iterator
+ * @uses       Zend_Service_Rackspace_Servers
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Servers
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Rackspace_Servers_ImageList implements Countable, Iterator, ArrayAccess
+{
+    /**
+     * @var array of Zend_Service_Rackspace_Servers_Image
+     */
+    protected $images = array();
+    /**
+     * @var int Iterator key
+     */
+    protected $iteratorKey = 0;
+    /**
+     * @var Zend_Service_Rackspace_Servers
+     */
+    protected $service;
+    /**
+     * Construct
+     *
+     * @param  RackspaceServers $service
+     * @param  array $list
+     * @return void
+     */
+    public function __construct($service,$list = array())
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($list)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception("You must pass a Zend_Service_Rackspace_Servers object and an array");
+        }
+        $this->service= $service;
+        $this->constructFromArray($list);
+    }
+    /**
+     * Transforms the array to array of Server
+     *
+     * @param  array $list
+     * @return void
+     */
+    private function constructFromArray(array $list)
+    {
+        foreach ($list as $image) {
+            $this->addImage(new Zend_Service_Rackspace_Servers_Image($this->service,$image));
+        }
+    }
+    /**
+     * Add an image
+     *
+     * @param  Zend_Service_Rackspace_Servers_Image $image
+     * @return Zend_Service_Rackspace_Servers_ImageList
+     */
+    protected function addImage (Zend_Service_Rackspace_Servers_Image $image)
+    {
+        $this->images[] = $image;
+        return $this;
+    }
+    /**
+     * To Array
+     * 
+     * @return array 
+     */
+    public function toArray()
+    {
+        $array= array();
+        foreach ($this->images as $image) {
+            $array[]= $image->toArray();
+        }
+        return $array;
+    }
+    /**
+     * Return number of images
+     *
+     * Implement Countable::count()
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->images);
+    }
+    /**
+     * Return the current element
+     *
+     * Implement Iterator::current()
+     *
+     * @return Zend_Service_Rackspace_Servers_Image
+     */
+    public function current()
+    {
+        return $this->images[$this->iteratorKey];
+    }
+    /**
+     * Return the key of the current element
+     *
+     * Implement Iterator::key()
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->iteratorKey;
+    }
+    /**
+     * Move forward to next element
+     *
+     * Implement Iterator::next()
+     *
+     * @return void
+     */
+    public function next()
+    {
+        $this->iteratorKey += 1;
+    }
+    /**
+     * Rewind the Iterator to the first element
+     *
+     * Implement Iterator::rewind()
+     *
+     * @return void
+     */
+    public function rewind()
+    {
+        $this->iteratorKey = 0;
+    }
+    /**
+     * Check if there is a current element after calls to rewind() or next()
+     *
+     * Implement Iterator::valid()
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        $numItems = $this->count();
+        if ($numItems > 0 && $this->iteratorKey < $numItems) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    /**
+     * Whether the offset exists
+     *
+     * Implement ArrayAccess::offsetExists()
+     *
+     * @param   int     $offset
+     * @return  bool
+     */
+    public function offsetExists($offset)
+    {
+        return ($offset < $this->count());
+    }
+    /**
+     * Return value at given offset
+     *
+     * Implement ArrayAccess::offsetGet()
+     *
+     * @param   int     $offset
+     * @throws  Zend_Service_Rackspace_Servers_Exception
+     * @return  Zend_Service_Rackspace_Servers_Image
+     */
+    public function offsetGet($offset)
+    {
+        if ($this->offsetExists($offset)) {
+            return $this->images[$offset];
+        } else {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception('Illegal index');
+        }
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetSet()
+     *
+     * @param   int     $offset
+     * @param   string  $value
+     * @throws  Zend_Service_Rackspace_Servers_Exception
+     */
+    public function offsetSet($offset, $value)
+    {
+        require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+        throw new Zend_Service_Rackspace_Servers_Exception('You are trying to set read-only property');
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetUnset()
+     *
+     * @param   int     $offset
+     * @throws  Zend_Service_Rackspace_Servers_Exception
+     */
+    public function offsetUnset($offset)
+    {
+        require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+        throw new Zend_Service_Rackspace_Servers_Exception('You are trying to unset read-only property');
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Servers/Server.php b/lib/zend/Zend/Service/Rackspace/Servers/Server.php
new file mode 100644
index 00000000000..5249a9732e4
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Servers/Server.php
@@ -0,0 +1,325 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Servers
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Servers.php';
+
+class Zend_Service_Rackspace_Servers_Server
+{
+    const ERROR_PARAM_CONSTRUCT = 'You must pass a Zend_Service_Rackspace_Servers object and an array';
+    const ERROR_PARAM_NO_NAME   = 'You must pass the server\'s name in the array (name)';
+    const ERROR_PARAM_NO_ID     = 'You must pass the server\'s id in the array (id)';
+    /**
+     * Server's name
+     * 
+     * @var string
+     */
+    protected $name;
+    /**
+     * Server's id
+     *
+     * @var string
+     */
+    protected $id;
+    /**
+     * Image id of the server
+     *
+     * @var string
+     */
+    protected $imageId;
+    /**
+     * Flavor id of the server
+     * 
+     * @var string 
+     */
+    protected $flavorId;
+    /**
+     * Host id
+     * 
+     * @var string
+     */
+    protected $hostId;
+    /**
+     * Server's status
+     * 
+     * @var string 
+     */
+    protected $status;
+    /**
+     * Progress of the status
+     * 
+     * @var integer
+     */
+    protected $progress;
+    /**
+     * Admin password, generated on a new server
+     * 
+     * @var string 
+     */
+    protected $adminPass;
+    /**
+     * Public and private IP addresses
+     * 
+     * @var array 
+     */
+    protected $addresses = array();
+    /**
+     * @var array
+     */
+    protected $metadata = array();
+    /**
+     * The service that has created the server object
+     *
+     * @var Zend_Service_Rackspace_Servers
+     */
+    protected $service;
+    /**
+     * Constructor
+     *
+     * @param  Zend_Service_Rackspace_Servers $service
+     * @param  array $data
+     * @return void
+     */
+    public function __construct($service, $data)
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($data)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_CONSTRUCT);
+        }
+        if (!array_key_exists('name', $data)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_NAME);
+        }
+        if (!array_key_exists('id', $data)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        $this->service = $service;
+        $this->name = $data['name'];
+        $this->id = $data['id'];
+        if (isset($data['imageId'])) {
+            $this->imageId= $data['imageId'];
+        }
+        if (isset($data['flavorId'])) {
+            $this->flavorId= $data['flavorId'];
+        }
+        if (isset($data['hostId'])) {
+            $this->hostId= $data['hostId'];
+        }
+        if (isset($data['status'])) {
+            $this->status= $data['status'];
+        }
+        if (isset($data['progress'])) {
+            $this->progress= $data['progress'];
+        }
+        if (isset($data['adminPass'])) {
+            $this->adminPass= $data['adminPass'];
+        }
+        if (isset($data['addresses']) && is_array($data['addresses'])) {
+            $this->addresses= $data['addresses'];
+        }
+        if (isset($data['metadata']) && is_array($data['metadata'])) {
+            $this->metadata= $data['metadata'];
+        } 
+    }
+    /**
+     * Get the name of the server
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+    /**
+     * Get the server's id
+     * 
+     * @return string 
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+    /**
+     * Get the server's image Id
+     * 
+     * @return string 
+     */
+    public function getImageId()
+    {
+        return $this->imageId;
+    }
+    /**
+     * Get the server's flavor Id
+     * 
+     * @return string 
+     */
+    public function getFlavorId()
+    {
+        return $this->flavorId;
+    }
+    /**
+     * Get the server's host Id
+     * 
+     * @return string 
+     */
+    public function getHostId()
+    {
+        return $this->hostId;
+    }
+    /**
+     * Ge the server's admin password
+     * 
+     * @return string 
+     */
+    public function getAdminPass()
+    {
+        return $this->adminPass;
+    }
+    /**
+     * Get the server's status
+     * 
+     * @return string|boolean
+     */
+    public function getStatus()
+    {
+        $data= $this->service->getServer($this->id);
+        if ($data!==false) {
+            $data= $data->toArray();
+            $this->status= $data['status'];
+            return $this->status;
+        }
+        return false;
+    }
+    /**
+     * Get the progress's status
+     * 
+     * @return integer|boolean
+     */
+    public function getProgress()
+    {
+        $data= $this->service->getServer($this->id);
+        if ($data!==false) {
+            $data= $data->toArray();
+            $this->progress= $data['progress'];
+            return $this->progress;
+        }
+        return false;
+    }
+    /**
+     * Get the private IPs
+     * 
+     * @return array|boolean
+     */
+    public function getPrivateIp()
+    {
+        if (isset($this->addresses['private'])) {
+            return $this->addresses['private'];
+        }
+        return false;
+    }
+    /**
+     * Get the public IPs
+     * 
+     * @return array|boolean
+     */
+    public function getPublicIp()
+    {
+        if (isset($this->addresses['public'])) {
+            return $this->addresses['public'];
+        }
+        return false;
+    }
+    /**
+     * Get the metadata of the container
+     *
+     * If $key is empty return the array of metadata
+     *
+     * @param string $key
+     * @return array|string
+     */
+    public function getMetadata($key=null)
+    {
+        if (!empty($key) && isset($this->metadata[$key])) {
+            return $this->metadata[$key];
+        }
+        return $this->metadata;
+    }
+    /**
+     * Change the name of the server
+     * 
+     * @param string $name
+     * @return boolean 
+     */
+    public function changeName($name) 
+    {
+        $result= $this->service->changeServerName($this->id, $name);
+        if ($result!==false) {
+            $this->name= $name;
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Change the admin password of the server
+     * 
+     * @param string $password
+     * @return boolean 
+     */
+    public function changePassword($password)
+    {
+        $result=  $this->service->changeServerPassword($this->id, $password);
+        if ($result!==false) {
+            $this->adminPass= $password;
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Reboot the server
+     * 
+     * @return boolean 
+     */
+    public function reboot($hard=false)
+    {
+        return $this->service->rebootServer($this->id,$hard);
+    }
+    /**
+     * To Array
+     * 
+     * @return array 
+     */
+    public function toArray()
+    {
+        return array (
+            'name'      => $this->name,
+            'id'        => $this->id,
+            'imageId'   => $this->imageId,
+            'flavorId'  => $this->flavorId,
+            'hostId'    => $this->hostId,
+            'status'    => $this->status,
+            'progress'  => $this->progress,
+            'adminPass' => $this->adminPass,
+            'addresses' => $this->addresses,
+            'metadata'  => $this->metadata
+        );
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Servers/ServerList.php b/lib/zend/Zend/Service/Rackspace/Servers/ServerList.php
new file mode 100644
index 00000000000..9dda8684ec1
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Servers/ServerList.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Servers
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Servers.php';
+require_once 'Zend/Service/Rackspace/Servers/Server.php';
+
+/**
+ * List of servers of Rackspace
+ *
+ * @uses       ArrayAccess
+ * @uses       Countable
+ * @uses       Iterator
+ * @uses       OutOfBoundsException
+ * @uses       Zend_Service_Rackspace_Servers
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Servers
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Rackspace_Servers_ServerList implements Countable, Iterator, ArrayAccess
+{
+    /**
+     * @var array of Zend_Service_Rackspace_Servers_Server
+     */
+    protected $servers = array();
+    /**
+     * @var int Iterator key
+     */
+    protected $iteratorKey = 0;
+    /**
+     * @var Zend_Service_Rackspace_Servers
+     */
+    protected $service;
+    /**
+     * Construct
+     *
+     * @param  Zend_Service_Rackspace_Servers $service
+     * @param  array $list
+     * @return void
+     */
+    public function __construct($service,$list = array())
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($list)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception("You must pass a Zend_Service_Rackspace_Servers object and an array");
+        }
+        $this->service= $service;
+        $this->constructFromArray($list);
+    }
+    /**
+     * Transforms the array to array of Server
+     *
+     * @param  array $list
+     * @return void
+     */
+    private function constructFromArray(array $list)
+    {
+        foreach ($list as $server) {
+            $this->addServer(new Zend_Service_Rackspace_Servers_Server($this->service,$server));
+        }
+    }
+    /**
+     * Add a server
+     *
+     * @param  Zend_Service_Rackspace_Servers_Server $server
+     * @return Zend_Service_Rackspace_Servers_ServerList
+     */
+    protected function addServer (Zend_Service_Rackspace_Servers_Server $server)
+    {
+        $this->servers[] = $server;
+        return $this;
+    }
+    /**
+     * To Array
+     * 
+     * @return array 
+     */
+    public function toArray()
+    {
+        $array= array();
+        foreach ($this->servers as $server) {
+            $array[]= $server->toArray();
+        }
+        return $array;
+    }
+    /**
+     * Return number of servers
+     *
+     * Implement Countable::count()
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->servers);
+    }
+    /**
+     * Return the current element
+     *
+     * Implement Iterator::current()
+     *
+     * @return Zend_Service_Rackspace_Servers_Server
+     */
+    public function current()
+    {
+        return $this->servers[$this->iteratorKey];
+    }
+    /**
+     * Return the key of the current element
+     *
+     * Implement Iterator::key()
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->iteratorKey;
+    }
+    /**
+     * Move forward to next element
+     *
+     * Implement Iterator::next()
+     *
+     * @return void
+     */
+    public function next()
+    {
+        $this->iteratorKey += 1;
+    }
+    /**
+     * Rewind the Iterator to the first element
+     *
+     * Implement Iterator::rewind()
+     *
+     * @return void
+     */
+    public function rewind()
+    {
+        $this->iteratorKey = 0;
+    }
+    /**
+     * Check if there is a current element after calls to rewind() or next()
+     *
+     * Implement Iterator::valid()
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        $numItems = $this->count();
+        if ($numItems > 0 && $this->iteratorKey < $numItems) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    /**
+     * Whether the offset exists
+     *
+     * Implement ArrayAccess::offsetExists()
+     *
+     * @param   int     $offset
+     * @return  bool
+     */
+    public function offsetExists($offset)
+    {
+        return ($offset < $this->count());
+    }
+    /**
+     * Return value at given offset
+     *
+     * Implement ArrayAccess::offsetGet()
+     *
+     * @param   int     $offset
+     * @throws  Zend_Service_Rackspace_Servers_Exception
+     * @return  Zend_Service_Rackspace_Servers_Server
+     */
+    public function offsetGet($offset)
+    {
+        if ($this->offsetExists($offset)) {
+            return $this->servers[$offset];
+        } else {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception('Illegal index');
+        }
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetSet()
+     *
+     * @param   int     $offset
+     * @param   string  $value
+     * @throws  Zend_Service_Rackspace_Servers_Exception
+     */
+    public function offsetSet($offset, $value)
+    {
+        require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+        throw new Zend_Service_Rackspace_Servers_Exception('You are trying to set read-only property');
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetUnset()
+     *
+     * @param   int     $offset
+     * @throws  Zend_Service_Rackspace_Servers_Exception
+     */
+    public function offsetUnset($offset)
+    {
+        require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+        throw new Zend_Service_Rackspace_Servers_Exception('You are trying to unset read-only property');
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Servers/SharedIpGroup.php b/lib/zend/Zend/Service/Rackspace/Servers/SharedIpGroup.php
new file mode 100644
index 00000000000..6367db299d2
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Servers/SharedIpGroup.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Servers
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Servers.php';
+
+class Zend_Service_Rackspace_Servers_SharedIpGroup
+{
+    const ERROR_PARAM_CONSTRUCT  = 'You must pass a Zend_Service_Rackspace_Servers object and an array';
+    const ERROR_PARAM_NO_NAME    = 'You must pass the image\'s name in the array (name)';
+    const ERROR_PARAM_NO_ID      = 'You must pass the image\'s id in the array (id)';
+    const ERROR_PARAM_NO_SERVERS = 'The servers parameter must be an array of Ids';
+    /**
+     * Name of the shared IP group
+     * 
+     * @var string 
+     */
+    protected $name;
+    /**
+     * Id of the shared IP group
+     * 
+     * @var string 
+     */
+    protected $id;
+    /**
+     * Array of servers of the shared IP group
+     * 
+     * @var array 
+     */
+    protected $serversId = array();
+    /**
+     * The service that has created the image object
+     *
+     * @var Zend_Service_Rackspace_Servers
+     */
+    protected $service;
+    /**
+     * Construct
+     * 
+     * @param  Zend_Service_Rackspace_Servers $service
+     * @param  array $data
+     * @return void
+     */
+    public function __construct($service, $data)
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($data)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_CONSTRUCT);
+        }
+        if (!array_key_exists('name', $data)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_NAME);
+        }
+        if (!array_key_exists('id', $data)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_ID);
+        }
+        if (isset($data['servers']) && !is_array($data['servers'])) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_SERVERS);
+        } 
+        $this->service= $service;
+        $this->name = $data['name'];
+        $this->id = $data['id'];
+        if (isset($data['servers'])) {
+            $this->serversId= $data['servers'];
+        }    
+    }
+    /**
+     * Get the name of the shared IP group
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+    /**
+     * Get the id of the shared IP group
+     * 
+     * @return string 
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+    /**
+     * Get the server's array of the shared IP group
+     * 
+     * @return string 
+     */
+    public function getServersId()
+    {
+        if (empty($this->serversId)) {
+            $info= $this->service->getSharedIpGroup($this->id);
+            if (($info!==false)) {
+                $info= $info->toArray();
+                if (isset($info['servers'])) {
+                    $this->serversId= $info['servers'];
+                }
+            }    
+        }
+        return $this->serversId;
+    }
+    /**
+     * Get the server 
+     * 
+     * @param integer $id
+     * @return Zend_Service_Rackspace_Servers_Server|boolean
+     */
+    public function getServer($id)
+    {
+        if (empty($this->serversId)) {
+            $this->getServersId();
+        }
+        if (in_array($id,$this->serversId)) {
+            return $this->service->getServer($id);
+        }
+        return false;
+    }
+    /**
+     * Create a server in the shared Ip Group
+     * 
+     * @param  array $data
+     * @param  array $metadata
+     * @param  array $files 
+     * @return Zend_Service_Rackspace_Servers_Server|boolean
+     */
+    public function createServer(array $data, $metadata=array(),$files=array()) 
+    {
+        $data['sharedIpGroupId']= (integer) $this->id;
+        return $this->service->createServer($data,$metadata,$files);
+    }
+    /**
+     * To Array
+     * 
+     * @return array 
+     */
+    public function toArray()
+    {
+        return array (
+            'name'    => $this->name,
+            'id'      => $this->id,
+            'servers' => $this->serversId
+        );
+    }
+}
diff --git a/lib/zend/Zend/Service/Rackspace/Servers/SharedIpGroupList.php b/lib/zend/Zend/Service/Rackspace/Servers/SharedIpGroupList.php
new file mode 100644
index 00000000000..476f58a6a53
--- /dev/null
+++ b/lib/zend/Zend/Service/Rackspace/Servers/SharedIpGroupList.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Servers
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+require_once 'Zend/Service/Rackspace/Servers.php';
+require_once 'Zend/Service/Rackspace/Servers/SharedIpGroup.php';
+
+/**
+ * List of shared Ip group of Rackspace
+ *
+ * @uses       ArrayAccess
+ * @uses       Countable
+ * @uses       Iterator
+ * @uses       Zend_Service_Rackspace_Servers
+ * @category   Zend
+ * @package    Zend_Service_Rackspace
+ * @subpackage Servers
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Rackspace_Servers_SharedIpGroupList implements Countable, Iterator, ArrayAccess
+{
+    /**
+     * @var array of Zend_Service_Rackspace_Servers_SharedIpGroup
+     */
+    protected $shared = array();
+    /**
+     * @var int Iterator key
+     */
+    protected $iteratorKey = 0;
+    /**
+     * @var Zend_Service_Rackspace_Servers
+     */
+    protected $service;
+    /**
+     * Construct
+     *
+     * @param  Zend_Service_Rackspace_Servers $service
+     * @param  array $list
+     * @return void
+     */
+    public function __construct($service,$list = array())
+    {
+        if (!($service instanceof Zend_Service_Rackspace_Servers) || !is_array($list)) {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception("You must pass a Zend_Service_Rackspace_Servers object and an array");
+        }
+        $this->service= $service;
+        $this->constructFromArray($list);
+    }
+    /**
+     * Transforms the array to array of Shared Ip Group
+     *
+     * @param  array $list
+     * @return void
+     */
+    private function constructFromArray(array $list)
+    {
+        foreach ($list as $share) {
+            $this->addSharedIpGroup(new Zend_Service_Rackspace_Servers_SharedIpGroup($this->service,$share));
+        }
+    }
+    /**
+     * Add a shared Ip group
+     *
+     * @param  Zend_Service_Rackspace_Servers_SharedIpGroup $shared
+     * @return Zend_Service_Rackspace_Servers_SharedIpGroupList
+     */
+    protected function addSharedIpGroup (Zend_Service_Rackspace_Servers_SharedIpGroup $share)
+    {
+        $this->shared[] = $share;
+        return $this;
+    }
+    /**
+     * To Array
+     * 
+     * @return array 
+     */
+    public function toArray()
+    {
+        $array= array();
+        foreach ($this->shared as $share) {
+            $array[]= $share->toArray();
+        }
+        return $array;
+    }
+    /**
+     * Return number of shared Ip Groups
+     *
+     * Implement Countable::count()
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->shared);
+    }
+    /**
+     * Return the current element
+     *
+     * Implement Iterator::current()
+     *
+     * @return Zend_Service_Rackspace_Servers_SharedIpGroup
+     */
+    public function current()
+    {
+        return $this->shared[$this->iteratorKey];
+    }
+    /**
+     * Return the key of the current element
+     *
+     * Implement Iterator::key()
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->iteratorKey;
+    }
+    /**
+     * Move forward to next element
+     *
+     * Implement Iterator::next()
+     *
+     * @return void
+     */
+    public function next()
+    {
+        $this->iteratorKey += 1;
+    }
+    /**
+     * Rewind the Iterator to the first element
+     *
+     * Implement Iterator::rewind()
+     *
+     * @return void
+     */
+    public function rewind()
+    {
+        $this->iteratorKey = 0;
+    }
+    /**
+     * Check if there is a current element after calls to rewind() or next()
+     *
+     * Implement Iterator::valid()
+     *
+     * @return boolean
+     */
+    public function valid()
+    {
+        $numItems = $this->count();
+        if ($numItems > 0 && $this->iteratorKey < $numItems) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    /**
+     * Whether the offset exists
+     *
+     * Implement ArrayAccess::offsetExists()
+     *
+     * @param   int     $offset
+     * @return  boolean
+     */
+    public function offsetExists($offset)
+    {
+        return ($offset < $this->count());
+    }
+    /**
+     * Return value at given offset
+     *
+     * Implement ArrayAccess::offsetGet()
+     *
+     * @param   int  $offset
+     * @throws  Zend_Service_Rackspace_Servers_Exception
+     * @return  Zend_Service_Rackspace_Servers_SharedIpGroup
+     */
+    public function offsetGet($offset)
+    {
+        if ($this->offsetExists($offset)) {
+            return $this->shared[$offset];
+        } else {
+            require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+            throw new Zend_Service_Rackspace_Servers_Exception('Illegal index');
+        }
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetSet()
+     *
+     * @param   int     $offset
+     * @param   string  $value
+     * @throws  Zend_Service_Rackspace_Servers_Exception
+     */
+    public function offsetSet($offset, $value)
+    {
+        require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+        throw new Zend_Service_Rackspace_Servers_Exception('You are trying to set read-only property');
+    }
+
+    /**
+     * Throws exception because all values are read-only
+     *
+     * Implement ArrayAccess::offsetUnset()
+     *
+     * @param  int $offset
+     * @throws Zend_Service_Rackspace_Servers_Exception
+     */
+    public function offsetUnset($offset)
+    {
+        require_once 'Zend/Service/Rackspace/Servers/Exception.php';
+        throw new Zend_Service_Rackspace_Servers_Exception('You are trying to unset read-only property');
+    }
+}
diff --git a/lib/zend/Zend/Service/ReCaptcha.php b/lib/zend/Zend/Service/ReCaptcha.php
index 2421d9dc898..4993d201eac 100644
--- a/lib/zend/Zend/Service/ReCaptcha.php
+++ b/lib/zend/Zend/Service/ReCaptcha.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -34,7 +34,7 @@ require_once 'Zend/Service/ReCaptcha/Response.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -45,21 +45,21 @@ class Zend_Service_ReCaptcha extends Zend_Service_Abstract
      *
      * @var string
      */
-    const API_SERVER = 'http://api.recaptcha.net';
+    const API_SERVER = 'http://www.google.com/recaptcha/api';
 
     /**
      * URI to the secure API
      *
      * @var string
      */
-    const API_SECURE_SERVER = 'https://api-secure.recaptcha.net';
+    const API_SECURE_SERVER = 'https://www.google.com/recaptcha/api';
 
     /**
      * URI to the verify server
      *
      * @var string
      */
-    const VERIFY_SERVER = 'http://api-verify.recaptcha.net/verify';
+    const VERIFY_SERVER = 'http://www.google.com/recaptcha/api/verify';
 
     /**
      * Public key used when displaying the captcha
@@ -103,8 +103,9 @@ class Zend_Service_ReCaptcha extends Zend_Service_Abstract
      * @var array
      */
     protected $_options = array(
-        'theme' => 'red',
-        'lang' => 'en',
+        'theme'               => 'red',
+        'lang'                => 'en',
+        'custom_translations' => array(),
     );
 
     /**
@@ -373,10 +374,11 @@ class Zend_Service_ReCaptcha extends Zend_Service_Abstract
      *
      * This method uses the public key to fetch a recaptcha form.
      *
+     * @param  null|string $name Base name for recaptcha form elements
      * @return string
      * @throws Zend_Service_ReCaptcha_Exception
      */
-    public function getHtml()
+    public function getHtml($name = null)
     {
         if ($this->_publicKey === null) {
             /** @see Zend_Service_ReCaptcha_Exception */
@@ -415,6 +417,12 @@ class Zend_Service_ReCaptcha extends Zend_Service_Abstract
 </script>
 SCRIPT;
         }
+        $challengeField = 'recaptcha_challenge_field';
+        $responseField  = 'recaptcha_response_field';
+        if (!empty($name)) {
+            $challengeField = $name . '[' . $challengeField . ']';
+            $responseField  = $name . '[' . $responseField . ']';
+        }
 
         $return = $reCaptchaOptions;
         $return .= <<<HTML
@@ -426,9 +434,9 @@ HTML;
 <noscript>
    <iframe src="{$host}/noscript?k={$this->_publicKey}{$errorPart}"
        height="300" width="500" frameborder="0"></iframe>{$htmlBreak}
-   <textarea name="recaptcha_challenge_field" rows="3" cols="40">
+   <textarea name="{$challengeField}" rows="3" cols="40">
    </textarea>
-   <input type="hidden" name="recaptcha_response_field"
+   <input type="hidden" name="{$responseField}"
        value="manual_challenge"{$htmlInputClosing}
 </noscript>
 HTML;
@@ -460,21 +468,9 @@ HTML;
             throw new Zend_Service_ReCaptcha_Exception('Missing ip address');
         }
 
-        if (empty($challengeField)) {
-            /** @see Zend_Service_ReCaptcha_Exception */
-            require_once 'Zend/Service/ReCaptcha/Exception.php';
-            throw new Zend_Service_ReCaptcha_Exception('Missing challenge field');
-        }
-
-        if (empty($responseField)) {
-            /** @see Zend_Service_ReCaptcha_Exception */
-            require_once 'Zend/Service/ReCaptcha/Exception.php';
-
-            throw new Zend_Service_ReCaptcha_Exception('Missing response field');
-        }
-
         /* Fetch an instance of the http client */
         $httpClient = self::getHttpClient();
+        $httpClient->resetParameters(true);
 
         $postParams = array('privatekey' => $this->_privateKey,
                             'remoteip'   => $this->_ip,
diff --git a/lib/zend/Zend/Service/ReCaptcha/Exception.php b/lib/zend/Zend/Service/ReCaptcha/Exception.php
index 4edf24e3a5e..b84d47eb13a 100644
--- a/lib/zend/Zend/Service/ReCaptcha/Exception.php
+++ b/lib/zend/Zend/Service/ReCaptcha/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@ require_once 'Zend/Service/Exception.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 class Zend_Service_ReCaptcha_Exception extends Zend_Service_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/zend/Zend/Service/ReCaptcha/MailHide.php b/lib/zend/Zend/Service/ReCaptcha/MailHide.php
index 0528af5395a..6bbe6614f1d 100644
--- a/lib/zend/Zend/Service/ReCaptcha/MailHide.php
+++ b/lib/zend/Zend/Service/ReCaptcha/MailHide.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,7 +28,7 @@ require_once 'Zend/Service/ReCaptcha.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -312,18 +312,18 @@ class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha
         $enc = $this->getOption('encoding');
 
         /* Genrate the HTML used to represent the email address */
-        $html = htmlentities($this->getEmailLocalPart(), ENT_COMPAT, $enc) 
-            . '<a href="' 
-                . htmlentities($url, ENT_COMPAT, $enc) 
-                . '" onclick="window.open(\'' 
-                    . htmlentities($url, ENT_COMPAT, $enc) 
+        $html = htmlentities($this->getEmailLocalPart(), ENT_COMPAT, $enc)
+            . '<a href="'
+                . htmlentities($url, ENT_COMPAT, $enc)
+                . '" onclick="window.open(\''
+                    . htmlentities($url, ENT_COMPAT, $enc)
                     . '\', \'\', \'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width='
-                    . $this->_options['popupWidth'] 
-                    . ',height=' 
-                    . $this->_options['popupHeight'] 
-                . '\'); return false;" title="' 
-                . $this->_options['linkTitle'] 
-                . '">' . $this->_options['linkHiddenText'] . '</a>@' 
+                    . $this->_options['popupWidth']
+                    . ',height='
+                    . $this->_options['popupHeight']
+                . '\'); return false;" title="'
+                . $this->_options['linkTitle']
+                . '">' . $this->_options['linkHiddenText'] . '</a>@'
                 . htmlentities($this->getEmailDomainPart(), ENT_COMPAT, $enc);
 
         return $html;
diff --git a/lib/zend/Zend/Service/ReCaptcha/MailHide/Exception.php b/lib/zend/Zend/Service/ReCaptcha/MailHide/Exception.php
index 105e8823927..7710e7fd0c3 100644
--- a/lib/zend/Zend/Service/ReCaptcha/MailHide/Exception.php
+++ b/lib/zend/Zend/Service/ReCaptcha/MailHide/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,9 +28,9 @@ require_once 'Zend/Service/ReCaptcha/Exception.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 class Zend_Service_ReCaptcha_MailHide_Exception extends Zend_Service_ReCaptcha_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/zend/Zend/Service/ReCaptcha/Response.php b/lib/zend/Zend/Service/ReCaptcha/Response.php
index d9fad2caba6..d20318f1d4a 100644
--- a/lib/zend/Zend/Service/ReCaptcha/Response.php
+++ b/lib/zend/Zend/Service/ReCaptcha/Response.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -25,7 +25,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -142,13 +142,18 @@ class Zend_Service_ReCaptcha_Response
     {
         $body = $response->getBody();
 
-        $parts = explode("\n", $body, 2);
+        // Default status and error code
+        $status = 'false';
+        $errorCode = '';
 
-        if (count($parts) !== 2) {
-            $status = 'false';
-            $errorCode = '';
-        } else {
-            list($status, $errorCode) = $parts;
+        $parts = explode("\n", $body);
+
+        if ($parts[0] === 'true') {
+            $status = 'true';
+        }
+
+        if (!empty($parts[1])) {
+            $errorCode = $parts[1];
         }
 
         $this->setStatus($status);
@@ -156,4 +161,4 @@ class Zend_Service_ReCaptcha_Response
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Service/Simpy.php b/lib/zend/Zend/Service/Simpy.php
deleted file mode 100644
index 26a9be6501a..00000000000
--- a/lib/zend/Zend/Service/Simpy.php
+++ /dev/null
@@ -1,433 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @link       http://www.simpy.com/doc/api/rest/
- */
-class Zend_Service_Simpy
-{
-    /**
-     * Base URI to which API methods and parameters will be appended
-     *
-     * @var string
-     */
-    protected $_baseUri = 'http://simpy.com/simpy/api/rest/';
-
-    /**
-     * HTTP client for use in making web service calls
-     *
-     * @var Zend_Http_Client
-     */
-    protected $_http;
-
-    /**
-     * Constructs a new Simpy (free) REST API Client
-     *
-     * @param  string $username Username for the Simpy user account
-     * @param  string $password Password for the Simpy user account
-     * @return void
-     */
-    public function __construct($username, $password)
-    {
-        $this->_http = new Zend_Http_Client;
-        $this->_http->setAuth($username, $password);
-    }
-
-    /**
-     * Returns the HTTP client currently in use by this class for REST API
-     * calls, intended mainly for testing.
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient()
-    {
-        return $this->_http;
-    }
-
-    /**
-     * Sends a request to the REST API service and does initial processing
-     * on the response.
-     *
-     * @param  string $op    Name of the operation for the request
-     * @param  array  $query Query data for the request (optional)
-     * @throws Zend_Service_Exception
-     * @return DOMDocument Parsed XML response
-     */
-    protected function _makeRequest($op, $query = null)
-    {
-        if ($query != null) {
-            $query = array_diff($query, array_filter($query, 'is_null'));
-            $query = '?' . http_build_query($query);
-        }
-
-        $this->_http->setUri($this->_baseUri . $op . '.do' . $query);
-        $response = $this->_http->request('GET');
-
-        if ($response->isSuccessful()) {
-            $doc = new DOMDocument();
-            $doc->loadXML($response->getBody());
-            $xpath = new DOMXPath($doc);
-            $list = $xpath->query('/status/code');
-
-            if ($list->length > 0) {
-                $code = $list->item(0)->nodeValue;
-
-                if ($code != 0) {
-                    $list = $xpath->query('/status/message');
-                    $message = $list->item(0)->nodeValue;
-                    /**
-                     * @see Zend_Service_Exception
-                     */
-                    require_once 'Zend/Service/Exception.php';
-                    throw new Zend_Service_Exception($message, $code);
-                }
-            }
-
-            return $doc;
-        }
-
-        /**
-         * @see Zend_Service_Exception
-         */
-        require_once 'Zend/Service/Exception.php';
-        throw new Zend_Service_Exception($response->getMessage(), $response->getStatus());
-    }
-
-    /**
-     * Returns a list of all tags and their counts, ordered by count in
-     * decreasing order
-     *
-     * @param  int $limit Limits the number of tags returned (optional)
-     * @link   http://www.simpy.com/doc/api/rest/GetTags
-     * @throws Zend_Service_Exception
-     * @return Zend_Service_Simpy_TagSet
-     */
-    public function getTags($limit = null)
-    {
-        $query = array(
-            'limit' => $limit
-        );
-
-        $doc = $this->_makeRequest('GetTags', $query);
-
-        /**
-         * @see Zend_Service_Simpy_TagSet
-         */
-        require_once 'Zend/Service/Simpy/TagSet.php';
-        return new Zend_Service_Simpy_TagSet($doc);
-    }
-
-    /**
-     * Removes a tag.
-     *
-     * @param  string $tag Tag to be removed
-     * @link   http://www.simpy.com/doc/api/rest/RemoveTag
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function removeTag($tag)
-    {
-        $query = array(
-            'tag' => $tag
-        );
-
-        $this->_makeRequest('RemoveTag', $query);
-
-        return $this;
-    }
-
-    /**
-     * Renames a tag.
-     *
-     * @param  string $fromTag Tag to be renamed
-     * @param  string $toTag   New tag name
-     * @link   http://www.simpy.com/doc/api/rest/RenameTag
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function renameTag($fromTag, $toTag)
-    {
-        $query = array(
-            'fromTag' => $fromTag,
-            'toTag' => $toTag
-        );
-
-        $this->_makeRequest('RenameTag', $query);
-
-        return $this;
-    }
-
-    /**
-     * Merges two tags into a new tag.
-     *
-     * @param  string $fromTag1 First tag to merge.
-     * @param  string $fromTag2 Second tag to merge.
-     * @param  string $toTag    Tag to merge the two tags into.
-     * @link   http://www.simpy.com/doc/api/rest/MergeTags
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function mergeTags($fromTag1, $fromTag2, $toTag)
-    {
-        $query = array(
-            'fromTag1' => $fromTag1,
-            'fromTag2' => $fromTag2,
-            'toTag' => $toTag
-        );
-
-        $this->_makeRequest('MergeTags', $query);
-
-        return $this;
-    }
-
-    /**
-     * Splits a single tag into two separate tags.
-     *
-     * @param  string $tag    Tag to split
-     * @param  string $toTag1 First tag to split into
-     * @param  string $toTag2 Second tag to split into
-     * @link   http://www.simpy.com/doc/api/rest/SplitTag
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function splitTag($tag, $toTag1, $toTag2)
-    {
-        $query = array(
-            'tag' => $tag,
-            'toTag1' => $toTag1,
-            'toTag2' => $toTag2
-        );
-
-        $this->_makeRequest('SplitTag', $query);
-
-        return $this;
-    }
-
-    /**
-     * Performs a query on existing links and returns the results or returns all
-     * links if no particular query is specified (which should be used sparingly
-     * to prevent overloading Simpy servers)
-     *
-     * @param  Zend_Service_Simpy_LinkQuery $q Query object to use (optional)
-     * @return Zend_Service_Simpy_LinkSet
-     */
-    public function getLinks(Zend_Service_Simpy_LinkQuery $q = null)
-    {
-        if ($q != null) {
-            $query = array(
-                'q'          => $q->getQueryString(),
-                'limit'      => $q->getLimit(),
-                'date'       => $q->getDate(),
-                'afterDate'  => $q->getAfterDate(),
-                'beforeDate' => $q->getBeforeDate()
-            );
-
-            $doc = $this->_makeRequest('GetLinks', $query);
-        } else {
-            $doc = $this->_makeRequest('GetLinks');
-        }
-
-        /**
-         * @see Zend_Service_Simpy_LinkSet
-         */
-        require_once 'Zend/Service/Simpy/LinkSet.php';
-        return new Zend_Service_Simpy_LinkSet($doc);
-    }
-
-    /**
-     * Saves a given link.
-     *
-     * @param  string $title       Title of the page to save
-     * @param  string $href        URL of the page to save
-     * @param  int    $accessType  ACCESSTYPE_PUBLIC or ACCESSTYPE_PRIVATE
-     * @param  mixed  $tags        String containing a comma-separated list of
-     *                             tags or array of strings containing tags
-     *                             (optional)
-     * @param  string $urlNickname Alternative custom title (optional)
-     * @param  string $note        Free text note (optional)
-     * @link   Zend_Service_Simpy::ACCESSTYPE_PUBLIC
-     * @link   Zend_Service_Simpy::ACCESSTYPE_PRIVATE
-     * @link   http://www.simpy.com/doc/api/rest/SaveLink
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function saveLink($title, $href, $accessType, $tags = null, $urlNickname = null, $note = null)
-    {
-        if (is_array($tags)) {
-            $tags = implode(',', $tags);
-        }
-
-        $query = array(
-            'title'       => $title,
-            'href'        => $href,
-            'accessType'  => $accessType,
-            'tags'        => $tags,
-            'urlNickname' => $urlNickname,
-            'note'        => $note
-        );
-
-        $this->_makeRequest('SaveLink', $query);
-
-        return $this;
-    }
-
-    /**
-     * Deletes a given link.
-     *
-     * @param  string $href URL of the bookmark to delete
-     * @link   http://www.simpy.com/doc/api/rest/DeleteLink
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function deleteLink($href)
-    {
-        $query = array(
-            'href' => $href
-        );
-
-        $this->_makeRequest('DeleteLink', $query);
-
-        return $this;
-    }
-
-    /**
-     * Return a list of watchlists and their meta-data, including the number
-     * of new links added to each watchlist since last login.
-     *
-     * @link   http://www.simpy.com/doc/api/rest/GetWatchlists
-     * @return Zend_Service_Simpy_WatchlistSet
-     */
-    public function getWatchlists()
-    {
-        $doc = $this->_makeRequest('GetWatchlists');
-
-        /**
-         * @see Zend_Service_Simpy_WatchlistSet
-         */
-        require_once 'Zend/Service/Simpy/WatchlistSet.php';
-        return new Zend_Service_Simpy_WatchlistSet($doc);
-    }
-
-    /**
-     * Returns the meta-data for a given watchlist.
-     *
-     * @param  int $watchlistId ID of the watchlist to retrieve
-     * @link   http://www.simpy.com/doc/api/rest/GetWatchlist
-     * @return Zend_Service_Simpy_Watchlist
-     */
-    public function getWatchlist($watchlistId)
-    {
-        $query = array(
-            'watchlistId' => $watchlistId
-        );
-
-        $doc = $this->_makeRequest('GetWatchlist', $query);
-
-        /**
-         * @see Zend_Service_Simpy_Watchlist
-         */
-        require_once 'Zend/Service/Simpy/Watchlist.php';
-        return new Zend_Service_Simpy_Watchlist($doc->documentElement);
-    }
-
-    /**
-     * Returns all notes in reverse chronological order by add date or by
-     * rank.
-     *
-     * @param  string $q     Query string formatted using Simpy search syntax
-     *                       and search fields (optional)
-     * @param  int    $limit Limits the number notes returned (optional)
-     * @link   http://www.simpy.com/doc/api/rest/GetNotes
-     * @link   http://www.simpy.com/simpy/FAQ.do#searchSyntax
-     * @link   http://www.simpy.com/simpy/FAQ.do#searchFieldsLinks
-     * @return Zend_Service_Simpy_NoteSet
-     */
-    public function getNotes($q = null, $limit = null)
-    {
-        $query = array(
-            'q'     => $q,
-            'limit' => $limit
-        );
-
-        $doc = $this->_makeRequest('GetNotes', $query);
-
-        /**
-         * @see Zend_Service_Simpy_NoteSet
-         */
-        require_once 'Zend/Service/Simpy/NoteSet.php';
-        return new Zend_Service_Simpy_NoteSet($doc);
-    }
-
-    /**
-     * Saves a note.
-     *
-     * @param  string $title       Title of the note
-     * @param  mixed  $tags        String containing a comma-separated list of
-     *                             tags or array of strings containing tags
-     *                             (optional)
-     * @param  string $description Free-text note (optional)
-     * @param  int    $noteId      Unique identifier for an existing note to
-     *                             update (optional)
-     * @link   http://www.simpy.com/doc/api/rest/SaveNote
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function saveNote($title, $tags = null, $description = null, $noteId = null)
-    {
-        if (is_array($tags)) {
-            $tags = implode(',', $tags);
-        }
-
-        $query = array(
-            'title'       => $title,
-            'tags'        => $tags,
-            'description' => $description,
-            'noteId'      => $noteId
-        );
-
-        $this->_makeRequest('SaveNote', $query);
-
-        return $this;
-    }
-
-    /**
-     * Deletes a given note.
-     *
-     * @param  int $noteId ID of the note to delete
-     * @link   http://www.simpy.com/doc/api/rest/DeleteNote
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function deleteNote($noteId)
-    {
-        $query = array(
-            'noteId' => $noteId
-        );
-
-        $this->_makeRequest('DeleteNote', $query);
-
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/Link.php b/lib/zend/Zend/Service/Simpy/Link.php
deleted file mode 100644
index 0a7c5381eb9..00000000000
--- a/lib/zend/Zend/Service/Simpy/Link.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Link
-{
-    /**
-     * Private access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PRIVATE = '0';
-
-    /**
-     * Public access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PUBLIC  = '1';
-
-    /**
-     * Access type assigned to the link
-     *
-     * @var string
-     */
-    protected $_accessType;
-
-    /**
-     * URL of the link
-     *
-     * @var string
-     */
-    protected $_url;
-
-    /**
-     * Date of the last modification made to the link
-     *
-     * @var string
-     */
-    protected $_modDate;
-
-    /**
-     * Date the link was added
-     *
-     * @var string
-     */
-    protected $_addDate;
-
-    /**
-     * Title assigned to the link
-     *
-     * @var string
-     */
-    protected $_title;
-
-    /**
-     * Nickname assigned to the link
-     *
-     * @var string
-     */
-    protected $_nickname;
-
-    /**
-     * Tags assigned to the link
-     *
-     * @var array
-     */
-    protected $_tags;
-
-    /**
-     * Note assigned to the link
-     *
-     * @var string
-     */
-    protected $_note;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <link> node from a parsed response from
-     *                       a GetLinks operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $this->_accessType = $node->attributes->getNamedItem('accessType')->nodeValue;
-
-        $doc = new DOMDocument();
-        $doc->appendChild($doc->importNode($node, true));
-        $xpath = new DOMXPath($doc);
-
-        $this->_url = $xpath->evaluate('/link/url')->item(0)->nodeValue;
-        $this->_modDate = $xpath->evaluate('/link/modDate')->item(0)->nodeValue;
-        $this->_addDate = $xpath->evaluate('/link/addDate')->item(0)->nodeValue;
-        $this->_title = $xpath->evaluate('/link/title')->item(0)->nodeValue;
-        $this->_nickname = $xpath->evaluate('/link/nickname')->item(0)->nodeValue;
-        $this->_note = $xpath->evaluate('/link/note')->item(0)->nodeValue;
-
-        $list = $xpath->query('/link/tags/tag');
-        $this->_tags = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_tags[$x] = $list->item($x)->nodeValue;
-        }
-    }
-
-    /**
-     * Returns the access type assigned to the link
-     *
-     * @see ACCESSTYPE_PRIVATE
-     * @see ACCESSTYPE_PUBLIC
-     * @return string
-     */
-    public function getAccessType()
-    {
-        return $this->_accessType;
-    }
-
-    /**
-     * Returns the URL of the link
-     *
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * Returns the date of the last modification made to the link
-     *
-     * @return string
-     */
-    public function getModDate()
-    {
-        return $this->_modDate;
-    }
-
-    /**
-     * Returns the date the link was added
-     *
-     * @return string
-     */
-    public function getAddDate()
-    {
-        return $this->_addDate;
-    }
-
-    /**
-     * Returns the title assigned to the link
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the nickname assigned to the link
-     *
-     * @return string
-     */
-    public function getNickname()
-    {
-        return $this->_nickname;
-    }
-
-    /**
-     * Returns the tags assigned to the link
-     *
-     * @return array
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * Returns the note assigned to the link
-     *
-     * @return string
-     */
-    public function getNote()
-    {
-        return $this->_note;
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/LinkQuery.php b/lib/zend/Zend/Service/Simpy/LinkQuery.php
deleted file mode 100644
index 68502f2a06e..00000000000
--- a/lib/zend/Zend/Service/Simpy/LinkQuery.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_LinkQuery
-{
-    /**
-     * Query string for the query
-     *
-     * @var string
-     */
-    protected $_query = null;
-
-    /**
-     * Maximum number of search results to return
-     *
-     * @var int
-     */
-    protected $_limit = null;
-
-    /**
-     * Date on which search results must have been added
-     *
-     * @var string
-     */
-    protected $_date = null;
-
-    /**
-     * Date after which search results must have been added
-     *
-     * @var string
-     */
-    protected $_afterDate = null;
-
-    /**
-     * Date before which search results must have been added
-     *
-     * @var string
-     */
-    protected $_beforeDate = null;
-
-    /**
-     * Sets the query string for the query
-     *
-     * @param  string $query Query string in valid Simpy syntax
-     * @see    http://www.simpy.com/faq#searchSyntax
-     * @see    http://www.simpy.com/faq#searchFieldsLinks
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setQueryString($query)
-    {
-        $this->_query = $query;
-
-        return $this;
-    }
-
-    /**
-     * Returns the query string set for this query
-     *
-     * @return string
-     */
-    public function getQueryString()
-    {
-        return $this->_query;
-    }
-
-    /**
-     * Sets the maximum number of search results to return
-     *
-     * @param  int $limit
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setLimit($limit)
-    {
-        $this->_limit = intval($limit);
-
-        if ($this->_limit == 0) {
-            $this->_limit = null;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the maximum number of search results to return
-     *
-     * @return int
-     */
-    public function getLimit()
-    {
-        return $this->_limit;
-    }
-
-    /**
-     * Sets the date on which search results must have been added, which will
-     * override any existing values set using setAfterDate() and setBeforeDate()
-     *
-     * @param  string $date
-     * @see    setAfterDate()
-     * @see    setBeforeDate()
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setDate($date)
-    {
-        $this->_date = $date;
-        $this->_afterDate = null;
-        $this->_beforeDate = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the date on which search results must have been added
-     *
-     * @return string
-     */
-    public function getDate()
-    {
-        return $this->_date;
-    }
-
-    /**
-     * Sets the date after which search results must have been added, which will
-     * override any existing values set using setDate()
-     *
-     * @param  string $date
-     * @see    setDate()
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setAfterDate($date)
-    {
-        $this->_afterDate = $date;
-        $this->_date = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the date after which search results must have been added
-     *
-     * @return string
-     */
-    public function getAfterDate()
-    {
-        return $this->_afterDate;
-    }
-
-    /**
-     * Sets the date before which search results must have been added, which
-     * will override any existing values set using setDate()
-     *
-     * @param  string $date
-     * @see    setDate()
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setBeforeDate($date)
-    {
-        $this->_beforeDate = $date;
-        $this->_date = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the date before which search results must have been added
-     *
-     * @return string
-     */
-    public function getBeforeDate()
-    {
-        return $this->_beforeDate;
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/LinkSet.php b/lib/zend/Zend/Service/Simpy/LinkSet.php
deleted file mode 100644
index 8fa5ad89c3a..00000000000
--- a/lib/zend/Zend/Service/Simpy/LinkSet.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_Link
- */
-require_once 'Zend/Service/Simpy/Link.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_LinkSet implements IteratorAggregate
-{
-    /**
-     * List of links
-     *
-     * @var array of Zend_Service_Simpy_Link objects
-     */
-    protected $_links;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetLinks operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//links/link');
-        $this->_links = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_links[$x] = new Zend_Service_Simpy_Link($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the link set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_links);
-    }
-
-    /**
-     * Returns the number of links in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_links);
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/Note.php b/lib/zend/Zend/Service/Simpy/Note.php
deleted file mode 100644
index 75d65d9ab64..00000000000
--- a/lib/zend/Zend/Service/Simpy/Note.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Note
-{
-    /**
-     * Private access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PRIVATE = 'private';
-
-    /**
-     * Public access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PUBLIC  = 'public';
-
-    /**
-     * Access type assigned to the note
-     *
-     * @var string
-     */
-    protected $_accessType;
-
-    /**
-     * ID of the note
-     *
-     * @var int
-     */
-    protected $_id;
-
-    /**
-     * URI of the note
-     *
-     * @var string
-     */
-    protected $_uri;
-
-    /**
-     * Date of the last modification made to the note
-     *
-     * @var string
-     */
-    protected $_modDate;
-
-    /**
-     * Date the note was added
-     *
-     * @var string
-     */
-    protected $_addDate;
-
-    /**
-     * Title of to the note
-     *
-     * @var string
-     */
-    protected $_title;
-
-    /**
-     * Tags assigned to the note
-     *
-     * @var array
-     */
-    protected $_tags;
-
-    /**
-     * Description of the note
-     *
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <link> node from a parsed response from
-     *                       a GetLinks operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $this->_accessType = $node->attributes->getNamedItem('accessType')->nodeValue;
-
-        $doc = new DOMDocument();
-        $doc->appendChild($doc->importNode($node, true));
-        $xpath = new DOMXPath($doc);
-
-        $this->_uri = $xpath->evaluate('/note/uri')->item(0)->nodeValue;
-        $this->_id = substr($this->_uri, strrpos($this->_uri, '=') + 1);
-        $this->_modDate = trim($xpath->evaluate('/note/modDate')->item(0)->nodeValue);
-        $this->_addDate = trim($xpath->evaluate('/note/addDate')->item(0)->nodeValue);
-        $this->_title = $xpath->evaluate('/note/title')->item(0)->nodeValue;
-        $this->_description = $xpath->evaluate('/note/description')->item(0)->nodeValue;
-
-        $list = $xpath->query('/note/tags/tag');
-        $this->_tags = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_tags[$x] = $list->item($x)->nodeValue;
-        }
-    }
-
-    /**
-     * Returns the access type assigned to the note
-     *
-     * @see    ACCESSTYPE_PRIVATE
-     * @see    ACCESSTYPE_PUBLIC
-     * @return string
-     */
-    public function getAccessType()
-    {
-        return $this->_accessType;
-    }
-
-    /**
-     * Returns the ID of the note
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Returns the URI of the note
-     *
-     * @return string
-     */
-    public function getUri()
-    {
-        return $this->_uri;
-    }
-
-    /**
-     * Returns the date of the last modification made to the note
-     *
-     * @return string
-     */
-    public function getModDate()
-    {
-        return $this->_modDate;
-    }
-
-    /**
-     * Returns the date the note was added
-     *
-     * @return string
-     */
-    public function getAddDate()
-    {
-        return $this->_addDate;
-    }
-
-    /**
-     * Returns the title assigned to the note
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the tags assigned to the note
-     *
-     * @return array
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * Returns the description assigned to the note
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/NoteSet.php b/lib/zend/Zend/Service/Simpy/NoteSet.php
deleted file mode 100644
index 38fa6fd99b5..00000000000
--- a/lib/zend/Zend/Service/Simpy/NoteSet.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_Note
- */
-require_once 'Zend/Service/Simpy/Note.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_NoteSet implements IteratorAggregate
-{
-    /**
-     * List of notes
-     *
-     * @var array of Zend_Service_Simpy_Note objects
-     */
-    protected $_notes;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetNotes operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//notes/note');
-        $this->_notes = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_notes[$x] = new Zend_Service_Simpy_Note($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the note set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_notes);
-    }
-
-    /**
-     * Returns the number of notes in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_notes);
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/Tag.php b/lib/zend/Zend/Service/Simpy/Tag.php
deleted file mode 100644
index 694c4ad7054..00000000000
--- a/lib/zend/Zend/Service/Simpy/Tag.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Tag
-{
-    /**
-     * Name of the tag
-     *
-     * @var string
-     */
-    protected $_tag;
-
-    /**
-     * Number of links with the tag
-     *
-     * @var int
-     */
-    protected $_count;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <tag> node from a parsed response from
-     *                       a GetTags operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $map =& $node->attributes;
-        $this->_tag = $map->getNamedItem('name')->nodeValue;
-        $this->_count = $map->getNamedItem('count')->nodeValue;
-    }
-
-    /**
-     * Returns the name of the tag
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return $this->_tag;
-    }
-
-    /**
-     * Returns the number of links with the tag
-     *
-     * @return int
-     */
-    public function getCount()
-    {
-        return $this->_count;
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/TagSet.php b/lib/zend/Zend/Service/Simpy/TagSet.php
deleted file mode 100644
index 904922cde76..00000000000
--- a/lib/zend/Zend/Service/Simpy/TagSet.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_Tag
- */
-require_once 'Zend/Service/Simpy/Tag.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_TagSet implements IteratorAggregate
-{
-    /**
-     * List of tags
-     *
-     * @var array of Zend_Service_Simpy_Tag objects
-     */
-    protected $_tags;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetTags operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//tags/tag');
-        $this->_tags = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_tags[$x] = new Zend_Service_Simpy_Tag($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the tag set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_tags);
-    }
-
-    /**
-     * Returns the number of tags in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_tags);
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/Watchlist.php b/lib/zend/Zend/Service/Simpy/Watchlist.php
deleted file mode 100644
index 2eb531c4a0a..00000000000
--- a/lib/zend/Zend/Service/Simpy/Watchlist.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_WatchlistFilterSet
- */
-require_once 'Zend/Service/Simpy/WatchlistFilterSet.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Watchlist
-{
-    /**
-     * Identifier for the watchlist
-     *
-     * @var int
-     */
-    protected $_id;
-
-    /**
-     * Name of the watchlist
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Description of the watchlist
-     *
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Timestamp for when the watchlist was added
-     *
-     * @var string
-     */
-    protected $_addDate;
-
-    /**
-     * Number of new links in the watchlist
-     *
-     * @var int
-     */
-    protected $_newLinks;
-
-    /**
-     * List of usernames for users included in the watchlist
-     *
-     * @var array
-     */
-    protected $_users;
-
-    /**
-     * List of filters included in the watchlist
-     *
-     * @var Zend_Service_Simpy_WatchlistFilterSet
-     */
-    protected $_filters;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <watchlist> node from a parsed
-     *                       response from a GetWatchlists or GetWatchlist
-     *                       operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $map =& $node->attributes;
-
-        $this->_id = $map->getNamedItem('id')->nodeValue;
-        $this->_name = $map->getNamedItem('name')->nodeValue;
-        $this->_description = $map->getNamedItem('description')->nodeValue;
-        $this->_addDate = $map->getNamedItem('addDate')->nodeValue;
-        $this->_newLinks = $map->getNamedItem('newLinks')->nodeValue;
-
-        $this->_users = array();
-        $this->_filters = new Zend_Service_Simpy_WatchlistFilterSet();
-
-        $childNode = $node->firstChild;
-        while ($childNode !== null) {
-            if ($childNode->nodeName == 'user') {
-                $this->_users[] = $childNode->attributes->getNamedItem('username')->nodeValue;
-            } elseif ($childNode->nodeName == 'filter') {
-                $filter = new Zend_Service_Simpy_WatchlistFilter($childNode);
-                $this->_filters->add($filter);
-            }
-            $childNode = $childNode->nextSibling;
-        }
-    }
-
-    /**
-     * Returns the identifier for the watchlist
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Returns the name of the watchlist
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Returns the description of the watchlist
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Returns a timestamp for when the watchlist was added
-     *
-     * @return string
-     */
-    public function getAddDate()
-    {
-        return $this->_addDate;
-    }
-
-    /**
-     * Returns the number of new links in the watchlist
-     *
-     * @return int
-     */
-    public function getNewLinks()
-    {
-        return $this->_newLinks;
-    }
-
-    /**
-     * Returns a list of usernames for users included in the watchlist
-     *
-     * @return array
-     */
-    public function getUsers()
-    {
-        return $this->_users;
-    }
-
-    /**
-     * Returns a list of filters included in the watchlist
-     *
-     * @return Zend_Service_Simpy_WatchlistFilterSet
-     */
-    public function getFilters()
-    {
-        return $this->_filters;
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/WatchlistFilter.php b/lib/zend/Zend/Service/Simpy/WatchlistFilter.php
deleted file mode 100644
index 210fddc317e..00000000000
--- a/lib/zend/Zend/Service/Simpy/WatchlistFilter.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_WatchlistFilter
-{
-    /**
-     * Name of the filter
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Query for the filter
-     *
-     * @var string
-     */
-    protected $_query;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <filter> node from a parsed response from
-     *                       a GetWatchlists or GetWatchlist operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $map =& $node->attributes;
-        $this->_name = $map->getNamedItem('name')->nodeValue;
-        $this->_query = $map->getNamedItem('query')->nodeValue;
-    }
-
-    /**
-     * Returns the name of the filter
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Returns the query for the filter
-     *
-     * @return string
-     */
-    public function getQuery()
-    {
-        return $this->_query;
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/WatchlistFilterSet.php b/lib/zend/Zend/Service/Simpy/WatchlistFilterSet.php
deleted file mode 100644
index 3e1a2f7d7a2..00000000000
--- a/lib/zend/Zend/Service/Simpy/WatchlistFilterSet.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_WatchlistFilter
- */
-require_once 'Zend/Service/Simpy/WatchlistFilter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_WatchlistFilterSet implements IteratorAggregate
-{
-    /**
-     * List of filters in the set
-     *
-     * @var array of Zend_Service_Simpy_WatchlistFilter objects
-     */
-    protected $_filters = array();
-
-    /**
-     * Adds a filter to the set
-     *
-     * @param  Zend_Service_Simpy_WatchlistFilter $filter Filter to be added
-     * @return void
-     */
-    public function add(Zend_Service_Simpy_WatchlistFilter $filter)
-    {
-        $this->_filters[] = $filter;
-    }
-
-    /**
-     * Returns an iterator for the watchlist filter set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_filters);
-    }
-
-    /**
-     * Returns the number of filters in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_filters);
-    }
-}
diff --git a/lib/zend/Zend/Service/Simpy/WatchlistSet.php b/lib/zend/Zend/Service/Simpy/WatchlistSet.php
deleted file mode 100644
index 93a5e4a3b97..00000000000
--- a/lib/zend/Zend/Service/Simpy/WatchlistSet.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_Watchlist
- */
-require_once 'Zend/Service/Simpy/Watchlist.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_WatchlistSet implements IteratorAggregate
-{
-    /**
-     * List of watchlists
-     *
-     * @var array of Zend_Service_Simpy_Watchlist objects
-     */
-    protected $_watchlists = array();
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetWatchlists operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//watchlists/watchlist');
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_watchlists[$x] = new Zend_Service_Simpy_Watchlist($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the watchlist set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_watchlists);
-    }
-
-    /**
-     * Returns the number of watchlists in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_watchlists);
-    }
-}
diff --git a/lib/zend/Zend/Service/SlideShare.php b/lib/zend/Zend/Service/SlideShare.php
index 7fcdc2510f8..33577af8a23 100644
--- a/lib/zend/Zend/Service/SlideShare.php
+++ b/lib/zend/Zend/Service/SlideShare.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -35,6 +35,9 @@ require_once 'Zend/Cache.php';
  */
 require_once 'Zend/Service/SlideShare/SlideShow.php';
 
+/** Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /**
  * The Zend_Service_SlideShare component is used to interface with the
  * slideshare.net web server to retrieve slide shows hosted on the web site for
@@ -44,12 +47,11 @@ require_once 'Zend/Service/SlideShare/SlideShow.php';
  * @package    Zend_Service
  * @subpackage SlideShare
  * @throws     Zend_Service_SlideShare_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_SlideShare
 {
-
     /**
      * Web service result code mapping
      */
@@ -71,17 +73,17 @@ class Zend_Service_SlideShare
     /**
      * Slide share Web service communication URIs
      */
-    const SERVICE_UPLOAD_URI                  = 'http://www.slideshare.net/api/1/upload_slideshow';
-    const SERVICE_GET_SHOW_URI                = 'http://www.slideshare.net/api/1/get_slideshow';
-    const SERVICE_GET_SHOW_BY_USER_URI        = 'http://www.slideshare.net/api/1/get_slideshow_by_user';
-    const SERVICE_GET_SHOW_BY_TAG_URI         = 'http://www.slideshare.net/api/1/get_slideshow_by_tag';
-    const SERVICE_GET_SHOW_BY_GROUP_URI       = 'http://www.slideshare.net/api/1/get_slideshows_from_group';
+    const SERVICE_UPLOAD_URI            = 'https://www.slideshare.net/api/2/upload_slideshow';
+    const SERVICE_GET_SHOW_URI          = 'https://www.slideshare.net/api/2/get_slideshow';
+    const SERVICE_GET_SHOW_BY_USER_URI  = 'https://www.slideshare.net/api/2/get_slideshows_by_user';
+    const SERVICE_GET_SHOW_BY_TAG_URI   = 'https://www.slideshare.net/api/2/get_slideshows_by_tag';
+    const SERVICE_GET_SHOW_BY_GROUP_URI = 'https://www.slideshare.net/api/2/get_slideshows_by_group';
 
     /**
      * The MIME type of Slideshow files
      *
      */
-    const POWERPOINT_MIME_TYPE    = "application/vnd.ms-powerpoint";
+    const POWERPOINT_MIME_TYPE = "application/vnd.ms-powerpoint";
 
     /**
      * The API key to use in requests
@@ -126,8 +128,8 @@ class Zend_Service_SlideShare
     protected $_cacheobject;
 
     /**
-     * Sets the Zend_Http_Client object to use in requests. If not provided a default will
-     * be used.
+     * Sets the Zend_Http_Client object to use in requests. If not provided a
+     * default will be used.
      *
      * @param Zend_Http_Client $client The HTTP client instance to use
      * @return Zend_Service_SlideShare
@@ -139,23 +141,28 @@ class Zend_Service_SlideShare
     }
 
     /**
-     * Returns the instance of the Zend_Http_Client which will be used. Creates an instance
-     * of Zend_Http_Client if no previous client was set.
+     * Returns the instance of the Zend_Http_Client which will be used. Creates
+     * an instance of Zend_Http_Client if no previous client was set.
      *
      * @return Zend_Http_Client The HTTP client which will be used
      */
     public function getHttpClient()
     {
 
-        if(!($this->_httpclient instanceof Zend_Http_Client)) {
+        if (!($this->_httpclient instanceof Zend_Http_Client)) {
             $client = new Zend_Http_Client();
-            $client->setConfig(array('maxredirects' => 2,
-                                     'timeout' => 5));
+            $client->setConfig(
+                array(
+                     'maxredirects' => 2,
+                     'timeout'      => 5
+                )
+            );
 
             $this->setHttpClient($client);
         }
 
         $this->_httpclient->resetParameters();
+
         return $this->_httpclient;
     }
 
@@ -172,19 +179,25 @@ class Zend_Service_SlideShare
     }
 
     /**
-     * Gets the Zend_Cache object which will be used to cache API queries. If no cache object
-     * was previously set the the default will be used (Filesystem caching in /tmp with a life
-     * time of 43200 seconds)
+     * Gets the Zend_Cache object which will be used to cache API queries. If no
+     * cache object was previously set the the default will be used (Filesystem
+     * caching in /tmp with a life time of 43200 seconds)
      *
      * @return Zend_Cache_Core The object used in caching
      */
     public function getCacheObject()
     {
 
-        if(!($this->_cacheobject instanceof Zend_Cache_Core)) {
-            $cache = Zend_Cache::factory('Core', 'File', array('lifetime' => 43200,
-                                                               'automatic_serialization' => true),
-                                                         array('cache_dir' => '/tmp'));
+        if (!($this->_cacheobject instanceof Zend_Cache_Core)) {
+            $cache = Zend_Cache::factory(
+                'Core',
+                'File',
+                array(
+                    'lifetime'                => 43200,
+                    'automatic_serialization' => true
+                ),
+                array('cache_dir' => '/tmp')
+            );
 
             $this->setCacheObject($cache);
         }
@@ -283,17 +296,19 @@ class Zend_Service_SlideShare
     /**
      * The Constructor
      *
-     * @param string $apikey The API key
+     * @param string $apikey       The API key
      * @param string $sharedSecret The shared secret
-     * @param string $username The username
-     * @param string $password The password
+     * @param string $username     The username
+     * @param string $password     The password
      */
-    public function __construct($apikey, $sharedSecret, $username = null, $password = null)
+    public function __construct(
+        $apikey, $sharedSecret, $username = null, $password = null
+    )
     {
         $this->setApiKey($apikey)
-             ->setSharedSecret($sharedSecret)
-             ->setUserName($username)
-             ->setPassword($password);
+            ->setSharedSecret($sharedSecret)
+            ->setUserName($username)
+            ->setPassword($password);
 
         $this->_httpclient = new Zend_Http_Client();
     }
@@ -301,41 +316,53 @@ class Zend_Service_SlideShare
     /**
      * Uploads the specified Slide show the the server
      *
-     * @param Zend_Service_SlideShare_SlideShow $ss The slide show object representing the slide show to upload
-     * @param boolean $make_src_public Determines if the the slide show's source file is public or not upon upload
-     * @return Zend_Service_SlideShare_SlideShow The passed Slide show object, with the new assigned ID provided
+     * @param Zend_Service_SlideShare_SlideShow $ss The slide show
+     *                                              object representing the
+     *                                              slide show to upload
+     * @param boolean $makeSrcPublic                Determines if the slide
+     *                                              show's source file is public
+     *                                              or not upon upload
+     * @return Zend_Service_SlideShare_SlideShow The passed Slide show object,
+     *                                           with the new assigned ID
+     *                                           provided
+     * @throws Zend_Service_SlideShare_Exception
      */
-    public function uploadSlideShow(Zend_Service_SlideShare_SlideShow $ss, $make_src_public = true)
+    public function uploadSlideShow(
+        Zend_Service_SlideShare_SlideShow $ss, $makeSrcPublic = true
+    )
     {
-
         $timestamp = time();
 
-        $params = array('api_key' => $this->getApiKey(),
-                        'ts' => $timestamp,
-                        'hash' => sha1($this->getSharedSecret().$timestamp),
-                        'username' => $this->getUserName(),
-                        'password' => $this->getPassword(),
-                        'slideshow_title' => $ss->getTitle());
+        $params = array(
+            'api_key'         => $this->getApiKey(),
+            'ts'              => $timestamp,
+            'hash'            => sha1($this->getSharedSecret() . $timestamp),
+            'username'        => $this->getUserName(),
+            'password'        => $this->getPassword(),
+            'slideshow_title' => $ss->getTitle()
+        );
 
         $description = $ss->getDescription();
-        $tags = $ss->getTags();
+        $tags        = $ss->getTags();
 
         $filename = $ss->getFilename();
 
-        if(!file_exists($filename) || !is_readable($filename)) {
+        if (!file_exists($filename) || !is_readable($filename)) {
             require_once 'Zend/Service/SlideShare/Exception.php';
-            throw new Zend_Service_SlideShare_Exception("Specified Slideshow for upload not found or unreadable");
+            throw new Zend_Service_SlideShare_Exception(
+                'Specified Slideshow for upload not found or unreadable'
+            );
         }
 
-        if(!empty($description)) {
+        if (!empty($description)) {
             $params['slideshow_description'] = $description;
         } else {
             $params['slideshow_description'] = "";
         }
 
-        if(!empty($tags)) {
+        if (!empty($tags)) {
             $tmp = array();
-            foreach($tags as $tag) {
+            foreach ($tags as $tag) {
                 $tmp[] = "\"$tag\"";
             }
             $params['slideshow_tags'] = implode(' ', $tmp);
@@ -343,7 +370,6 @@ class Zend_Service_SlideShare
             $params['slideshow_tags'] = "";
         }
 
-
         $client = $this->getHttpClient();
         $client->setUri(self::SERVICE_UPLOAD_URI);
         $client->setParameterPost($params);
@@ -352,23 +378,30 @@ class Zend_Service_SlideShare
         require_once 'Zend/Http/Client/Exception.php';
         try {
             $response = $client->request('POST');
-        } catch(Zend_Http_Client_Exception $e) {
+        } catch (Zend_Http_Client_Exception $e) {
             require_once 'Zend/Service/SlideShare/Exception.php';
-            throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e);
+            throw new Zend_Service_SlideShare_Exception(
+                "Service Request Failed: {$e->getMessage()}", 0, $e
+            );
         }
 
-        $sxe = simplexml_load_string($response->getBody());
+        $sxe = Zend_Xml_Security::scan($response->getBody());
 
-        if($sxe->getName() == "SlideShareServiceError") {
+        if ($sxe->getName() == "SlideShareServiceError") {
             $message = (string)$sxe->Message[0];
-            list($code, $error_str) = explode(':', $message);
+            list($code, $errorStr) = explode(':', $message);
             require_once 'Zend/Service/SlideShare/Exception.php';
-            throw new Zend_Service_SlideShare_Exception(trim($error_str), $code);
+            throw new Zend_Service_SlideShare_Exception(
+                trim($errorStr),
+                $code
+            );
         }
 
-        if(!$sxe->getName() == "SlideShowUploaded") {
+        if (!$sxe->getName() == "SlideShowUploaded") {
             require_once 'Zend/Service/SlideShare/Exception.php';
-            throw new Zend_Service_SlideShare_Exception("Unknown XML Respons Received");
+            throw new Zend_Service_SlideShare_Exception(
+                'Unknown XML Respons Received'
+            );
         }
 
         $ss->setId((int)(string)$sxe->SlideShowID);
@@ -379,23 +412,25 @@ class Zend_Service_SlideShare
     /**
      * Retrieves a slide show's information based on slide show ID
      *
-     * @param int $ss_id The slide show ID
+     * @param int $ssId The slide show ID
      * @return Zend_Service_SlideShare_SlideShow the Slideshow object
+     * @throws Zend_Service_SlideShare_Exception
      */
-    public function getSlideShow($ss_id)
+    public function getSlideShow($ssId)
     {
         $timestamp = time();
 
-        $params = array('api_key' => $this->getApiKey(),
-                        'ts' => $timestamp,
-                        'hash' => sha1($this->getSharedSecret().$timestamp),
-                        'slideshow_id' => $ss_id);
+        $params = array(
+            'api_key'      => $this->getApiKey(),
+            'ts'           => $timestamp,
+            'hash'         => sha1($this->getSharedSecret() . $timestamp),
+            'slideshow_id' => $ssId
+        );
 
-        $cache = $this->getCacheObject();
+        $cache    = $this->getCacheObject();
+        $cacheKey = md5("__zendslideshare_cache_$ssId");
 
-        $cache_key = md5("__zendslideshare_cache_$ss_id");
-
-        if(!$retval = $cache->load($cache_key)) {
+        if (!$retval = $cache->load($cacheKey)) {
             $client = $this->getHttpClient();
 
             $client->setUri(self::SERVICE_GET_SHOW_URI);
@@ -404,28 +439,34 @@ class Zend_Service_SlideShare
             require_once 'Zend/Http/Client/Exception.php';
             try {
                 $response = $client->request('POST');
-            } catch(Zend_Http_Client_Exception $e) {
+            } catch (Zend_Http_Client_Exception $e) {
                 require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e);
+                throw new Zend_Service_SlideShare_Exception(
+                    "Service Request Failed: {$e->getMessage()}", 0, $e
+                );
             }
 
-            $sxe = simplexml_load_string($response->getBody());
+            $sxe = Zend_Xml_Security::scan($response->getBody());
 
-            if($sxe->getName() == "SlideShareServiceError") {
+            if ($sxe->getName() == "SlideShareServiceError") {
                 $message = (string)$sxe->Message[0];
-                list($code, $error_str) = explode(':', $message);
+                list($code, $errorStr) = explode(':', $message);
                 require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception(trim($error_str), $code);
+                throw new Zend_Service_SlideShare_Exception(
+                    trim($errorStr),
+                    $code
+                );
             }
 
-            if(!$sxe->getName() == 'Slideshows') {
+            if (!($sxe->getName() == 'Slideshow')) {
                 require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception('Unknown XML Repsonse Received');
+                throw new Zend_Service_SlideShare_Exception(
+                    'Unknown XML Repsonse Received'
+                );
             }
+            $retval = $this->_slideShowNodeToObject(clone $sxe);
 
-            $retval = $this->_slideShowNodeToObject(clone $sxe->Slideshow[0]);
-
-            $cache->save($retval, $cache_key);
+            $cache->save($retval, $cacheKey);
         }
 
         return $retval;
@@ -439,9 +480,13 @@ class Zend_Service_SlideShare
      * @param int $limit The maximum number of slide shows to retrieve
      * @return array An array of Zend_Service_SlideShare_SlideShow objects
      */
-    public function getSlideShowsByUsername($username, $offset = null, $limit = null)
+    public function getSlideShowsByUsername(
+        $username, $offset = null, $limit = null
+    )
     {
-        return $this->_getSlideShowsByType('username_for', $username, $offset, $limit);
+        return $this->_getSlideShowsByType(
+            'username_for', $username, $offset, $limit
+        );
     }
 
     /**
@@ -455,9 +500,9 @@ class Zend_Service_SlideShare
     public function getSlideShowsByTag($tag, $offset = null, $limit = null)
     {
 
-        if(is_array($tag)) {
+        if (is_array($tag)) {
             $tmp = array();
-            foreach($tag as $t) {
+            foreach ($tag as $t) {
                 $tmp[] = "\"$t\"";
             }
 
@@ -484,56 +529,60 @@ class Zend_Service_SlideShare
      * Retrieves Zend_Service_SlideShare_SlideShow object arrays based on the type of
      * list desired
      *
-     * @param string $key The type of slide show object to retrieve
-     * @param string $value The specific search query for the slide show type to look up
-     * @param int $offset The offset of the list to start retrieving from
-     * @param int $limit The maximum number of slide shows to retrieve
+     * @param string $key    The type of slide show object to retrieve
+     * @param string $value  The specific search query for the slide show type to look up
+     * @param int    $offset The offset of the list to start retrieving from
+     * @param int    $limit  The maximum number of slide shows to retrieve
      * @return array An array of Zend_Service_SlideShare_SlideShow objects
+     * @throws Zend_Service_SlideShare_Exception
      */
-    protected function _getSlideShowsByType($key, $value, $offset = null, $limit = null)
+    protected function _getSlideShowsByType(
+        $key, $value, $offset = null, $limit = null
+    )
     {
-
         $key = strtolower($key);
 
-        switch($key) {
+        switch ($key) {
             case 'username_for':
                 $responseTag = 'User';
-                $queryUri = self::SERVICE_GET_SHOW_BY_USER_URI;
+                $queryUri    = self::SERVICE_GET_SHOW_BY_USER_URI;
                 break;
             case 'group_name':
                 $responseTag = 'Group';
-                $queryUri = self::SERVICE_GET_SHOW_BY_GROUP_URI;
+                $queryUri    = self::SERVICE_GET_SHOW_BY_GROUP_URI;
                 break;
             case 'tag':
                 $responseTag = 'Tag';
-                $queryUri = self::SERVICE_GET_SHOW_BY_TAG_URI;
+                $queryUri    = self::SERVICE_GET_SHOW_BY_TAG_URI;
                 break;
             default:
                 require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception("Invalid SlideShare Query");
+                throw new Zend_Service_SlideShare_Exception(
+                    'Invalid SlideShare Query'
+                );
         }
 
         $timestamp = time();
 
-        $params = array('api_key' => $this->getApiKey(),
-                        'ts' => $timestamp,
-                        'hash' => sha1($this->getSharedSecret().$timestamp),
-                        $key => $value);
+        $params = array(
+            'api_key' => $this->getApiKey(),
+            'ts'      => $timestamp,
+            'hash'    => sha1($this->getSharedSecret() . $timestamp),
+            $key      => $value
+        );
 
-        if($offset !== null) {
+        if ($offset !== null) {
             $params['offset'] = (int)$offset;
         }
 
-        if($limit !== null) {
+        if ($limit !== null) {
             $params['limit'] = (int)$limit;
         }
 
-        $cache = $this->getCacheObject();
-
-        $cache_key = md5($key.$value.$offset.$limit);
-
-        if(!$retval = $cache->load($cache_key)) {
+        $cache    = $this->getCacheObject();
+        $cacheKey = md5($key . $value . $offset . $limit);
 
+        if (!$retval = $cache->load($cacheKey)) {
             $client = $this->getHttpClient();
 
             $client->setUri($queryUri);
@@ -542,34 +591,40 @@ class Zend_Service_SlideShare
             require_once 'Zend/Http/Client/Exception.php';
             try {
                 $response = $client->request('POST');
-            } catch(Zend_Http_Client_Exception $e) {
+            } catch (Zend_Http_Client_Exception $e) {
                 require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e);
+                throw new Zend_Service_SlideShare_Exception(
+                    "Service Request Failed: {$e->getMessage()}", 0, $e
+                );
             }
 
-            $sxe = simplexml_load_string($response->getBody());
+            $sxe = Zend_Xml_Security::scan($response->getBody());
 
-            if($sxe->getName() == "SlideShareServiceError") {
+            if ($sxe->getName() == "SlideShareServiceError") {
                 $message = (string)$sxe->Message[0];
-                list($code, $error_str) = explode(':', $message);
+                list($code, $errorStr) = explode(':', $message);
                 require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception(trim($error_str), $code);
+                throw new Zend_Service_SlideShare_Exception(
+                    trim($errorStr), $code
+                );
             }
 
-            if(!$sxe->getName() == $responseTag) {
+            if (!$sxe->getName() == $responseTag) {
                 require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception('Unknown or Invalid XML Repsonse Received');
+                throw new Zend_Service_SlideShare_Exception(
+                    'Unknown or Invalid XML Repsonse Received'
+                );
             }
 
             $retval = array();
 
-            foreach($sxe->children() as $node) {
-                if($node->getName() == 'Slideshow') {
+            foreach ($sxe->children() as $node) {
+                if ($node->getName() == 'Slideshow') {
                     $retval[] = $this->_slideShowNodeToObject($node);
                 }
             }
 
-            $cache->save($retval, $cache_key);
+            $cache->save($retval, $cacheKey);
         }
 
         return $retval;
@@ -579,41 +634,43 @@ class Zend_Service_SlideShare
      * Converts a SimpleXMLElement object representing a response from the service
      * into a Zend_Service_SlideShare_SlideShow object
      *
+     * @see http://www.slideshare.net/developers/documentation#get_slideshow
+     *
      * @param SimpleXMLElement $node The input XML from the slideshare.net service
      * @return Zend_Service_SlideShare_SlideShow The resulting object
+     * @throws Zend_Service_SlideShare_Exception
      */
     protected function _slideShowNodeToObject(SimpleXMLElement $node)
     {
 
-        if($node->getName() == 'Slideshow') {
-
+        if ($node->getName() == 'Slideshow') {
             $ss = new Zend_Service_SlideShare_SlideShow();
 
             $ss->setId((string)$node->ID);
             $ss->setDescription((string)$node->Description);
-            $ss->setEmbedCode((string)$node->EmbedCode);
+            $ss->setEmbedCode((string)$node->Embed);
             $ss->setNumViews((string)$node->Views);
-            $ss->setPermaLink((string)$node->Permalink);
+            $ss->setUrl((string)$node->URL);
             $ss->setStatus((string)$node->Status);
             $ss->setStatusDescription((string)$node->StatusDescription);
 
-            foreach(explode(",", (string)$node->Tags) as $tag) {
-
-                if(!in_array($tag, $ss->getTags())) {
+            foreach (explode(",", (string)$node->Tags) as $tag) {
+                if (!in_array($tag, $ss->getTags())) {
                     $ss->addTag($tag);
                 }
             }
 
-            $ss->setThumbnailUrl((string)$node->Thumbnail);
+            $ss->setThumbnailUrl((string)$node->ThumbnailURL);
             $ss->setTitle((string)$node->Title);
             $ss->setLocation((string)$node->Location);
             $ss->setTranscript((string)$node->Transcript);
 
             return $ss;
-
         }
 
         require_once 'Zend/Service/SlideShare/Exception.php';
-        throw new Zend_Service_SlideShare_Exception("Was not provided the expected XML Node for processing");
+        throw new Zend_Service_SlideShare_Exception(
+            'Was not provided the expected XML Node for processing'
+        );
     }
 }
diff --git a/lib/zend/Zend/Service/SlideShare/Exception.php b/lib/zend/Zend/Service/SlideShare/Exception.php
index a8939d30c80..577d6366014 100644
--- a/lib/zend/Zend/Service/SlideShare/Exception.php
+++ b/lib/zend/Zend/Service/SlideShare/Exception.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,9 +30,9 @@ require_once 'Zend/Service/Exception.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_SlideShare_Exception extends Zend_Service_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Service/SlideShare/SlideShow.php b/lib/zend/Zend/Service/SlideShare/SlideShow.php
index 7699e0238ea..782ef496e52 100644
--- a/lib/zend/Zend/Service/SlideShare/SlideShow.php
+++ b/lib/zend/Zend/Service/SlideShare/SlideShow.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -28,12 +28,11 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_SlideShare_SlideShow
 {
-
     /**
      * Status constant mapping for web service
      *
@@ -86,11 +85,11 @@ class Zend_Service_SlideShare_SlideShow
     protected $_statusDescription;
 
     /**
-     * The Permanent link for the slide show
+     * The URL for the slide show
      *
-     * @var string the Permalink for the slide show
+     * @var string the URL for the slide show
      */
-    protected $_permalink;
+    protected $_url;
 
     /**
      * The number of views this slide show has received
@@ -328,7 +327,7 @@ class Zend_Service_SlideShare_SlideShow
     /**
      * Sets the description for the Slide show
      *
-     * @param strign $desc The description of the slide show
+     * @param string $desc The description of the slide show
      * @return Zend_Service_SlideShare_SlideShow
      */
     public function setDescription($desc)
@@ -394,23 +393,51 @@ class Zend_Service_SlideShare_SlideShow
     /**
      * Sets the permanent link of the slide show
      *
+     * @see Zend_Service_SlideShare_SlideShow::setUrl()
+     *
      * @param string $url The permanent URL for the slide show
      * @return Zend_Service_SlideShare_SlideShow
+     * @deprecated Since 1.12.10, use setUrl()
      */
     public function setPermaLink($url)
     {
-        $this->_permalink = (string)$url;
+        $this->setUrl($url);
         return $this;
     }
 
     /**
      * Gets the permanent link of the slide show
      *
+     * @see Zend_Service_SlideShare_SlideShow::getUrl()
+     *
      * @return string the permanent URL for the slide show
+     * @deprecated Since 1.12.10, use getUrl()
      */
     public function getPermaLink()
     {
-        return $this->_permalink;
+        return $this->getUrl();
+    }
+
+    /**
+     * Sets the URL of the slide show
+     *
+     * @param  string $url The URL for the slide show
+     * @return self
+     */
+    public function setUrl($url)
+    {
+        $this->_url = (string)$url;
+        return $this;
+    }
+
+    /**
+     * Gets the URL of the slide show
+     *
+     * @return string The URL for the slide show
+     */
+    public function getUrl()
+    {
+        return $this->_url;
     }
 
     /**
@@ -434,4 +461,4 @@ class Zend_Service_SlideShare_SlideShow
     {
         return $this->_numViews;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Exception.php b/lib/zend/Zend/Service/SqlAzure/Exception.php
similarity index 78%
rename from lib/zend/Zend/Service/WindowsAzure/Exception.php
rename to lib/zend/Zend/Service/SqlAzure/Exception.php
index 73f69523e42..800baafcef8 100644
--- a/lib/zend/Zend/Service/WindowsAzure/Exception.php
+++ b/lib/zend/Zend/Service/SqlAzure/Exception.php
@@ -16,7 +16,7 @@
  * @package    Zend_Service_WindowsAzure
  * @subpackage Exception
  * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -27,9 +27,9 @@ require_once 'Zend/Service/Exception.php';
 
 /**
  * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Service_SqlAzure
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_WindowsAzure_Exception extends Zend_Service_Exception
+class Zend_Service_SqlAzure_Exception extends Zend_Service_Exception
 {}
diff --git a/lib/zend/Zend/Service/SqlAzure/Management/Client.php b/lib/zend/Zend/Service/SqlAzure/Management/Client.php
new file mode 100644
index 00000000000..5aec418b887
--- /dev/null
+++ b/lib/zend/Zend/Service/SqlAzure/Management/Client.php
@@ -0,0 +1,612 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_WindowsAzure
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Http_Client
+ */
+ require_once 'Zend/Http/Client.php';
+ 
+ /**
+ * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
+ */
+ require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
+ 
+ /**
+ * @see Zend_Service_SqlAzure_Management_ServerInstance
+ */
+ require_once 'Zend/Service/SqlAzure/Management/ServerInstance.php';
+ 
+ /**
+ * @see Zend_Service_SqlAzure_Management_FirewallRuleInstance
+ */
+ require_once 'Zend/Service/SqlAzure/Management/FirewallRuleInstance.php';
+
+ /** @see Zend_Xml_Security */
+ require_once 'Zend/Xml/Security.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_SqlAzure
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_SqlAzure_Management_Client
+{
+	/**
+	 * Management service URL
+	 */
+	const URL_MANAGEMENT        = "https://management.database.windows.net:8443";
+	
+	/**
+	 * Operations
+	 */
+	const OP_OPERATIONS                = "operations";
+	const OP_SERVERS                   = "servers";
+	const OP_FIREWALLRULES             = "firewallrules";
+
+	/**
+	 * Current API version
+	 * 
+	 * @var string
+	 */
+	protected $_apiVersion = '1.0';
+	
+	/**
+	 * Subscription ID
+	 *
+	 * @var string
+	 */
+	protected $_subscriptionId = '';
+	
+	/**
+	 * Management certificate path (.PEM)
+	 *
+	 * @var string
+	 */
+	protected $_certificatePath = '';
+	
+	/**
+	 * Management certificate passphrase
+	 *
+	 * @var string
+	 */
+	protected $_certificatePassphrase = '';
+	
+	/**
+	 * Zend_Http_Client channel used for communication with REST services
+	 * 
+	 * @var Zend_Http_Client
+	 */
+	protected $_httpClientChannel = null;	
+
+	/**
+	 * Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract instance
+	 * 
+	 * @var Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
+	 */
+	protected $_retryPolicy = null;
+	
+	/**
+	 * Returns the last request ID
+	 * 
+	 * @var string
+	 */
+	protected $_lastRequestId = null;
+	
+	/**
+	 * Creates a new Zend_Service_SqlAzure_Management instance
+	 * 
+	 * @param string $subscriptionId Subscription ID
+	 * @param string $certificatePath Management certificate path (.PEM)
+	 * @param string $certificatePassphrase Management certificate passphrase
+     * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
+	 */
+	public function __construct(
+		$subscriptionId,
+		$certificatePath,
+		$certificatePassphrase,
+		Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null
+	) {
+		$this->_subscriptionId = $subscriptionId;
+		$this->_certificatePath = $certificatePath;
+		$this->_certificatePassphrase = $certificatePassphrase;
+		
+		$this->_retryPolicy = $retryPolicy;
+		if (is_null($this->_retryPolicy)) {
+		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
+		}
+		
+		// Setup default Zend_Http_Client channel
+		$options = array(
+		    'adapter'       => 'Zend_Http_Client_Adapter_Socket',
+		    'ssltransport'  => 'ssl',
+			'sslcert'       => $this->_certificatePath,
+			'sslpassphrase' => $this->_certificatePassphrase,
+			'sslusecontext' => true,
+		);
+		if (function_exists('curl_init')) {
+			// Set cURL options if cURL is used afterwards
+			$options['curloptions'] = array(
+					CURLOPT_FOLLOWLOCATION => true,
+					CURLOPT_TIMEOUT => 120,
+			);
+		}
+		$this->_httpClientChannel = new Zend_Http_Client(null, $options);
+	}
+	
+	/**
+	 * Set the HTTP client channel to use
+	 * 
+	 * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name.
+	 */
+	public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Socket')
+	{
+		$this->_httpClientChannel->setAdapter($adapterInstance);
+	}
+	
+    /**
+     * Retrieve HTTP client channel
+     * 
+     * @return Zend_Http_Client_Adapter_Interface
+     */
+    public function getHttpClientChannel()
+    {
+        return $this->_httpClientChannel;
+    }
+	
+	/**
+	 * Returns the Windows Azure subscription ID
+	 * 
+	 * @return string
+	 */
+	public function getSubscriptionId()
+	{
+		return $this->_subscriptionId;
+	}
+	
+	/**
+	 * Returns the last request ID.
+	 * 
+	 * @return string
+	 */
+	public function getLastRequestId()
+	{
+		return $this->_lastRequestId;
+	}
+	
+	/**
+	 * Get base URL for creating requests
+	 *
+	 * @return string
+	 */
+	public function getBaseUrl()
+	{
+		return self::URL_MANAGEMENT . '/' . $this->_subscriptionId;
+	}
+	
+	/**
+	 * Perform request using Zend_Http_Client channel
+	 *
+	 * @param string $path Path
+	 * @param string $queryString Query string
+	 * @param string $httpVerb HTTP verb the request will use
+	 * @param array $headers x-ms headers to add
+	 * @param mixed $rawData Optional RAW HTTP data to be sent over the wire
+	 * @return Zend_Http_Response
+	 */
+	protected function _performRequest(
+		$path = '/',
+		$queryString = '',
+		$httpVerb = Zend_Http_Client::GET,
+		$headers = array(),
+		$rawData = null
+	) {
+	    // Clean path
+		if (strpos($path, '/') !== 0) {
+			$path = '/' . $path;
+		}
+			
+		// Clean headers
+		if (is_null($headers)) {
+		    $headers = array();
+		}
+		
+		// Ensure cUrl will also work correctly:
+		//  - disable Content-Type if required
+		//  - disable Expect: 100 Continue
+		if (!isset($headers["Content-Type"])) {
+			$headers["Content-Type"] = '';
+		}
+		//$headers["Expect"] = '';
+
+		// Add version header
+		$headers['x-ms-version'] = $this->_apiVersion;
+		    
+		// URL encoding
+		$path           = self::urlencode($path);
+		$queryString    = self::urlencode($queryString);
+
+		// Generate URL and sign request
+		$requestUrl     = $this->getBaseUrl() . $path . $queryString;
+		$requestHeaders = $headers;
+
+		// Prepare request 
+		$this->_httpClientChannel->resetParameters(true);
+		$this->_httpClientChannel->setUri($requestUrl);
+		$this->_httpClientChannel->setHeaders($requestHeaders);
+		$this->_httpClientChannel->setRawData($rawData);
+
+		// Execute request
+		$response = $this->_retryPolicy->execute(
+		    array($this->_httpClientChannel, 'request'),
+		    array($httpVerb)
+		);
+		
+		// Store request id
+		$this->_lastRequestId = $response->getHeader('x-ms-request-id');
+		
+		return $response;
+	}
+	
+	/** 
+	 * Parse result from Zend_Http_Response
+	 *
+	 * @param Zend_Http_Response $response Response from HTTP call
+	 * @return object
+	 * @throws Zend_Service_WindowsAzure_Exception
+	 */
+	protected function _parseResponse(Zend_Http_Response $response = null)
+	{
+		if (is_null($response)) {
+			require_once 'Zend/Service/SqlAzure/Exception.php';
+			throw new Zend_Service_SqlAzure_Exception('Response should not be null.');
+		}
+		
+        $xml = @Zend_Xml_Security::scan($response->getBody());
+        
+        if ($xml !== false) {
+            // Fetch all namespaces 
+            $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); 
+            
+            // Register all namespace prefixes
+            foreach ($namespaces as $prefix => $ns) { 
+                if ($prefix != '') {
+                    $xml->registerXPathNamespace($prefix, $ns);
+                } 
+            } 
+        }
+        
+        return $xml;
+	}
+	
+	/**
+	 * URL encode function
+	 * 
+	 * @param  string $value Value to encode
+	 * @return string        Encoded value
+	 */
+	public static function urlencode($value)
+	{
+	    return str_replace(' ', '%20', $value);
+	}
+	
+    /**
+     * Builds a query string from an array of elements
+     * 
+     * @param array     Array of elements
+     * @return string   Assembled query string
+     */
+    public static function createQueryStringFromArray($queryString)
+    {
+    	return count($queryString) > 0 ? '?' . implode('&', $queryString) : '';
+    }
+    
+	/**
+	 * Get error message from Zend_Http_Response
+	 *
+	 * @param Zend_Http_Response $response Repsonse
+	 * @param string $alternativeError Alternative error message
+	 * @return string
+	 */
+	protected function _getErrorMessage(Zend_Http_Response $response, $alternativeError = 'Unknown error.')
+	{
+		$response = $this->_parseResponse($response);
+		if ($response && $response->Message) {
+			return (string)$response->Message;
+		} else {
+			return $alternativeError;
+		}
+	}
+	
+	/**
+	 * The Create Server operation adds a new SQL Azure server to a subscription.
+	 * 
+	 * @param string $administratorLogin Administrator login.
+	 * @param string $administratorPassword Administrator password.
+	 * @param string $location Location of the server.
+	 * @return Zend_Service_SqlAzure_Management_ServerInstance Server information.
+	 * @throws Zend_Service_SqlAzure_Management_Exception
+	 */
+	public function createServer($administratorLogin, $administratorPassword, $location)
+	{
+		if ($administratorLogin == '' || is_null($administratorLogin)) {
+                    require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+                    throw new Zend_Service_SqlAzure_Management_Exception('Administrator login should be specified.');
+                }
+		if ($administratorPassword == '' || is_null($administratorPassword)) {
+                    require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+                    throw new Zend_Service_SqlAzure_Management_Exception('Administrator password should be specified.');
+                }
+                if (is_null($location) && is_null($affinityGroup)) {
+                    require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+                    throw new Zend_Service_SqlAzure_Management_Exception('Please specify a location for the server.');
+                }
+    	
+                $response = $this->_performRequest(self::OP_SERVERS, '',
+    		Zend_Http_Client::POST,
+    		array('Content-Type' => 'application/xml; charset=utf-8'),
+    		'<Server xmlns="http://schemas.microsoft.com/sqlazure/2010/12/"><AdministratorLogin>' . $administratorLogin . '</AdministratorLogin><AdministratorLoginPassword>' . $administratorPassword . '</AdministratorLoginPassword><Location>' . $location . '</Location></Server>');
+ 	
+                if ($response->isSuccessful()) {
+			$xml = $this->_parseResponse($response);
+			
+			return new Zend_Service_SqlAzure_Management_ServerInstance(
+				(string)$xml,
+				$administratorLogin,
+				$location
+			);
+                } else {
+			require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+			throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
+		}	
+	}
+	
+	/**
+	 * The Get Servers operation enumerates SQL Azure servers that are provisioned for a subscription.
+	 * 
+	 * @return array An array of Zend_Service_SqlAzure_Management_ServerInstance.
+	 * @throws Zend_Service_SqlAzure_Management_Exception
+	 */
+	public function listServers()
+	{
+            $response = $this->_performRequest(self::OP_SERVERS);
+ 	
+            if ($response->isSuccessful()) {
+		$xml = $this->_parseResponse($response);
+		$xmlServices = null;
+			
+                if (!$xml->Server) {
+                    return array();
+		}
+		if (count($xml->Server) > 1) {
+    		    $xmlServices = $xml->Server;
+    		} else {
+    		    $xmlServices = array($xml->Server);
+    		}
+    		
+		$services = array();
+		if (!is_null($xmlServices)) {				
+				
+                    for ($i = 0; $i < count($xmlServices); $i++) {
+                        $services[] = new Zend_Service_SqlAzure_Management_ServerInstance(
+                                	    (string)$xmlServices[$i]->Name,
+					    (string)$xmlServices[$i]->AdministratorLogin,
+					    (string)$xmlServices[$i]->Location
+					);
+                    }
+		}
+		return $services;
+            } else {
+		require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
+            }
+	}
+	
+	/**
+	 * The Drop Server operation drops a SQL Azure server from a subscription.
+	 * 
+	 * @param string $serverName Server to drop.
+	 * @throws Zend_Service_SqlAzure_Management_Exception
+	 */
+	public function dropServer($serverName)
+	{
+            if ($serverName == '' || is_null($serverName)) {
+                require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+                throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.');
+            }
+    	
+            $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName, '', Zend_Http_Client::DELETE);
+
+            if (!$response->isSuccessful()) {
+		require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
+            }	
+	}
+	
+	/**
+	 * The Set Server Administrator Password operation sets the administrative password of a SQL Azure server for a subscription.
+	 * 
+	 * @param string $serverName Server to set password for.
+	 * @param string $administratorPassword Administrator password.
+	 * @throws Zend_Service_SqlAzure_Management_Exception
+	 */
+	public function setAdministratorPassword($serverName, $administratorPassword)
+	{
+            if ($serverName == '' || is_null($serverName)) {
+		require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+    		throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.');
+            }
+            if ($administratorPassword == '' || is_null($administratorPassword)) {
+                require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+    		throw new Zend_Service_SqlAzure_Management_Exception('Administrator password should be specified.');
+            }
+    	
+            $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName, '?op=ResetPassword',
+    		Zend_Http_Client::POST,
+    		array('Content-Type' => 'application/xml; charset=utf-8'),
+    		'<AdministratorLoginPassword xmlns="http://schemas.microsoft.com/sqlazure/2010/12/">' . $administratorPassword . '</AdministratorLoginPassword>');
+    		
+            if (!$response->isSuccessful()) {
+		require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
+            }	
+	}
+	
+	/**
+	 * The Set Server Firewall Rule operation updates an existing firewall rule or adds a new firewall rule for a SQL Azure server that belongs to a subscription.
+	 * 
+	 * @param string $serverName Server name.
+	 * @param string $ruleName Firewall rule name.
+	 * @param string $startIpAddress Start IP address.
+	 * @param string $endIpAddress End IP address.
+	 * @return Zend_Service_SqlAzure_Management_FirewallRuleInstance
+	 * @throws Zend_Service_SqlAzure_Management_Exception
+	 */
+	public function createFirewallRule($serverName, $ruleName, $startIpAddress, $endIpAddress)
+	{
+            if ($serverName == '' || is_null($serverName)) {
+                require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+                throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.');
+            }
+            if ($ruleName == '' || is_null($ruleName)) {
+                require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+                throw new Zend_Service_SqlAzure_Management_Exception('Rule name should be specified.');
+            }
+            if ($startIpAddress == '' || is_null($startIpAddress) || !filter_var($startIpAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+                throw new Zend_Service_SqlAzure_Management_Exception('Start IP address should be specified.');
+            }
+            if ($endIpAddress == '' || is_null($endIpAddress) || !filter_var($endIpAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+                throw new Zend_Service_SqlAzure_Management_Exception('End IP address should be specified.');
+            }
+    	
+            $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName . '/' . self::OP_FIREWALLRULES . '/' . $ruleName, '',
+    		Zend_Http_Client::PUT,
+    		array('Content-Type' => 'application/xml; charset=utf-8'),
+    		'<FirewallRule xmlns="http://schemas.microsoft.com/sqlazure/2010/12/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.microsoft.com/sqlazure/2010/12/ FirewallRule.xsd"><StartIpAddress>' . $startIpAddress . '</StartIpAddress><EndIpAddress>' . $endIpAddress . '</EndIpAddress></FirewallRule>');
+
+            if ($response->isSuccessful()) {
+		
+    		return new Zend_Service_SqlAzure_Management_FirewallRuleInstance(
+    			$ruleName,
+    			$startIpAddress,
+    			$endIpAddress
+    		);
+            } else {
+		require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
+            }
+	}
+	
+	/**
+	 * The Get Server Firewall Rules operation retrieves a list of all the firewall rules for a SQL Azure server that belongs to a subscription.
+	 * 
+	 * @param string $serverName Server name.
+	 * @return Array of Zend_Service_SqlAzure_Management_FirewallRuleInstance.
+	 * @throws Zend_Service_SqlAzure_Management_Exception
+	 */
+	public function listFirewallRules($serverName)
+	{
+            if ($serverName == '' || is_null($serverName)) {
+		require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+                throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.');
+            }
+    	
+	    $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName . '/' . self::OP_FIREWALLRULES);
+ 	
+            if ($response->isSuccessful()) {
+		$xml = $this->_parseResponse($response);
+		$xmlServices = null;
+			
+    		if (!$xml->FirewallRule) {
+                    return array();
+		}
+		if (count($xml->FirewallRule) > 1) {
+    		    $xmlServices = $xml->FirewallRule;
+    		} else {
+    		    $xmlServices = array($xml->FirewallRule);
+    		}
+    		
+		$services = array();
+		if (!is_null($xmlServices)) {				
+                    
+                    for ($i = 0; $i < count($xmlServices); $i++) {
+                        $services[] = new Zend_Service_SqlAzure_Management_FirewallRuleInstance(
+					    (string)$xmlServices[$i]->Name,
+					    (string)$xmlServices[$i]->StartIpAddress,
+					    (string)$xmlServices[$i]->EndIpAddress
+					);
+                    }
+		}
+		return $services;
+            } else {
+		require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
+            }		
+	}
+	
+	/**
+	 * The Delete Server Firewall Rule operation deletes a firewall rule from a SQL Azure server that belongs to a subscription.
+	 * 
+	 * @param string $serverName Server name.
+	 * @param string $ruleName Rule name.
+	 * @throws Zend_Service_SqlAzure_Management_Exception
+	 */
+	public function deleteFirewallRule($serverName, $ruleName)
+	{
+		if ($serverName == '' || is_null($serverName)) {
+			require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+    		throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.');
+    	}
+		if ($ruleName == '' || is_null($ruleName)) {
+			require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+    		throw new Zend_Service_SqlAzure_Management_Exception('Rule name should be specified.');
+    	}
+    	
+        $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName . '/' . self::OP_FIREWALLRULES . '/' . $ruleName, '',
+    		Zend_Http_Client::DELETE);
+
+    	if (!$response->isSuccessful()) {
+			require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+			throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
+		}
+	}
+	
+	/**
+	 * Creates a firewall rule for Microsoft Services. This is required if access to SQL Azure is required from other services like Windows Azure.
+	 * 
+	 * @param string $serverName Server name.
+	 * @param boolean $allowAccess Allow access from other Microsoft Services?
+	 * @throws Zend_Service_SqlAzure_Management_Exception
+	 */
+	public function createFirewallRuleForMicrosoftServices($serverName, $allowAccess)
+	{
+		if ($allowAccess) {
+			$this->createFirewallRule($serverName, 'MicrosoftServices', '0.0.0.0', '0.0.0.0');
+		} else {
+			$this->deleteFirewallRule($serverName, 'MicrosoftServices');
+		}
+	}
+	
+}
diff --git a/lib/zend/Zend/Service/SqlAzure/Management/Exception.php b/lib/zend/Zend/Service/SqlAzure/Management/Exception.php
new file mode 100644
index 00000000000..88e2f8fefe1
--- /dev/null
+++ b/lib/zend/Zend/Service/SqlAzure/Management/Exception.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_WindowsAzure
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+ require_once 'Zend/Service/SqlAzure/Exception.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_SqlAzure
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_SqlAzure_Management_Exception
+	extends Zend_Service_SqlAzure_Exception
+{
+}
diff --git a/lib/zend/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php b/lib/zend/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php
new file mode 100644
index 00000000000..63e28599b25
--- /dev/null
+++ b/lib/zend/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_WindowsAzure
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Service_SqlAzure_Management_ServiceEntityAbstract
+ */
+require_once 'Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_SqlAzure
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * 
+ * @property string $Name               The name of the firewall rule.
+ * @property string $StartIpAddress     The start IP address.
+ * @property string $EndIpAddress       The end IP address.
+ */
+class Zend_Service_SqlAzure_Management_FirewallRuleInstance
+	extends Zend_Service_SqlAzure_Management_ServiceEntityAbstract
+{    
+    /**
+     * Constructor
+     * 
+     * @param string $name               The name of the firewall rule.
+     * @param string $startIpAddress     The start IP address.
+     * @param string $endIpAddress       The end IP address.
+	 */
+    public function __construct($name, $startIpAddress, $endIpAddress) 
+    {	        
+        $this->_data = array(
+            'name'               => $name,
+            'startipaddress'     => $startIpAddress,
+            'endipaddress'       => $endIpAddress       
+        );
+    }
+}
diff --git a/lib/zend/Zend/Service/SqlAzure/Management/ServerInstance.php b/lib/zend/Zend/Service/SqlAzure/Management/ServerInstance.php
new file mode 100644
index 00000000000..d10611e5467
--- /dev/null
+++ b/lib/zend/Zend/Service/SqlAzure/Management/ServerInstance.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service_WindowsAzure
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Service_SqlAzure_Management_ServiceEntityAbstract
+ */
+require_once 'Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Service_SqlAzure
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * 
+ * @property string $Name               The name of the server.
+ * @property string $DnsName            The DNS name of the server.
+ * @property string $AdministratorLogin The administrator login.
+ * @property string $Location           The location of the server in Windows Azure.
+ */
+class Zend_Service_SqlAzure_Management_ServerInstance
+	extends Zend_Service_SqlAzure_Management_ServiceEntityAbstract
+{    
+    /**
+     * Constructor
+     * 
+     * @param string $name               The name of the server.
+     * @param string $administratorLogin The administrator login.
+     * @param string $location           The location of the server in Windows Azure.
+	 */
+    public function __construct($name, $administratorLogin, $location) 
+    {	        
+        $this->_data = array(
+            'name'               => $name,
+            'dnsname'            => $name . '.database.windows.net',
+            'administratorlogin' => $administratorLogin,
+            'location'           => $location       
+        );
+    }
+}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/QueueInstance.php b/lib/zend/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php
similarity index 57%
rename from lib/zend/Zend/Service/WindowsAzure/Storage/QueueInstance.php
rename to lib/zend/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php
index c6f03f7ee9f..5cc53711a47 100644
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/QueueInstance.php
+++ b/lib/zend/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php
@@ -14,30 +14,21 @@
  *
  * @category   Zend
  * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
 
 /**
  * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_Service_SqlAzure
+ * @subpackage Management
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string  $Name                     Name of the queue
- * @property array   $Metadata                 Key/value pairs of meta data
- * @property integer $ApproximateMessageCount  The approximate number of messages in the queue
  */
-class Zend_Service_WindowsAzure_Storage_QueueInstance
+abstract class Zend_Service_SqlAzure_Management_ServiceEntityAbstract
 {
     /**
      * Data
@@ -46,21 +37,6 @@ class Zend_Service_WindowsAzure_Storage_QueueInstance
      */
     protected $_data = null;
     
-    /**
-     * Constructor
-     * 
-     * @param string $name          Name
-     * @param array  $metadata      Key/value pairs of meta data
-     */
-    public function __construct($name, $metadata = array()) 
-    {
-        $this->_data = array(
-            'name'         => $name,
-            'metadata'     => $metadata,
-            'approximatemessagecount' => 0
-        );
-    }
-    
     /**
      * Magic overload for setting properties
      * 
@@ -72,8 +48,8 @@ class Zend_Service_WindowsAzure_Storage_QueueInstance
             $this->_data[strtolower($name)] = $value;
             return;
         }
-
-        throw new Exception("Unknown property: " . $name);
+	require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+        throw new Zend_Service_SqlAzure_Management_Exception("Unknown property: " . $name);
     }
 
     /**
@@ -85,7 +61,7 @@ class Zend_Service_WindowsAzure_Storage_QueueInstance
         if (array_key_exists(strtolower($name), $this->_data)) {
             return $this->_data[strtolower($name)];
         }
-
-        throw new Exception("Unknown property: " . $name);
+	require_once 'Zend/Service/SqlAzure/Management/Exception.php';
+        throw new Zend_Service_SqlAzure_Management_Exception("Unknown property: " . $name);
     }
 }
diff --git a/lib/zend/Zend/Service/StrikeIron.php b/lib/zend/Zend/Service/StrikeIron.php
index 2501a56ae4f..5ab03fcda3b 100644
--- a/lib/zend/Zend/Service/StrikeIron.php
+++ b/lib/zend/Zend/Service/StrikeIron.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_StrikeIron
diff --git a/lib/zend/Zend/Service/StrikeIron/Base.php b/lib/zend/Zend/Service/StrikeIron/Base.php
index 9b55b519638..a2d35ef218b 100644
--- a/lib/zend/Zend/Service/StrikeIron/Base.php
+++ b/lib/zend/Zend/Service/StrikeIron/Base.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/StrikeIron/Decorator.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_StrikeIron_Base
@@ -193,10 +193,10 @@ class Zend_Service_StrikeIron_Base
      * on what was originally called.
      *
      * @see    __call()
-     * @param  $result  Raw result returned from SOAPClient_>__soapCall()
-     * @param  $method  Method name that was passed to SOAPClient->__soapCall()
-     * @param  $params  Method parameters that were passed to SOAPClient->__soapCall()
-     * @return mixed    Transformed result
+     * @param  object $result  Raw result returned from SOAPClient_>__soapCall()
+     * @param  string $method  Method name that was passed to SOAPClient->__soapCall()
+     * @param  array  $params  Method parameters that were passed to SOAPClient->__soapCall()
+     * @return mixed  Transformed result
      */
     protected function _transformResult($result, $method, $params)
     {
diff --git a/lib/zend/Zend/Service/StrikeIron/Decorator.php b/lib/zend/Zend/Service/StrikeIron/Decorator.php
index 280204147c6..023fd8c7f68 100644
--- a/lib/zend/Zend/Service/StrikeIron/Decorator.php
+++ b/lib/zend/Zend/Service/StrikeIron/Decorator.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_StrikeIron_Decorator
diff --git a/lib/zend/Zend/Service/StrikeIron/Exception.php b/lib/zend/Zend/Service/StrikeIron/Exception.php
index f9172aed9c0..5506309743c 100644
--- a/lib/zend/Zend/Service/StrikeIron/Exception.php
+++ b/lib/zend/Zend/Service/StrikeIron/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Service/Exception.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_StrikeIron_Exception extends Zend_Service_Exception
diff --git a/lib/zend/Zend/Service/StrikeIron/SalesUseTaxBasic.php b/lib/zend/Zend/Service/StrikeIron/SalesUseTaxBasic.php
index b70d46f86dc..5dae1ce60d3 100644
--- a/lib/zend/Zend/Service/StrikeIron/SalesUseTaxBasic.php
+++ b/lib/zend/Zend/Service/StrikeIron/SalesUseTaxBasic.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Service/StrikeIron/Base.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_StrikeIron_SalesUseTaxBasic extends Zend_Service_StrikeIron_Base
diff --git a/lib/zend/Zend/Service/StrikeIron/USAddressVerification.php b/lib/zend/Zend/Service/StrikeIron/USAddressVerification.php
index 93ba95cbece..86cb22f5667 100644
--- a/lib/zend/Zend/Service/StrikeIron/USAddressVerification.php
+++ b/lib/zend/Zend/Service/StrikeIron/USAddressVerification.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Service/StrikeIron/Base.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_StrikeIron_USAddressVerification extends Zend_Service_StrikeIron_Base
diff --git a/lib/zend/Zend/Service/StrikeIron/ZipCodeInfo.php b/lib/zend/Zend/Service/StrikeIron/ZipCodeInfo.php
index 8e917924fb7..1a60ee298f9 100644
--- a/lib/zend/Zend/Service/StrikeIron/ZipCodeInfo.php
+++ b/lib/zend/Zend/Service/StrikeIron/ZipCodeInfo.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Service/StrikeIron/Base.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_StrikeIron_ZipCodeInfo extends Zend_Service_StrikeIron_Base
diff --git a/lib/zend/Zend/Service/Technorati.php b/lib/zend/Zend/Service/Technorati.php
deleted file mode 100644
index 3658f43e068..00000000000
--- a/lib/zend/Zend/Service/Technorati.php
+++ /dev/null
@@ -1,1028 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * Zend_Service_Technorati provides an easy, intuitive and object-oriented interface
- * for using the Technorati API.
- *
- * It provides access to all available Technorati API queries
- * and returns the original XML response as a friendly PHP object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati
-{
-    /** Base Technorati API URI */
-    const API_URI_BASE = 'http://api.technorati.com';
-
-    /** Query paths */
-    const API_PATH_COSMOS           = '/cosmos';
-    const API_PATH_SEARCH           = '/search';
-    const API_PATH_TAG              = '/tag';
-    const API_PATH_DAILYCOUNTS      = '/dailycounts';
-    const API_PATH_TOPTAGS          = '/toptags';
-    const API_PATH_BLOGINFO         = '/bloginfo';
-    const API_PATH_BLOGPOSTTAGS     = '/blogposttags';
-    const API_PATH_GETINFO          = '/getinfo';
-    const API_PATH_KEYINFO          = '/keyinfo';
-
-    /** Prevent magic numbers */
-    const PARAM_LIMIT_MIN_VALUE = 1;
-    const PARAM_LIMIT_MAX_VALUE = 100;
-    const PARAM_DAYS_MIN_VALUE  = 1;
-    const PARAM_DAYS_MAX_VALUE  = 180;
-    const PARAM_START_MIN_VALUE = 1;
-
-
-    /**
-     * Technorati API key
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_apiKey;
-
-    /**
-     * Zend_Rest_Client instance
-     *
-     * @var     Zend_Rest_Client
-     * @access  protected
-     */
-    protected $_restClient;
-
-
-    /**
-     * Constructs a new Zend_Service_Technorati instance
-     * and setup character encoding.
-     *
-     * @param  string $apiKey  Your Technorati API key
-     */
-    public function __construct($apiKey)
-    {
-        iconv_set_encoding('output_encoding', 'UTF-8');
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
-
-        $this->_apiKey = $apiKey;
-    }
-
-
-    /**
-     * Cosmos query lets you see what blogs are linking to a given URL.
-     *
-     * On the Technorati site, you can enter a URL in the searchbox and
-     * it will return a list of blogs linking to it.
-     * The API version allows more features and gives you a way
-     * to use the cosmos on your own site.
-     *
-     * Query options include:
-     *
-     * 'type'       => (link|weblog)
-     *      optional - A value of link returns the freshest links referencing your target URL.
-     *      A value of weblog returns the last set of unique weblogs referencing your target URL.
-     * 'limit'      => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'      => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     * 'current'    => (true|false)
-     *      optional - the default setting of true
-     *      Technorati returns links that are currently on a weblog's homepage.
-     *      Set this parameter to false if you would like to receive all links
-     *      to the given URL regardless of their current placement on the source blog.
-     *      Internally the value is converted in (yes|no).
-     * 'claim'      => (true|false)
-     *      optional - the default setting of FALSE returns no user information
-     *      about each weblog included in the result set when available.
-     *      Set this parameter to FALSE to include Technorati member data
-     *      in the result set when a weblog in your result set
-     *      has been successfully claimed by a member of Technorati.
-     *      Internally the value is converted in (int).
-     * 'highlight'  => (true|false)
-     *      optional - the default setting of TRUE
-     *      highlights the citation of the given URL within the weblog excerpt.
-     *      Set this parameter to FALSE to apply no special markup to the blog excerpt.
-     *      Internally the value is converted in (int).
-     *
-     * @param   string $url     the URL you are searching for. Prefixes http:// and www. are optional.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_CosmosResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/cosmos.html Technorati API: Cosmos Query reference
-     */
-    public function cosmos($url, $options = null)
-    {
-        static $defaultOptions = array( 'type'      => 'link',
-                                        'start'     => 1,
-                                        'limit'     => 20,
-                                        'current'   => 'yes',
-                                        'format'    => 'xml',
-                                        'claim'     => 0,
-                                        'highlight' => 1,
-                                        );
-
-        $options['url'] = $url;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateCosmos($options);
-        $response = $this->_makeRequest(self::API_PATH_COSMOS, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_CosmosResultSet
-         */
-        require_once 'Zend/Service/Technorati/CosmosResultSet.php';
-        return new Zend_Service_Technorati_CosmosResultSet($dom, $options);
-    }
-
-    /**
-     * Search lets you see what blogs contain a given search string.
-     *
-     * Query options include:
-     *
-     * 'language'   => (string)
-     *      optional - a ISO 639-1 two character language code
-     *      to retrieve results specific to that language.
-     *      This feature is currently beta and may not work for all languages.
-     * 'authority'  => (n|a1|a4|a7)
-     *      optional - filter results to those from blogs with at least
-     *      the Technorati Authority specified.
-     *      Technorati calculates a blog's authority by how many people link to it.
-     *      Filtering by authority is a good way to refine your search results.
-     *      There are four settings:
-     *      - n  => Any authority: All results.
-     *      - a1 => A little authority: Results from blogs with at least one link.
-     *      - a4 => Some authority: Results from blogs with a handful of links.
-     *      - a7 => A lot of authority: Results from blogs with hundreds of links.
-     * 'limit'      => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'      => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     * 'claim'      => (true|false)
-     *      optional - the default setting of FALSE returns no user information
-     *      about each weblog included in the result set when available.
-     *      Set this parameter to FALSE to include Technorati member data
-     *      in the result set when a weblog in your result set
-     *      has been successfully claimed by a member of Technorati.
-     *      Internally the value is converted in (int).
-     *
-     * @param   string $query   the words you are searching for.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_SearchResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/search.html Technorati API: Search Query reference
-     */
-    public function search($query, $options = null)
-    {
-        static $defaultOptions = array( 'start'     => 1,
-                                        'limit'     => 20,
-                                        'format'    => 'xml',
-                                        'claim'     => 0);
-
-        $options['query'] = $query;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateSearch($options);
-        $response = $this->_makeRequest(self::API_PATH_SEARCH, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_SearchResultSet
-         */
-        require_once 'Zend/Service/Technorati/SearchResultSet.php';
-        return new Zend_Service_Technorati_SearchResultSet($dom, $options);
-    }
-
-    /**
-     * Tag lets you see what posts are associated with a given tag.
-     *
-     * Query options include:
-     *
-     * 'limit'          => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'          => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     * 'excerptsize'    => (int)
-     *      optional - number of word characters to include in the post excerpts.
-     *      By default 100 word characters are returned.
-     * 'topexcerptsize' => (int)
-     *      optional - number of word characters to include in the first post excerpt.
-     *      By default 150 word characters are returned.
-     *
-     * @param   string $tag     the tag term you are searching posts for.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_TagResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     *  @link    http://technorati.com/developers/api/tag.html Technorati API: Tag Query reference
-     */
-    public function tag($tag, $options = null)
-    {
-        static $defaultOptions = array( 'start'          => 1,
-                                        'limit'          => 20,
-                                        'format'         => 'xml',
-                                        'excerptsize'    => 100,
-                                        'topexcerptsize' => 150);
-
-        $options['tag'] = $tag;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateTag($options);
-        $response = $this->_makeRequest(self::API_PATH_TAG, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_TagResultSet
-         */
-        require_once 'Zend/Service/Technorati/TagResultSet.php';
-        return new Zend_Service_Technorati_TagResultSet($dom, $options);
-    }
-
-    /**
-     * TopTags provides daily counts of posts containing the queried keyword.
-     *
-     * Query options include:
-     *
-     * 'days'       => (int)
-     *      optional - Used to specify the number of days in the past
-     *      to request daily count data for.
-     *      Can be any integer between 1 and 180, default is 180
-     *
-     * @param   string $q       the keyword query
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_DailyCountsResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/dailycounts.html Technorati API: DailyCounts Query reference
-     */
-    public function dailyCounts($query, $options = null)
-    {
-        static $defaultOptions = array( 'days'      => 180,
-                                        'format'    => 'xml'
-                                        );
-
-        $options['q'] = $query;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateDailyCounts($options);
-        $response = $this->_makeRequest(self::API_PATH_DAILYCOUNTS, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_DailyCountsResultSet
-         */
-        require_once 'Zend/Service/Technorati/DailyCountsResultSet.php';
-        return new Zend_Service_Technorati_DailyCountsResultSet($dom);
-    }
-
-    /**
-     * TopTags provides information on top tags indexed by Technorati.
-     *
-     * Query options include:
-     *
-     * 'limit'      => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'      => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     *
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_TagsResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/toptags.html Technorati API: TopTags Query reference
-     */
-    public function topTags($options = null)
-    {
-        static $defaultOptions = array( 'start'     => 1,
-                                        'limit'     => 20,
-                                        'format'    => 'xml'
-                                        );
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateTopTags($options);
-        $response = $this->_makeRequest(self::API_PATH_TOPTAGS, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_TagsResultSet
-         */
-        require_once 'Zend/Service/Technorati/TagsResultSet.php';
-        return new Zend_Service_Technorati_TagsResultSet($dom);
-    }
-
-    /**
-     * BlogInfo provides information on what blog, if any, is associated with a given URL.
-     *
-     * @param   string $url     the URL you are searching for. Prefixes http:// and www. are optional.
-     *                          The URL must be recognized by Technorati as a blog.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_BlogInfoResult
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/bloginfo.html Technorati API: BlogInfo Query reference
-     */
-    public function blogInfo($url, $options = null)
-    {
-        static $defaultOptions = array( 'format'    => 'xml'
-                                        );
-
-        $options['url'] = $url;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateBlogInfo($options);
-        $response = $this->_makeRequest(self::API_PATH_BLOGINFO, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_BlogInfoResult
-         */
-        require_once 'Zend/Service/Technorati/BlogInfoResult.php';
-        return new Zend_Service_Technorati_BlogInfoResult($dom);
-    }
-
-    /**
-     * BlogPostTags provides information on the top tags used by a specific blog.
-     *
-     * Query options include:
-     *
-     * 'limit'      => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'      => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     *      Note. This property is not documented.
-     *
-     * @param   string $url     the URL you are searching for. Prefixes http:// and www. are optional.
-     *                          The URL must be recognized by Technorati as a blog.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_TagsResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/blogposttags.html Technorati API: BlogPostTags Query reference
-     */
-    public function blogPostTags($url, $options = null)
-    {
-        static $defaultOptions = array( 'start'     => 1,
-                                        'limit'     => 20,
-                                        'format'    => 'xml'
-                                        );
-
-        $options['url'] = $url;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateBlogPostTags($options);
-        $response = $this->_makeRequest(self::API_PATH_BLOGPOSTTAGS, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_TagsResultSet
-         */
-        require_once 'Zend/Service/Technorati/TagsResultSet.php';
-        return new Zend_Service_Technorati_TagsResultSet($dom);
-    }
-
-    /**
-     * GetInfo query tells you things that Technorati knows about a member.
-     *
-     * The returned info is broken up into two sections:
-     * The first part describes some information that the user wants
-     * to allow people to know about him- or herself.
-     * The second part of the document is a listing of the weblogs
-     * that the user has successfully claimed and the information
-     * that Technorati knows about these weblogs.
-     *
-     * @param   string $username    the Technorati user name you are searching for
-     * @param   array $options      additional parameters to refine your query
-     * @return  Zend_Service_Technorati_GetInfoResult
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/getinfo.html Technorati API: GetInfo reference
-     */
-    public function getInfo($username, $options = null)
-    {
-        static $defaultOptions = array('format' => 'xml');
-
-        $options['username'] = $username;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateGetInfo($options);
-        $response = $this->_makeRequest(self::API_PATH_GETINFO, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_GetInfoResult
-         */
-        require_once 'Zend/Service/Technorati/GetInfoResult.php';
-        return new Zend_Service_Technorati_GetInfoResult($dom);
-    }
-
-    /**
-     * KeyInfo query provides information on daily usage of an API key.
-     * Key Info Queries do not count against a key's daily query limit.
-     *
-     * A day is defined as 00:00-23:59 Pacific time.
-     *
-     * @return  Zend_Service_Technorati_KeyInfoResult
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://developers.technorati.com/wiki/KeyInfo Technorati API: Key Info reference
-     */
-    public function keyInfo()
-    {
-        static $defaultOptions = array();
-
-        $options = $this->_prepareOptions(array(), $defaultOptions);
-        // you don't need to validate this request
-        // because key is the only mandatory element
-        // and it's already set in #_prepareOptions
-        $response = $this->_makeRequest(self::API_PATH_KEYINFO, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_KeyInfoResult
-         */
-        require_once 'Zend/Service/Technorati/KeyInfoResult.php';
-        return new Zend_Service_Technorati_KeyInfoResult($dom, $this->_apiKey);
-    }
-
-
-    /**
-     * Returns Technorati API key.
-     *
-     * @return string   Technorati API key
-     */
-    public function getApiKey()
-    {
-        return $this->_apiKey;
-    }
-
-    /**
-     * Returns a reference to the REST client object in use.
-     *
-     * If the reference hasn't being inizialized yet,
-     * then a new Zend_Rest_Client instance is created.
-     *
-     * @return Zend_Rest_Client
-     */
-    public function getRestClient()
-    {
-        if ($this->_restClient === null) {
-            /**
-             * @see Zend_Rest_Client
-             */
-            require_once 'Zend/Rest/Client.php';
-            $this->_restClient = new Zend_Rest_Client(self::API_URI_BASE);
-        }
-
-        return $this->_restClient;
-    }
-
-    /**
-     * Sets Technorati API key.
-     *
-     * Be aware that this function doesn't validate the key.
-     * The key is validated as soon as the first API request is sent.
-     * If the key is invalid, the API request method will throw
-     * a Zend_Service_Technorati_Exception exception with Invalid Key message.
-     *
-     * @param   string $key     Technorati API Key
-     * @return  void
-     * @link    http://technorati.com/developers/apikey.html How to get your Technorati API Key
-     */
-    public function setApiKey($key)
-    {
-        $this->_apiKey = $key;
-        return $this;
-    }
-
-
-    /**
-     * Validates Cosmos query options.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateCosmos(array $options)
-    {
-        static $validOptions = array('key', 'url',
-            'type', 'limit', 'start', 'current', 'claim', 'highlight', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate url (required)
-        $this->_validateOptionUrl($options);
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-        // Validate type (optional)
-        $this->_validateInArrayOption('type', $options, array('link', 'weblog'));
-        // Validate claim (optional)
-        $this->_validateOptionClaim($options);
-        // Validate highlight (optional)
-        $this->_validateIntegerOption('highlight', $options);
-        // Validate current (optional)
-        if (isset($options['current'])) {
-            $tmp = (int) $options['current'];
-            $options['current'] = $tmp ? 'yes' : 'no';
-        }
-
-    }
-
-    /**
-     * Validates Search query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateSearch(array $options)
-    {
-        static $validOptions = array('key', 'query',
-            'language', 'authority', 'limit', 'start', 'claim', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate query (required)
-        $this->_validateMandatoryOption('query', $options);
-        // Validate authority (optional)
-        $this->_validateInArrayOption('authority', $options, array('n', 'a1', 'a4', 'a7'));
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate claim (optional)
-        $this->_validateOptionClaim($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Validates Tag query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateTag(array $options)
-    {
-        static $validOptions = array('key', 'tag',
-            'limit', 'start', 'excerptsize', 'topexcerptsize', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate query (required)
-        $this->_validateMandatoryOption('tag', $options);
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate excerptsize (optional)
-        $this->_validateIntegerOption('excerptsize', $options);
-        // Validate excerptsize (optional)
-        $this->_validateIntegerOption('topexcerptsize', $options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-
-    /**
-     * Validates DailyCounts query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateDailyCounts(array $options)
-    {
-        static $validOptions = array('key', 'q',
-            'days', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate q (required)
-        $this->_validateMandatoryOption('q', $options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-        // Validate days (optional)
-        if (isset($options['days'])) {
-            $options['days'] = (int) $options['days'];
-            if ($options['days'] < self::PARAM_DAYS_MIN_VALUE ||
-                $options['days'] > self::PARAM_DAYS_MAX_VALUE) {
-                /**
-                 * @see Zend_Service_Technorati_Exception
-                 */
-                require_once 'Zend/Service/Technorati/Exception.php';
-                throw new Zend_Service_Technorati_Exception(
-                            "Invalid value '" . $options['days'] . "' for 'days' option");
-            }
-        }
-    }
-
-    /**
-     * Validates GetInfo query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateGetInfo(array $options)
-    {
-        static $validOptions = array('key', 'username',
-            'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate username (required)
-        $this->_validateMandatoryOption('username', $options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Validates TopTags query options.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateTopTags(array $options)
-    {
-        static $validOptions = array('key',
-            'limit', 'start', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Validates BlogInfo query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateBlogInfo(array $options)
-    {
-        static $validOptions = array('key', 'url',
-            'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate url (required)
-        $this->_validateOptionUrl($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Validates TopTags query options.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateBlogPostTags(array $options)
-    {
-        static $validOptions = array('key', 'url',
-            'limit', 'start', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate url (required)
-        $this->_validateOptionUrl($options);
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Checks whether an option is in a given array.
-     *
-     * @param   string $name    option name
-     * @param   array $options
-     * @param   array $array    array of valid options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateInArrayOption($name, $options, array $array)
-    {
-        if (isset($options[$name]) && !in_array($options[$name], $array)) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Invalid value '{$options[$name]}' for '$name' option");
-        }
-    }
-
-    /**
-     * Checks whether mandatory $name option exists and it's valid.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateMandatoryOption($name, $options)
-    {
-        if (!isset($options[$name]) || !trim($options[$name])) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Empty value for '$name' option");
-        }
-    }
-
-    /**
-     * Checks whether $name option is a valid integer and casts it.
-     *
-     * @param   array $options
-     * @return  void
-     * @access  protected
-     */
-    protected function _validateIntegerOption($name, $options)
-    {
-        if (isset($options[$name])) {
-            $options[$name] = (int) $options[$name];
-        }
-    }
-
-    /**
-     * Makes and HTTP GET request to given $path with $options.
-     * HTTP Response is first validated, then returned.
-     *
-     * @param   string $path
-     * @param   array $options
-     * @return  Zend_Http_Response
-     * @throws  Zend_Service_Technorati_Exception on failure
-     * @access  protected
-     */
-    protected function _makeRequest($path, $options = array())
-    {
-        $restClient = $this->getRestClient();
-        $restClient->getHttpClient()->resetParameters();
-        $response = $restClient->restGet($path, $options);
-        self::_checkResponse($response);
-        return $response;
-    }
-
-    /**
-     * Checks whether 'claim' option value is valid.
-     *
-     * @param   array $options
-     * @return  void
-     * @access  protected
-     */
-    protected function _validateOptionClaim(array $options)
-    {
-        $this->_validateIntegerOption('claim', $options);
-    }
-
-    /**
-     * Checks whether 'format' option value is valid.
-     * Be aware that Zend_Service_Technorati supports only XML as format value.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if 'format' value != XML
-     * @access  protected
-     */
-    protected function _validateOptionFormat(array $options)
-    {
-        if (isset($options['format']) && $options['format'] != 'xml') {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Invalid value '" . $options['format'] . "' for 'format' option. " .
-                        "Zend_Service_Technorati supports only 'xml'");
-        }
-    }
-
-    /**
-     * Checks whether 'limit' option value is valid.
-     * Value must be an integer greater than PARAM_LIMIT_MIN_VALUE
-     * and lower than PARAM_LIMIT_MAX_VALUE.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if 'limit' value is invalid
-     * @access  protected
-     */
-    protected function _validateOptionLimit(array $options)
-    {
-        if (!isset($options['limit'])) return;
-
-        $options['limit'] = (int) $options['limit'];
-        if ($options['limit'] < self::PARAM_LIMIT_MIN_VALUE ||
-            $options['limit'] > self::PARAM_LIMIT_MAX_VALUE) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Invalid value '" . $options['limit'] . "' for 'limit' option");
-        }
-    }
-
-    /**
-     * Checks whether 'start' option value is valid.
-     * Value must be an integer greater than 0.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if 'start' value is invalid
-     * @access  protected
-     */
-    protected function _validateOptionStart(array $options)
-    {
-        if (!isset($options['start'])) return;
-
-        $options['start'] = (int) $options['start'];
-        if ($options['start'] < self::PARAM_START_MIN_VALUE) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Invalid value '" . $options['start'] . "' for 'start' option");
-        }
-    }
-
-    /**
-     * Checks whether 'url' option value exists and is valid.
-     * 'url' must be a valid HTTP(s) URL.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if 'url' value is invalid
-     * @access  protected
-     * @todo    support for Zend_Uri_Http
-     */
-    protected function _validateOptionUrl(array $options)
-    {
-        $this->_validateMandatoryOption('url', $options);
-    }
-
-    /**
-     * Checks XML response content for errors.
-     *
-     * @param   DomDocument $dom    the XML response as a DOM document
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/error.html Technorati API: Error response
-     * @access  protected
-     */
-    protected static function _checkErrors(DomDocument $dom)
-    {
-        $xpath = new DOMXPath($dom);
-
-        $result = $xpath->query("/tapi/document/result/error");
-        if ($result->length >= 1) {
-            $error = $result->item(0)->nodeValue;
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception($error);
-        }
-    }
-
-    /**
-     * Converts $response body to a DOM object and checks it.
-     *
-     * @param   Zend_Http_Response $response
-     * @return  DOMDocument
-     * @throws  Zend_Service_Technorati_Exception if response content contains an error message
-     * @access  protected
-     */
-    protected function _convertResponseAndCheckContent(Zend_Http_Response $response)
-    {
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-        self::_checkErrors($dom);
-        return $dom;
-    }
-
-    /**
-     * Checks ReST response for errors.
-     *
-     * @param   Zend_Http_Response $response    the ReST response
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected static function _checkResponse(Zend_Http_Response $response)
-    {
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(sprintf(
-                        'Invalid response status code (HTTP/%s %s %s)',
-                        $response->getVersion(), $response->getStatus(), $response->getMessage()));
-        }
-    }
-
-    /**
-     * Checks whether user given options are valid.
-     *
-     * @param   array $options        user options
-     * @param   array $validOptions   valid options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _compareOptions(array $options, array $validOptions)
-    {
-        $difference = array_diff(array_keys($options), $validOptions);
-        if ($difference) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "The following parameters are invalid: '" .
-                        implode("', '", $difference) . "'");
-        }
-    }
-
-    /**
-     * Prepares options for the request
-     *
-     * @param   array $options        user options
-     * @param   array $defaultOptions default options
-     * @return  array Merged array of user and default/required options.
-     * @access  protected
-     */
-    protected function _prepareOptions($options, array $defaultOptions)
-    {
-        $options = (array) $options; // force cast to convert null to array()
-        $options['key'] = $this->_apiKey;
-        $options = array_merge($defaultOptions, $options);
-        return $options;
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/Author.php b/lib/zend/Zend/Service/Technorati/Author.php
deleted file mode 100644
index 7cffc24244c..00000000000
--- a/lib/zend/Zend/Service/Technorati/Author.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_Utils
- */
-require_once 'Zend/Service/Technorati/Utils.php';
-
-
-/**
- * Represents a weblog Author object. It usually belongs to a Technorati account.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_Author
-{
-    /**
-     * Author first name
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_firstName;
-
-    /**
-     * Author last name
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_lastName;
-
-    /**
-     * Technorati account username
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_username;
-
-    /**
-     * Technorati account description
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_description;
-
-    /**
-     * Technorati account biography
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_bio;
-
-    /**
-     * Technorati account thumbnail picture URL, if any
-     *
-     * @var     null|Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_thumbnailPicture;
-
-
-    /**
-     * Constructs a new object from DOM Element.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-
-        $result = $xpath->query('./firstname/text()', $dom);
-        if ($result->length == 1) $this->setFirstName($result->item(0)->data);
-
-        $result = $xpath->query('./lastname/text()', $dom);
-        if ($result->length == 1) $this->setLastName($result->item(0)->data);
-
-        $result = $xpath->query('./username/text()', $dom);
-        if ($result->length == 1) $this->setUsername($result->item(0)->data);
-
-        $result = $xpath->query('./description/text()', $dom);
-        if ($result->length == 1) $this->setDescription($result->item(0)->data);
-
-        $result = $xpath->query('./bio/text()', $dom);
-        if ($result->length == 1) $this->setBio($result->item(0)->data);
-
-        $result = $xpath->query('./thumbnailpicture/text()', $dom);
-        if ($result->length == 1) $this->setThumbnailPicture($result->item(0)->data);
-    }
-
-
-    /**
-     * Returns Author first name.
-     *
-     * @return  string  Author first name
-     */
-    public function getFirstName() {
-        return $this->_firstName;
-    }
-
-    /**
-     * Returns Author last name.
-     *
-     * @return  string  Author last name
-     */
-    public function getLastName() {
-        return $this->_lastName;
-    }
-
-    /**
-     * Returns Technorati account username.
-     *
-     * @return  string  Technorati account username
-     */
-    public function getUsername() {
-        return $this->_username;
-    }
-
-    /**
-     * Returns Technorati account description.
-     *
-     * @return  string  Technorati account description
-     */
-    public function getDescription() {
-        return $this->_description;
-    }
-
-    /**
-     * Returns Technorati account biography.
-     *
-     * @return  string  Technorati account biography
-     */
-    public function getBio() {
-        return $this->_bio;
-    }
-
-    /**
-     * Returns Technorati account thumbnail picture.
-     *
-     * @return  null|Zend_Uri_Http  Technorati account thumbnail picture
-     */
-    public function getThumbnailPicture() {
-        return $this->_thumbnailPicture;
-    }
-
-
-    /**
-     * Sets author first name.
-     *
-     * @param   string $input   first Name input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setFirstName($input) {
-        $this->_firstName = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets author last name.
-     *
-     * @param   string $input   last Name input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setLastName($input) {
-        $this->_lastName = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets Technorati account username.
-     *
-     * @param   string $input   username input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setUsername($input) {
-        $this->_username = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets Technorati account biography.
-     *
-     * @param   string $input   biography input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setBio($input) {
-        $this->_bio = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets Technorati account description.
-     *
-     * @param   string $input   description input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setDescription($input) {
-        $this->_description = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets Technorati account thumbnail picture.
-     *
-     * @param   string|Zend_Uri_Http $input thumbnail picture URI
-     * @return  Zend_Service_Technorati_Author  $this instance
-     * @throws  Zend_Service_Technorati_Exception if $input is an invalid URI
-     *          (via Zend_Service_Technorati_Utils::normalizeUriHttp)
-     */
-    public function setThumbnailPicture($input) {
-        $this->_thumbnailPicture = Zend_Service_Technorati_Utils::normalizeUriHttp($input);
-        return $this;
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Technorati/BlogInfoResult.php b/lib/zend/Zend/Service/Technorati/BlogInfoResult.php
deleted file mode 100644
index a288693d6d3..00000000000
--- a/lib/zend/Zend/Service/Technorati/BlogInfoResult.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_Utils
- */
-require_once 'Zend/Service/Technorati/Utils.php';
-
-
-/**
- * Represents a single Technorati BlogInfo query result object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_BlogInfoResult
-{
-    /**
-     * Technorati weblog url, if queried URL is a valid weblog.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_url;
-
-    /**
-     * Technorati weblog, if queried URL is a valid weblog.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * Number of unique blogs linking this blog
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundBlogs;
-
-    /**
-     * Number of incoming links to this blog
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundLinks;
-
-
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomDocument $dom the ReST fragment for this object
-     */
-    public function __construct(DomDocument $dom)
-    {
-        $xpath = new DOMXPath($dom);
-        /**
-         * @see Zend_Service_Technorati_Weblog
-         */
-        require_once 'Zend/Service/Technorati/Weblog.php';
-
-        $result = $xpath->query('//result/weblog');
-        if ($result->length == 1) {
-            $this->_weblog = new Zend_Service_Technorati_Weblog($result->item(0));
-        } else {
-            // follow the same behavior of blogPostTags
-            // and raise an Exception if the URL is not a valid weblog
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                "Your URL is not a recognized Technorati weblog");
-        }
-
-        $result = $xpath->query('//result/url/text()');
-        if ($result->length == 1) {
-            try {
-                // fetched URL often doens't include schema
-                // and this issue causes the following line to fail
-                $this->_url = Zend_Service_Technorati_Utils::normalizeUriHttp($result->item(0)->data);
-            } catch(Zend_Service_Technorati_Exception $e) {
-                if ($this->getWeblog() instanceof Zend_Service_Technorati_Weblog) {
-                    $this->_url = $this->getWeblog()->getUrl();
-                }
-            }
-        }
-
-        $result = $xpath->query('//result/inboundblogs/text()');
-        if ($result->length == 1) $this->_inboundBlogs = (int) $result->item(0)->data;
-
-        $result = $xpath->query('//result/inboundlinks/text()');
-        if ($result->length == 1) $this->_inboundLinks = (int) $result->item(0)->data;
-
-    }
-
-
-    /**
-     * Returns the weblog URL.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getUrl() {
-        return $this->_url;
-    }
-
-    /**
-     * Returns the weblog.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns number of unique blogs linking this blog.
-     *
-     * @return  integer the number of inbound blogs
-     */
-    public function getInboundBlogs()
-    {
-        return (int) $this->_inboundBlogs;
-    }
-
-    /**
-     * Returns number of incoming links to this blog.
-     *
-     * @return  integer the number of inbound links
-     */
-    public function getInboundLinks()
-    {
-        return (int) $this->_inboundLinks;
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Technorati/CosmosResult.php b/lib/zend/Zend/Service/Technorati/CosmosResult.php
deleted file mode 100644
index 8a930a5dbda..00000000000
--- a/lib/zend/Zend/Service/Technorati/CosmosResult.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati Cosmos query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_CosmosResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Technorati weblog object that links queried URL.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * The nearest permalink tracked for queried URL.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_nearestPermalink;
-
-    /**
-     * The excerpt of the blog/page linking queried URL.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_excerpt;
-
-    /**
-     * The the datetime the link was created.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_linkCreated;
-
-    /**
-     * The URL of the specific link target page
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_linkUrl;
-
-
-    /**
-     * Constructs a new object object from DOM Element.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_nearestPermalink' => 'nearestpermalink',
-                                '_excerpt'          => 'excerpt',
-                                '_linkCreated'      => 'linkcreated',
-                                '_linkUrl'          => 'linkurl');
-        parent::__construct($dom);
-
-        // weblog object field
-        $this->_parseWeblog();
-
-        // filter fields
-        $this->_nearestPermalink = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_nearestPermalink);
-        $this->_linkUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_linkUrl);
-        $this->_linkCreated = Zend_Service_Technorati_Utils::normalizeDate($this->_linkCreated);
-    }
-
-    /**
-     * Returns the weblog object that links queried URL.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns the nearest permalink tracked for queried URL.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getNearestPermalink() {
-        return $this->_nearestPermalink;
-    }
-
-    /**
-     * Returns the excerpt of the blog/page linking queried URL.
-     *
-     * @return  string
-     */
-    public function getExcerpt() {
-        return $this->_excerpt;
-    }
-
-    /**
-     * Returns the datetime the link was created.
-     *
-     * @return  Zend_Date
-     */
-    public function getLinkCreated() {
-        return $this->_linkCreated;
-    }
-
-    /**
-     * If queried URL is a valid blog,
-     * returns the URL of the specific link target page.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getLinkUrl() {
-        return $this->_linkUrl;
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Technorati/CosmosResultSet.php b/lib/zend/Zend/Service/Technorati/CosmosResultSet.php
deleted file mode 100644
index 03d7363762e..00000000000
--- a/lib/zend/Zend/Service/Technorati/CosmosResultSet.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-
-/**
- * Represents a Technorati Cosmos query result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_CosmosResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Technorati weblog url, if queried URL is a valid weblog.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_url;
-
-    /**
-     * Technorati weblog, if queried URL is a valid weblog.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * Number of unique blogs linking this blog
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundBlogs;
-
-    /**
-     * Number of incoming links to this blog
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundLinks;
-
-    /**
-     * Parses the search response and retrieve the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        $result = $this->_xpath->query('/tapi/document/result/inboundlinks/text()');
-        if ($result->length == 1) $this->_inboundLinks = (int) $result->item(0)->data;
-
-        $result = $this->_xpath->query('/tapi/document/result/inboundblogs/text()');
-        if ($result->length == 1) $this->_inboundBlogs = (int) $result->item(0)->data;
-
-        $result = $this->_xpath->query('/tapi/document/result/weblog');
-        if ($result->length == 1) {
-            /**
-             * @see Zend_Service_Technorati_Weblog
-             */
-            require_once 'Zend/Service/Technorati/Weblog.php';
-            $this->_weblog = new Zend_Service_Technorati_Weblog($result->item(0));
-        }
-
-        $result = $this->_xpath->query('/tapi/document/result/url/text()');
-        if ($result->length == 1) {
-            try {
-                // fetched URL often doens't include schema
-                // and this issue causes the following line to fail
-                $this->_url = Zend_Service_Technorati_Utils::normalizeUriHttp($result->item(0)->data);
-            } catch(Zend_Service_Technorati_Exception $e) {
-                if ($this->getWeblog() instanceof Zend_Service_Technorati_Weblog) {
-                    $this->_url = $this->getWeblog()->getUrl();
-                }
-            }
-        }
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/item)");
-
-        // total number of results depends on query type
-        // for now check only getInboundLinks() and getInboundBlogs() value
-        if ((int) $this->getInboundLinks() > 0) {
-            $this->_totalResultsAvailable = $this->getInboundLinks();
-        } elseif ((int) $this->getInboundBlogs() > 0) {
-            $this->_totalResultsAvailable = $this->getInboundBlogs();
-        } else {
-            $this->_totalResultsAvailable = 0;
-        }
-    }
-
-
-    /**
-     * Returns the weblog URL.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getUrl() {
-        return $this->_url;
-    }
-
-    /**
-     * Returns the weblog.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns number of unique blogs linking this blog.
-     *
-     * @return  integer the number of inbound blogs
-     */
-    public function getInboundBlogs()
-    {
-        return $this->_inboundBlogs;
-    }
-
-    /**
-     * Returns number of incoming links to this blog.
-     *
-     * @return  integer the number of inbound links
-     */
-    public function getInboundLinks()
-    {
-        return $this->_inboundLinks;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_CosmosResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_CosmosResult
-         */
-        require_once 'Zend/Service/Technorati/CosmosResult.php';
-        return new Zend_Service_Technorati_CosmosResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/DailyCountsResult.php b/lib/zend/Zend/Service/Technorati/DailyCountsResult.php
deleted file mode 100644
index c1e6a804deb..00000000000
--- a/lib/zend/Zend/Service/Technorati/DailyCountsResult.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati DailyCounts query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_DailyCountsResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_DailyCountsResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Date of count.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_date;
-
-    /**
-     * Number of posts containing query on given date.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_count;
-
-
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_date'   => 'date',
-                                '_count'  => 'count');
-        parent::__construct($dom);
-
-        // filter fields
-        $this->_date  = new Zend_Date(strtotime($this->_date));
-        $this->_count = (int) $this->_count;
-    }
-
-    /**
-     * Returns the date of count.
-     *
-     * @return  Zend_Date
-     */
-    public function getDate() {
-        return $this->_date;
-    }
-
-    /**
-     * Returns the number of posts containing query on given date.
-     *
-     * @return  int
-     */
-    public function getCount() {
-        return $this->_count;
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/DailyCountsResultSet.php b/lib/zend/Zend/Service/Technorati/DailyCountsResultSet.php
deleted file mode 100644
index e28c63361ca..00000000000
--- a/lib/zend/Zend/Service/Technorati/DailyCountsResultSet.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-/**
- * @see Zend_Service_Technorati_Utils
- */
-require_once 'Zend/Service/Technorati/Utils.php';
-
-
-/**
- * Represents a Technorati Tag query result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_DailyCountsResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Technorati search URL for given query.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_searchUrl;
-
-    /**
-     * Number of days for which counts provided.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_days;
-
-    /**
-     * Parses the search response and retrieve the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        // default locale prevent Zend_Date to fail
-        // when script is executed via shell
-        // Zend_Locale::setDefault('en');
-
-        $result = $this->_xpath->query('/tapi/document/result/days/text()');
-        if ($result->length == 1) $this->_days = (int) $result->item(0)->data;
-
-        $result = $this->_xpath->query('/tapi/document/result/searchurl/text()');
-        if ($result->length == 1) {
-            $this->_searchUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($result->item(0)->data);
-        }
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/items/item)");
-        $this->_totalResultsAvailable = (int) $this->getDays();
-    }
-
-
-    /**
-     * Returns the search URL for given query.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getSearchUrl() {
-        return $this->_searchUrl;
-    }
-
-    /**
-     * Returns the number of days for which counts provided.
-     *
-     * @return  int
-     */
-    public function getDays() {
-        return $this->_days;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_DailyCountsResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_DailyCountsResult
-         */
-        require_once 'Zend/Service/Technorati/DailyCountsResult.php';
-        return new Zend_Service_Technorati_DailyCountsResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/GetInfoResult.php b/lib/zend/Zend/Service/Technorati/GetInfoResult.php
deleted file mode 100644
index 1cfdd9bf644..00000000000
--- a/lib/zend/Zend/Service/Technorati/GetInfoResult.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * Represents a single Technorati GetInfo query result object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_GetInfoResult
-{
-    /**
-     * Technorati author
-     *
-     * @var     Zend_Service_Technorati_Author
-     * @access  protected
-     */
-    protected $_author;
-
-    /**
-     * A list of weblogs claimed by this author
-     *
-     * @var     array
-     * @access  protected
-     */
-    protected $_weblogs = array();
-
-
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomDocument $dom the ReST fragment for this object
-     */
-    public function __construct(DomDocument $dom)
-    {
-        $xpath = new DOMXPath($dom);
-
-        /**
-         * @see Zend_Service_Technorati_Author
-         */
-        require_once 'Zend/Service/Technorati/Author.php';
-
-        $result = $xpath->query('//result');
-        if ($result->length == 1) {
-            $this->_author = new Zend_Service_Technorati_Author($result->item(0));
-        }
-
-        /**
-         * @see Zend_Service_Technorati_Weblog
-         */
-        require_once 'Zend/Service/Technorati/Weblog.php';
-
-        $result = $xpath->query('//item/weblog');
-        if ($result->length >= 1) {
-            foreach ($result as $weblog) {
-                $this->_weblogs[] = new Zend_Service_Technorati_Weblog($weblog);
-            }
-        }
-    }
-
-
-    /**
-     * Returns the author associated with queried username.
-     *
-     * @return  Zend_Service_Technorati_Author
-     */
-    public function getAuthor() {
-        return $this->_author;
-    }
-
-    /**
-     * Returns the collection of weblogs authored by queried username.
-     *
-     * @return  array of Zend_Service_Technorati_Weblog
-     */
-    public function getWeblogs() {
-        return $this->_weblogs;
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Technorati/KeyInfoResult.php b/lib/zend/Zend/Service/Technorati/KeyInfoResult.php
deleted file mode 100644
index e98666913db..00000000000
--- a/lib/zend/Zend/Service/Technorati/KeyInfoResult.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * Represents a single Technorati KeyInfo query result object.
- * It provides information about your Technorati API Key daily usage.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_KeyInfoResult
-{
-    /**
-     * Technorati API key
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_apiKey;
-
-    /**
-     * Number of queries used today
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_apiQueries;
-
-    /**
-     * Total number of available queries per day
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_maxQueries;
-
-
-    /**
-     * Constructs a new object from DOM Element.
-     * Parses given Key element from $dom and sets API key string.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     * @param   string $apiKey  the API Key string
-     */
-    public function __construct(DomDocument $dom, $apiKey = null)
-    {
-        // $this->_dom   = $dom;
-        // $this->_xpath = new DOMXPath($dom);
-        $xpath = new DOMXPath($dom);
-
-        $this->_apiQueries   = (int) $xpath->query('/tapi/document/result/apiqueries/text()')->item(0)->data;
-        $this->_maxQueries   = (int) $xpath->query('/tapi/document/result/maxqueries/text()')->item(0)->data;
-        $this->setApiKey($apiKey);
-    }
-
-
-    /**
-     * Returns API Key string.
-     *
-     * @return  string  API Key string
-     */
-    public function getApiKey() {
-        return $this->_apiKey;
-    }
-
-    /**
-     * Returns the number of queries sent today.
-     *
-     * @return  int     number of queries sent today
-     */
-    public function getApiQueries() {
-        return $this->_apiQueries;
-    }
-
-    /**
-     * Returns Key's daily query limit.
-     *
-     * @return  int     maximum number of available queries per day
-     */
-    public function getMaxQueries() {
-        return $this->_maxQueries;
-    }
-
-
-    /**
-     * Sets API Key string.
-     *
-     * @param   string $apiKey  the API Key
-     * @return  Zend_Service_Technorati_KeyInfoResult $this instance
-     */
-    public function setApiKey($apiKey) {
-        $this->_apiKey = $apiKey;
-        return $this;
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/Result.php b/lib/zend/Zend/Service/Technorati/Result.php
deleted file mode 100644
index 518e06f69a5..00000000000
--- a/lib/zend/Zend/Service/Technorati/Result.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * Represents a single Technorati Search query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_SearchResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @abstract
- */
-abstract class Zend_Service_Technorati_Result
-{
-    /**
-     * An associative array of 'fieldName' => 'xmlfieldtag'
-     *
-     * @var     array
-     * @access  protected
-     */
-    protected $_fields;
-
-    /**
-     * The ReST fragment for this result object
-     *
-     * @var     DomElement
-     * @access  protected
-     */
-    protected $_dom;
-
-    /**
-     * Object for $this->_dom
-     *
-     * @var     DOMXpath
-     * @access  protected
-     */
-    protected $_xpath;
-
-
-    /**
-     * Constructs a new object from DOM Element.
-     * Properties are automatically fetched from XML
-     * according to array of $_fields to be read.
-     *
-     * @param   DomElement $result  the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_xpath = new DOMXPath($dom->ownerDocument);
-        $this->_dom = $dom;
-
-        // default fields for all search results
-        $fields = array();
-
-        // merge with child's object fields
-        $this->_fields = array_merge($this->_fields, $fields);
-
-        // add results to appropriate fields
-        foreach($this->_fields as $phpName => $xmlName) {
-            $query = "./$xmlName/text()";
-            $node = $this->_xpath->query($query, $this->_dom);
-            if ($node->length == 1) {
-                $this->{$phpName} = (string) $node->item(0)->data;
-            }
-        }
-    }
-
-    /**
-     * Parses weblog node and sets weblog object.
-     *
-     * @return  void
-     */
-    protected function _parseWeblog()
-    {
-        // weblog object field
-        $result = $this->_xpath->query('./weblog', $this->_dom);
-        if ($result->length == 1) {
-            /**
-             * @see Zend_Service_Technorati_Weblog
-             */
-            require_once 'Zend/Service/Technorati/Weblog.php';
-            $this->_weblog = new Zend_Service_Technorati_Weblog($result->item(0));
-        } else {
-            $this->_weblog = null;
-        }
-    }
-
-    /**
-     * Returns the document fragment for this object as XML string.
-     *
-     * @return string   the document fragment for this object
-     *                  converted into XML format
-     */
-    public function getXml()
-    {
-        return $this->_dom->ownerDocument->saveXML($this->_dom);
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/ResultSet.php b/lib/zend/Zend/Service/Technorati/ResultSet.php
deleted file mode 100644
index 43008210f0b..00000000000
--- a/lib/zend/Zend/Service/Technorati/ResultSet.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * This is the most essential result set.
- * The scope of this class is to be extended by a query-specific child result set class,
- * and it should never be used to initialize a standalone object.
- *
- * Each of the specific result sets represents a collection of query-specific
- * Zend_Service_Technorati_Result objects.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @abstract
- */
-abstract class Zend_Service_Technorati_ResultSet implements SeekableIterator
-{
-    /**
-     * The total number of results available
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_totalResultsAvailable;
-
-    /**
-     * The number of results in this result set
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_totalResultsReturned;
-
-    /**
-     * The offset in the total result set of this search set
-     *
-     * @var     int
-     */
-    //TODO public $firstResultPosition;
-
-
-    /**
-     * A DomNodeList of results
-     *
-     * @var     DomNodeList
-     * @access  protected
-     */
-    protected $_results;
-
-    /**
-     * Technorati API response document
-     *
-     * @var     DomDocument
-     * @access  protected
-     */
-    protected $_dom;
-
-    /**
-     * Object for $this->_dom
-     *
-     * @var     DOMXpath
-     * @access  protected
-     */
-    protected $_xpath;
-
-    /**
-     * XML string representation for $this->_dom
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_xml;
-
-    /**
-     * Current Item
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_currentIndex = 0;
-
-
-    /**
-     * Parses the search response and retrieves the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        $this->_init($dom, $options);
-
-        // Technorati loves to make developer's life really hard
-        // I must read query options in order to normalize a single way
-        // to display start and limit.
-        // The value is printed out in XML using many different tag names,
-        // too hard to get it from XML
-
-        // Additionally, the following tags should be always available
-        // according to API documentation but... this is not the truth!
-        // - querytime
-        // - limit
-        // - start (sometimes rankingstart)
-
-        // query tag is only available for some requests, the same for url.
-        // For now ignore them.
-
-        //$start = isset($options['start']) ? $options['start'] : 1;
-        //$limit = isset($options['limit']) ? $options['limit'] : 20;
-        //$this->_firstResultPosition = $start;
-    }
-
-    /**
-     * Initializes this object from a DomDocument response.
-     *
-     * Because __construct and __wakeup shares some common executions,
-     * it's useful to group them in a single initialization method.
-     * This method is called once each time a new instance is created
-     * or a serialized object is unserialized.
-     *
-     * @param   DomDocument $dom the ReST fragment for this object
-     * @param   array $options   query options as associative array
-     *      * @return  void
-     */
-    protected function _init(DomDocument $dom, $options = array())
-    {
-        $this->_dom     = $dom;
-        $this->_xpath   = new DOMXPath($dom);
-
-        $this->_results = $this->_xpath->query("//item");
-    }
-
-    /**
-     * Number of results returned.
-     *
-     * @return  int     total number of results returned
-     */
-    public function totalResults()
-    {
-        return (int) $this->_totalResultsReturned;
-    }
-
-
-    /**
-     * Number of available results.
-     *
-     * @return  int     total number of available results
-     */
-    public function totalResultsAvailable()
-    {
-        return (int) $this->_totalResultsAvailable;
-    }
-
-    /**
-     * Implements SeekableIterator::current().
-     *
-     * @return  void
-     * @throws  Zend_Service_Exception
-     * @abstract
-     */
-    // abstract public function current();
-
-    /**
-     * Implements SeekableIterator::key().
-     *
-     * @return  int
-     */
-    public function key()
-    {
-        return $this->_currentIndex;
-    }
-
-    /**
-     * Implements SeekableIterator::next().
-     *
-     * @return  void
-     */
-    public function next()
-    {
-        $this->_currentIndex += 1;
-    }
-
-    /**
-     * Implements SeekableIterator::rewind().
-     *
-     * @return  bool
-     */
-    public function rewind()
-    {
-        $this->_currentIndex = 0;
-        return true;
-    }
-
-    /**
-     * Implement SeekableIterator::seek().
-     *
-     * @param   int $index
-     * @return  void
-     * @throws  OutOfBoundsException
-     */
-    public function seek($index)
-    {
-        $indexInt = (int) $index;
-        if ($indexInt >= 0 && $indexInt < $this->_results->length) {
-            $this->_currentIndex = $indexInt;
-        } else {
-            throw new OutOfBoundsException("Illegal index '$index'");
-        }
-    }
-
-    /**
-     * Implement SeekableIterator::valid().
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return null !== $this->_results && $this->_currentIndex < $this->_results->length;
-    }
-
-    /**
-     * Returns the response document as XML string.
-     *
-     * @return string   the response document converted into XML format
-     */
-    public function getXml()
-    {
-        return $this->_dom->saveXML();
-    }
-
-    /**
-     * Overwrites standard __sleep method to make this object serializable.
-     *
-     * DomDocument and DOMXpath objects cannot be serialized.
-     * This method converts them back to an XML string.
-     *
-     * @return void
-     */
-    public function __sleep() {
-        $this->_xml     = $this->getXml();
-        $vars = array_keys(get_object_vars($this));
-        return array_diff($vars, array('_dom', '_xpath'));
-    }
-
-    /**
-     * Overwrites standard __wakeup method to make this object unserializable.
-     *
-     * Restores object status before serialization.
-     * Converts XML string into a DomDocument object and creates a valid
-     * DOMXpath instance for given DocDocument.
-     *
-     * @return void
-     */
-    public function __wakeup() {
-        $dom = new DOMDocument();
-        $dom->loadXml($this->_xml);
-        $this->_init($dom);
-        $this->_xml = null; // reset XML content
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/SearchResult.php b/lib/zend/Zend/Service/Technorati/SearchResult.php
deleted file mode 100644
index 76828439f4f..00000000000
--- a/lib/zend/Zend/Service/Technorati/SearchResult.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati Search query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_SearchResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_SearchResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Technorati weblog object corresponding to queried keyword.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * The title of the entry.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_title;
-
-    /**
-     * The blurb from entry with search term highlighted.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_excerpt;
-
-    /**
-     * The datetime the entry was created.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_created;
-
-    /**
-     * The permalink of the blog entry.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_permalink;
-
-
-    /**
-     * Constructs a new object object from DOM Element.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_permalink'    => 'permalink',
-                                '_excerpt'      => 'excerpt',
-                                '_created'      => 'created',
-                                '_title'        => 'title');
-        parent::__construct($dom);
-
-        // weblog object field
-        $this->_parseWeblog();
-
-        // filter fields
-        $this->_permalink = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_permalink);
-        $this->_created = Zend_Service_Technorati_Utils::normalizeDate($this->_created);
-    }
-
-    /**
-     * Returns the weblog object that links queried URL.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns the title of the entry.
-     *
-     * @return  string
-     */
-    public function getTitle() {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the blurb from entry with search term highlighted.
-     *
-     * @return  string
-     */
-    public function getExcerpt() {
-        return $this->_excerpt;
-    }
-
-    /**
-     * Returns the datetime the entry was created.
-     *
-     * @return  Zend_Date
-     */
-    public function getCreated() {
-        return $this->_created;
-    }
-
-    /**
-     * Returns the permalink of the blog entry.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getPermalink() {
-        return $this->_permalink;
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Technorati/SearchResultSet.php b/lib/zend/Zend/Service/Technorati/SearchResultSet.php
deleted file mode 100644
index c6718ee0727..00000000000
--- a/lib/zend/Zend/Service/Technorati/SearchResultSet.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-
-/**
- * Represents a Technorati Search query result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_SearchResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Number of query results.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_queryCount;
-
-    /**
-     * Parses the search response and retrieve the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        $result = $this->_xpath->query('/tapi/document/result/querycount/text()');
-        if ($result->length == 1) $this->_queryCount = (int) $result->item(0)->data;
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/item)");
-        $this->_totalResultsAvailable = (int) $this->_queryCount;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_SearchResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_SearchResult
-         */
-        require_once 'Zend/Service/Technorati/SearchResult.php';
-        return new Zend_Service_Technorati_SearchResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/TagResult.php b/lib/zend/Zend/Service/Technorati/TagResult.php
deleted file mode 100644
index e371b9abc7a..00000000000
--- a/lib/zend/Zend/Service/Technorati/TagResult.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati Tag query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_TagResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_TagResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Technorati weblog object corresponding to queried keyword.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * The title of the entry.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_title;
-
-    /**
-     * The blurb from entry with search term highlighted.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_excerpt;
-
-    /**
-     * The datetime the entry was created.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_created;
-
-    /**
-     * The datetime the entry was updated.
-     * Called 'postupdate' in original XML response,
-     * it has been renamed to provide more coherence.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_updated;
-
-    /**
-     * The permalink of the blog entry.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_permalink;
-
-
-    /**
-     * Constructs a new object object from DOM Element.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_permalink'    => 'permalink',
-                                '_excerpt'      => 'excerpt',
-                                '_created'      => 'created',
-                                '_updated'      => 'postupdate',
-                                '_title'        => 'title');
-        parent::__construct($dom);
-
-        // weblog object field
-        $this->_parseWeblog();
-
-        // filter fields
-        $this->_permalink = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_permalink);
-        $this->_created = Zend_Service_Technorati_Utils::normalizeDate($this->_created);
-        $this->_updated = Zend_Service_Technorati_Utils::normalizeDate($this->_updated);
-    }
-
-    /**
-     * Returns the weblog object that links queried URL.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns the title of the entry.
-     *
-     * @return  string
-     */
-    public function getTitle() {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the blurb from entry with search term highlighted.
-     *
-     * @return  string
-     */
-    public function getExcerpt() {
-        return $this->_excerpt;
-    }
-
-    /**
-     * Returns the datetime the entry was created.
-     *
-     * @return  Zend_Date
-     */
-    public function getCreated() {
-        return $this->_created;
-    }
-
-    /**
-     * Returns the datetime the entry was updated.
-     *
-     * @return  Zend_Date
-     */
-    public function getUpdated() {
-        return $this->_updated;
-    }
-
-    /**
-     * Returns the permalink of the blog entry.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getPermalink() {
-        return $this->_permalink;
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Technorati/TagResultSet.php b/lib/zend/Zend/Service/Technorati/TagResultSet.php
deleted file mode 100644
index 62068bba62d..00000000000
--- a/lib/zend/Zend/Service/Technorati/TagResultSet.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-
-/**
- * Represents a Technorati Tag query result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_TagResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Number of posts that match the tag.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_postsMatched;
-
-    /**
-     * Number of blogs that match the tag.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_blogsMatched;
-
-    /**
-     * Parses the search response and retrieve the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        $result = $this->_xpath->query('/tapi/document/result/postsmatched/text()');
-        if ($result->length == 1) $this->_postsMatched = (int) $result->item(0)->data;
-
-        $result = $this->_xpath->query('/tapi/document/result/blogsmatched/text()');
-        if ($result->length == 1) $this->_blogsMatched = (int) $result->item(0)->data;
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/item)");
-        /** @todo Validate the following assertion */
-        $this->_totalResultsAvailable = (int) $this->getPostsMatched();
-    }
-
-
-    /**
-     * Returns the number of posts that match the tag.
-     *
-     * @return  int
-     */
-    public function getPostsMatched() {
-        return $this->_postsMatched;
-    }
-
-    /**
-     * Returns the number of blogs that match the tag.
-     *
-     * @return  int
-     */
-    public function getBlogsMatched() {
-        return $this->_blogsMatched;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_TagResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_TagResult
-         */
-        require_once 'Zend/Service/Technorati/TagResult.php';
-        return new Zend_Service_Technorati_TagResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/TagsResult.php b/lib/zend/Zend/Service/Technorati/TagsResult.php
deleted file mode 100644
index b97980154be..00000000000
--- a/lib/zend/Zend/Service/Technorati/TagsResult.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati TopTags or BlogPostTags query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_TagsResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_TagsResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Name of the tag.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_tag;
-
-    /**
-     * Number of posts containing this tag.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_posts;
-
-
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_tag'   => 'tag',
-                                '_posts' => 'posts');
-        parent::__construct($dom);
-
-        // filter fields
-        $this->_tag   = (string) $this->_tag;
-        $this->_posts = (int) $this->_posts;
-    }
-
-    /**
-     * Returns the tag name.
-     *
-     * @return  string
-     */
-    public function getTag() {
-        return $this->_tag;
-    }
-
-    /**
-     * Returns the number of posts.
-     *
-     * @return  int
-     */
-    public function getPosts() {
-        return $this->_posts;
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/TagsResultSet.php b/lib/zend/Zend/Service/Technorati/TagsResultSet.php
deleted file mode 100644
index c804ecd21e6..00000000000
--- a/lib/zend/Zend/Service/Technorati/TagsResultSet.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-
-/**
- * Represents a Technorati TopTags or BlogPostTags queries result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_TagsResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomDocument $dom the ReST fragment for this object
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/item)");
-        $this->_totalResultsAvailable = (int) $this->_totalResultsReturned;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_TagsResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_TagsResult
-         */
-        require_once 'Zend/Service/Technorati/TagsResult.php';
-        return new Zend_Service_Technorati_TagsResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/lib/zend/Zend/Service/Technorati/Utils.php b/lib/zend/Zend/Service/Technorati/Utils.php
deleted file mode 100644
index 36448d75749..00000000000
--- a/lib/zend/Zend/Service/Technorati/Utils.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * Collection of utilities for various Zend_Service_Technorati classes.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_Utils
-{
-    /**
-     * Parses, validates and returns a valid Zend_Uri object
-     * from given $input.
-     *
-     * @param   string|Zend_Uri_Http $input
-     * @return  null|Zend_Uri_Http
-     * @throws  Zend_Service_Technorati_Exception
-     * @static
-     */
-    public static function normalizeUriHttp($input)
-    {
-        // allow null as value
-        if ($input === null) {
-            return null;
-        }
-
-        /**
-         * @see Zend_Uri
-         */
-        require_once 'Zend/Uri.php';
-        if ($input instanceof Zend_Uri_Http) {
-            $uri = $input;
-        } else {
-            try {
-                $uri = Zend_Uri::factory((string) $input);
-            }
-            // wrap exception under Zend_Service_Technorati_Exception object
-            catch (Exception $e) {
-                /**
-                 * @see Zend_Service_Technorati_Exception
-                 */
-                require_once 'Zend/Service/Technorati/Exception.php';
-                throw new Zend_Service_Technorati_Exception($e->getMessage(), 0, $e);
-            }
-        }
-
-        // allow inly Zend_Uri_Http objects or child classes
-        if (!($uri instanceof Zend_Uri_Http)) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                "Invalid URL $uri, only HTTP(S) protocols can be used");
-        }
-
-        return $uri;
-    }
-    /**
-     * Parses, validates and returns a valid Zend_Date object
-     * from given $input.
-     *
-     * $input can be either a string, an integer or a Zend_Date object.
-     * If $input is string or int, it will be provided to Zend_Date as it is.
-     * If $input is a Zend_Date object, the object instance will be returned.
-     *
-     * @param   mixed|Zend_Date $input
-     * @return  null|Zend_Date
-     * @throws  Zend_Service_Technorati_Exception
-     * @static
-     */
-    public static function normalizeDate($input)
-    {
-        /**
-         * @see Zend_Date
-         */
-        require_once 'Zend/Date.php';
-        /**
-         * @see Zend_Locale
-         */
-        require_once 'Zend/Locale.php';
-
-        // allow null as value and return valid Zend_Date objects
-        if (($input === null) || ($input instanceof Zend_Date)) {
-            return $input;
-        }
-
-        // due to a BC break as of ZF 1.5 it's not safe to use Zend_Date::isDate() here
-        // see ZF-2524, ZF-2334
-        if (@strtotime($input) !== FALSE) {
-            return new Zend_Date($input);
-        } else {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception("'$input' is not a valid Date/Time");
-        }
-    }
-
-    /**
-     * @todo public static function xpathQueryAndSet() {}
-     */
-
-    /**
-     * @todo public static function xpathQueryAndSetIf() {}
-     */
-
-    /**
-     * @todo public static function xpathQueryAndSetUnless() {}
-     */
-}
diff --git a/lib/zend/Zend/Service/Technorati/Weblog.php b/lib/zend/Zend/Service/Technorati/Weblog.php
deleted file mode 100644
index c7044d84ac6..00000000000
--- a/lib/zend/Zend/Service/Technorati/Weblog.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Technorati_Author
- */
-require_once 'Zend/Service/Technorati/Author.php';
-
-/**
- * @see Zend_Service_Technorati_Utils
- */
-require_once 'Zend/Service/Technorati/Utils.php';
-
-
-/**
- * Represents a Weblog object successful recognized by Technorati.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_Weblog
-{
-    /**
-     * Blog name as written in the feed.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_name;
-
-    /**
-     * Base blog URL.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_url;
-
-    /**
-     * RSS feed URL, if any.
-     *
-     * @var     null|Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_rssUrl;
-
-    /**
-     * Atom feed URL, if any.
-     *
-     * @var     null|Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_atomUrl;
-
-    /**
-     * Number of unique blogs linking this blog.
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundBlogs;
-
-    /**
-     * Number of incoming links to this blog.
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundLinks;
-
-    /**
-     * Last blog update UNIX timestamp.
-     *
-     * @var     null|Zend_Date
-     * @access  protected
-     */
-    protected $_lastUpdate;
-
-    /**
-     * Technorati rank value for this weblog.
-     *
-     * Note. This property has no official documentation.
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_rank;
-
-    /**
-     * Blog latitude coordinate.
-     *
-     * Note. This property has no official documentation.
-     *
-     * @var     float
-     * @access  protected
-     */
-    protected $_lat;
-
-    /**
-     * Blog longitude coordinate.
-     *
-     * Note. This property has no official documentation.
-     *
-     * @var     float
-     * @access  protected
-     */
-    protected $_lon;
-
-    /**
-     * Whether the author who claimed this weblog has a photo.
-     *
-     * Note. This property has no official documentation.
-     *
-     * @var     bool
-     * @access  protected
-     * @see     Zend_Service_Technorati_Author::$thumbnailPicture
-     */
-    protected $_hasPhoto = false;
-
-    /**
-     * An array of Zend_Service_Technorati_Author who claimed this blog
-     *
-     * @var     array
-     * @access  protected
-     */
-    protected $_authors = array();
-
-
-    /**
-     * Constructs a new object from DOM Element.
-     *
-     * @param  DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-
-        $result = $xpath->query('./name/text()', $dom);
-        if ($result->length == 1) $this->setName($result->item(0)->data);
-
-        $result = $xpath->query('./url/text()', $dom);
-        if ($result->length == 1) $this->setUrl($result->item(0)->data);
-
-        $result = $xpath->query('./inboundblogs/text()', $dom);
-        if ($result->length == 1) $this->setInboundBlogs($result->item(0)->data);
-
-        $result = $xpath->query('./inboundlinks/text()', $dom);
-        if ($result->length == 1) $this->setInboundLinks($result->item(0)->data);
-
-        $result = $xpath->query('./lastupdate/text()', $dom);
-        if ($result->length == 1) $this->setLastUpdate($result->item(0)->data);
-
-        /* The following elements need more attention */
-
-        $result = $xpath->query('./rssurl/text()', $dom);
-        if ($result->length == 1) $this->setRssUrl($result->item(0)->data);
-
-        $result = $xpath->query('./atomurl/text()', $dom);
-        if ($result->length == 1) $this->setAtomUrl($result->item(0)->data);
-
-        $result = $xpath->query('./author', $dom);
-        if ($result->length >= 1) {
-            foreach ($result as $author) {
-                $this->_authors[] = new Zend_Service_Technorati_Author($author);
-            }
-        }
-
-        /**
-         * The following are optional elements
-         *
-         * I can't find any official documentation about the following properties
-         * however they are included in response DTD and/or test responses.
-         */
-
-        $result = $xpath->query('./rank/text()', $dom);
-        if ($result->length == 1) $this->setRank($result->item(0)->data);
-
-        $result = $xpath->query('./lat/text()', $dom);
-        if ($result->length == 1) $this->setLat($result->item(0)->data);
-
-        $result = $xpath->query('./lon/text()', $dom);
-        if ($result->length == 1) $this->setLon($result->item(0)->data);
-
-        $result = $xpath->query('./hasphoto/text()', $dom);
-        if ($result->length == 1) $this->setHasPhoto($result->item(0)->data);
-    }
-
-
-    /**
-     * Returns weblog name.
-     *
-     * @return  string  Weblog name
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Returns weblog URL.
-     *
-     * @return  null|Zend_Uri_Http object representing weblog base URL
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * Returns number of unique blogs linking this blog.
-     *
-     * @return  integer the number of inbound blogs
-     */
-    public function getInboundBlogs()
-    {
-        return $this->_inboundBlogs;
-    }
-
-    /**
-     * Returns number of incoming links to this blog.
-     *
-     * @return  integer the number of inbound links
-     */
-    public function getInboundLinks()
-    {
-        return $this->_inboundLinks;
-    }
-
-    /**
-     * Returns weblog Rss URL.
-     *
-     * @return  null|Zend_Uri_Http object representing the URL
-     *          of the RSS feed for given blog
-     */
-    public function getRssUrl()
-    {
-        return $this->_rssUrl;
-    }
-
-    /**
-     * Returns weblog Atom URL.
-     *
-     * @return  null|Zend_Uri_Http object representing the URL
-     *          of the Atom feed for given blog
-     */
-    public function getAtomUrl()
-    {
-        return $this->_atomUrl;
-    }
-
-    /**
-     * Returns UNIX timestamp of the last weblog update.
-     *
-     * @return  integer UNIX timestamp of the last weblog update
-     */
-    public function getLastUpdate()
-    {
-        return $this->_lastUpdate;
-    }
-
-    /**
-     * Returns weblog rank value.
-     *
-     * Note. This property is not documented.
-     *
-     * @return  integer weblog rank value
-     */
-    public function getRank()
-    {
-        return $this->_rank;
-    }
-
-    /**
-     * Returns weblog latitude coordinate.
-     *
-     * Note. This property is not documented.
-     *
-     * @return  float   weblog latitude coordinate
-     */
-    public function getLat() {
-        return $this->_lat;
-    }
-
-    /**
-     * Returns weblog longitude coordinate.
-     *
-     * Note. This property is not documented.
-     *
-     * @return  float   weblog longitude coordinate
-     */
-    public function getLon()
-    {
-        return $this->_lon;
-    }
-
-    /**
-     * Returns whether the author who claimed this weblog has a photo.
-     *
-     * Note. This property is not documented.
-     *
-     * @return  bool    TRUE if the author who claimed this weblog has a photo,
-     *                  FALSE otherwise.
-     */
-    public function hasPhoto()
-    {
-        return (bool) $this->_hasPhoto;
-    }
-
-    /**
-     * Returns the array of weblog authors.
-     *
-     * @return  array of Zend_Service_Technorati_Author authors
-     */
-    public function getAuthors()
-    {
-        return (array) $this->_authors;
-    }
-
-
-    /**
-     * Sets weblog name.
-     *
-     * @param   string $name
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setName($name)
-    {
-        $this->_name = (string) $name;
-        return $this;
-    }
-
-    /**
-     * Sets weblog URL.
-     *
-     * @param   string|Zend_Uri_Http $url
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if $input is an invalid URI
-     *          (via Zend_Service_Technorati_Utils::normalizeUriHttp)
-     */
-    public function setUrl($url)
-    {
-        $this->_url = Zend_Service_Technorati_Utils::normalizeUriHttp($url);
-        return $this;
-    }
-
-    /**
-     * Sets number of inbound blogs.
-     *
-     * @param   integer $number
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setInboundBlogs($number)
-    {
-        $this->_inboundBlogs = (int) $number;
-        return $this;
-    }
-
-    /**
-     * Sets number of Iinbound links.
-     *
-     * @param   integer $number
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setInboundLinks($number)
-    {
-        $this->_inboundLinks = (int) $number;
-        return $this;
-    }
-
-    /**
-     * Sets weblog Rss URL.
-     *
-     * @param   string|Zend_Uri_Http $url
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     * @throws  Zend_Service_Technorati_Exception if $input is an invalid URI
-     *          (via Zend_Service_Technorati_Utils::normalizeUriHttp)
-     */
-    public function setRssUrl($url)
-    {
-        $this->_rssUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($url);
-        return $this;
-    }
-
-    /**
-     * Sets weblog Atom URL.
-     *
-     * @param   string|Zend_Uri_Http $url
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     * @throws  Zend_Service_Technorati_Exception if $input is an invalid URI
-     *          (via Zend_Service_Technorati_Utils::normalizeUriHttp)
-     */
-    public function setAtomUrl($url)
-    {
-        $this->_atomUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($url);
-        return $this;
-    }
-
-    /**
-     * Sets weblog Last Update timestamp.
-     *
-     * $datetime can be any value supported by
-     * Zend_Service_Technorati_Utils::normalizeDate().
-     *
-     * @param   mixed $datetime A string representing the last update date time
-     *                          in a valid date time format
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     * @throws  Zend_Service_Technorati_Exception
-     */
-    public function setLastUpdate($datetime)
-    {
-        $this->_lastUpdate = Zend_Service_Technorati_Utils::normalizeDate($datetime);
-        return $this;
-    }
-
-    /**
-     * Sets weblog Rank.
-     *
-     * @param   integer $rank
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setRank($rank)
-    {
-        $this->_rank = (int) $rank;
-        return $this;
-    }
-
-    /**
-     * Sets weblog latitude coordinate.
-     *
-     * @param   float $coordinate
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setLat($coordinate)
-    {
-        $this->_lat = (float) $coordinate;
-        return $this;
-    }
-
-    /**
-     * Sets weblog longitude coordinate.
-     *
-     * @param   float $coordinate
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setLon($coordinate)
-    {
-        $this->_lon = (float) $coordinate;
-        return $this;
-    }
-
-    /**
-     * Sets hasPhoto property.
-     *
-     * @param   bool $hasPhoto
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setHasPhoto($hasPhoto)
-    {
-        $this->_hasPhoto = (bool) $hasPhoto;
-        return $this;
-    }
-
-}
diff --git a/lib/zend/Zend/Service/Twitter.php b/lib/zend/Zend/Service/Twitter.php
old mode 100644
new mode 100755
index d75bb8be958..836d3b8cadb
--- a/lib/zend/Zend/Service/Twitter.php
+++ b/lib/zend/Zend/Service/Twitter.php
@@ -15,35 +15,54 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * @see Zend_Rest_Client
+ * @see Zend_Http_Client
  */
-require_once 'Zend/Rest/Client.php';
+require_once 'Zend/Http/Client.php';
 
 /**
- * @see Zend_Rest_Client_Result
+ * @see Zend_Http_CookieJar
  */
-require_once 'Zend/Rest/Client/Result.php';
+require_once 'Zend/Http/CookieJar.php';
 
 /**
  * @see Zend_Oauth_Consumer
  */
 require_once 'Zend/Oauth/Consumer.php';
 
+/**
+ * @see Zend_Oauth_Token_Access
+ */
+require_once 'Zend/Oauth/Token/Access.php';
+
+/**
+ * @see Zend_Service_Twitter_Response
+ */
+require_once 'Zend/Service/Twitter/Response.php';
+
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_Twitter extends Zend_Rest_Client
+class Zend_Service_Twitter
 {
+    /**
+     * Base URI for all API calls
+     */
+    const API_BASE_URI = 'https://api.twitter.com/1.1/';
+
+    /**
+     * OAuth Endpoint
+     */
+    const OAUTH_BASE_URI = 'https://api.twitter.com/oauth';
 
     /**
      * 246 is the current limit for a status message, 140 characters are displayed
@@ -54,181 +73,165 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      * This should be reviewed in the future...
      */
     const STATUS_MAX_CHARACTERS = 246;
-    
+
     /**
-     * OAuth Endpoint
+     * @var array
      */
-    const OAUTH_BASE_URI = 'http://twitter.com/oauth';
-    
-    /**
-     * @var Zend_Http_CookieJar
-     */
-    protected $_cookieJar;
-    
+    protected $cookieJar;
+
     /**
      * Date format for 'since' strings
      *
      * @var string
      */
-    protected $_dateFormat = 'D, d M Y H:i:s T';
-    
+    protected $dateFormat = 'D, d M Y H:i:s T';
+
     /**
-     * Username
-     *
-     * @var string
+     * @var Zend_Http_Client
      */
-    protected $_username;
-    
+    protected $httpClient = null;
+
     /**
      * Current method type (for method proxying)
      *
      * @var string
      */
-    protected $_methodType;
-    
+    protected $methodType;
+
     /**
-     * Zend_Oauth Consumer
+     * Oauth Consumer
      *
      * @var Zend_Oauth_Consumer
      */
-    protected $_oauthConsumer = null;
-    
+    protected $oauthConsumer = null;
+
     /**
      * Types of API methods
      *
      * @var array
      */
-    protected $_methodTypes = array(
-        'status',
-        'user',
-        'directMessage',
-        'friendship',
+    protected $methodTypes = array(
         'account',
-        'favorite',
-        'block'
+        'application',
+        'blocks',
+        'directmessages',
+        'favorites',
+        'friendships',
+        'search',
+        'statuses',
+        'users',
     );
-    
+
     /**
      * Options passed to constructor
      *
      * @var array
      */
-    protected $_options = array();
+    protected $options = array();
 
     /**
-     * Local HTTP Client cloned from statically set client
+     * Username
      *
-     * @var Zend_Http_Client
+     * @var string
      */
-    protected $_localHttpClient = null;
+    protected $username;
 
     /**
      * Constructor
      *
-     * @param  array $options Optional options array
-     * @return void
+     * @param  null|array|Zend_Config $options
+     * @param  null|Zend_Oauth_Consumer $consumer
+     * @param  null|Zend_Http_Client $httpClient
      */
-    public function __construct(array $options = null, Zend_Oauth_Consumer $consumer = null)
+    public function __construct($options = null, Zend_Oauth_Consumer $consumer = null, Zend_Http_Client $httpClient = null)
     {
-        $this->setUri('http://api.twitter.com');
-        if (!is_array($options)) $options = array();
-        $options['siteUrl'] = self::OAUTH_BASE_URI;
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         }
-        $this->_options = $options;
+        if (!is_array($options)) {
+            $options = array();
+        }
+
+        $this->options = $options;
+
         if (isset($options['username'])) {
             $this->setUsername($options['username']);
         }
-        if (isset($options['accessToken'])
-        && $options['accessToken'] instanceof Zend_Oauth_Token_Access) {
-            $this->setLocalHttpClient($options['accessToken']->getHttpClient($options));
+
+        $accessToken = false;
+        if (isset($options['accessToken'])) {
+            $accessToken = $options['accessToken'];
+        } elseif (isset($options['access_token'])) {
+            $accessToken = $options['access_token'];
+        }
+
+        $oauthOptions = array();
+        if (isset($options['oauthOptions'])) {
+            $oauthOptions = $options['oauthOptions'];
+        } elseif (isset($options['oauth_options'])) {
+            $oauthOptions = $options['oauth_options'];
+        }
+        $oauthOptions['siteUrl'] = self::OAUTH_BASE_URI;
+
+        $httpClientOptions = array();
+        if (isset($options['httpClientOptions'])) {
+            $httpClientOptions = $options['httpClientOptions'];
+        } elseif (isset($options['http_client_options'])) {
+            $httpClientOptions = $options['http_client_options'];
+        }
+
+        // If we have an OAuth access token, use the HTTP client it provides
+        if ($accessToken && is_array($accessToken)
+            && (isset($accessToken['token']) && isset($accessToken['secret']))
+        ) {
+            $token = new Zend_Oauth_Token_Access();
+            $token->setToken($accessToken['token']);
+            $token->setTokenSecret($accessToken['secret']);
+            $accessToken = $token;
+        }
+        if ($accessToken && $accessToken instanceof Zend_Oauth_Token_Access) {
+            $oauthOptions['token'] = $accessToken;
+            $this->setHttpClient($accessToken->getHttpClient($oauthOptions, self::OAUTH_BASE_URI, $httpClientOptions));
+            return;
+        }
+
+        // See if we were passed an http client
+        if (isset($options['httpClient']) && null === $httpClient) {
+            $httpClient = $options['httpClient'];
+        } elseif (isset($options['http_client']) && null === $httpClient) {
+            $httpClient = $options['http_client'];
+        }
+        if ($httpClient instanceof Zend_Http_Client) {
+            $this->httpClient = $httpClient;
         } else {
-            $this->setLocalHttpClient(clone self::getHttpClient());
-            if (is_null($consumer)) {
-                $this->_oauthConsumer = new Zend_Oauth_Consumer($options);
-            } else {
-                $this->_oauthConsumer = $consumer;
-            }
+            $this->setHttpClient(new Zend_Http_Client(null, $httpClientOptions));
         }
-    }
 
-    /**
-     * Set local HTTP client as distinct from the static HTTP client
-     * as inherited from Zend_Rest_Client.
-     *
-     * @param Zend_Http_Client $client
-     * @return self
-     */
-    public function setLocalHttpClient(Zend_Http_Client $client)
-    {
-        $this->_localHttpClient = $client;
-        $this->_localHttpClient->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8');
-        return $this;
-    }
-    
-    /**
-     * Get the local HTTP client as distinct from the static HTTP client
-     * inherited from Zend_Rest_Client
-     *
-     * @return Zend_Http_Client
-     */
-    public function getLocalHttpClient()
-    {
-        return $this->_localHttpClient;
-    }
-    
-    /**
-     * Checks for an authorised state
-     *
-     * @return bool
-     */
-    public function isAuthorised()
-    {
-        if ($this->getLocalHttpClient() instanceof Zend_Oauth_Client) {
-            return true;
+        // Set the OAuth consumer
+        if ($consumer === null) {
+            $consumer = new Zend_Oauth_Consumer($oauthOptions);
         }
-        return false;
-    }
-
-    /**
-     * Retrieve username
-     *
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Set username
-     *
-     * @param  string $value
-     * @return Zend_Service_Twitter
-     */
-    public function setUsername($value)
-    {
-        $this->_username = $value;
-        return $this;
+        $this->oauthConsumer = $consumer;
     }
 
     /**
      * Proxy service methods
      *
      * @param  string $type
-     * @return Zend_Service_Twitter
-     * @throws Zend_Service_Twitter_Exception If method not in method types list
+     * @return Twitter
+     * @throws Exception\DomainException If method not in method types list
      */
     public function __get($type)
     {
-        if (!in_array($type, $this->_methodTypes)) {
-            include_once 'Zend/Service/Twitter/Exception.php';
+        $type = strtolower($type);
+        $type = str_replace('_', '', $type);
+        if (!in_array($type, $this->methodTypes)) {
+            require_once 'Zend/Service/Twitter/Exception.php';
             throw new Zend_Service_Twitter_Exception(
                 'Invalid method type "' . $type . '"'
             );
         }
-        $this->_methodType = $type;
+        $this->methodType = $type;
         return $this;
     }
 
@@ -238,26 +241,28 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      * @param  string $method
      * @param  array $params
      * @return mixed
-     * @throws Zend_Service_Twitter_Exception if unable to find method
+     * @throws Exception\BadMethodCallException if unable to find method
      */
     public function __call($method, $params)
     {
-        if (method_exists($this->_oauthConsumer, $method)) {
-            $return = call_user_func_array(array($this->_oauthConsumer, $method), $params);
+        if (method_exists($this->oauthConsumer, $method)) {
+            $return = call_user_func_array(array($this->oauthConsumer, $method), $params);
             if ($return instanceof Zend_Oauth_Token_Access) {
-                $this->setLocalHttpClient($return->getHttpClient($this->_options));
+                $this->setHttpClient($return->getHttpClient($this->options));
             }
             return $return;
         }
-        if (empty($this->_methodType)) {
-            include_once 'Zend/Service/Twitter/Exception.php';
+        if (empty($this->methodType)) {
+            require_once 'Zend/Service/Twitter/Exception.php';
             throw new Zend_Service_Twitter_Exception(
                 'Invalid method "' . $method . '"'
             );
         }
-        $test = $this->_methodType . ucfirst($method);
+
+        $test = str_replace('_', '', strtolower($method));
+        $test = $this->methodType . $test;
         if (!method_exists($this, $test)) {
-            include_once 'Zend/Service/Twitter/Exception.php';
+            require_once 'Zend/Service/Twitter/Exception.php';
             throw new Zend_Service_Twitter_Exception(
                 'Invalid method "' . $test . '"'
             );
@@ -267,414 +272,158 @@ class Zend_Service_Twitter extends Zend_Rest_Client
     }
 
     /**
-     * Initialize HTTP authentication
+     * Set HTTP client
      *
-     * @return void
+     * @param Zend_Http_Client $client
+     * @return self
      */
-    protected function _init()
+    public function setHttpClient(Zend_Http_Client $client)
     {
-        if (!$this->isAuthorised() && $this->getUsername() !== null) {
-            require_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception(
-                'Twitter session is unauthorised. You need to initialize '
-                . 'Zend_Service_Twitter with an OAuth Access Token or use '
-                . 'its OAuth functionality to obtain an Access Token before '
-                . 'attempting any API actions that require authorisation'
-            );
-        }
-        $client = $this->_localHttpClient;
-        $client->resetParameters();
-        if (null == $this->_cookieJar) {
-            $client->setCookieJar();
-            $this->_cookieJar = $client->getCookieJar();
-        } else {
-            $client->setCookieJar($this->_cookieJar);
-        }
+        $this->httpClient = $client;
+        $this->httpClient->setHeaders(array('Accept-Charset' => 'ISO-8859-1,utf-8'));
+        return $this;
     }
 
     /**
-     * Set date header
+     * Get the HTTP client
      *
-     * @param  int|string $value
-     * @deprecated Not supported by Twitter since April 08, 2009
-     * @return void
+     * Lazy loads one if none present
+     *
+     * @return Zend_Http_Client
      */
-    protected function _setDate($value)
+    public function getHttpClient()
     {
-        if (is_int($value)) {
-            $date = date($this->_dateFormat, $value);
-        } else {
-            $date = date($this->_dateFormat, strtotime($value));
+        if (null === $this->httpClient) {
+            $this->setHttpClient(new Zend_Http_Client());
         }
-        $this->_localHttpClient->setHeaders('If-Modified-Since', $date);
+        return $this->httpClient;
     }
 
     /**
-     * Public Timeline status
+     * Retrieve username
+     *
+     * @return string
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+
+    /**
+     * Set username
+     *
+     * @param  string $value
+     * @return self
+     */
+    public function setUsername($value)
+    {
+        $this->username = $value;
+        return $this;
+    }
+
+    /**
+     * Checks for an authorised state
+     *
+     * @return bool
+     */
+    public function isAuthorised()
+    {
+        if ($this->getHttpClient() instanceof Zend_Oauth_Client) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Verify Account Credentials
      *
      * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function statusPublicTimeline()
+    public function accountVerifyCredentials()
     {
-        $this->_init();
-        $path = '/1/statuses/public_timeline.xml';
-        $response = $this->_get($path);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $response = $this->get('account/verify_credentials');
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Friend Timeline Status
+     * Returns the number of api requests you have left per hour.
      *
-     * $params may include one or more of the following keys
-     * - id: ID of a friend whose timeline you wish to receive
-     * - count: how many statuses to return
-     * - since_id: return results only after the specific tweet
-     * - page: return page X of results
-     *
-     * @param  array $params
+     * @todo   Have a separate payload object to represent rate limits
      * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return void
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function statusFriendsTimeline(array $params = array())
+    public function applicationRateLimitStatus()
     {
-        $this->_init();
-        $path = '/1/statuses/friends_timeline';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'count':
-                    $count = (int) $value;
-                    if (0 >= $count) {
-                        $count = 1;
-                    } elseif (200 < $count) {
-                        $count = 200;
-                    }
-                    $_params['count'] = (int) $count;
-                    break;
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $path .= '.xml';
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $response = $this->get('application/rate_limit_status');
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * User Timeline status
+     * Blocks the user specified in the ID parameter as the authenticating user.
+     * Destroys a friendship to the blocked user if it exists.
      *
-     * $params may include one or more of the following keys
-     * - id: ID of a friend whose timeline you wish to receive
-     * - since_id: return results only after the tweet id specified
-     * - page: return page X of results
-     * - count: how many statuses to return
-     * - max_id: returns only statuses with an ID less than or equal to the specified ID
-     * - user_id: specfies the ID of the user for whom to return the user_timeline
-     * - screen_name: specfies the screen name of the user for whom to return the user_timeline
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
+     * @param  integer|string $id       The ID or screen name of a user to block.
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function statusUserTimeline(array $params = array())
+    public function blocksCreate($id)
     {
-        $this->_init();
-        $path = '/1/statuses/user_timeline';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'id':
-                    $path .= '/' . $value;
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                case 'count':
-                    $count = (int) $value;
-                    if (0 >= $count) {
-                        $count = 1;
-                    } elseif (200 < $count) {
-                        $count = 200;
-                    }
-                    $_params['count'] = $count;
-                    break;
-                case 'user_id':
-                    $_params['user_id'] = $this->_validInteger($value);
-                    break;
-                case 'screen_name':
-                    $_params['screen_name'] = $this->_validateScreenName($value);
-                    break;
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'max_id':
-                    $_params['max_id'] = $this->_validInteger($value);
-                    break;
-                default:
-                    break;
-            }
-        }
-        $path .= '.xml';
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $path     = 'blocks/create';
+        $params   = $this->createUserParameter($id, array());
+        $response = $this->post($path, $params);
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Show a single status
+     * Un-blocks the user specified in the ID parameter for the authenticating user
      *
-     * @param  int $id Id of status to show
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
+     * @param  integer|string $id       The ID or screen_name of the user to un-block.
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function statusShow($id)
+    public function blocksDestroy($id)
     {
-        $this->_init();
-        $path = '/1/statuses/show/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_get($path);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $path   = 'blocks/destroy';
+        $params = $this->createUserParameter($id, array());
+        $response = $this->post($path, $params);
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Update user's current status
+     * Returns an array of user ids that the authenticating user is blocking
      *
-     * @param  string $status
-     * @param  int $in_reply_to_status_id
-     * @return Zend_Rest_Client_Result
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @throws Zend_Service_Twitter_Exception if message is too short or too long
+     * @param  integer $cursor  Optional. Specifies the cursor position at which to begin listing ids; defaults to first "page" of results.
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function statusUpdate($status, $inReplyToStatusId = null)
+    public function blocksIds($cursor = -1)
     {
-        $this->_init();
-        $path = '/1/statuses/update.xml';
-        $len = iconv_strlen(htmlspecialchars($status, ENT_QUOTES, 'UTF-8'), 'UTF-8');
-        if ($len > self::STATUS_MAX_CHARACTERS) {
-            include_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception(
-                'Status must be no more than '
-                . self::STATUS_MAX_CHARACTERS
-                . ' characters in length'
-            );
-        } elseif (0 == $len) {
-            include_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception(
-                'Status must contain at least one character'
-            );
-        }
-        $data = array('status' => $status);
-        if (is_numeric($inReplyToStatusId) && !empty($inReplyToStatusId)) {
-            $data['in_reply_to_status_id'] = $inReplyToStatusId;
-        }
-        $response = $this->_post($path, $data);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $path = 'blocks/ids';
+        $response = $this->get($path, array('cursor' => $cursor));
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Get status replies
+     * Returns an array of user objects that the authenticating user is blocking
      *
-     * $params may include one or more of the following keys
-     * - since_id: return results only after the specified tweet id
-     * - page: return page X of results
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
+     * @param  integer $cursor  Optional. Specifies the cursor position at which to begin listing ids; defaults to first "page" of results.
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function statusReplies(array $params = array())
+    public function blocksList($cursor = -1)
     {
-        $this->_init();
-        $path = '/1/statuses/mentions.xml';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Destroy a status message
-     *
-     * @param  int $id ID of status to destroy
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function statusDestroy($id)
-    {
-        $this->_init();
-        $path = '/1/statuses/destroy/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * User friends
-     *
-     * @param  int|string $id Id or username of user for whom to fetch friends
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function userFriends(array $params = array())
-    {
-        $this->_init();
-        $path = '/1/statuses/friends';
-        $_params = array();
-
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'id':
-                    $path .= '/' . $value;
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $path .= '.xml';
-
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * User Followers
-     *
-     * @param  bool $lite If true, prevents inline inclusion of current status for followers; defaults to false
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function userFollowers($lite = false)
-    {
-        $this->_init();
-        $path = '/1/statuses/followers.xml';
-        if ($lite) {
-            $this->lite = 'true';
-        }
-        $response = $this->_get($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Show extended information on a user
-     *
-     * @param  int|string $id User ID or name
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function userShow($id)
-    {
-        $this->_init();
-        $path = '/1/users/show.xml';
-        $response = $this->_get($path, array('id'=>$id));
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Retrieve direct messages for the current user
-     *
-     * $params may include one or more of the following keys
-     * - since_id: return statuses only greater than the one specified
-     * - page: return page X of results
-     *
-     * @param  array $params
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function directMessageMessages(array $params = array())
-    {
-        $this->_init();
-        $path = '/1/direct_messages.xml';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Retrieve list of direct messages sent by current user
-     *
-     * $params may include one or more of the following keys
-     * - since_id: return statuses only greater than the one specified
-     * - page: return page X of results
-     *
-     * @param  array $params
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function directMessageSent(array $params = array())
-    {
-        $this->_init();
-        $path = '/1/direct_messages/sent.xml';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Send a direct message to a user
-     *
-     * @param  int|string $user User to whom to send message
-     * @param  string $text Message to send to user
-     * @return Zend_Rest_Client_Result
-     * @throws Zend_Service_Twitter_Exception if message is too short or too long
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     */
-    public function directMessageNew($user, $text)
-    {
-        $this->_init();
-        $path = '/1/direct_messages/new.xml';
-        $len = iconv_strlen($text, 'UTF-8');
-        if (0 == $len) {
-            throw new Zend_Service_Twitter_Exception(
-                'Direct message must contain at least one character'
-            );
-        } elseif (140 < $len) {
-            throw new Zend_Service_Twitter_Exception(
-                'Direct message must contain no more than 140 characters'
-            );
-        }
-        $data = array('user' => $user, 'text' => $text);
-        $response = $this->_post($path, $data);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $path = 'blocks/list';
+        $response = $this->get($path, array('cursor' => $cursor));
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
@@ -682,132 +431,141 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      *
      * @param  int $id ID of message to destroy
      * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function directMessageDestroy($id)
+    public function directMessagesDestroy($id)
     {
-        $this->_init();
-        $path = '/1/direct_messages/destroy/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $path     = 'direct_messages/destroy';
+        $params   = array('id' => $this->validInteger($id));
+        $response = $this->post($path, $params);
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Create friendship
+     * Retrieve direct messages for the current user
      *
-     * @param  int|string $id User ID or name of new friend
+     * $options may include one or more of the following keys
+     * - count: return page X of results
+     * - since_id: return statuses only greater than the one specified
+     * - max_id: return statuses with an ID less than (older than) or equal to that specified
+     * - include_entities: setting to false will disable embedded entities
+     * - skip_status:setting to true, "t", or 1 will omit the status in returned users
+     *
+     * @param  array $options
      * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function friendshipCreate($id)
+    public function directMessagesMessages(array $options = array())
     {
-        $this->_init();
-        $path = '/1/friendships/create/' . $id . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Destroy friendship
-     *
-     * @param  int|string $id User ID or name of friend to remove
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function friendshipDestroy($id)
-    {
-        $this->_init();
-        $path = '/1/friendships/destroy/' . $id . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Friendship exists
-     *
-     * @param int|string $id User ID or name of friend to see if they are your friend
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_result
-     */
-    public function friendshipExists($id)
-    {
-        $this->_init();
-        $path = '/1/friendships/exists.xml';
-        $data = array('user_a' => $this->getUsername(), 'user_b' => $id);
-        $response = $this->_get($path, $data);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Verify Account Credentials
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     *
-     * @return Zend_Rest_Client_Result
-     */
-    public function accountVerifyCredentials()
-    {
-        $this->_init();
-        $response = $this->_get('/1/account/verify_credentials.xml');
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * End current session
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return true
-     */
-    public function accountEndSession()
-    {
-        $this->_init();
-        $this->_get('/1/account/end_session');
-        return true;
-    }
-
-    /**
-     * Returns the number of api requests you have left per hour.
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function accountRateLimitStatus()
-    {
-        $this->_init();
-        $response = $this->_get('/1/account/rate_limit_status.xml');
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Fetch favorites
-     *
-     * $params may contain one or more of the following:
-     * - 'id': Id of a user for whom to fetch favorites
-     * - 'page': Retrieve a different page of resuls
-     *
-     * @param  array $params
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function favoriteFavorites(array $params = array())
-    {
-        $this->_init();
-        $path = '/1/favorites';
-        $_params = array();
-        foreach ($params as $key => $value) {
+        $this->init();
+        $path   = 'direct_messages';
+        $params = array();
+        foreach ($options as $key => $value) {
             switch (strtolower($key)) {
-                case 'id':
-                    $path .= '/' . $this->_validInteger($value);
+                case 'count':
+                    $params['count'] = (int) $value;
                     break;
-                case 'page':
-                    $_params['page'] = (int) $value;
+                case 'since_id':
+                    $params['since_id'] = $this->validInteger($value);
+                    break;
+                case 'max_id':
+                    $params['max_id'] = $this->validInteger($value);
+                    break;
+                case 'include_entities':
+                    $params['include_entities'] = (bool) $value;
+                    break;
+                case 'skip_status':
+                    $params['skip_status'] = (bool) $value;
                     break;
                 default:
                     break;
             }
         }
-        $path .= '.xml';
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $response = $this->get($path, $params);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * Send a direct message to a user
+     *
+     * @param  int|string $user User to whom to send message
+     * @param  string $text Message to send to user
+     * @throws Exception\InvalidArgumentException if message is empty
+     * @throws Exception\OutOfRangeException if message is too long
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function directMessagesNew($user, $text)
+    {
+        $this->init();
+        $path = 'direct_messages/new';
+
+        $len = iconv_strlen($text, 'UTF-8');
+        if (0 == $len) {
+            require_once 'Zend/Service/Twitter/Exception.php';
+            throw new Zend_Service_Twitter_Exception(
+                'Direct message must contain at least one character'
+            );
+        } elseif (140 < $len) {
+            require_once 'Zend/Service/Twitter/Exception.php';
+            throw new Zend_Service_Twitter_Exception(
+                'Direct message must contain no more than 140 characters'
+            );
+        }
+
+        $params         = $this->createUserParameter($user, array());
+        $params['text'] = $text;
+        $response       = $this->post($path, $params);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * Retrieve list of direct messages sent by current user
+     *
+     * $options may include one or more of the following keys
+     * - count: return page X of results
+     * - page: return starting at page
+     * - since_id: return statuses only greater than the one specified
+     * - max_id: return statuses with an ID less than (older than) or equal to that specified
+     * - include_entities: setting to false will disable embedded entities
+     *
+     * @param  array $options
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function directMessagesSent(array $options = array())
+    {
+        $this->init();
+        $path   = 'direct_messages/sent';
+        $params = array();
+        foreach ($options as $key => $value) {
+            switch (strtolower($key)) {
+                case 'count':
+                    $params['count'] = (int) $value;
+                    break;
+                case 'page':
+                    $params['page'] = (int) $value;
+                    break;
+                case 'since_id':
+                    $params['since_id'] = $this->validInteger($value);
+                    break;
+                case 'max_id':
+                    $params['max_id'] = $this->validInteger($value);
+                    break;
+                case 'include_entities':
+                    $params['include_entities'] = (bool) $value;
+                    break;
+                default:
+                    break;
+            }
+        }
+        $response = $this->get($path, $params);
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
@@ -815,14 +573,16 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      *
      * @param  int $id Status ID you want to mark as a favorite
      * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function favoriteCreate($id)
+    public function favoritesCreate($id)
     {
-        $this->_init();
-        $path = '/1/favorites/create/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $path     = 'favorites/create';
+        $params   = array('id' => $this->validInteger($id));
+        $response = $this->post($path, $params);
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
@@ -830,96 +590,602 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      *
      * @param  int $id Status ID you want to de-list as a favorite
      * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function favoriteDestroy($id)
+    public function favoritesDestroy($id)
     {
-        $this->_init();
-        $path = '/1/favorites/destroy/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $path     = 'favorites/destroy';
+        $params   = array('id' => $this->validInteger($id));
+        $response = $this->post($path, $params);
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Blocks the user specified in the ID parameter as the authenticating user.
-     * Destroys a friendship to the blocked user if it exists.
+     * Fetch favorites
      *
-     * @param integer|string $id       The ID or screen name of a user to block.
-     * @return Zend_Rest_Client_Result
+     * $options may contain one or more of the following:
+     * - user_id: Id of a user for whom to fetch favorites
+     * - screen_name: Screen name of a user for whom to fetch favorites
+     * - count: number of tweets to attempt to retrieve, up to 200
+     * - since_id: return results only after the specified tweet id
+     * - max_id: return results with an ID less than (older than) or equal to the specified ID
+     * - include_entities: when set to false, entities member will be omitted
+     *
+     * @param  array $params
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function blockCreate($id)
+    public function favoritesList(array $options = array())
     {
-        $this->_init();
-        $path = '/1/blocks/create/' . $id . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $path = 'favorites/list';
+        $params = array();
+        foreach ($options as $key => $value) {
+            switch (strtolower($key)) {
+                case 'user_id':
+                    $params['user_id'] = $this->validInteger($value);
+                    break;
+                case 'screen_name':
+                    $params['screen_name'] = $value;
+                    break;
+                case 'count':
+                    $params['count'] = (int) $value;
+                    break;
+                case 'since_id':
+                    $params['since_id'] = $this->validInteger($value);
+                    break;
+                case 'max_id':
+                    $params['max_id'] = $this->validInteger($value);
+                    break;
+                case 'include_entities':
+                    $params['include_entities'] = (bool) $value;
+                    break;
+                default:
+                    break;
+            }
+        }
+        $response = $this->get($path, $params);
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Un-blocks the user specified in the ID parameter for the authenticating user
+     * Create friendship
      *
-     * @param integer|string $id       The ID or screen_name of the user to un-block.
-     * @return Zend_Rest_Client_Result
+     * @param  int|string $id User ID or name of new friend
+     * @param  array $params Additional parameters to pass
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function blockDestroy($id)
+    public function friendshipsCreate($id, array $params = array())
     {
-        $this->_init();
-        $path = '/1/blocks/destroy/' . $id . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
+        $this->init();
+        $path    = 'friendships/create';
+        $params  = $this->createUserParameter($id, $params);
+        $allowed = array(
+            'user_id'     => null,
+            'screen_name' => null,
+            'follow'      => null,
+        );
+        $params = array_intersect_key($params, $allowed);
+        $response = $this->post($path, $params);
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Returns if the authenticating user is blocking a target user.
+     * Destroy friendship
      *
-     * @param string|integer $id    The ID or screen_name of the potentially blocked user.
-     * @param boolean $returnResult Instead of returning a boolean return the rest response from twitter
-     * @return Boolean|Zend_Rest_Client_Result
+     * @param  int|string $id User ID or name of friend to remove
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function blockExists($id, $returnResult = false)
+    public function friendshipsDestroy($id)
     {
-        $this->_init();
-        $path = '/1/blocks/exists/' . $id . '.xml';
-        $response = $this->_get($path);
+        $this->init();
+        $path     = 'friendships/destroy';
+        $params   = $this->createUserParameter($id, array());
+        $response = $this->post($path, $params);
+        return new Zend_Service_Twitter_Response($response);
+    }
 
-        $cr = new Zend_Rest_Client_Result($response->getBody());
+    /**
+     * Search tweets
+     *
+     * $options may include any of the following:
+     * - geocode: a string of the form "latitude, longitude, radius"
+     * - lang: restrict tweets to the two-letter language code
+     * - locale: query is in the given two-letter language code
+     * - result_type: what type of results to receive: mixed, recent, or popular
+     * - count: number of tweets to return per page; up to 100
+     * - until: return tweets generated before the given date
+     * - since_id: return resutls with an ID greater than (more recent than) the given ID
+     * - max_id: return results with an ID less than (older than) the given ID
+     * - include_entities: whether or not to include embedded entities
+     *
+     * @param  string $query
+     * @param  array $options
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function searchTweets($query, array $options = array())
+    {
+        $this->init();
+        $path = 'search/tweets';
 
-        if ($returnResult === true)
-            return $cr;
-
-        if (!empty($cr->request)) {
-            return false;
+        $len = iconv_strlen($query, 'UTF-8');
+        if (0 == $len) {
+            require_once 'Zend/Service/Twitter/Exception.php';
+            throw new Zend_Service_Twitter_Exception(
+                'Query must contain at least one character'
+            );
         }
 
-        return true;
+        $params = array('q' => $query);
+        foreach ($options as $key => $value) {
+            switch (strtolower($key)) {
+                case 'geocode':
+                    if (!substr_count($value, ',') !== 2) {
+                        require_once 'Zend/Service/Twitter/Exception.php';
+                        throw new Zend_Service_Twitter_Exception(
+                            '"geocode" must be of the format "latitude,longitude,radius"'
+                        );
+                    }
+                    list($latitude, $longitude, $radius) = explode(',', $value);
+                    $radius = trim($radius);
+                    if (!preg_match('/^\d+(mi|km)$/', $radius)) {
+                        require_once 'Zend/Service/Twitter/Exception.php';
+                        throw new Zend_Service_Twitter_Exception(
+                            'Radius segment of "geocode" must be of the format "[unit](mi|km)"'
+                        );
+                    }
+                    $latitude  = (float) $latitude;
+                    $longitude = (float) $longitude;
+                    $params['geocode'] = $latitude . ',' . $longitude . ',' . $radius;
+                    break;
+                case 'lang':
+                    if (strlen($value) > 2) {
+                        require_once 'Zend/Service/Twitter/Exception.php';
+                        throw new Zend_Service_Twitter_Exception(
+                            'Query language must be a 2 character string'
+                        );
+                    }
+                    $params['lang'] = strtolower($value);
+                    break;
+                case 'locale':
+                    if (strlen($value) > 2) {
+                        require_once 'Zend/Service/Twitter/Exception.php';
+                        throw new Zend_Service_Twitter_Exception(
+                            'Query locale must be a 2 character string'
+                        );
+                    }
+                    $params['locale'] = strtolower($value);
+                    break;
+                case 'result_type':
+                    $value = strtolower($value);
+                    if (!in_array($value, array('mixed', 'recent', 'popular'))) {
+                        require_once 'Zend/Service/Twitter/Exception.php';
+                        throw new Zend_Service_Twitter_Exception(
+                            'result_type must be one of "mixed", "recent", or "popular"'
+                        );
+                    }
+                    $params['result_type'] = $value;
+                    break;
+                case 'count':
+                    $value = (int) $value;
+                    if (1 > $value || 100 < $value) {
+                        require_once 'Zend/Service/Twitter/Exception.php';
+                        throw new Zend_Service_Twitter_Exception(
+                            'count must be between 1 and 100'
+                        );
+                    }
+                    $params['count'] = $value;
+                    break;
+                case 'until':
+                    if (!preg_match('/^\d{4}-\d{2}-\d{2}$/', $value)) {
+                        require_once 'Zend/Service/Twitter/Exception.php';
+                        throw new Zend_Service_Twitter_Exception(
+                            '"until" must be a date in the format YYYY-MM-DD'
+                        );
+                    }
+                    $params['until'] = $value;
+                    break;
+                case 'since_id':
+                    $params['since_id'] = $this->validInteger($value);
+                    break;
+                case 'max_id':
+                    $params['max_id'] = $this->validInteger($value);
+                    break;
+                case 'include_entities':
+                    $params['include_entities'] = (bool) $value;
+                    break;
+                default:
+                    break;
+            }
+        }
+        $response = $this->get($path, $params);
+        return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Returns an array of user objects that the authenticating user is blocking
+     * Destroy a status message
      *
-     * @param integer $page         Optional. Specifies the page number of the results beginning at 1. A single page contains 20 ids.
-     * @param boolean $returnUserIds  Optional. Returns only the userid's instead of the whole user object
-     * @return Zend_Rest_Client_Result
+     * @param  int $id ID of status to destroy
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
      */
-    public function blockBlocking($page = 1, $returnUserIds = false)
+    public function statusesDestroy($id)
     {
-        $this->_init();
-        $path = '/1/blocks/blocking';
-        if ($returnUserIds === true) {
-            $path .= '/ids';
+        $this->init();
+        $path = 'statuses/destroy/' . $this->validInteger($id);
+        $response = $this->post($path);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * Friend Timeline Status
+     *
+     * $options may include one or more of the following keys
+     * - count: number of tweets to attempt to retrieve, up to 200
+     * - since_id: return results only after the specified tweet id
+     * - max_id: return results with an ID less than (older than) or equal to the specified ID
+     * - trim_user: when set to true, "t", or 1, user object in tweets will include only author's ID.
+     * - contributor_details: when set to true, includes screen_name of each contributor
+     * - include_entities: when set to false, entities member will be omitted
+     * - exclude_replies: when set to true, will strip replies appearing in the timeline
+     *
+     * @param  array $params
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function statusesHomeTimeline(array $options = array())
+    {
+        $this->init();
+        $path = 'statuses/home_timeline';
+        $params = array();
+        foreach ($options as $key => $value) {
+            switch (strtolower($key)) {
+                case 'count':
+                    $params['count'] = (int) $value;
+                    break;
+                case 'since_id':
+                    $params['since_id'] = $this->validInteger($value);
+                    break;
+                case 'max_id':
+                    $params['max_id'] = $this->validInteger($value);
+                    break;
+                case 'trim_user':
+                    if (in_array($value, array(true, 'true', 't', 1, '1'))) {
+                        $value = true;
+                    } else {
+                        $value = false;
+                    }
+                    $params['trim_user'] = $value;
+                    break;
+                case 'contributor_details:':
+                    $params['contributor_details:'] = (bool) $value;
+                    break;
+                case 'include_entities':
+                    $params['include_entities'] = (bool) $value;
+                    break;
+                case 'exclude_replies':
+                    $params['exclude_replies'] = (bool) $value;
+                    break;
+                default:
+                    break;
+            }
+        }
+        $response = $this->get($path, $params);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * Get status replies
+     *
+     * $options may include one or more of the following keys
+     * - count: number of tweets to attempt to retrieve, up to 200
+     * - since_id: return results only after the specified tweet id
+     * - max_id: return results with an ID less than (older than) or equal to the specified ID
+     * - trim_user: when set to true, "t", or 1, user object in tweets will include only author's ID.
+     * - contributor_details: when set to true, includes screen_name of each contributor
+     * - include_entities: when set to false, entities member will be omitted
+     *
+     * @param  array $options
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function statusesMentionsTimeline(array $options = array())
+    {
+        $this->init();
+        $path   = 'statuses/mentions_timeline';
+        $params = array();
+        foreach ($options as $key => $value) {
+            switch (strtolower($key)) {
+                case 'count':
+                    $params['count'] = (int) $value;
+                    break;
+                case 'since_id':
+                    $params['since_id'] = $this->validInteger($value);
+                    break;
+                case 'max_id':
+                    $params['max_id'] = $this->validInteger($value);
+                    break;
+                case 'trim_user':
+                    if (in_array($value, array(true, 'true', 't', 1, '1'))) {
+                        $value = true;
+                    } else {
+                        $value = false;
+                    }
+                    $params['trim_user'] = $value;
+                    break;
+                case 'contributor_details:':
+                    $params['contributor_details:'] = (bool) $value;
+                    break;
+                case 'include_entities':
+                    $params['include_entities'] = (bool) $value;
+                    break;
+                default:
+                    break;
+            }
+        }
+        $response = $this->get($path, $params);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * Public Timeline status
+     *
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function statusesSample()
+    {
+        $this->init();
+        $path = 'statuses/sample';
+        $response = $this->get($path);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * Show a single status
+     *
+     * @param  int $id Id of status to show
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function statusesShow($id)
+    {
+        $this->init();
+        $path = 'statuses/show/' . $this->validInteger($id);
+        $response = $this->get($path);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * Update user's current status
+     *
+     * @todo   Support additional parameters supported by statuses/update endpoint
+     * @param  string $status
+     * @param  null|int $inReplyToStatusId
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\OutOfRangeException if message is too long
+     * @throws Exception\InvalidArgumentException if message is empty
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function statusesUpdate($status, $inReplyToStatusId = null)
+    {
+        $this->init();
+        $path = 'statuses/update';
+        $len = iconv_strlen(htmlspecialchars($status, ENT_QUOTES, 'UTF-8'), 'UTF-8');
+        if ($len > self::STATUS_MAX_CHARACTERS) {
+            require_once 'Zend/Service/Twitter/Exception.php';
+            throw new Zend_Service_Twitter_Exception(
+                'Status must be no more than '
+                . self::STATUS_MAX_CHARACTERS
+                . ' characters in length'
+            );
+        } elseif (0 == $len) {
+            require_once 'Zend/Service/Twitter/Exception.php';
+            throw new Zend_Service_Twitter_Exception(
+                'Status must contain at least one character'
+            );
+        }
+
+        $params = array('status' => $status);
+        $inReplyToStatusId = $this->validInteger($inReplyToStatusId);
+        if ($inReplyToStatusId) {
+            $params['in_reply_to_status_id'] = $inReplyToStatusId;
+        }
+        $response = $this->post($path, $params);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * User Timeline status
+     *
+     * $options may include one or more of the following keys
+     * - user_id: Id of a user for whom to fetch favorites
+     * - screen_name: Screen name of a user for whom to fetch favorites
+     * - count: number of tweets to attempt to retrieve, up to 200
+     * - since_id: return results only after the specified tweet id
+     * - max_id: return results with an ID less than (older than) or equal to the specified ID
+     * - trim_user: when set to true, "t", or 1, user object in tweets will include only author's ID.
+     * - exclude_replies: when set to true, will strip replies appearing in the timeline
+     * - contributor_details: when set to true, includes screen_name of each contributor
+     * - include_rts: when set to false, will strip native retweets
+     *
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function statusesUserTimeline(array $options = array())
+    {
+        $this->init();
+        $path = 'statuses/user_timeline';
+        $params = array();
+        foreach ($options as $key => $value) {
+            switch (strtolower($key)) {
+                case 'user_id':
+                    $params['user_id'] = $this->validInteger($value);
+                    break;
+                case 'screen_name':
+                    $params['screen_name'] = $this->validateScreenName($value);
+                    break;
+                case 'count':
+                    $params['count'] = (int) $value;
+                    break;
+                case 'since_id':
+                    $params['since_id'] = $this->validInteger($value);
+                    break;
+                case 'max_id':
+                    $params['max_id'] = $this->validInteger($value);
+                    break;
+                case 'trim_user':
+                    if (in_array($value, array(true, 'true', 't', 1, '1'))) {
+                        $value = true;
+                    } else {
+                        $value = false;
+                    }
+                    $params['trim_user'] = $value;
+                    break;
+                case 'contributor_details:':
+                    $params['contributor_details:'] = (bool) $value;
+                    break;
+                case 'exclude_replies':
+                    $params['exclude_replies'] = (bool) $value;
+                    break;
+                case 'include_rts':
+                    $params['include_rts'] = (bool) $value;
+                    break;
+                default:
+                    break;
+            }
+        }
+        $response = $this->get($path, $params);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * Search users
+     *
+     * $options may include any of the following:
+     * - page: the page of results to retrieve
+     * - count: the number of users to retrieve per page; max is 20
+     * - include_entities: if set to boolean true, include embedded entities
+     *
+     * @param  string $query
+     * @param  array $options
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function usersSearch($query, array $options = array())
+    {
+        $this->init();
+        $path = 'users/search';
+
+        $len = iconv_strlen($query, 'UTF-8');
+        if (0 == $len) {
+            require_once 'Zend/Service/Twitter/Exception.php';
+            throw new Zend_Service_Twitter_Exception(
+                'Query must contain at least one character'
+            );
+        }
+
+        $params = array('q' => $query);
+        foreach ($options as $key => $value) {
+            switch (strtolower($key)) {
+                case 'count':
+                    $value = (int) $value;
+                    if (1 > $value || 20 < $value) {
+                        require_once 'Zend/Service/Twitter/Exception.php';
+                        throw new Zend_Service_Twitter_Exception(
+                            'count must be between 1 and 20'
+                        );
+                    }
+                    $params['count'] = $value;
+                    break;
+                case 'page':
+                    $params['page'] = (int) $value;
+                    break;
+                case 'include_entities':
+                    $params['include_entities'] = (bool) $value;
+                    break;
+                default:
+                    break;
+            }
+        }
+        $response = $this->get($path, $params);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+
+    /**
+     * Show extended information on a user
+     *
+     * @param  int|string $id User ID or name
+     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
+     * @throws Exception\DomainException if unable to decode JSON payload
+     * @return Zend_Service_Twitter_Response
+     */
+    public function usersShow($id)
+    {
+        $this->init();
+        $path     = 'users/show';
+        $params   = $this->createUserParameter($id, array());
+        $response = $this->get($path, $params);
+        return new Zend_Service_Twitter_Response($response);
+    }
+
+    /**
+     * Initialize HTTP authentication
+     *
+     * @return void
+     * @throws Exception\DomainException if unauthorised
+     */
+    protected function init()
+    {
+        if (!$this->isAuthorised() && $this->getUsername() !== null) {
+            require_once 'Zend/Service/Twitter/Exception.php';
+            throw new Zend_Service_Twitter_Exception(
+                'Twitter session is unauthorised. You need to initialize '
+                . __CLASS__ . ' with an OAuth Access Token or use '
+                . 'its OAuth functionality to obtain an Access Token before '
+                . 'attempting any API actions that require authorisation'
+            );
+        }
+        $client = $this->getHttpClient();
+        $client->resetParameters();
+        if (null === $this->cookieJar) {
+            $cookieJar = $client->getCookieJar();
+            if (null === $cookieJar) {
+                $cookieJar = new Zend_Http_CookieJar();
+            }
+            $this->cookieJar = $cookieJar;
+            $this->cookieJar->reset();
+        } else {
+            $client->setCookieJar($this->cookieJar);
         }
-        $path .= '.xml';
-        $response = $this->_get($path, array('page' => $page));
-        return new Zend_Rest_Client_Result($response->getBody());
     }
 
     /**
      * Protected function to validate that the integer is valid or return a 0
-     * @param $int
+     *
+     * @param  $int
      * @throws Zend_Http_Client_Exception if HTTP request fails or times out
      * @return integer
      */
-    protected function _validInteger($int)
+    protected function validInteger($int)
     {
         if (preg_match("/(\d+)/", $int)) {
             return $int;
@@ -931,10 +1197,10 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      * Validate a screen name using Twitter rules
      *
      * @param string $name
-     * @throws Zend_Service_Twitter_Exception
      * @return string
+     * @throws Exception\InvalidArgumentException
      */
-    protected function _validateScreenName($name)
+    protected function validateScreenName($name)
     {
         if (!preg_match('/^[a-zA-Z0-9_]{0,20}$/', $name)) {
             require_once 'Zend/Service/Twitter/Exception.php';
@@ -947,36 +1213,21 @@ class Zend_Service_Twitter extends Zend_Rest_Client
     }
 
     /**
-     * Call a remote REST web service URI and return the Zend_Http_Response object
+     * Call a remote REST web service URI
      *
-     * @param  string $path            The path to append to the URI
-     * @throws Zend_Rest_Client_Exception
+     * @param  string $path The path to append to the URI
+     * @param  Zend_Http_Client $client
+     * @throws Zend_Http_Client_Exception
      * @return void
      */
-    protected function _prepare($path)
+    protected function prepare($path, Zend_Http_Client $client)
     {
-        // Get the URI object and configure it
-        if (!$this->_uri instanceof Zend_Uri_Http) {
-            require_once 'Zend/Rest/Client/Exception.php';
-            throw new Zend_Rest_Client_Exception(
-                'URI object must be set before performing call'
-            );
-        }
-
-        $uri = $this->_uri->getUri();
-
-        if ($path[0] != '/' && $uri[strlen($uri) - 1] != '/') {
-            $path = '/' . $path;
-        }
-
-        $this->_uri->setPath($path);
+        $client->setUri(self::API_BASE_URI . $path . '.json');
 
         /**
-         * Get the HTTP client and configure it for the endpoint URI.
-         * Do this each time because the Zend_Http_Client instance is shared
-         * among all Zend_Service_Abstract subclasses.
+         * Do this each time to ensure oauth calls do not inject new params
          */
-        $this->_localHttpClient->resetParameters()->setUri((string) $this->_uri);
+        $client->resetParameters();
     }
 
     /**
@@ -987,11 +1238,13 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      * @throws Zend_Http_Client_Exception
      * @return Zend_Http_Response
      */
-    protected function _get($path, array $query = null)
+    protected function get($path, array $query = array())
     {
-        $this->_prepare($path);
-        $this->_localHttpClient->setParameterGet($query);
-        return $this->_localHttpClient->request(Zend_Http_Client::GET);
+        $client = $this->getHttpClient();
+        $this->prepare($path, $client);
+        $client->setParameterGet($query);
+        $response = $client->request(Zend_Http_Client::GET);
+        return $response;
     }
 
     /**
@@ -1002,10 +1255,12 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      * @throws Zend_Http_Client_Exception
      * @return Zend_Http_Response
      */
-    protected function _post($path, $data = null)
+    protected function post($path, $data = null)
     {
-        $this->_prepare($path);
-        return $this->_performPost(Zend_Http_Client::POST, $data);
+        $client = $this->getHttpClient();
+        $this->prepare($path, $client);
+        $response = $this->performPost(Zend_Http_Client::POST, $data, $client);
+        return $response;
     }
 
     /**
@@ -1019,9 +1274,8 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      * @param mixed $data
      * @return Zend_Http_Response
      */
-    protected function _performPost($method, $data = null)
+    protected function performPost($method, $data, Zend_Http_Client $client)
     {
-        $client = $this->_localHttpClient;
         if (is_string($data)) {
             $client->setRawData($data);
         } elseif (is_array($data) || is_object($data)) {
@@ -1030,4 +1284,24 @@ class Zend_Service_Twitter extends Zend_Rest_Client
         return $client->request($method);
     }
 
+    /**
+     * Create a parameter representing the user
+     *
+     * Determines if $id is an integer, and, if so, sets the "user_id" parameter.
+     * If not, assumes the $id is the "screen_name".
+     *
+     * @param  int|string $id
+     * @param  array $params
+     * @return array
+     */
+    protected function createUserParameter($id, array $params)
+    {
+        if ($this->validInteger($id)) {
+            $params['user_id'] = $id;
+            return $params;
+        }
+
+        $params['screen_name'] = $this->validateScreenName($id);
+        return $params;
+    }
 }
diff --git a/lib/zend/Zend/Service/Twitter/Exception.php b/lib/zend/Zend/Service/Twitter/Exception.php
old mode 100644
new mode 100755
index 06fc25ef2df..742f14418f9
--- a/lib/zend/Zend/Service/Twitter/Exception.php
+++ b/lib/zend/Zend/Service/Twitter/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Service/Exception.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Twitter_Exception extends Zend_Service_Exception
diff --git a/lib/zend/Zend/Service/Twitter/Response.php b/lib/zend/Zend/Service/Twitter/Response.php
new file mode 100644
index 00000000000..23f994dab5e
--- /dev/null
+++ b/lib/zend/Zend/Service/Twitter/Response.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Twitter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Http_Response
+ */
+require_once 'Zend/Http/Response.php';
+
+/**
+ * @see Zend_Json
+ */
+require_once 'Zend/Json.php';
+
+/**
+ * Representation of a response from Twitter.
+ *
+ * Provides:
+ *
+ * - method for testing if we have a successful call
+ * - method for retrieving errors, if any
+ * - method for retrieving the raw JSON
+ * - method for retrieving the decoded response
+ * - proxying to elements of the decoded response via property overloading
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Twitter
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Twitter_Response
+{
+    /**
+     * @var Zend_Http_Response
+     */
+    protected $httpResponse;
+
+    /**
+     * @var array|stdClass
+     */
+    protected $jsonBody;
+
+    /**
+     * @var string
+     */
+    protected $rawBody;
+
+    /**
+     * Constructor
+     *
+     * Assigns the HTTP response to a property, as well as the body
+     * representation. It then attempts to decode the body as JSON.
+     *
+     * @param  Zend_Http_Response $httpResponse
+     * @throws Zend_Service_Twitter_Exception if unable to decode JSON response
+     */
+    public function __construct(Zend_Http_Response $httpResponse)
+    {
+        $this->httpResponse = $httpResponse;
+        $this->rawBody      = $httpResponse->getBody();
+        try {
+            $jsonBody = Zend_Json::decode($this->rawBody, Zend_Json::TYPE_OBJECT);
+            $this->jsonBody = $jsonBody;
+        } catch (Zend_Json_Exception $e) {
+            require_once 'Zend/Service/Twitter/Exception.php';
+            throw new Zend_Service_Twitter_Exception(sprintf(
+                'Unable to decode response from twitter: %s',
+                $e->getMessage()
+            ), 0, $e);
+        }
+    }
+
+    /**
+     * Property overloading to JSON elements
+     *
+     * If a named property exists within the JSON response returned,
+     * proxies to it. Otherwise, returns null.
+     *
+     * @param  string $name
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        if (null === $this->jsonBody) {
+            return null;
+        }
+        if (!isset($this->jsonBody->{$name})) {
+            return null;
+        }
+        return $this->jsonBody->{$name};
+    }
+
+    /**
+     * Was the request successful?
+     *
+     * @return bool
+     */
+    public function isSuccess()
+    {
+        return $this->httpResponse->isSuccessful();
+    }
+
+    /**
+     * Did an error occur in the request?
+     *
+     * @return bool
+     */
+    public function isError()
+    {
+        return !$this->httpResponse->isSuccessful();
+    }
+
+    /**
+     * Retrieve the errors.
+     *
+     * Twitter _should_ return a standard error object, which contains an
+     * "errors" property pointing to an array of errors. This method will
+     * return that array if present, and raise an exception if not detected.
+     *
+     * If the response was successful, an empty array is returned.
+     *
+     * @return array
+     * @throws Exception\DomainException if unable to detect structure of error response
+     */
+    public function getErrors()
+    {
+        if (!$this->isError()) {
+            return array();
+        }
+        if (null === $this->jsonBody
+            || !isset($this->jsonBody->errors)
+        ) {
+            require_once 'Zend/Service/Twitter/Exception.php';
+            throw new Zend_Service_Twitter_Exception(
+                'Either no JSON response received, or JSON error response is malformed; cannot return errors'
+            );
+        }
+        return $this->jsonBody->errors;
+    }
+
+    /**
+     * Retrieve the raw response body
+     *
+     * @return string
+     */
+    public function getRawResponse()
+    {
+        return $this->rawBody;
+    }
+
+    /**
+     * Retun the decoded response body
+     *
+     * @return array|stdClass
+     */
+    public function toValue()
+    {
+        return $this->jsonBody;
+    }
+}
diff --git a/lib/zend/Zend/Service/Twitter/Search.php b/lib/zend/Zend/Service/Twitter/Search.php
deleted file mode 100644
index f20961e94a2..00000000000
--- a/lib/zend/Zend/Service/Twitter/Search.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Rest/Client.php';
-
-/**
- * @see Zend_Json
- */
-require_once 'Zend/Json.php';
-
-/**
- * @see Zend_Feed
- */
-require_once 'Zend/Feed.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Service_Twitter_Search extends Zend_Rest_Client
-{
-    /**
-     * Return Type
-     * @var String
-     */
-    protected $_responseType = 'json';
-
-    /**
-     * Response Format Types
-     * @var array
-     */
-    protected $_responseTypes = array(
-        'atom',
-        'json'
-    );
-
-    /**
-     * Uri Compoent
-     *
-     * @var Zend_Uri_Http
-     */
-    protected $_uri;
-
-    /**
-     * Constructor
-     *
-     * @param  string $returnType
-     * @return void
-     */
-    public function __construct($responseType = 'json')
-    {
-        $this->setResponseType($responseType);
-        $this->setUri("http://search.twitter.com");
-
-        $this->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8');
-    }
-
-    /**
-     * set responseType
-     *
-     * @param string $responseType
-     * @throws Zend_Service_Twitter_Exception
-     * @return Zend_Service_Twitter_Search
-     */
-    public function setResponseType($responseType = 'json')
-    {
-        if(!in_array($responseType, $this->_responseTypes, TRUE)) {
-            require_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception('Invalid Response Type');
-        }
-        $this->_responseType = $responseType;
-        return $this;
-    }
-
-    /**
-     * Retrieve responseType
-     *
-     * @return string
-     */
-    public function getResponseType()
-    {
-        return $this->_responseType;
-    }
-
-    /**
-     * Get the current twitter trends.  Currnetly only supports json as the return.
-     *
-     * @throws Zend_Http_Client_Exception
-     * @return array
-     */
-    public function trends()
-    {
-        $response     = $this->restGet('/trends.json');
-
-        return Zend_Json::decode($response->getBody());
-    }
-
-    /**
-     * Performs a Twitter search query.
-     *
-     * @throws Zend_Http_Client_Exception
-     */
-    public function search($query, array $params = array())
-    {
-
-        $_query = array();
-
-        $_query['q'] = $query;
-
-        foreach($params as $key=>$param) {
-            switch($key) {
-                case 'geocode':
-                case 'lang':
-                case 'since_id':
-                    $_query[$key] = $param;
-                    break;
-                case 'rpp':
-                    $_query[$key] = (intval($param) > 100) ? 100 : intval($param);
-                    break;
-                case 'page':
-                    $_query[$key] = intval($param);
-                    break;
-                case 'show_user':
-                    $_query[$key] = 'true';
-            }
-        }
-
-        $response = $this->restGet('/search.' . $this->_responseType, $_query);
-
-        switch($this->_responseType) {
-            case 'json':
-                return Zend_Json::decode($response->getBody());
-                break;
-            case 'atom':
-                return Zend_Feed::importString($response->getBody());
-                break;
-        }
-
-        return ;
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php b/lib/zend/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php
deleted file mode 100644
index 1af258269bf..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
-abstract class Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-{
-	/**
-	 * Development storage account and key
-	 */
-	const DEVSTORE_ACCOUNT       = "devstoreaccount1";
-	const DEVSTORE_KEY           = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
-	
-	/**
-	 * HTTP header prefixes
-	 */
-	const PREFIX_PROPERTIES      = "x-ms-prop-";
-	const PREFIX_METADATA        = "x-ms-meta-";
-	const PREFIX_STORAGE_HEADER  = "x-ms-";
-	
-	/**
-	 * Permissions
-	 */
-	const PERMISSION_READ        = "r";
-	const PERMISSION_WRITE       = "w";
-	const PERMISSION_DELETE      = "d";
-	const PERMISSION_LIST        = "l";
-
-	/**
-	 * Account name for Windows Azure
-	 *
-	 * @var string
-	 */
-	protected $_accountName = '';
-	
-	/**
-	 * Account key for Windows Azure
-	 *
-	 * @var string
-	 */
-	protected $_accountKey = '';
-	
-	/**
-	 * Use path-style URI's
-	 *
-	 * @var boolean
-	 */
-	protected $_usePathStyleUri = false;
-	
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 *
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 */
-	public function __construct(
-		$accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT,
-		$accountKey  = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY,
-		$usePathStyleUri = false
-	) {
-		$this->_accountName = $accountName;
-		$this->_accountKey = base64_decode($accountKey);
-		$this->_usePathStyleUri = $usePathStyleUri;
-	}
-	
-	/**
-	 * Set account name for Windows Azure
-	 *
-	 * @param  string $value
-	 * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	public function setAccountName($value = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT)
-	{
-		$this->_accountName = $value;
-		return $this;
-	}
-	
-	/**
-	 * Set account key for Windows Azure
-	 *
-	 * @param  string $value
-	 * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	public function setAccountkey($value = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY)
-	{
-		$this->_accountKey = base64_decode($value);
-		return $this;
-	}
-	
-	/**
-	 * Set use path-style URI's
-	 *
-	 * @param  boolean $value
-	 * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	public function setUsePathStyleUri($value = false)
-	{
-		$this->_usePathStyleUri = $value;
-		return $this;
-	}
-	
-	/**
-	 * Sign request URL with credentials
-	 *
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-	abstract public function signRequestUrl(
-		$requestUrl = '',
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	);
-	
-	/**
-	 * Sign request headers with credentials
-	 *
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param string $path Path for the request
-	 * @param string $queryString Query string for the request
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return array Array of headers
-	 */
-	abstract public function signRequestHeaders(
-		$httpVerb = Zend_Http_Client::GET,
-		$path = '/',
-		$queryString = '',
-		$headers = null,
-		$forTableStorage = false,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	);
-	
-	
-	/**
-	 * Prepare query string for signing
-	 * 
-	 * @param  string $value Original query string
-	 * @return string        Query string for signing
-	 */
-	protected function _prepareQueryStringForSigning($value)
-	{
-	    // Check for 'comp='
-	    if (strpos($value, 'comp=') === false) {
-	        // If not found, no query string needed
-	        return '';
-	    } else {
-	        // If found, make sure it is the only parameter being used      
-    		if (strlen($value) > 0 && strpos($value, '?') === 0) {
-    			$value = substr($value, 1);
-    		}
-    		
-    		// Split parts
-    		$queryParts = explode('&', $value);
-    		foreach ($queryParts as $queryPart) {
-    		    if (strpos($queryPart, 'comp=') !== false) {
-    		        return '?' . $queryPart;
-    		    }
-    		}
-
-    		// Should never happen...
-			return '';
-	    }
-	}
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php b/lib/zend/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
deleted file mode 100644
index f3134a96693..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
-class Zend_Service_WindowsAzure_Credentials_SharedAccessSignature
-    extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-{
-    /**
-     * Permission set
-     * 
-     * @var array
-     */
-    protected $_permissionSet = array();
-    
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance
-	 *
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param array $permissionSet Permission set
-	 */
-	public function __construct(
-		$accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT,
-		$accountKey  = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY,
-		$usePathStyleUri = false, $permissionSet = array()
-	) {
-	    parent::__construct($accountName, $accountKey, $usePathStyleUri);
-	    $this->_permissionSet = $permissionSet;
-	}
-	
-	/**
-	 * Get permission set
-	 * 
-	 * @return array
-	 */
-    public function getPermissionSet()
-	{
-	    return $this->_permissionSet;   
-	}
-	
-	/**
-	 * Set permisison set
-	 * 
-	 * Warning: fine-grained permissions should be added prior to coarse-grained permissions.
-	 * For example: first add blob permissions, end with container-wide permissions.
-	 * 
-	 * Warning: the signed access signature URL must match the account name of the
-	 * Zend_Service_WindowsAzure_Credentials_Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance
-	 * 
-	 * @param  array $value Permission set
-	 * @return void
-	 */
-    public function setPermissionSet($value = array())
-	{
-		foreach ($value as $url) {
-			if (strpos($url, $this->_accountName) === false) {
-				throw new Zend_Service_WindowsAzure_Exception('The permission set can only contain URLs for the account name specified in the Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance.');
-			}
-		}
-	    $this->_permissionSet = $value;
-	}
-    
-    /**
-     * Create signature
-     * 
-     * @param string $path 		   Path for the request
-     * @param string $resource     Signed resource - container (c) - blob (b)
-     * @param string $permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
-     * @param string $start        The time at which the Shared Access Signature becomes valid.
-     * @param string $expiry       The time at which the Shared Access Signature becomes invalid.
-     * @param string $identifier   Signed identifier
-     * @return string 
-     */
-    public function createSignature(
-    	$path = '/',
-    	$resource = 'b',
-    	$permissions = 'r',
-    	$start = '',
-    	$expiry = '',
-    	$identifier = ''
-    ) {
-		// Determine path
-		if ($this->_usePathStyleUri) {
-			$path = substr($path, strpos($path, '/'));
-		}
-			
-		// Add trailing slash to $path
-		if (substr($path, 0, 1) !== '/') {
-		    $path = '/' . $path;
-		}
-
-		// Build canonicalized resource string
-		$canonicalizedResource  = '/' . $this->_accountName;
-		/*if ($this->_usePathStyleUri) {
-			$canonicalizedResource .= '/' . $this->_accountName;
-		}*/
-		$canonicalizedResource .= $path;
-		    
-		// Create string to sign   
-		$stringToSign   = array();
-		$stringToSign[] = $permissions;
-    	$stringToSign[] = $start;
-    	$stringToSign[] = $expiry;
-    	$stringToSign[] = $canonicalizedResource;
-    	$stringToSign[] = $identifier;
-
-    	$stringToSign = implode("\n", $stringToSign);
-    	$signature    = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true));
-	
-    	return $signature;
-    }
-
-    /**
-     * Create signed query string
-     * 
-     * @param string $path 		   Path for the request
-     * @param string $queryString  Query string for the request
-     * @param string $resource     Signed resource - container (c) - blob (b)
-     * @param string $permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
-     * @param string $start        The time at which the Shared Access Signature becomes valid.
-     * @param string $expiry       The time at which the Shared Access Signature becomes invalid.
-     * @param string $identifier   Signed identifier
-     * @return string 
-     */
-    public function createSignedQueryString(
-    	$path = '/',
-    	$queryString = '',
-    	$resource = 'b',
-    	$permissions = 'r',
-    	$start = '',
-    	$expiry = '',
-    	$identifier = ''
-    ) {
-        // Parts
-        $parts = array();
-        if ($start !== '') {
-            $parts[] = 'st=' . urlencode($start);
-        }
-        $parts[] = 'se=' . urlencode($expiry);
-        $parts[] = 'sr=' . $resource;
-        $parts[] = 'sp=' . $permissions;
-        if ($identifier !== '') {
-            $parts[] = 'si=' . urlencode($identifier);
-        }
-        $parts[] = 'sig=' . urlencode($this->createSignature($path, $resource, $permissions, $start, $expiry, $identifier));
-
-        // Assemble parts and query string
-        if ($queryString != '') {
-            $queryString .= '&';
-	    }
-        $queryString .= implode('&', $parts);
-
-        return $queryString;
-    }
-    
-    /**
-	 * Permission matches request?
-	 *
-	 * @param string $permissionUrl Permission URL
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-    public function permissionMatchesRequest(
-    	$permissionUrl = '',
-    	$requestUrl = '',
-    	$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-    	$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-    ) {
-        // Build requirements
-        $requiredResourceType = $resourceType;
-        if ($requiredResourceType == Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB) {
-            $requiredResourceType .= Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER;
-        }
-
-        // Parse permission url
-	    $parsedPermissionUrl = parse_url($permissionUrl);
-	    
-	    // Parse permission properties
-	    $permissionParts = explode('&', $parsedPermissionUrl['query']);
-	    
-	    // Parse request url
-	    $parsedRequestUrl = parse_url($requestUrl);
-	    
-	    // Check if permission matches request
-	    $matches = true;
-	    foreach ($permissionParts as $part) {
-	        list($property, $value) = explode('=', $part, 2);
-	        
-	        if ($property == 'sr') {
-	            $matches = $matches && (strpbrk($value, $requiredResourceType) !== false);
-	        }
-	        
-	    	if ($property == 'sp') {
-	            $matches = $matches && (strpbrk($value, $requiredPermission) !== false);
-	        }
-	    }
-	    
-	    // Ok, but... does the resource match?
-	    $matches = $matches && (strpos($parsedRequestUrl['path'], $parsedPermissionUrl['path']) !== false);
-	    
-        // Return
-	    return $matches;
-    }    
-    
-    /**
-	 * Sign request URL with credentials
-	 *
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-	public function signRequestUrl(
-		$requestUrl = '',
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    // Look for a matching permission
-	    foreach ($this->getPermissionSet() as $permittedUrl) {
-	        if ($this->permissionMatchesRequest($permittedUrl, $requestUrl, $resourceType, $requiredPermission)) {
-	            // This matches, append signature data
-	            $parsedPermittedUrl = parse_url($permittedUrl);
-
-	            if (strpos($requestUrl, '?') === false) {
-	                $requestUrl .= '?';
-	            } else {
-	                $requestUrl .= '&';
-	            }
-	            
-	            $requestUrl .= $parsedPermittedUrl['query'];
-
-	            // Return url
-	            return $requestUrl;
-	        }
-	    }
-	    
-	    // Return url, will be unsigned...
-	    return $requestUrl;
-	}
-    
-	/**
-	 * Sign request with credentials
-	 *
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param string $path Path for the request
-	 * @param string $queryString Query string for the request
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return array Array of headers
-	 */
-	public function signRequestHeaders(
-		$httpVerb = Zend_Http_Client::GET,
-		$path = '/',
-		$queryString = '',
-		$headers = null,
-		$forTableStorage = false,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    return $headers;
-	}
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Credentials/SharedKey.php b/lib/zend/Zend/Service/WindowsAzure/Credentials/SharedKey.php
deleted file mode 100644
index df9836d36f1..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Credentials/SharedKey.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
-class Zend_Service_WindowsAzure_Credentials_SharedKey
-    extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-{
-    /**
-	 * Sign request URL with credentials
-	 *
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-	public function signRequestUrl(
-		$requestUrl = '',
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    return $requestUrl;
-	}
-	
-	/**
-	 * Sign request headers with credentials
-	 *
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param string $path Path for the request
-	 * @param string $queryString Query string for the request
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return array Array of headers
-	 */
-	public function signRequestHeaders(
-		$httpVerb = Zend_Http_Client::GET,
-		$path = '/',
-		$queryString = '',
-		$headers = null,
-		$forTableStorage = false,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-		// http://github.com/sriramk/winazurestorage/blob/214010a2f8931bac9c96dfeb337d56fe084ca63b/winazurestorage.py
-
-		// Determine path
-		if ($this->_usePathStyleUri) {
-			$path = substr($path, strpos($path, '/'));
-		}
-
-		// Determine query
-		$queryString = $this->_prepareQueryStringForSigning($queryString);
-	
-		// Canonicalized headers
-		$canonicalizedHeaders = array();
-		
-		// Request date
-		$requestDate = '';
-		if (isset($headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'])) {
-		    $requestDate = $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'];
-		} else {
-		    $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123
-		    $canonicalizedHeaders[] = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date:' . $requestDate;
-		}
-		
-		// Build canonicalized headers
-		if (!is_null($headers)) {
-			foreach ($headers as $header => $value) {
-				if (is_bool($value)) {
-					$value = $value === true ? 'True' : 'False';
-				}
-
-				$headers[$header] = $value;
-				if (substr($header, 0, strlen(Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER)) == Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER) {
-				    $canonicalizedHeaders[] = strtolower($header) . ':' . $value;
-				}
-			}
-		}
-		sort($canonicalizedHeaders);
-
-		// Build canonicalized resource string
-		$canonicalizedResource  = '/' . $this->_accountName;
-		if ($this->_usePathStyleUri) {
-			$canonicalizedResource .= '/' . $this->_accountName;
-		}
-		$canonicalizedResource .= $path;
-		if ($queryString !== '') {
-		    $canonicalizedResource .= $queryString;
-		}
-
-		// Create string to sign   
-		$stringToSign   = array();
-		$stringToSign[] = strtoupper($httpVerb); 	// VERB
-    	$stringToSign[] = "";						// Content-MD5
-    	$stringToSign[] = "";						// Content-Type
-    	$stringToSign[] = "";
-        // Date already in $canonicalizedHeaders
-    	// $stringToSign[] = self::PREFIX_STORAGE_HEADER . 'date:' . $requestDate; // Date
-    	
-    	if (!$forTableStorage && count($canonicalizedHeaders) > 0) {
-    		$stringToSign[] = implode("\n", $canonicalizedHeaders); // Canonicalized headers
-    	}
-    		
-    	$stringToSign[] = $canonicalizedResource;		 			// Canonicalized resource
-    	$stringToSign   = implode("\n", $stringToSign);
-    	$signString     = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true));
-
-    	// Sign request
-    	$headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'] = $requestDate;
-    	$headers['Authorization'] = 'SharedKey ' . $this->_accountName . ':' . $signString;
-    	
-    	// Return headers
-    	return $headers;
-	}
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php b/lib/zend/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
deleted file mode 100644
index c880ad35673..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
-class Zend_Service_WindowsAzure_Credentials_SharedKeyLite
-    extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-{
-    /**
-	 * Sign request URL with credentials
-	 *
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-	public function signRequestUrl(
-		$requestUrl = '',
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    return $requestUrl;
-	}
-	
-	/**
-	 * Sign request headers with credentials
-	 *
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param string $path Path for the request
-	 * @param string $queryString Query string for the request
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return array Array of headers
-	 */
-	public function signRequestHeaders(
-		$httpVerb = Zend_Http_Client::GET,
-		$path = '/',
-		$queryString = '',
-		$headers = null,
-		$forTableStorage = false,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-		// Determine path
-		if ($this->_usePathStyleUri) {
-			$path = substr($path, strpos($path, '/'));
-		}
-
-		// Determine query
-		$queryString = $this->_prepareQueryStringForSigning($queryString);
-
-		// Build canonicalized resource string
-		$canonicalizedResource  = '/' . $this->_accountName;
-		if ($this->_usePathStyleUri) {
-			$canonicalizedResource .= '/' . $this->_accountName;
-		}
-		$canonicalizedResource .= $path;
-		if ($queryString !== '') {
-		    $canonicalizedResource .= $queryString;
-		}
-
-		// Request date
-		$requestDate = '';
-		if (isset($headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'])) {
-		    $requestDate = $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'];
-		} else {
-		    $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123
-		}
-
-		// Create string to sign   
-		$stringToSign   = array();
-    	$stringToSign[] = $requestDate; // Date
-    	$stringToSign[] = $canonicalizedResource;		 			// Canonicalized resource
-    	$stringToSign   = implode("\n", $stringToSign);
-    	$signString     = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true));
-
-    	// Sign request
-    	$headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'] = $requestDate;
-    	$headers['Authorization'] = 'SharedKeyLite ' . $this->_accountName . ':' . $signString;
-    	
-    	// Return headers
-    	return $headers;
-	}
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/Exception.php b/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/Exception.php
deleted file mode 100644
index 1d42a7926ce..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Exception
- * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_RetryPolicy_Exception extends Zend_Service_WindowsAzure_Exception
-{}
diff --git a/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php b/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
deleted file mode 100644
index 2a392303581..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_RetryPolicy_NoRetry extends Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
-{
-    /**
-     * Execute function under retry policy
-     * 
-     * @param string|array $function       Function to execute
-     * @param array        $parameters     Parameters for function call
-     * @return mixed
-     */
-    public function execute($function, $parameters = array())
-    {
-        $returnValue = null;
-        
-        try
-        {
-            $returnValue = call_user_func_array($function, $parameters);
-            return $returnValue;
-        }
-        catch (Exception $ex)
-        {
-            throw $ex;
-        }
-    }
-}
\ No newline at end of file
diff --git a/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php b/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
deleted file mode 100644
index ecdcae0ddf3..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_Exception
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_RetryPolicy_RetryN extends Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
-{
-    /**
-     * Number of retries
-     * 
-     * @var int
-     */
-    protected $_retryCount = 1;
-    
-    /**
-     * Interval between retries (in milliseconds)
-     * 
-     * @var int
-     */
-    protected $_retryInterval = 0;
-    
-    /**
-     * Constructor
-     * 
-     * @param int $count                    Number of retries
-     * @param int $intervalBetweenRetries   Interval between retries (in milliseconds)
-     */
-    public function __construct($count = 1, $intervalBetweenRetries = 0)
-    {
-        $this->_retryCount = $count;
-        $this->_retryInterval = $intervalBetweenRetries;
-    }
-    
-    /**
-     * Execute function under retry policy
-     * 
-     * @param string|array $function       Function to execute
-     * @param array        $parameters     Parameters for function call
-     * @return mixed
-     */
-    public function execute($function, $parameters = array())
-    {
-        $returnValue = null;
-        
-        for ($retriesLeft = $this->_retryCount; $retriesLeft >= 0; --$retriesLeft) {
-            try {
-                $returnValue = call_user_func_array($function, $parameters);
-                return $returnValue;
-            } catch (Exception $ex) {
-                if ($retriesLeft == 1) {
-                    throw new Zend_Service_WindowsAzure_RetryPolicy_Exception("Exceeded retry count of " . $this->_retryCount . ". " . $ex->getMessage());
-                }
-                    
-                usleep($this->_retryInterval * 1000);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php b/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
deleted file mode 100644
index e3a48764be4..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @version    $Id$
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_NoRetry
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryN
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryN.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
-{
-    /**
-     * Execute function under retry policy
-     * 
-     * @param string|array $function       Function to execute
-     * @param array        $parameters     Parameters for function call
-     * @return mixed
-     */
-    public abstract function execute($function, $parameters = array());
-    
-    /**
-     * Create a Zend_Service_WindowsAzure_RetryPolicy_NoRetry instance
-     * 
-     * @return Zend_Service_WindowsAzure_RetryPolicy_NoRetry
-     */
-    public static function noRetry()
-    {
-        return new Zend_Service_WindowsAzure_RetryPolicy_NoRetry();
-    }
-    
-    /**
-     * Create a Zend_Service_WindowsAzure_RetryPolicy_RetryN instance
-     * 
-     * @param int $count                    Number of retries
-     * @param int $intervalBetweenRetries   Interval between retries (in milliseconds)
-     * @return Zend_Service_WindowsAzure_RetryPolicy_RetryN
-     */
-    public static function retryN($count = 1, $intervalBetweenRetries = 0)
-    {
-        return new Zend_Service_WindowsAzure_RetryPolicy_RetryN($count, $intervalBetweenRetries);
-    }
-}
\ No newline at end of file
diff --git a/lib/zend/Zend/Service/WindowsAzure/SessionHandler.php b/lib/zend/Zend/Service/WindowsAzure/SessionHandler.php
deleted file mode 100644
index bd5df68122a..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/SessionHandler.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/** Zend_Service_WindowsAzure_Storage_Table */
-require_once 'Zend/Service/WindowsAzure/Storage/Table.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_SessionHandler
-{
-    /**
-     * Table storage
-     * 
-     * @var Zend_Service_WindowsAzure_Storage_Table
-     */
-    protected $_tableStorage;
-    
-    /**
-     * Session table name
-     * 
-     * @var string
-     */
-    protected $_sessionTable;
-    
-    /**
-     * Session table partition
-     * 
-     * @var string
-     */
-    protected $_sessionTablePartition;
-	
-    /**
-     * Creates a new Zend_Service_WindowsAzure_SessionHandler instance
-     * 
-     * @param Zend_Service_WindowsAzure_Storage_Table $tableStorage Table storage
-     * @param string $sessionTable Session table name
-     * @param string $sessionTablePartition Session table partition
-     */
-    public function __construct(Zend_Service_WindowsAzure_Storage_Table $tableStorage, $sessionTable = 'phpsessions', $sessionTablePartition = 'sessions')
-	{
-	    // Set properties
-		$this->_tableStorage = $tableStorage;
-		$this->_sessionTable = $sessionTable;
-		$this->_sessionTablePartition = $sessionTablePartition;
-	}
-	
-	/**
-	 * Registers the current session handler as PHP's session handler
-	 * 
-	 * @return boolean
-	 */
-	public function register()
-	{
-        return session_set_save_handler(array($this, 'open'),
-                                        array($this, 'close'),
-                                        array($this, 'read'),
-                                        array($this, 'write'),
-                                        array($this, 'destroy'),
-                                        array($this, 'gc')
-        );
-	}
-	
-    /**
-     * Open the session store
-     * 
-     * @return bool
-     */
-    public function open()
-    {
-    	// Make sure table exists
-    	$tableExists = $this->_tableStorage->tableExists($this->_sessionTable);
-    	if (!$tableExists) {
-		    $this->_tableStorage->createTable($this->_sessionTable);
-		}
-		
-		// Ok!
-		return true;
-    }
-
-    /**
-     * Close the session store
-     * 
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
-    
-    /**
-     * Read a specific session
-     * 
-     * @param int $id Session Id
-     * @return string
-     */
-    public function read($id)
-    {
-        try
-        {
-            $sessionRecord = $this->_tableStorage->retrieveEntityById(
-                $this->_sessionTable,
-                $this->_sessionTablePartition,
-                $id
-            );
-            return base64_decode($sessionRecord->serializedData);
-        }
-        catch (Zend_Service_WindowsAzure_Exception $ex)
-        {
-            return '';
-        }
-    }
-    
-    /**
-     * Write a specific session
-     * 
-     * @param int $id Session Id
-     * @param string $serializedData Serialized PHP object
-     */
-    public function write($id, $serializedData)
-    {
-        $sessionRecord = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($this->_sessionTablePartition, $id);
-        $sessionRecord->sessionExpires = time();
-        $sessionRecord->serializedData = base64_encode($serializedData);
-        
-        $sessionRecord->setAzurePropertyType('sessionExpires', 'Edm.Int32');
-
-        try
-        {
-            $this->_tableStorage->updateEntity($this->_sessionTable, $sessionRecord);
-        }
-        catch (Zend_Service_WindowsAzure_Exception $unknownRecord)
-        {
-            $this->_tableStorage->insertEntity($this->_sessionTable, $sessionRecord);
-        }
-    }
-    
-    /**
-     * Destroy a specific session
-     * 
-     * @param int $id Session Id
-     * @return boolean
-     */
-    public function destroy($id)
-    {
-        try
-        {
-            $sessionRecord = $this->_tableStorage->retrieveEntityById(
-                $this->_sessionTable,
-                $this->_sessionTablePartition,
-                $id
-            );
-            $this->_tableStorage->deleteEntity($this->_sessionTable, $sessionRecord);
-            
-            return true;
-        }
-        catch (Zend_Service_WindowsAzure_Exception $ex)
-        {
-            return false;
-        }
-    }
-    
-    /**
-     * Garbage collector
-     * 
-     * @param int $lifeTime Session maximal lifetime
-     * @see session.gc_divisor  100
-     * @see session.gc_maxlifetime 1440
-     * @see session.gc_probability 1
-     * @usage Execution rate 1/100 (session.gc_probability/session.gc_divisor)
-     * @return boolean
-     */
-    public function gc($lifeTime)
-    {
-        try
-        {
-            $result = $this->_tableStorage->retrieveEntities($this->_sessionTable, 'PartitionKey eq \'' . $this->_sessionTablePartition . '\' and sessionExpires lt ' . (time() - $lifeTime));
-            foreach ($result as $sessionRecord)
-            {
-                $this->_tableStorage->deleteEntity($this->_sessionTable, $sessionRecord);
-            }
-            return true;
-        }
-        catch (Zend_Service_WindowsAzure_exception $ex)
-        {
-            return false;
-        }
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage.php b/lib/zend/Zend/Service/WindowsAzure/Storage.php
deleted file mode 100644
index a2448c2d91c..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage.php
+++ /dev/null
@@ -1,507 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage
-{
-	/**
-	 * Development storage URLS
-	 */
-	const URL_DEV_BLOB      = "127.0.0.1:10000";
-	const URL_DEV_QUEUE     = "127.0.0.1:10001";
-	const URL_DEV_TABLE     = "127.0.0.1:10002";
-	
-	/**
-	 * Live storage URLS
-	 */
-	const URL_CLOUD_BLOB    = "blob.core.windows.net";
-	const URL_CLOUD_QUEUE   = "queue.core.windows.net";
-	const URL_CLOUD_TABLE   = "table.core.windows.net";
-	
-	/**
-	 * Resource types
-	 */
-	const RESOURCE_UNKNOWN     = "unknown";
-	const RESOURCE_CONTAINER   = "c";
-	const RESOURCE_BLOB        = "b";
-	const RESOURCE_TABLE       = "t";
-	const RESOURCE_ENTITY      = "e";
-	const RESOURCE_QUEUE       = "q";
-	
-	/**
-	 * Current API version
-	 * 
-	 * @var string
-	 */
-	protected $_apiVersion = '2009-04-14';
-	
-	/**
-	 * Storage host name
-	 *
-	 * @var string
-	 */
-	protected $_host = '';
-	
-	/**
-	 * Account name for Windows Azure
-	 *
-	 * @var string
-	 */
-	protected $_accountName = '';
-	
-	/**
-	 * Account key for Windows Azure
-	 *
-	 * @var string
-	 */
-	protected $_accountKey = '';
-	
-	/**
-	 * Use path-style URI's
-	 *
-	 * @var boolean
-	 */
-	protected $_usePathStyleUri = false;
-	
-	/**
-	 * Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 *
-	 * @var Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	protected $_credentials = null;
-	
-	/**
-	 * Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract instance
-	 * 
-	 * @var Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
-	 */
-	protected $_retryPolicy = null;
-	
-	/**
-	 * Zend_Http_Client channel used for communication with REST services
-	 * 
-	 * @var Zend_Http_Client
-	 */
-	protected $_httpClientChannel = null;
-	
-	/**
-	 * Use proxy?
-	 * 
-	 * @var boolean
-	 */
-	protected $_useProxy = false;
-	
-	/**
-	 * Proxy url
-	 * 
-	 * @var string
-	 */
-	protected $_proxyUrl = '';
-	
-	/**
-	 * Proxy port
-	 * 
-	 * @var int
-	 */
-	protected $_proxyPort = 80;
-	
-	/**
-	 * Proxy credentials
-	 * 
-	 * @var string
-	 */
-	protected $_proxyCredentials = '';
-	
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Storage instance
-	 *
-	 * @param string $host Storage host name
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function __construct(
-		$host = self::URL_DEV_BLOB,
-		$accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT,
-		$accountKey = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY,
-		$usePathStyleUri = false,
-		Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null
-	) {
-		$this->_host = $host;
-		$this->_accountName = $accountName;
-		$this->_accountKey = $accountKey;
-		$this->_usePathStyleUri = $usePathStyleUri;
-		
-		// Using local storage?
-		if (!$this->_usePathStyleUri
-			&& ($this->_host == self::URL_DEV_BLOB
-				|| $this->_host == self::URL_DEV_QUEUE
-				|| $this->_host == self::URL_DEV_TABLE)
-		) {
-			// Local storage
-			$this->_usePathStyleUri = true;
-		}
-		
-		if (is_null($this->_credentials)) {
-		    $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKey(
-		    	$this->_accountName, $this->_accountKey, $this->_usePathStyleUri);
-		}
-		
-		$this->_retryPolicy = $retryPolicy;
-		if (is_null($this->_retryPolicy)) {
-		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
-		}
-		
-		// Setup default Zend_Http_Client channel
-		$options = array(
-			'adapter' => 'Zend_Http_Client_Adapter_Proxy'
-		);
-		if (function_exists('curl_init')) {
-			// Set cURL options if cURL is used afterwards
-			$options['curloptions'] = array(
-					CURLOPT_FOLLOWLOCATION => true,
-					CURLOPT_TIMEOUT => 120,
-			);
-		}
-		$this->_httpClientChannel = new Zend_Http_Client(null, $options);
-	}
-	
-	/**
-	 * Set the HTTP client channel to use
-	 * 
-	 * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name.
-	 */
-	public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Proxy')
-	{
-		$this->_httpClientChannel->setAdapter($adapterInstance);
-	}
-	
-	/**
-	 * Set retry policy to use when making requests
-	 *
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function setRetryPolicy(Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
-	{
-		$this->_retryPolicy = $retryPolicy;
-		if (is_null($this->_retryPolicy)) {
-		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
-		}
-	}
-	
-	/**
-	 * Set proxy
-	 * 
-	 * @param boolean $useProxy         Use proxy?
-	 * @param string  $proxyUrl         Proxy URL
-	 * @param int     $proxyPort        Proxy port
-	 * @param string  $proxyCredentials Proxy credentials
-	 */
-	public function setProxy($useProxy = false, $proxyUrl = '', $proxyPort = 80, $proxyCredentials = '')
-	{
-	    $this->_useProxy         = $useProxy;
-	    $this->_proxyUrl         = $proxyUrl;
-	    $this->_proxyPort        = $proxyPort;
-	    $this->_proxyCredentials = $proxyCredentials;
-	    
-	    if ($this->_useProxy) {
-	    	$credentials = explode(':', $this->_proxyCredentials);
-	    	if(!isset($credentials[1])) {
-	    	    $credentials[1] = '';
-	    	}
-	    	$this->_httpClientChannel->setConfig(array(
-				'proxy_host' => $this->_proxyUrl,
-	    		'proxy_port' => $this->_proxyPort,
-	    		'proxy_user' => $credentials[0],
-	    		'proxy_pass' => $credentials[1],
-	    	));
-	    } else {
-			$this->_httpClientChannel->setConfig(array(
-				'proxy_host' => '',
-	    		'proxy_port' => 8080,
-	    		'proxy_user' => '',
-	    		'proxy_pass' => '',
-	    	));
-	    }
-	}
-	
-	/**
-	 * Returns the Windows Azure account name
-	 * 
-	 * @return string
-	 */
-	public function getAccountName()
-	{
-		return $this->_accountName;
-	}
-	
-	/**
-	 * Get base URL for creating requests
-	 *
-	 * @return string
-	 */
-	public function getBaseUrl()
-	{
-		if ($this->_usePathStyleUri) {
-			return 'http://' . $this->_host . '/' . $this->_accountName;
-		} else {
-			return 'http://' . $this->_accountName . '.' . $this->_host;
-		}
-	}
-	
-	/**
-	 * Set Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 * 
-	 * @param Zend_Service_WindowsAzure_Credentials_CredentialsAbstract $credentials Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance to use for request signing.
-	 */
-	public function setCredentials(Zend_Service_WindowsAzure_Credentials_CredentialsAbstract $credentials)
-	{
-	    $this->_credentials = $credentials;
-	    $this->_credentials->setAccountName($this->_accountName);
-	    $this->_credentials->setAccountkey($this->_accountKey);
-	    $this->_credentials->setUsePathStyleUri($this->_usePathStyleUri);
-	}
-	
-	/**
-	 * Get Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 * 
-	 * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	public function getCredentials()
-	{
-	    return $this->_credentials;
-	}
-	
-	/**
-	 * Perform request using Zend_Http_Client channel
-	 *
-	 * @param string $path Path
-	 * @param string $queryString Query string
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param mixed $rawData Optional RAW HTTP data to be sent over the wire
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return Zend_Http_Response
-	 */
-	protected function _performRequest(
-		$path = '/',
-		$queryString = '',
-		$httpVerb = Zend_Http_Client::GET,
-		$headers = array(),
-		$forTableStorage = false,
-		$rawData = null,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    // Clean path
-		if (strpos($path, '/') !== 0) {
-			$path = '/' . $path;
-		}
-			
-		// Clean headers
-		if (is_null($headers)) {
-		    $headers = array();
-		}
-		
-		// Ensure cUrl will also work correctly:
-		//  - disable Content-Type if required
-		//  - disable Expect: 100 Continue
-		if (!isset($headers["Content-Type"])) {
-			$headers["Content-Type"] = '';
-		}
-		$headers["Expect"]= '';
-
-		// Add version header
-		$headers['x-ms-version'] = $this->_apiVersion;
-		    
-		// URL encoding
-		$path           = self::urlencode($path);
-		$queryString    = self::urlencode($queryString);
-
-		// Generate URL and sign request
-		$requestUrl     = $this->_credentials
-						  ->signRequestUrl($this->getBaseUrl() . $path . $queryString, $resourceType, $requiredPermission);
-		$requestHeaders = $this->_credentials
-						  ->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission);
-
-		// Prepare request
-		$this->_httpClientChannel->resetParameters(true);
-		$this->_httpClientChannel->setUri($requestUrl);
-		$this->_httpClientChannel->setHeaders($requestHeaders);
-		$this->_httpClientChannel->setRawData($rawData);
-		
-		// Execute request
-		$response = $this->_retryPolicy->execute(
-		    array($this->_httpClientChannel, 'request'),
-		    array($httpVerb)
-		);
-		
-		return $response;
-	}
-	
-	/** 
-	 * Parse result from Zend_Http_Response
-	 *
-	 * @param Zend_Http_Response $response Response from HTTP call
-	 * @return object
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	protected function _parseResponse(Zend_Http_Response $response = null)
-	{
-		if (is_null($response)) {
-			throw new Zend_Service_WindowsAzure_Exception('Response should not be null.');
-		}
-		
-        $xml = @simplexml_load_string($response->getBody());
-        
-        if ($xml !== false) {
-            // Fetch all namespaces 
-            $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); 
-            
-            // Register all namespace prefixes
-            foreach ($namespaces as $prefix => $ns) { 
-                if ($prefix != '') {
-                    $xml->registerXPathNamespace($prefix, $ns);
-                } 
-            } 
-        }
-        
-        return $xml;
-	}
-	
-	/**
-	 * Generate metadata headers
-	 * 
-	 * @param array $metadata
-	 * @return HTTP headers containing metadata
-	 */
-	protected function _generateMetadataHeaders($metadata = array())
-	{
-		// Validate
-		if (!is_array($metadata)) {
-			return array();
-		}
-		
-		// Return headers
-		$headers = array();
-		foreach ($metadata as $key => $value) {
-			if (strpos($value, "\r") !== false || strpos($value, "\n") !== false) {
-				throw new Zend_Service_WindowsAzure_Exception('Metadata cannot contain newline characters.');
-			}
-		    $headers["x-ms-meta-" . strtolower($key)] = $value;
-		}
-		return $headers;
-	}
-	
-	/**
-	 * Parse metadata errors
-	 * 
-	 * @param array $headers HTTP headers containing metadata
-	 * @return array
-	 */
-	protected function _parseMetadataHeaders($headers = array())
-	{
-		// Validate
-		if (!is_array($headers)) {
-			return array();
-		}
-		
-		// Return metadata
-		$metadata = array();
-		foreach ($headers as $key => $value) {
-		    if (substr(strtolower($key), 0, 10) == "x-ms-meta-") {
-		        $metadata[str_replace("x-ms-meta-", '', strtolower($key))] = $value;
-		    }
-		}
-		return $metadata;
-	}
-	
-	/**
-	 * Generate ISO 8601 compliant date string in UTC time zone
-	 * 
-	 * @param int $timestamp
-	 * @return string
-	 */
-	public function isoDate($timestamp = null) 
-	{        
-	    $tz = @date_default_timezone_get();
-	    @date_default_timezone_set('UTC');
-	    
-	    if (is_null($timestamp)) {
-	        $timestamp = time();
-	    }
-	        
-	    $returnValue = str_replace('+00:00', '.0000000Z', @date('c', $timestamp));
-	    @date_default_timezone_set($tz);
-	    return $returnValue;
-	}
-	
-	/**
-	 * URL encode function
-	 * 
-	 * @param  string $value Value to encode
-	 * @return string        Encoded value
-	 */
-	public static function urlencode($value)
-	{
-	    return str_replace(' ', '%20', $value);
-	}
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/Batch.php b/lib/zend/Zend/Service/WindowsAzure/Storage/Batch.php
deleted file mode 100644
index 369c5c29692..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/Batch.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Batch
-{	
-    /**
-     * Storage client the batch is defined on
-     * 
-     * @var Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
-     */
-    protected $_storageClient = null;
-    
-    /**
-     * For table storage?
-     * 
-     * @var boolean
-     */
-    protected $_forTableStorage = false;
-    
-    /**
-     * Base URL
-     * 
-     * @var string
-     */
-    protected $_baseUrl;
-    
-    /**
-     * Pending operations
-     * 
-     * @var unknown_type
-     */
-    protected $_operations = array();
-    
-    /**
-     * Does the batch contain a single select?
-     * 
-     * @var boolean
-     */
-    protected $_isSingleSelect = false;
-    
-    /**
-     * Creates a new Zend_Service_WindowsAzure_Storage_Batch
-     * 
-     * @param Zend_Service_WindowsAzure_Storage_BatchStorageAbstract $storageClient Storage client the batch is defined on
-     */
-    public function __construct(Zend_Service_WindowsAzure_Storage_BatchStorageAbstract $storageClient = null, $baseUrl = '')
-    {
-        $this->_storageClient = $storageClient;
-        $this->_baseUrl       = $baseUrl;
-        $this->_beginBatch();
-    }
-    
-	/**
-	 * Get base URL for creating requests
-	 *
-	 * @return string
-	 */
-	public function getBaseUrl()
-	{
-		return $this->_baseUrl;
-	}
-    
-    /**
-     * Starts a new batch operation set
-     * 
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    protected function _beginBatch()
-    {
-        $this->_storageClient->setCurrentBatch($this);
-    }
-    
-    /**
-     * Cleanup current batch
-     */
-    protected function _clean()
-    {
-        unset($this->_operations);
-        $this->_storageClient->setCurrentBatch(null);
-        $this->_storageClient = null;
-        unset($this);
-    }
-
-	/**
-	 * Enlist operation in current batch
-	 *
-	 * @param string $path Path
-	 * @param string $queryString Query string
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param mixed $rawData Optional RAW HTTP data to be sent over the wire
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend_Http_Client::GET, $headers = array(), $forTableStorage = false, $rawData = null)
-	{
-	    // Set _forTableStorage
-	    if ($forTableStorage) {
-	        $this->_forTableStorage = true;
-	    }
-	    
-	    // Set _isSingleSelect
-	    if ($httpVerb == Zend_Http_Client::GET) {
-	        if (count($this->_operations) > 0) {
-	            throw new Zend_Service_WindowsAzure_Exception("Select operations can only be performed in an empty batch transaction.");
-	        }
-	        $this->_isSingleSelect = true;
-	    }
-	    
-	    // Clean path
-		if (strpos($path, '/') !== 0) {
-			$path = '/' . $path;
-		}
-			
-		// Clean headers
-		if (is_null($headers)) {
-		    $headers = array();
-		}
-		    
-		// URL encoding
-		$path           = Zend_Service_WindowsAzure_Storage::urlencode($path);
-		$queryString    = Zend_Service_WindowsAzure_Storage::urlencode($queryString);
-
-		// Generate URL
-		$requestUrl     = $this->getBaseUrl() . $path . $queryString;
-		
-		// Generate $rawData
-		if (is_null($rawData)) {
-		    $rawData = '';
-		}
-		    
-		// Add headers
-		if ($httpVerb != Zend_Http_Client::GET) {
-    		$headers['Content-ID'] = count($this->_operations) + 1;
-    		if ($httpVerb != Zend_Http_Client::DELETE) {
-    		    $headers['Content-Type'] = 'application/atom+xml;type=entry';
-    		}
-    		$headers['Content-Length'] = strlen($rawData);
-		}
-		    
-		// Generate $operation
-		$operation = '';
-		$operation .= $httpVerb . ' ' . $requestUrl . ' HTTP/1.1' . "\n";
-		foreach ($headers as $key => $value)
-		{
-		    $operation .= $key . ': ' . $value . "\n";
-		}
-		$operation .= "\n";
-		
-		// Add data
-		$operation .= $rawData;
-
-		// Store operation
-		$this->_operations[] = $operation;	        
-	}
-    
-    /**
-     * Commit current batch
-     * 
-     * @return Zend_Http_Response
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function commit()
-    {
-        // Perform batch
-        $response = $this->_storageClient->performBatch($this->_operations, $this->_forTableStorage, $this->_isSingleSelect);
-        
-        // Dispose
-        $this->_clean();
-        
-        // Parse response
-        $errors = null;
-        preg_match_all('/<message (.*)>(.*)<\/message>/', $response->getBody(), $errors);
-        
-        // Error?
-        if (count($errors[2]) > 0) {
-            throw new Zend_Service_WindowsAzure_Exception('An error has occured while committing a batch: ' . $errors[2][0]);
-        }
-        
-        // Return
-        return $response;
-    }
-    
-    /**
-     * Rollback current batch
-     */
-    public function rollback()
-    {
-        // Dispose
-        $this->_clean();
-    }
-    
-    /**
-     * Get operation count
-     * 
-     * @return integer
-     */
-    public function getOperationCount()
-    {
-        return count($this->_operations);
-    }
-    
-    /**
-     * Is single select?
-     * 
-     * @return boolean
-     */
-    public function isSingleSelect()
-    {
-        return $this->_isSingleSelect;
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php b/lib/zend/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php
deleted file mode 100644
index 3a1f7c0117b..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_Batch
- */
-require_once 'Zend/Service/WindowsAzure/Storage/Batch.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
-    extends Zend_Service_WindowsAzure_Storage
-{	
-    /**
-     * Current batch
-     * 
-     * @var Zend_Service_WindowsAzure_Storage_Batch
-     */
-    protected $_currentBatch = null;
-    
-    /**
-     * Set current batch
-     * 
-     * @param Zend_Service_WindowsAzure_Storage_Batch $batch Current batch
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function setCurrentBatch(Zend_Service_WindowsAzure_Storage_Batch $batch = null)
-    {
-        if (!is_null($batch) && $this->isInBatch()) {
-            throw new Zend_Service_WindowsAzure_Exception('Only one batch can be active at a time.');
-        }
-        $this->_currentBatch = $batch;
-    }
-    
-    /**
-     * Get current batch
-     * 
-     * @return Zend_Service_WindowsAzure_Storage_Batch
-     */
-    public function getCurrentBatch()
-    {
-        return $this->_currentBatch;
-    }
-    
-    /**
-     * Is there a current batch?
-     * 
-     * @return boolean
-     */
-    public function isInBatch()
-    {
-        return !is_null($this->_currentBatch);
-    }
-    
-    /**
-     * Starts a new batch operation set
-     * 
-     * @return Zend_Service_WindowsAzure_Storage_Batch
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function startBatch()
-    {
-        return new Zend_Service_WindowsAzure_Storage_Batch($this, $this->getBaseUrl());
-    }
-	
-	/**
-	 * Perform batch using Zend_Http_Client channel, combining all batch operations into one request
-	 *
-	 * @param array $operations Operations in batch
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param boolean $isSingleSelect Is the request a single select statement?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return Zend_Http_Response
-	 */
-	public function performBatch($operations = array(), $forTableStorage = false, $isSingleSelect = false, $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ)
-	{
-	    // Generate boundaries
-	    $batchBoundary = 'batch_' . md5(time() . microtime());
-	    $changesetBoundary = 'changeset_' . md5(time() . microtime());
-	    
-	    // Set headers
-	    $headers = array();
-	    
-		// Add version header
-		$headers['x-ms-version'] = $this->_apiVersion;
-		
-		// Add content-type header
-		$headers['Content-Type'] = 'multipart/mixed; boundary=' . $batchBoundary;
-
-		// Set path and query string
-		$path           = '/$batch';
-		$queryString    = '';
-		
-		// Set verb
-		$httpVerb = Zend_Http_Client::POST;
-		
-		// Generate raw data
-    	$rawData = '';
-    		
-		// Single select?
-		if ($isSingleSelect) {
-		    $operation = $operations[0];
-		    $rawData .= '--' . $batchBoundary . "\n";
-            $rawData .= 'Content-Type: application/http' . "\n";
-            $rawData .= 'Content-Transfer-Encoding: binary' . "\n\n";
-            $rawData .= $operation; 
-            $rawData .= '--' . $batchBoundary . '--';
-		} else {
-    		$rawData .= '--' . $batchBoundary . "\n";
-    		$rawData .= 'Content-Type: multipart/mixed; boundary=' . $changesetBoundary . "\n\n";
-    		
-        		// Add operations
-        		foreach ($operations as $operation)
-        		{
-                    $rawData .= '--' . $changesetBoundary . "\n";
-                	$rawData .= 'Content-Type: application/http' . "\n";
-                	$rawData .= 'Content-Transfer-Encoding: binary' . "\n\n";
-                	$rawData .= $operation;
-        		}
-        		$rawData .= '--' . $changesetBoundary . '--' . "\n";
-    		    		    
-    		$rawData .= '--' . $batchBoundary . '--';
-		}
-
-		// Generate URL and sign request
-		$requestUrl     = $this->_credentials->signRequestUrl($this->getBaseUrl() . $path . $queryString, $resourceType, $requiredPermission);
-		$requestHeaders = $this->_credentials->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission);
-
-		// Prepare request
-		$this->_httpClientChannel->resetParameters(true);
-		$this->_httpClientChannel->setUri($requestUrl);
-		$this->_httpClientChannel->setHeaders($requestHeaders);
-		$this->_httpClientChannel->setRawData($rawData);
-		
-		// Execute request
-		$response = $this->_retryPolicy->execute(
-		    array($this->_httpClientChannel, 'request'),
-		    array($httpVerb)
-		);
-
-		return $response;
-	}
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/Blob.php b/lib/zend/Zend/Service/WindowsAzure/Storage/Blob.php
deleted file mode 100644
index 67d0fe511d9..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/Blob.php
+++ /dev/null
@@ -1,1401 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://todo     name_todo
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedAccessSignature
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_BlobContainer
- */
-require_once 'Zend/Service/WindowsAzure/Storage/BlobContainer.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_BlobInstance
- */
-require_once 'Zend/Service/WindowsAzure/Storage/BlobInstance.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_SignedIdentifier
- */
-require_once 'Zend/Service/WindowsAzure/Storage/SignedIdentifier.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_Storage
-{
-	/**
-	 * ACL - Private access
-	 */
-	const ACL_PRIVATE = false;
-	
-	/**
-	 * ACL - Public access
-	 */
-	const ACL_PUBLIC = true;
-	
-	/**
-	 * Maximal blob size (in bytes)
-	 */
-	const MAX_BLOB_SIZE = 67108864;
-
-	/**
-	 * Maximal blob transfer size (in bytes)
-	 */
-	const MAX_BLOB_TRANSFER_SIZE = 4194304;
-	
-    /**
-     * Stream wrapper clients
-     *
-     * @var array
-     */
-    protected static $_wrapperClients = array();
-    
-    /**
-     * SharedAccessSignature credentials
-     * 
-     * @var Zend_Service_WindowsAzure_Credentials_SharedAccessSignature
-     */
-    private $_sharedAccessSignatureCredentials = null;
-	
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Storage_Blob instance
-	 *
-	 * @param string $host Storage host name
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_BLOB, $accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT, $accountKey = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY, $usePathStyleUri = false, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
-	{
-		parent::__construct($host, $accountName, $accountKey, $usePathStyleUri, $retryPolicy);
-		
-		// API version
-		$this->_apiVersion = '2009-07-17';
-		
-		// SharedAccessSignature credentials
-		$this->_sharedAccessSignatureCredentials = new Zend_Service_WindowsAzure_Credentials_SharedAccessSignature($accountName, $accountKey, $usePathStyleUri);
-	}
-	
-	/**
-	 * Check if a blob exists
-	 * 
-	 * @param string $containerName Container name
-	 * @param string $blobName      Blob name
-	 * @return boolean
-	 */
-	public function blobExists($containerName = '', $blobName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		
-		// List blobs
-        $blobs = $this->listBlobs($containerName, $blobName, '', 1);
-        foreach ($blobs as $blob) {
-            if ($blob->Name == $blobName) {
-                return true;
-            }
-        }
-        
-        return false;
-	}
-	
-	/**
-	 * Check if a container exists
-	 * 
-	 * @param string $containerName Container name
-	 * @return boolean
-	 */
-	public function containerExists($containerName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-			
-		// List containers
-        $containers = $this->listContainers($containerName, 1);
-        foreach ($containers as $container) {
-            if ($container->Name == $containerName) {
-                return true;
-            }
-        }
-        
-        return false;
-	}
-	
-	/**
-	 * Create container
-	 *
-	 * @param string $containerName Container name
-	 * @param array  $metadata      Key/value pairs of meta data
-	 * @return object Container properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function createContainer($containerName = '', $metadata = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if (!is_array($metadata)) {
-			throw new Zend_Service_WindowsAzure_Exception('Meta data should be an array of key and value pairs.');
-		}
-			
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
-		
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);			
-		if ($response->isSuccessful()) {
-		    return new Zend_Service_WindowsAzure_Storage_BlobContainer(
-		        $containerName,
-		        $response->getHeader('Etag'),
-		        $response->getHeader('Last-modified'),
-		        $metadata
-		    );
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get container ACL
-	 *
-	 * @param string $containerName Container name
-	 * @param bool   $signedIdentifiers Display only public/private or display signed identifiers?
-	 * @return bool Acl, to be compared with Zend_Service_WindowsAzure_Storage_Blob::ACL_*
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getContainerAcl($containerName = '', $signedIdentifiers = false)
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container&comp=acl', Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);
-		if ($response->isSuccessful()) {
-		    if ($signedIdentifiers == false)  {
-		        // Only public/private
-			    return $response->getHeader('x-ms-prop-publicaccess') == 'True';
-		    } else {
-       		    // Parse result
-    		    $result = $this->_parseResponse($response);
-    		    if (!$result) {
-    		        return array();
-    		    }
-    
-    		    $entries = null;
-    		    if ($result->SignedIdentifier) {
-        		    if (count($result->SignedIdentifier) > 1) {
-        		        $entries = $result->SignedIdentifier;
-        		    } else {
-        		        $entries = array($result->SignedIdentifier);
-        		    }
-    		    }
-    		    
-    		    // Return value
-    		    $returnValue = array();
-    		    foreach ($entries as $entry) {
-    		        $returnValue[] = new Zend_Service_WindowsAzure_Storage_SignedIdentifier(
-    		            $entry->Id,
-    		            $entry->AccessPolicy ? $entry->AccessPolicy->Start ? $entry->AccessPolicy->Start : '' : '',
-    		            $entry->AccessPolicy ? $entry->AccessPolicy->Expiry ? $entry->AccessPolicy->Expiry : '' : '',
-    		            $entry->AccessPolicy ? $entry->AccessPolicy->Permission ? $entry->AccessPolicy->Permission : '' : ''
-    		        );
-    		    }
-    		    
-    		    // Return
-    		    return $returnValue;
-		    }			   
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Set container ACL
-	 *
-	 * @param string $containerName Container name
-	 * @param bool $acl Zend_Service_WindowsAzure_Storage_Blob::ACL_*
-	 * @param array $signedIdentifiers Signed identifiers
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function setContainerAcl($containerName = '', $acl = self::ACL_PRIVATE, $signedIdentifiers = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-
-		// Policies
-		$policies = null;
-		if (is_array($signedIdentifiers) && count($signedIdentifiers) > 0) {
-		    $policies  = '';
-		    $policies .= '<?xml version="1.0" encoding="utf-8"?>' . "\r\n";
-		    $policies .= '<SignedIdentifiers>' . "\r\n";
-		    foreach ($signedIdentifiers as $signedIdentifier) {
-		        $policies .= '  <SignedIdentifier>' . "\r\n";
-		        $policies .= '    <Id>' . $signedIdentifier->Id . '</Id>' . "\r\n";
-		        $policies .= '    <AccessPolicy>' . "\r\n";
-		        if ($signedIdentifier->Start != '')
-		            $policies .= '      <Start>' . $signedIdentifier->Start . '</Start>' . "\r\n";
-		        if ($signedIdentifier->Expiry != '')
-		            $policies .= '      <Expiry>' . $signedIdentifier->Expiry . '</Expiry>' . "\r\n";
-		        if ($signedIdentifier->Permissions != '')
-		            $policies .= '      <Permission>' . $signedIdentifier->Permissions . '</Permission>' . "\r\n";
-		        $policies .= '    </AccessPolicy>' . "\r\n";
-		        $policies .= '  </SignedIdentifier>' . "\r\n";
-		    }
-		    $policies .= '</SignedIdentifiers>' . "\r\n";
-		}
-		
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container&comp=acl', Zend_Http_Client::PUT, array('x-ms-prop-publicaccess' => $acl), false, $policies, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get container
-	 * 
-	 * @param string $containerName  Container name
-	 * @return Zend_Service_WindowsAzure_Storage_BlobContainer
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getContainer($containerName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		    
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);	
-		if ($response->isSuccessful()) {
-		    // Parse metadata
-		    $metadata = $this->_parseMetadataHeaders($response->getHeaders());
-
-		    // Return container
-		    return new Zend_Service_WindowsAzure_Storage_BlobContainer(
-		        $containerName,
-		        $response->getHeader('Etag'),
-		        $response->getHeader('Last-modified'),
-		        $metadata
-		    );
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get container metadata
-	 * 
-	 * @param string $containerName  Container name
-	 * @return array Key/value pairs of meta data
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getContainerMetadata($containerName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		
-	    return $this->getContainer($containerName)->Metadata;
-	}
-	
-	/**
-	 * Set container metadata
-	 * 
-	 * Calling the Set Container Metadata operation overwrites all existing metadata that is associated with the container. It's not possible to modify an individual name/value pair.
-	 *
-	 * @param string $containerName      Container name
-	 * @param array  $metadata           Key/value pairs of meta data
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function setContainerMetadata($containerName = '', $metadata = array(), $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if (!is_array($metadata)) {
-			throw new Zend_Service_WindowsAzure_Exception('Meta data should be an array of key and value pairs.');
-		}
-		if (count($metadata) == 0) {
-		    return;
-		}
-		    
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container&comp=metadata', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete container
-	 *
-	 * @param string $containerName      Container name
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteContainer($containerName = '', $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-			
-		// Additional headers?
-		$headers = array();
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::DELETE, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * List containers
-	 *
-	 * @param string $prefix     Optional. Filters the results to return only containers whose name begins with the specified prefix.
-	 * @param int    $maxResults Optional. Specifies the maximum number of containers to return per call to Azure storage. This does NOT affect list size returned by this function. (maximum: 5000)
-	 * @param string $marker     Optional string value that identifies the portion of the list to be returned with the next list operation.
-	 * @param int    $currentResultCount Current result count (internal use)
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function listContainers($prefix = null, $maxResults = null, $marker = null, $currentResultCount = 0)
-	{
-	    // Build query string
-	    $queryString = '?comp=list';
-	    if (!is_null($prefix)) {
-	        $queryString .= '&prefix=' . $prefix;
-	    }
-	    if (!is_null($maxResults)) {
-	        $queryString .= '&maxresults=' . $maxResults;
-	    }
-	    if (!is_null($marker)) {
-	        $queryString .= '&marker=' . $marker;
-	    }
-	        
-		// Perform request
-		$response = $this->_performRequest('', $queryString, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_LIST);	
-		if ($response->isSuccessful()) {
-			$xmlContainers = $this->_parseResponse($response)->Containers->Container;
-			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
-
-			$containers = array();
-			if (!is_null($xmlContainers)) {
-				for ($i = 0; $i < count($xmlContainers); $i++) {
-					$containers[] = new Zend_Service_WindowsAzure_Storage_BlobContainer(
-						(string)$xmlContainers[$i]->Name,
-						(string)$xmlContainers[$i]->Etag,
-						(string)$xmlContainers[$i]->LastModified
-					);
-				}
-			}
-			$currentResultCount = $currentResultCount + count($containers);
-			if (!is_null($maxResults) && $currentResultCount < $maxResults) {
-    			if (!is_null($xmlMarker) && $xmlMarker != '') {
-    			    $containers = array_merge($containers, $this->listContainers($prefix, $maxResults, $xmlMarker, $currentResultCount));
-    			}
-			}
-			if (!is_null($maxResults) && count($containers) > $maxResults) {
-			    $containers = array_slice($containers, 0, $maxResults);
-			}
-			    
-			return $containers;
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Put blob
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param string $localFileName      Local file name to be uploaded
-	 * @param array  $metadata           Key/value pairs of meta data
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @return object Partial blob properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putBlob($containerName = '', $blobName = '', $localFileName = '', $metadata = array(), $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($localFileName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Local file name is not specified.');
-		}
-		if (!file_exists($localFileName)) {
-			throw new Zend_Service_WindowsAzure_Exception('Local file not found.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-			
-		// Check file size
-		if (filesize($localFileName) >= self::MAX_BLOB_SIZE) {
-			return $this->putLargeBlob($containerName, $blobName, $localFileName, $metadata);
-		}
-
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// File contents
-		$fileContents = file_get_contents($localFileName);
-		
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-		// Perform request
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::PUT, $headers, false, $fileContents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);	
-		if ($response->isSuccessful()) {
-			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
-				$containerName,
-				$blobName,
-				$response->getHeader('Etag'),
-				$response->getHeader('Last-modified'),
-				$this->getBaseUrl() . '/' . $containerName . '/' . $blobName,
-				strlen($fileContents),
-				'',
-				'',
-				'',
-				false,
-		        $metadata
-			);
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Put large blob (> 64 MB)
-	 *
-	 * @param string $containerName Container name
-	 * @param string $blobName Blob name
-	 * @param string $localFileName Local file name to be uploaded
-	 * @param array  $metadata      Key/value pairs of meta data
-	 * @return object Partial blob properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putLargeBlob($containerName = '', $blobName = '', $localFileName = '', $metadata = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($localFileName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Local file name is not specified.');
-		}
-		if (!file_exists($localFileName)) {
-			throw new Zend_Service_WindowsAzure_Exception('Local file not found.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-			
-		// Check file size
-		if (filesize($localFileName) < self::MAX_BLOB_SIZE) {
-			return $this->putBlob($containerName, $blobName, $localFileName, $metadata);
-		}
-			
-		// Determine number of parts
-		$numberOfParts = ceil( filesize($localFileName) / self::MAX_BLOB_TRANSFER_SIZE );
-		
-		// Generate block id's
-		$blockIdentifiers = array();
-		for ($i = 0; $i < $numberOfParts; $i++) {
-			$blockIdentifiers[] = $this->_generateBlockId($i);
-		}
-		
-		// Open file
-		$fp = fopen($localFileName, 'r');
-		if ($fp === false) {
-			throw new Zend_Service_WindowsAzure_Exception('Could not open local file.');
-		}
-			
-		// Upload parts
-		for ($i = 0; $i < $numberOfParts; $i++) {
-			// Seek position in file
-			fseek($fp, $i * self::MAX_BLOB_TRANSFER_SIZE);
-			
-			// Read contents
-			$fileContents = fread($fp, self::MAX_BLOB_TRANSFER_SIZE);
-			
-			// Put block
-			$this->putBlock($containerName, $blobName, $blockIdentifiers[$i], $fileContents);
-			
-			// Dispose file contents
-			$fileContents = null;
-			unset($fileContents);
-		}
-		
-		// Close file
-		fclose($fp);
-		
-		// Put block list
-		$this->putBlockList($containerName, $blobName, $blockIdentifiers, $metadata);
-		
-		// Return information of the blob
-		return $this->getBlobInstance($containerName, $blobName);
-	}			
-			
-	/**
-	 * Put large blob block
-	 *
-	 * @param string $containerName Container name
-	 * @param string $blobName      Blob name
-	 * @param string $identifier    Block ID
-	 * @param array  $contents      Contents of the block
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putBlock($containerName = '', $blobName = '', $identifier = '', $contents = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($identifier === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Block identifier is not specified.');
-		}
-		if (strlen($contents) > self::MAX_BLOB_TRANSFER_SIZE) {
-			throw new Zend_Service_WindowsAzure_Exception('Block size is too big.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-			
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-    	// Upload
-		$response = $this->_performRequest($resourceName, '?comp=block&blockid=' . base64_encode($identifier), Zend_Http_Client::PUT, null, false, $contents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Put block list
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param array $blockList           Array of block identifiers
-	 * @param array  $metadata           Key/value pairs of meta data
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putBlockList($containerName = '', $blobName = '', $blockList = array(), $metadata = array(), $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if (count($blockList) == 0) {
-			throw new Zend_Service_WindowsAzure_Exception('Block list does not contain any elements.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-		
-		// Generate block list
-		$blocks = '';
-		foreach ($blockList as $block) {
-			$blocks .= '  <Latest>' . base64_encode($block) . '</Latest>' . "\n";
-		}
-		
-		// Generate block list request
-		$fileContents = utf8_encode(implode("\n", array(
-			'<?xml version="1.0" encoding="utf-8"?>',
-			'<BlockList>',
-			$blocks,
-			'</BlockList>'
-		)));
-		
-	    // Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-		// Perform request
-		$response = $this->_performRequest($resourceName, '?comp=blocklist', Zend_Http_Client::PUT, $headers, false, $fileContents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get block list
-	 *
-	 * @param string $containerName Container name
-	 * @param string $blobName      Blob name
-	 * @param integer $type         Type of block list to retrieve. 0 = all, 1 = committed, 2 = uncommitted
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getBlockList($containerName = '', $blobName = '', $type = 0)
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($type < 0 || $type > 2) {
-			throw new Zend_Service_WindowsAzure_Exception('Invalid type of block list to retrieve.');
-		}
-			
-		// Set $blockListType
-		$blockListType = 'all';
-		if ($type == 1) {
-		    $blockListType = 'committed';
-		}
-		if ($type == 2) {
-		    $blockListType = 'uncommitted';
-		}
-		    
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-			
-		// Perform request
-		$response = $this->_performRequest($resourceName, '?comp=blocklist&blocklisttype=' . $blockListType, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);
-		if ($response->isSuccessful()) {
-		    // Parse response
-		    $blockList = $this->_parseResponse($response);
-		    
-		    // Create return value
-		    $returnValue = array();
-		    if ($blockList->CommittedBlocks) {
-			    foreach ($blockList->CommittedBlocks->Block as $block) {
-			        $returnValue['CommittedBlocks'][] = (object)array(
-			            'Name' => (string)$block->Name,
-			            'Size' => (string)$block->Size
-			        );
-			    }
-		    }
-		    if ($blockList->UncommittedBlocks)  {
-			    foreach ($blockList->UncommittedBlocks->Block as $block) {
-			        $returnValue['UncommittedBlocks'][] = (object)array(
-			            'Name' => (string)$block->Name,
-			            'Size' => (string)$block->Size
-			        );
-			    }
-		    }
-		    
-		    return $returnValue;
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-			
-	/**
-	 * Copy blob
-	 *
-	 * @param string $sourceContainerName       Source container name
-	 * @param string $sourceBlobName            Source blob name
-	 * @param string $destinationContainerName  Destination container name
-	 * @param string $destinationBlobName       Destination blob name
-	 * @param array  $metadata                  Key/value pairs of meta data
-	 * @param array  $additionalHeaders         Additional headers. See http://msdn.microsoft.com/en-us/library/dd894037.aspx for more information.
-	 * @return object Partial blob properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function copyBlob($sourceContainerName = '', $sourceBlobName = '', $destinationContainerName = '', $destinationBlobName = '', $metadata = array(), $additionalHeaders = array())
-	{
-		if ($sourceContainerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Source container name is not specified.');
-		}
-		if (!self::isValidContainerName($sourceContainerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Source container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($sourceBlobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Source blob name is not specified.');
-		}
-		if ($destinationContainerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Destination container name is not specified.');
-		}
-		if (!self::isValidContainerName($destinationContainerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Destination container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($destinationBlobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Destination blob name is not specified.');
-		}
-		if ($sourceContainerName === '$root' && strpos($sourceBlobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-		if ($destinationContainerName === '$root' && strpos($destinationBlobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Resource names
-		$sourceResourceName = self::createResourceName($sourceContainerName, $sourceBlobName);
-		$destinationResourceName = self::createResourceName($destinationContainerName, $destinationBlobName);
-		
-		// Set source blob
-		$headers["x-ms-copy-source"] = '/' . $this->_accountName . '/' . $sourceResourceName;
-
-		// Perform request
-		$response = $this->_performRequest($destinationResourceName, '', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if ($response->isSuccessful()) {
-			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
-				$destinationContainerName,
-				$destinationBlobName,
-				$response->getHeader('Etag'),
-				$response->getHeader('Last-modified'),
-				$this->getBaseUrl() . '/' . $destinationContainerName . '/' . $destinationBlobName,
-				0,
-				'',
-				'',
-				'',
-				false,
-		        $metadata
-			);
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get blob
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param string $localFileName      Local file name to store downloaded blob
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getBlob($containerName = '', $blobName = '', $localFileName = '', $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($localFileName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Local file name is not specified.');
-		}
-			
-		// Additional headers?
-		$headers = array();
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-		// Perform request
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::GET, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);
-		if ($response->isSuccessful()) {
-			file_put_contents($localFileName, $response->getBody());
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get container
-	 * 
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @return Zend_Service_WindowsAzure_Storage_BlobInstance
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getBlobInstance($containerName = '', $blobName = '', $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-	        
-		// Additional headers?
-		$headers = array();
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-        // Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		    
-		// Perform request
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::HEAD, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);
-		if ($response->isSuccessful()) {
-		    // Parse metadata
-		    $metadata = $this->_parseMetadataHeaders($response->getHeaders());
-
-		    // Return blob
-			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
-				$containerName,
-				$blobName,
-				$response->getHeader('Etag'),
-				$response->getHeader('Last-modified'),
-				$this->getBaseUrl() . '/' . $containerName . '/' . $blobName,
-				$response->getHeader('Content-Length'),
-				$response->getHeader('Content-Type'),
-				$response->getHeader('Content-Encoding'),
-				$response->getHeader('Content-Language'),
-				false,
-		        $metadata
-			);
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get blob metadata
-	 * 
-	 * @param string $containerName  Container name
-	 * @param string $blobName Blob name
-	 * @return array Key/value pairs of meta data
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getBlobMetadata($containerName = '', $blobName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-		
-	    return $this->getBlobInstance($containerName, $blobName)->Metadata;
-	}
-	
-	/**
-	 * Set blob metadata
-	 * 
-	 * Calling the Set Blob Metadata operation overwrites all existing metadata that is associated with the blob. It's not possible to modify an individual name/value pair.
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param array  $metadata           Key/value pairs of meta data
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function setBlobMetadata($containerName = '', $blobName = '', $metadata = array(), $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-		if (count($metadata) == 0) {
-		    return;
-		}
-		    
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Perform request
-		$response = $this->_performRequest($containerName . '/' . $blobName, '?comp=metadata', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete blob
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteBlob($containerName = '', $blobName = '', $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-			
-		// Additional headers?
-		$headers = array();
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-		// Perform request
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::DELETE, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * List blobs
-	 *
-	 * @param string $containerName Container name
-	 * @param string $prefix     Optional. Filters the results to return only blobs whose name begins with the specified prefix.
-	 * @param string $delimiter  Optional. Delimiter, i.e. '/', for specifying folder hierarchy
-	 * @param int    $maxResults Optional. Specifies the maximum number of blobs to return per call to Azure storage. This does NOT affect list size returned by this function. (maximum: 5000)
-	 * @param string $marker     Optional string value that identifies the portion of the list to be returned with the next list operation.
-	 * @param int    $currentResultCount Current result count (internal use)
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function listBlobs($containerName = '', $prefix = '', $delimiter = '', $maxResults = null, $marker = null, $currentResultCount = 0)
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-			
-	    // Build query string
-	    $queryString = '?restype=container&comp=list';
-        if (!is_null($prefix)) {
-	        $queryString .= '&prefix=' . $prefix;
-        }
-		if ($delimiter !== '') {
-			$queryString .= '&delimiter=' . $delimiter;
-		}
-	    if (!is_null($maxResults)) {
-	        $queryString .= '&maxresults=' . $maxResults;
-	    }
-	    if (!is_null($marker)) {
-	        $queryString .= '&marker=' . $marker;
-	    }
-
-	    // Perform request
-		$response = $this->_performRequest($containerName, $queryString, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_LIST);
-		if ($response->isSuccessful()) {
-		    // Return value
-		    $blobs = array();
-		    
-			// Blobs
-			$xmlBlobs = $this->_parseResponse($response)->Blobs->Blob;
-			if (!is_null($xmlBlobs)) {
-				for ($i = 0; $i < count($xmlBlobs); $i++) {
-					$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
-						$containerName,
-						(string)$xmlBlobs[$i]->Name,
-						(string)$xmlBlobs[$i]->Etag,
-						(string)$xmlBlobs[$i]->LastModified,
-						(string)$xmlBlobs[$i]->Url,
-						(string)$xmlBlobs[$i]->Size,
-						(string)$xmlBlobs[$i]->ContentType,
-						(string)$xmlBlobs[$i]->ContentEncoding,
-						(string)$xmlBlobs[$i]->ContentLanguage,
-						false
-					);
-				}
-			}
-			
-			// Blob prefixes (folders)
-			$xmlBlobs = $this->_parseResponse($response)->Blobs->BlobPrefix;
-			
-			if (!is_null($xmlBlobs)) {
-				for ($i = 0; $i < count($xmlBlobs); $i++) {
-					$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
-						$containerName,
-						(string)$xmlBlobs[$i]->Name,
-						'',
-						'',
-						'',
-						0,
-						'',
-						'',
-						'',
-						true
-					);
-				}
-			}
-			
-			// More blobs?
-			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
-			$currentResultCount = $currentResultCount + count($blobs);
-			if (!is_null($maxResults) && $currentResultCount < $maxResults) {
-    			if (!is_null($xmlMarker) && $xmlMarker != '') {
-    			    $blobs = array_merge($blobs, $this->listBlobs($containerName, $prefix, $delimiter, $maxResults, $marker, $currentResultCount));
-    			}
-			}
-			if (!is_null($maxResults) && count($blobs) > $maxResults) {
-			    $blobs = array_slice($blobs, 0, $maxResults);
-			}
-			
-			return $blobs;
-		} else {        
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Generate shared access URL
-	 * 
-	 * @param string $containerName  Container name
-	 * @param string $blobName       Blob name
-     * @param string $resource       Signed resource - container (c) - blob (b)
-     * @param string $permissions    Signed permissions - read (r), write (w), delete (d) and list (l)
-     * @param string $start          The time at which the Shared Access Signature becomes valid.
-     * @param string $expiry         The time at which the Shared Access Signature becomes invalid.
-     * @param string $identifier     Signed identifier
-	 * @return string
-	 */
-	public function generateSharedAccessUrl($containerName = '', $blobName = '', $resource = 'b', $permissions = 'r', $start = '', $expiry = '', $identifier = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-
-        // Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-
-		// Generate URL
-		return $this->getBaseUrl() . '/' . $resourceName . '?' .
-		    $this->_sharedAccessSignatureCredentials->createSignedQueryString(
-		        $resourceName,
-		        '',
-		        $resource,
-		        $permissions,
-		        $start,
-		        $expiry,
-		        $identifier);
-	}
-	
-    /**
-     * Register this object as stream wrapper client
-     *
-     * @param  string $name Protocol name
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    public function registerAsClient($name)
-    {
-        self::$_wrapperClients[$name] = $this;
-        return $this;
-    }
-
-    /**
-     * Unregister this object as stream wrapper client
-     *
-     * @param  string $name Protocol name
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    public function unregisterAsClient($name)
-    {
-        unset(self::$_wrapperClients[$name]);
-        return $this;
-    }
-
-    /**
-     * Get wrapper client for stream type
-     *
-     * @param  string $name Protocol name
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    public static function getWrapperClient($name)
-    {
-        return self::$_wrapperClients[$name];
-    }
-
-    /**
-     * Register this object as stream wrapper
-     *
-     * @param  string $name Protocol name
-     */
-    public function registerStreamWrapper($name = 'azure')
-    {
-        /**
-         * @see Zend_Service_WindowsAzure_Storage_Blob_Stream
-         */
-        require_once 'Zend/Service/WindowsAzure/Storage/Blob/Stream.php';
-
-        stream_register_wrapper($name, 'Zend_Service_WindowsAzure_Storage_Blob_Stream');
-        $this->registerAsClient($name);
-    }
-
-    /**
-     * Unregister this object as stream wrapper
-     *
-     * @param  string $name Protocol name
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    public function unregisterStreamWrapper($name = 'azure')
-    {
-        stream_wrapper_unregister($name);
-        $this->unregisterAsClient($name);
-    }
-    
-    /**
-     * Create resource name
-     * 
-	 * @param string $containerName  Container name
-	 * @param string $blobName Blob name
-     * @return string
-     */
-    public static function createResourceName($containerName = '', $blobName = '')
-    {
-		// Resource name
-		$resourceName = $containerName . '/' . $blobName;
-		if ($containerName === '' || $containerName === '$root') {
-		    $resourceName = $blobName;
-		}
-		if ($blobName === '') {
-		    $resourceName = $containerName;
-		}
-		    
-		return $resourceName;
-    }
-	
-	/**
-	 * Is valid container name?
-	 *
-	 * @param string $containerName Container name
-	 * @return boolean
-	 */
-    public static function isValidContainerName($containerName = '')
-    {
-        if ($containerName == '$root') {
-            return true;
-        }
-            
-        if (preg_match("/^[a-z0-9][a-z0-9-]*$/", $containerName) === 0) {
-            return false;
-        }
-    
-        if (strpos($containerName, '--') !== false) {
-            return false;
-        }
-    
-        if (strtolower($containerName) != $containerName) {
-            return false;
-        }
-    
-        if (strlen($containerName) < 3 || strlen($containerName) > 63) {
-            return false;
-        }
-            
-        if (substr($containerName, -1) == '-') {
-            return false;
-        }
-    
-        return true;
-    }
-    
-	/**
-	 * Get error message from Zend_Http_Response
-	 * 
-	 * @param Zend_Http_Response $response Repsonse
-	 * @param string $alternativeError Alternative error message
-	 * @return string
-	 */
-	protected function _getErrorMessage(Zend_Http_Response $response, $alternativeError = 'Unknown error.')
-	{
-		$response = $this->_parseResponse($response);
-		if ($response && $response->Message) {
-		    return (string)$response->Message;
-		} else {
-		    return $alternativeError;
-		}
-	}
-	
-	/**
-	 * Generate block id
-	 * 
-	 * @param int $part Block number
-	 * @return string Windows Azure Blob Storage block number
-	 */
-	protected function _generateBlockId($part = 0)
-	{
-		$returnValue = $part;
-		while (strlen($returnValue) < 64) {
-			$returnValue = '0' . $returnValue;
-		}
-		
-		return $returnValue;
-	}
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/Blob/Stream.php b/lib/zend/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
deleted file mode 100644
index 4171828585b..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
+++ /dev/null
@@ -1,565 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure_Storage
- * @subpackage Blob
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://todo     name_todo
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_Blob
- */
-require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure_Storage
- * @subpackage Blob
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Blob_Stream
-{
-    /**
-     * Current file name
-     * 
-     * @var string
-     */
-    private $_fileName = null;
-    
-    /**
-     * Temporary file name
-     * 
-     * @var string
-     */
-    private $_temporaryFileName = null;
-    
-    /**
-     * Temporary file handle
-     * 
-     * @var resource
-     */
-    private $_temporaryFileHandle = null;
-    
-    /**
-     * Blob storage client
-     * 
-     * @var Zend_Service_WindowsAzure_Storage_Blob
-     */
-    private $_storageClient = null;
-    
-    /**
-     * Write mode?
-     * 
-     * @var boolean
-     */
-    private $_writeMode = false;
-    
-    /**
-     * List of blobs
-     * 
-     * @var array
-     */
-    private $_blobs = null;
-    
-    /**
-     * Retrieve storage client for this stream type
-     * 
-     * @param string $path
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    protected function _getStorageClient($path = '')
-    {
-        if (is_null($this->_storageClient)) {
-            $url = explode(':', $path);
-            if (!$url) {
-                throw new Zend_Service_WindowsAzure_Exception('Could not parse path "' . $path . '".');
-            }
-
-            $this->_storageClient = Zend_Service_WindowsAzure_Storage_Blob::getWrapperClient($url[0]);
-            if (!$this->_storageClient) {
-                throw new Zend_Service_WindowsAzure_Exception('No storage client registered for stream type "' . $url[0] . '://".');
-            }
-        }
-        
-        return $this->_storageClient;
-    }
-    
-    /**
-     * Extract container name
-     *
-     * @param string $path
-     * @return string
-     */
-    protected function _getContainerName($path)
-    {
-        $url = parse_url($path);
-        if ($url['host']) {
-            return $url['host'];
-        }
-
-        return '';
-    }
-    
-    /**
-     * Extract file name
-     *
-     * @param string $path
-     * @return string
-     */
-    protected function _getFileName($path)
-    {
-        $url = parse_url($path);
-        if ($url['host']) {
-            $fileName = isset($url['path']) ? $url['path'] : $url['host'];
-    	    if (strpos($fileName, '/') === 0) {
-    	        $fileName = substr($fileName, 1);
-    	    }
-            return $fileName;
-        }
-
-        return '';
-    }
-       
-    /**
-     * Open the stream
-     *
-     * @param  string  $path
-     * @param  string  $mode
-     * @param  integer $options
-     * @param  string  $opened_path
-     * @return boolean
-     */
-    public function stream_open($path, $mode, $options, $opened_path)
-    {
-        $this->_fileName = $path;
-        $this->_temporaryFileName = tempnam(sys_get_temp_dir(), 'azure');
-        
-        // Check the file can be opened
-        $fh = @fopen($this->_temporaryFileName, $mode);
-        if ($fh === false) {
-            return false;
-        }
-        fclose($fh);
-        
-        // Write mode?
-        if (strpbrk($mode, 'wax+')) {
-            $this->_writeMode = true;
-    	} else {
-            $this->_writeMode = false;
-        }
-        
-        // If read/append, fetch the file
-        if (!$this->_writeMode || strpbrk($mode, 'ra+')) {
-            $this->_getStorageClient($this->_fileName)->getBlob(
-                $this->_getContainerName($this->_fileName),
-                $this->_getFileName($this->_fileName),
-                $this->_temporaryFileName
-            );
-        }
-        
-        // Open temporary file handle
-        $this->_temporaryFileHandle = fopen($this->_temporaryFileName, $mode);
-        
-        // Ok!
-        return true;
-    }
-
-    /**
-     * Close the stream
-     *
-     * @return void
-     */
-    public function stream_close()
-    {
-        @fclose($this->_temporaryFileHandle);
-        
-        // Upload the file?
-        if ($this->_writeMode) {
-            // Make sure the container exists
-            $containerExists = $this->_getStorageClient($this->_fileName)->containerExists(
-                $this->_getContainerName($this->_fileName)
-            );
-            if (!$containerExists) {
-                $this->_getStorageClient($this->_fileName)->createContainer(
-                    $this->_getContainerName($this->_fileName)
-                );
-            }
-            
-            // Upload the file
-            try {
-                $this->_getStorageClient($this->_fileName)->putBlob(
-                    $this->_getContainerName($this->_fileName),
-                    $this->_getFileName($this->_fileName),
-                    $this->_temporaryFileName
-                );
-            } catch (Zend_Service_WindowsAzure_Exception $ex) {
-                @unlink($this->_temporaryFileName);
-                unset($this->_storageClient);
-                
-                throw $ex;
-            }
-        }
-        
-        @unlink($this->_temporaryFileName);
-        unset($this->_storageClient);
-    }
-
-    /**
-     * Read from the stream
-     *
-     * @param  integer $count
-     * @return string
-     */
-    public function stream_read($count)
-    {
-        if (!$this->_temporaryFileHandle) {
-            return false;
-        }
-
-        return fread($this->_temporaryFileHandle, $count);
-    }
-
-    /**
-     * Write to the stream
-     *
-     * @param  string $data
-     * @return integer
-     */
-    public function stream_write($data)
-    {
-        if (!$this->_temporaryFileHandle) {
-            return 0;
-        }
-        
-        $len = strlen($data);
-        fwrite($this->_temporaryFileHandle, $data, $len);
-        return $len;
-    }
-
-    /**
-     * End of the stream?
-     *
-     * @return boolean
-     */
-    public function stream_eof()
-    {
-        if (!$this->_temporaryFileHandle) {
-            return true;
-        }
-
-        return feof($this->_temporaryFileHandle);
-    }
-
-    /**
-     * What is the current read/write position of the stream?
-     *
-     * @return integer
-     */
-    public function stream_tell()
-    {
-        return ftell($this->_temporaryFileHandle);
-    }
-
-    /**
-     * Update the read/write position of the stream
-     *
-     * @param  integer $offset
-     * @param  integer $whence
-     * @return boolean
-     */
-    public function stream_seek($offset, $whence)
-    {
-        if (!$this->_temporaryFileHandle) {
-            return false;
-        }
-        
-        return (fseek($this->_temporaryFileHandle, $offset, $whence) === 0);
-    }
-
-    /**
-     * Flush current cached stream data to storage
-     *
-     * @return boolean
-     */
-    public function stream_flush()
-    {
-        $result = fflush($this->_temporaryFileHandle);
-        
-         // Upload the file?
-        if ($this->_writeMode) {
-            // Make sure the container exists
-            $containerExists = $this->_getStorageClient($this->_fileName)->containerExists(
-                $this->_getContainerName($this->_fileName)
-            );
-            if (!$containerExists) {
-                $this->_getStorageClient($this->_fileName)->createContainer(
-                    $this->_getContainerName($this->_fileName)
-                );
-            }
-            
-            // Upload the file
-            try {
-                $this->_getStorageClient($this->_fileName)->putBlob(
-                    $this->_getContainerName($this->_fileName),
-                    $this->_getFileName($this->_fileName),
-                    $this->_temporaryFileName
-                );
-            } catch (Zend_Service_WindowsAzure_Exception $ex) {
-                @unlink($this->_temporaryFileName);
-                unset($this->_storageClient);
-                
-                throw $ex;
-            }
-        }
-        
-        return $result;
-    }
-
-    /**
-     * Returns data array of stream variables
-     *
-     * @return array
-     */
-    public function stream_stat()
-    {
-        if (!$this->_temporaryFileHandle) {
-            return false;
-        }
-
-        $stat = array();
-        $stat['dev'] = 0;
-        $stat['ino'] = 0;
-        $stat['mode'] = 0;
-        $stat['nlink'] = 0;
-        $stat['uid'] = 0;
-        $stat['gid'] = 0;
-        $stat['rdev'] = 0;
-        $stat['size'] = 0;
-        $stat['atime'] = 0;
-        $stat['mtime'] = 0;
-        $stat['ctime'] = 0;
-        $stat['blksize'] = 0;
-        $stat['blocks'] = 0;
-
-        $info = null;
-        try {
-            $info = $this->_getStorageClient($this->_fileName)->getBlobInstance(
-                        $this->_getContainerName($this->_fileName),
-                        $this->_getFileName($this->_fileName)
-                    );
-        } catch (Zend_Service_WindowsAzure_Exception $ex) {
-            // Unexisting file...
-        }
-        if (!is_null($info)) {
-            $stat['size']  = $info->Size;
-            $stat['atime'] = time();
-        }     
-        
-        return $stat;
-    }
-
-    /**
-     * Attempt to delete the item
-     *
-     * @param  string $path
-     * @return boolean
-     */
-    public function unlink($path)
-    {
-        $this->_getStorageClient($path)->deleteBlob(
-            $this->_getContainerName($path),
-            $this->_getFileName($path)
-        );
-    }
-
-    /**
-     * Attempt to rename the item
-     *
-     * @param  string  $path_from
-     * @param  string  $path_to
-     * @return boolean False
-     */
-    public function rename($path_from, $path_to)
-    {
-        if ($this->_getContainerName($path_from) != $this->_getContainerName($path_to)) {
-            throw new Zend_Service_WindowsAzure_Exception('Container name can not be changed.');
-        }
-        
-        if ($this->_getFileName($path_from) == $this->_getContainerName($path_to)) {
-            return true;
-        }
-            
-        $this->_getStorageClient($path_from)->copyBlob(
-            $this->_getContainerName($path_from),
-            $this->_getFileName($path_from),
-            $this->_getContainerName($path_to),
-            $this->_getFileName($path_to)
-        );
-        $this->_getStorageClient($path_from)->deleteBlob(
-            $this->_getContainerName($path_from),
-            $this->_getFileName($path_from)
-        );
-        return true;
-    }
-    
-    /**
-     * Return array of URL variables
-     *
-     * @param  string $path
-     * @param  integer $flags
-     * @return array
-     */
-    public function url_stat($path, $flags)
-    {
-        $stat = array();
-        $stat['dev'] = 0;
-        $stat['ino'] = 0;
-        $stat['mode'] = 0;
-        $stat['nlink'] = 0;
-        $stat['uid'] = 0;
-        $stat['gid'] = 0;
-        $stat['rdev'] = 0;
-        $stat['size'] = 0;
-        $stat['atime'] = 0;
-        $stat['mtime'] = 0;
-        $stat['ctime'] = 0;
-        $stat['blksize'] = 0;
-        $stat['blocks'] = 0;
-
-        $info = null;
-        try {
-            $info = $this->_getStorageClient($path)->getBlobInstance(
-                        $this->_getContainerName($path),
-                        $this->_getFileName($path)
-                    );
-        } catch (Zend_Service_WindowsAzure_Exception $ex) {
-            // Unexisting file...
-        }
-        if (!is_null($info)) {
-            $stat['size']  = $info->Size;
-            $stat['atime'] = time();
-        } 
-
-        return $stat;
-    }
-
-    /**
-     * Create a new directory
-     *
-     * @param  string  $path
-     * @param  integer $mode
-     * @param  integer $options
-     * @return boolean
-     */
-    public function mkdir($path, $mode, $options)
-    {
-        if ($this->_getContainerName($path) == $this->_getFileName($path)) {
-            // Create container
-            try {
-                $this->_getStorageClient($path)->createContainer(
-                    $this->_getContainerName($path)
-                );
-            } catch (Zend_Service_WindowsAzure_Exception $ex) {
-                return false;
-            }
-        } else {
-            throw new Zend_Service_WindowsAzure_Exception('mkdir() with multiple levels is not supported on Windows Azure Blob Storage.');
-        }
-    }
-
-    /**
-     * Remove a directory
-     *
-     * @param  string  $path
-     * @param  integer $options
-     * @return boolean
-     */
-    public function rmdir($path, $options)
-    {
-        if ($this->_getContainerName($path) == $this->_getFileName($path)) {
-            // Delete container
-            try {
-                $this->_getStorageClient($path)->deleteContainer(
-                    $this->_getContainerName($path)
-                );
-            } catch (Zend_Service_WindowsAzure_Exception $ex) {
-                return false;
-            }
-        } else {
-            throw new Zend_Service_WindowsAzure_Exception('rmdir() with multiple levels is not supported on Windows Azure Blob Storage.');
-        }
-    }
-
-    /**
-     * Attempt to open a directory
-     *
-     * @param  string $path
-     * @param  integer $options
-     * @return boolean
-     */
-    public function dir_opendir($path, $options)
-    {
-        $this->_blobs = $this->_getStorageClient($path)->listBlobs(
-            $this->_getContainerName($path)
-        );
-        return is_array($this->_blobs);
-    }
-
-    /**
-     * Return the next filename in the directory
-     *
-     * @return string
-     */
-    public function dir_readdir()
-    {
-        $object = current($this->_blobs);
-        if ($object !== false) {
-            next($this->_blobs);
-            return $object->Name;
-        }
-        return false;
-    }
-
-    /**
-     * Reset the directory pointer
-     *
-     * @return boolean True
-     */
-    public function dir_rewinddir()
-    {
-        reset($this->_blobs);
-        return true;
-    }
-
-    /**
-     * Close a directory
-     *
-     * @return boolean True
-     */
-    public function dir_closedir()
-    {
-        $this->_blobs = null;
-        return true;
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/BlobContainer.php b/lib/zend/Zend/Service/WindowsAzure/Storage/BlobContainer.php
deleted file mode 100644
index 1066f43a3cf..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/BlobContainer.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string $Name          Name of the container
- * @property string $Etag          Etag of the container
- * @property string $LastModified  Last modified date of the container
- * @property array  $Metadata      Key/value pairs of meta data
- */
-class Zend_Service_WindowsAzure_Storage_BlobContainer
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string $name          Name
-     * @param string $etag          Etag
-     * @param string $lastModified  Last modified date
-     * @param array  $metadata      Key/value pairs of meta data
-     */
-    public function __construct($name, $etag, $lastModified, $metadata = array()) 
-    {
-        $this->_data = array(
-            'name'         => $name,
-            'etag'         => $etag,
-            'lastmodified' => $lastModified,
-            'metadata'     => $metadata
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/BlobInstance.php b/lib/zend/Zend/Service/WindowsAzure/Storage/BlobInstance.php
deleted file mode 100644
index d8185ccb2f8..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/BlobInstance.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string  $Container       Container name
- * @property string  $Name            Name
- * @property string  $Etag            Etag
- * @property string  $LastModified    Last modified date
- * @property string  $Url             Url
- * @property int     $Size            Size
- * @property string  $ContentType     Content Type
- * @property string  $ContentEncoding Content Encoding
- * @property string  $ContentLanguage Content Language
- * @property boolean $IsPrefix        Is Prefix?
- * @property array   $Metadata        Key/value pairs of meta data
- */
-class Zend_Service_WindowsAzure_Storage_BlobInstance
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string  $containerName   Container name
-     * @param string  $name            Name
-     * @param string  $etag            Etag
-     * @param string  $lastModified    Last modified date
-     * @param string  $url             Url
-     * @param int     $size            Size
-     * @param string  $contentType     Content Type
-     * @param string  $contentEncoding Content Encoding
-     * @param string  $contentLanguage Content Language
-     * @param boolean $isPrefix        Is Prefix?
-     * @param array   $metadata        Key/value pairs of meta data
-     */
-    public function __construct($containerName, $name, $etag, $lastModified, $url = '', $size = 0, $contentType = '', $contentEncoding = '', $contentLanguage = '', $isPrefix = false, $metadata = array()) 
-    {	        
-        $this->_data = array(
-            'container'        => $containerName,
-            'name'             => $name,
-            'etag'             => $etag,
-            'lastmodified'     => $lastModified,
-            'url'              => $url,
-            'size'             => $size,
-            'contenttype'      => $contentType,
-            'contentencoding'  => $contentEncoding,
-            'contentlanguage'  => $contentLanguage,
-            'isprefix'         => $isPrefix,
-            'metadata'         => $metadata
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php b/lib/zend/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
deleted file mode 100644
index 03a18509d40..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_TableEntity
- */
-require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_DynamicTableEntity extends Zend_Service_WindowsAzure_Storage_TableEntity
-{   
-    /**
-     * Dynamic properties
-     * 
-     * @var array
-     */
-    protected $_dynamicProperties = array();
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {      
-        $this->setAzureProperty($name, $value, null);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        return $this->getAzureProperty($name);
-    }
-    
-    /**
-     * Set an Azure property
-     * 
-     * @param string $name Property name
-     * @param mixed $value Property value
-     * @param string $type Property type (Edm.xxxx)
-     * @return Zend_Service_WindowsAzure_Storage_DynamicTableEntity
-     */
-    public function setAzureProperty($name, $value = '', $type = null)
-    {
-        if (strtolower($name) == 'partitionkey') {
-            $this->setPartitionKey($value);
-        } else if (strtolower($name) == 'rowkey') {
-            $this->setRowKey($value);
-        } else if (strtolower($name) == 'etag') {
-            $this->setEtag($value);
-        } else {
-            if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-                // Determine type?
-                if (is_null($type)) {
-                    $type = 'Edm.String';
-                    if (is_int($value)) {
-                        $type = 'Edm.Int32';
-                    } else if (is_float($value)) {
-                        $type = 'Edm.Double';
-                    } else if (is_bool($value)) {
-                        $type = 'Edm.Boolean';
-                    }
-                }
-                
-                // Set dynamic property
-                $this->_dynamicProperties[strtolower($name)] = (object)array(
-                        'Name'  => $name,
-                    	'Type'  => $type,
-                    	'Value' => $value,
-                    );
-            }
-    
-            $this->_dynamicProperties[strtolower($name)]->Value = $value;
-        }
-        return $this;
-    }
-    
-    /**
-     * Set an Azure property type
-     * 
-     * @param string $name Property name
-     * @param string $type Property type (Edm.xxxx)
-     * @return Zend_Service_WindowsAzure_Storage_DynamicTableEntity
-     */
-    public function setAzurePropertyType($name, $type = 'Edm.String')
-    {
-        if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-            $this->setAzureProperty($name, '', $type);            
-        } else {
-            $this->_dynamicProperties[strtolower($name)]->Type = $type;   
-        }
-        return $this;
-    }
-    
-    /**
-     * Get an Azure property
-     * 
-     * @param string $name Property name
-     * @param mixed $value Property value
-     * @param string $type Property type (Edm.xxxx)
-     * @return Zend_Service_WindowsAzure_Storage_DynamicTableEntity
-     */
-    public function getAzureProperty($name)
-    {
-        if (strtolower($name) == 'partitionkey') {
-            return $this->getPartitionKey();
-        }
-        if (strtolower($name) == 'rowkey') {
-            return $this->getRowKey();
-        }
-        if (strtolower($name) == 'etag') {
-            return $this->getEtag();
-        }
-
-        if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-            $this->setAzureProperty($name);            
-        }
-
-        return $this->_dynamicProperties[strtolower($name)]->Value;
-    }
-    
-    /**
-     * Get an Azure property type
-     * 
-     * @param string $name Property name
-     * @return string Property type (Edm.xxxx)
-     */
-    public function getAzurePropertyType($name)
-    {
-        if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-            $this->setAzureProperty($name, '', $type);            
-        }
-        
-        return $this->_dynamicProperties[strtolower($name)]->Type;
-    }
-    
-    /**
-     * Get Azure values
-     * 
-     * @return array
-     */
-    public function getAzureValues()
-    {
-        return array_merge(array_values($this->_dynamicProperties), parent::getAzureValues());
-    }
-    
-    /**
-     * Set Azure values
-     * 
-     * @param array $values
-     * @param boolean $throwOnError Throw Zend_Service_WindowsAzure_Exception when a property is not specified in $values?
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function setAzureValues($values = array(), $throwOnError = false)
-    {
-        // Set parent values
-        parent::setAzureValues($values, false);
-        
-        // Set current values
-        foreach ($values as $key => $value) 
-        {
-            $this->$key = $value;
-        }
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/Queue.php b/lib/zend/Zend/Service/WindowsAzure/Storage/Queue.php
deleted file mode 100644
index 0a7b48fb8fd..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/Queue.php
+++ /dev/null
@@ -1,547 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://todo     name_todo
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * Zend_Service_WindowsAzure_Storage_QueueInstance
- */
-require_once 'Zend/Service/WindowsAzure/Storage/QueueInstance.php';
-
-/**
- * Zend_Service_WindowsAzure_Storage_QueueMessage
- */
-require_once 'Zend/Service/WindowsAzure/Storage/QueueMessage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_Storage
-{
-	/**
-	 * Maximal message size (in bytes)
-	 */
-	const MAX_MESSAGE_SIZE = 8388608;
-	
-	/**
-	 * Maximal message ttl (in seconds)
-	 */
-	const MAX_MESSAGE_TTL = 604800;
-	
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Storage_Queue instance
-	 *
-	 * @param string $host Storage host name
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_QUEUE, $accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT, $accountKey = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY, $usePathStyleUri = false, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
-	{
-		parent::__construct($host, $accountName, $accountKey, $usePathStyleUri, $retryPolicy);
-		
-		// API version
-		$this->_apiVersion = '2009-04-14';
-	}
-	
-	/**
-	 * Check if a queue exists
-	 * 
-	 * @param string $queueName Queue name
-	 * @return boolean
-	 */
-	public function queueExists($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-			
-		// List queues
-        $queues = $this->listQueues($queueName, 1);
-        foreach ($queues as $queue) {
-            if ($queue->Name == $queueName) {
-                return true;
-            }
-        }
-        
-        return false;
-	}
-	
-	/**
-	 * Create queue
-	 *
-	 * @param string $queueName Queue name
-	 * @param array  $metadata  Key/value pairs of meta data
-	 * @return object Queue properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function createQueue($queueName = '', $metadata = array())
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-			
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Perform request
-		$response = $this->_performRequest($queueName, '', Zend_Http_Client::PUT, $headers);			
-		if ($response->isSuccessful()) {
-		    return new Zend_Service_WindowsAzure_Storage_QueueInstance(
-		        $queueName,
-		        $metadata
-		    );
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get queue
-	 * 
-	 * @param string $queueName  Queue name
-	 * @return Zend_Service_WindowsAzure_Storage_QueueInstance
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getQueue($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		    
-		// Perform request
-		$response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::GET);	
-		if ($response->isSuccessful()) {
-		    // Parse metadata
-		    $metadata = $this->_parseMetadataHeaders($response->getHeaders());
-
-		    // Return queue
-		    $queue = new Zend_Service_WindowsAzure_Storage_QueueInstance(
-		        $queueName,
-		        $metadata
-		    );
-		    $queue->ApproximateMessageCount = intval($response->getHeader('x-ms-approximate-message-count'));
-		    return $queue;
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get queue metadata
-	 * 
-	 * @param string $queueName  Queue name
-	 * @return array Key/value pairs of meta data
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getQueueMetadata($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-			
-	    return $this->getQueue($queueName)->Metadata;
-	}
-	
-	/**
-	 * Set queue metadata
-	 * 
-	 * Calling the Set Queue Metadata operation overwrites all existing metadata that is associated with the queue. It's not possible to modify an individual name/value pair.
-	 *
-	 * @param string $queueName  Queue name
-	 * @param array  $metadata       Key/value pairs of meta data
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function setQueueMetadata($queueName = '', $metadata = array())
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		if (count($metadata) == 0) {
-		    return;
-		}
-		    
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Perform request
-		$response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::PUT, $headers);
-
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete queue
-	 *
-	 * @param string $queueName Queue name
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteQueue($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-			
-		// Perform request
-		$response = $this->_performRequest($queueName, '', Zend_Http_Client::DELETE);
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * List queues
-	 *
-	 * @param string $prefix     Optional. Filters the results to return only queues whose name begins with the specified prefix.
-	 * @param int    $maxResults Optional. Specifies the maximum number of queues to return per call to Azure storage. This does NOT affect list size returned by this function. (maximum: 5000)
-	 * @param string $marker     Optional string value that identifies the portion of the list to be returned with the next list operation.
-	 * @param int    $currentResultCount Current result count (internal use)
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function listQueues($prefix = null, $maxResults = null, $marker = null, $currentResultCount = 0)
-	{
-	    // Build query string
-	    $queryString = '?comp=list';
-	    if (!is_null($prefix)) {
-	        $queryString .= '&prefix=' . $prefix;
-	    }
-	    if (!is_null($maxResults)) {
-	        $queryString .= '&maxresults=' . $maxResults;
-	    }
-	    if (!is_null($marker)) {
-	        $queryString .= '&marker=' . $marker;
-	    }
-	        
-		// Perform request
-		$response = $this->_performRequest('', $queryString, Zend_Http_Client::GET);	
-		if ($response->isSuccessful()) {
-			$xmlQueues = $this->_parseResponse($response)->Queues->Queue;
-			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
-
-			$queues = array();
-			if (!is_null($xmlQueues)) {
-				for ($i = 0; $i < count($xmlQueues); $i++) {
-					$queues[] = new Zend_Service_WindowsAzure_Storage_QueueInstance(
-						(string)$xmlQueues[$i]->QueueName
-					);
-				}
-			}
-			$currentResultCount = $currentResultCount + count($queues);
-			if (!is_null($maxResults) && $currentResultCount < $maxResults) {
-    			if (!is_null($xmlMarker) && $xmlMarker != '') {
-    			    $queues = array_merge($queues, $this->listQueues($prefix, $maxResults, $xmlMarker, $currentResultCount));
-    			}
-			}
-			if (!is_null($maxResults) && count($queues) > $maxResults) {
-			    $queues = array_slice($queues, 0, $maxResults);
-			}
-			    
-			return $queues;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Put message into queue
-	 *
-	 * @param string $queueName  Queue name
-	 * @param string $message    Message
-	 * @param int    $ttl        Message Time-To-Live (in seconds). Defaults to 7 days if the parameter is omitted.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putMessage($queueName = '', $message = '', $ttl = null)
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		if (strlen($message) > self::MAX_MESSAGE_SIZE) {
-		    throw new Zend_Service_WindowsAzure_Exception('Message is too big. Message content should be < 8KB.');
-		}
-		if ($message == '') {
-		    throw new Zend_Service_WindowsAzure_Exception('Message is not specified.');
-		}
-		if (!is_null($ttl) && ($ttl <= 0 || $ttl > self::MAX_MESSAGE_SIZE)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Message TTL is invalid. Maximal TTL is 7 days (' . self::MAX_MESSAGE_SIZE . ' seconds) and should be greater than zero.');
-		}
-		    
-	    // Build query string
-	    $queryString = '';
-	    if (!is_null($ttl)) {
-	        $queryString .= '?messagettl=' . $ttl;
-	    }
-	        
-	    // Build body
-	    $rawData = '';
-	    $rawData .= '<QueueMessage>';
-	    $rawData .= '    <MessageText>' . base64_encode($message) . '</MessageText>';
-	    $rawData .= '</QueueMessage>';
-	        
-		// Perform request
-		$response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::POST, array(), false, $rawData);
-
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception('Error putting message into queue.');
-		}
-	}
-	
-	/**
-	 * Get queue messages
-	 *
-	 * @param string $queueName         Queue name
-	 * @param string $numOfMessages     Optional. A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. By default, a single message is retrieved from the queue with this operation.
-	 * @param int    $visibilityTimeout Optional. An integer value that specifies the message's visibility timeout in seconds. The maximum value is 2 hours. The default message visibility timeout is 30 seconds.
-	 * @param string $peek              Peek only?
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTimeout = null, $peek = false)
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		if ($numOfMessages < 1 || $numOfMessages > 32 || intval($numOfMessages) != $numOfMessages) {
-		    throw new Zend_Service_WindowsAzure_Exception('Invalid number of messages to retrieve.');
-		}
-		if (!is_null($visibilityTimeout) && ($visibilityTimeout <= 0 || $visibilityTimeout > 7200)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Visibility timeout is invalid. Maximum value is 2 hours (7200 seconds) and should be greater than zero.');
-		}
-		    
-	    // Build query string
-	    $query = array();
-    	if ($peek) {
-    	    $query[] = 'peekonly=true';
-    	}
-    	if ($numOfMessages > 1) {
-	        $query[] = 'numofmessages=' . $numOfMessages;
-    	}
-    	if (!$peek && !is_null($visibilityTimeout)) {
-	        $query[] = 'visibilitytimeout=' . $visibilityTimeout;
-    	}   
-    	$queryString = '?' . implode('&', $query);
-	        
-		// Perform request
-		$response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::GET);	
-		if ($response->isSuccessful()) {
-		    // Parse results
-			$result = $this->_parseResponse($response);
-		    if (!$result) {
-		        return array();
-		    }
-
-		    $xmlMessages = null;
-		    if (count($result->QueueMessage) > 1) {
-    		    $xmlMessages = $result->QueueMessage;
-    		} else {
-    		    $xmlMessages = array($result->QueueMessage);
-    		}
-
-			$messages = array();
-			for ($i = 0; $i < count($xmlMessages); $i++) {
-				$messages[] = new Zend_Service_WindowsAzure_Storage_QueueMessage(
-					(string)$xmlMessages[$i]->MessageId,
-					(string)$xmlMessages[$i]->InsertionTime,
-					(string)$xmlMessages[$i]->ExpirationTime,
-					($peek ? '' : (string)$xmlMessages[$i]->PopReceipt),
-					($peek ? '' : (string)$xmlMessages[$i]->TimeNextVisible),
-					base64_decode((string)$xmlMessages[$i]->MessageText)
-			    );
-			}
-			    
-			return $messages;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Peek queue messages
-	 *
-	 * @param string $queueName         Queue name
-	 * @param string $numOfMessages     Optional. A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. By default, a single message is retrieved from the queue with this operation.
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function peekMessages($queueName = '', $numOfMessages = 1)
-	{
-	    return $this->getMessages($queueName, $numOfMessages, null, true);
-	}
-	
-	/**
-	 * Clear queue messages
-	 *
-	 * @param string $queueName         Queue name
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function clearMessages($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-
-		// Perform request
-		$response = $this->_performRequest($queueName . '/messages', '', Zend_Http_Client::DELETE);	
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception('Error clearing messages from queue.');
-		}
-	}
-	
-	/**
-	 * Delete queue message
-	 *
-	 * @param string $queueName         					Queue name
-	 * @param Zend_Service_WindowsAzure_Storage_QueueMessage $message Message to delete from queue. A message retrieved using "peekMessages" can NOT be deleted!
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteMessage($queueName = '', Zend_Service_WindowsAzure_Storage_QueueMessage $message)
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		if ($message->PopReceipt == '') {
-		    throw new Zend_Service_WindowsAzure_Exception('A message retrieved using "peekMessages" can NOT be deleted! Use "getMessages" instead.');
-		}
-
-		// Perform request
-		$response = $this->_performRequest($queueName . '/messages/' . $message->MessageId, '?popreceipt=' . $message->PopReceipt, Zend_Http_Client::DELETE);	
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Is valid queue name?
-	 *
-	 * @param string $queueName Queue name
-	 * @return boolean
-	 */
-    public static function isValidQueueName($queueName = '')
-    {
-        if (preg_match("/^[a-z0-9][a-z0-9-]*$/", $queueName) === 0) {
-            return false;
-        }
-    
-        if (strpos($queueName, '--') !== false) {
-            return false;
-        }
-    
-        if (strtolower($queueName) != $queueName) {
-            return false;
-        }
-    
-        if (strlen($queueName) < 3 || strlen($queueName) > 63) {
-            return false;
-        }
-            
-        if (substr($queueName, -1) == '-') {
-            return false;
-        }
-    
-        return true;
-    }
-    
-	/**
-	 * Get error message from Zend_Http_Response
-	 * 
-	 * @param Zend_Http_Response $response Repsonse
-	 * @param string $alternativeError Alternative error message
-	 * @return string
-	 */
-	protected function _getErrorMessage(Zend_Http_Response $response, $alternativeError = 'Unknown error.')
-	{
-		$response = $this->_parseResponse($response);
-		if ($response && $response->Message) {
-		    return (string)$response->Message;
-		} else {
-		    return $alternativeError;
-		}
-	}
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/QueueMessage.php b/lib/zend/Zend/Service/WindowsAzure/Storage/QueueMessage.php
deleted file mode 100644
index 2317489d52a..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/QueueMessage.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- *   
- * @property string $MessageId         Message ID
- * @property string $InsertionTime     Insertion time
- * @property string $ExpirationTime    Expiration time
- * @property string $PopReceipt  	   Receipt verification for deleting the message from queue.
- * @property string $TimeNextVisible   Next time the message is visible in the queue
- * @property string $MessageText       Message text
- */
-class Zend_Service_WindowsAzure_Storage_QueueMessage
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string $messageId         Message ID
-     * @param string $insertionTime     Insertion time
-     * @param string $expirationTime    Expiration time
-     * @param string $popReceipt  	    Receipt verification for deleting the message from queue.
-     * @param string $timeNextVisible   Next time the message is visible in the queue
-     * @param string $messageText       Message text
-     */
-    public function __construct($messageId, $insertionTime, $expirationTime, $popReceipt, $timeNextVisible, $messageText) 
-    {
-        $this->_data = array(
-            'messageid'       => $messageId,
-            'insertiontime'   => $insertionTime,
-            'expirationtime'  => $expirationTime,
-            'popreceipt'      => $popReceipt,
-            'timenextvisible' => $timeNextVisible,
-            'messagetext'     => $messageText
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php b/lib/zend/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
deleted file mode 100644
index cd262fbd560..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string $Id           Id for the signed identifier
- * @property string $Start        The time at which the Shared Access Signature becomes valid.
- * @property string $Expiry       The time at which the Shared Access Signature becomes invalid.
- * @property string $Permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
- */
-class Zend_Service_WindowsAzure_Storage_SignedIdentifier
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string $id           Id for the signed identifier
-     * @param string $start        The time at which the Shared Access Signature becomes valid.
-     * @param string $expiry       The time at which the Shared Access Signature becomes invalid.
-     * @param string $permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
-     */
-    public function __construct($id = '', $start = '', $expiry = '', $permissions = '') 
-    {
-        $this->_data = array(
-            'id'           => $id,
-            'start'        => $start,
-            'expiry'       => $expiry,
-            'permissions'  => $permissions
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/Table.php b/lib/zend/Zend/Service/WindowsAzure/Storage/Table.php
deleted file mode 100644
index 0307f09bd9c..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/Table.php
+++ /dev/null
@@ -1,816 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKeyLite
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_TableInstance
- */
-require_once 'Zend/Service/WindowsAzure/Storage/TableInstance.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_TableEntity
- */
-require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_DynamicTableEntity
- */
-require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_TableEntityQuery
- */
-require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Table
-    extends Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
-{
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Storage_Table instance
-	 *
-	 * @param string $host Storage host name
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_TABLE, $accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT, $accountKey = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY, $usePathStyleUri = false, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
-	{
-		parent::__construct($host, $accountName, $accountKey, $usePathStyleUri, $retryPolicy);
-
-	    // Always use SharedKeyLite authentication
-	    $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKeyLite($accountName, $accountKey, $this->_usePathStyleUri);
-	    
-	    // API version
-		$this->_apiVersion = '2009-04-14';
-	}
-	
-	/**
-	 * Check if a table exists
-	 * 
-	 * @param string $tableName Table name
-	 * @return boolean
-	 */
-	public function tableExists($tableName = '')
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-			
-		// List tables
-        $tables = $this->listTables($tableName);
-        foreach ($tables as $table) {
-            if ($table->Name == $tableName) {
-                return true;
-            }
-        }
-        
-        return false;
-	}
-	
-	/**
-	 * List tables
-	 *
-	 * @param  string $nextTableName Next table name, used for listing tables when total amount of tables is > 1000.
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function listTables($nextTableName = '')
-	{
-	    // Build query string
-	    $queryString = '';
-	    if ($nextTableName != '') {
-	        $queryString = '?NextTableName=' . $nextTableName;
-	    }
-	    
-		// Perform request
-		$response = $this->_performRequest('Tables', $queryString, Zend_Http_Client::GET, null, true);
-		if ($response->isSuccessful()) {	    
-		    // Parse result
-		    $result = $this->_parseResponse($response);	
-		    
-		    if (!$result || !$result->entry) {
-		        return array();
-		    }
-	        
-		    $entries = null;
-		    if (count($result->entry) > 1) {
-		        $entries = $result->entry;
-		    } else {
-		        $entries = array($result->entry);
-		    }
-
-		    // Create return value
-		    $returnValue = array();		    
-		    foreach ($entries as $entry) {
-		        $tableName = $entry->xpath('.//m:properties/d:TableName');
-		        $tableName = (string)$tableName[0];
-		        
-		        $returnValue[] = new Zend_Service_WindowsAzure_Storage_TableInstance(
-		            (string)$entry->id,
-		            $tableName,
-		            (string)$entry->link['href'],
-		            (string)$entry->updated
-		        );
-		    }
-		    
-			// More tables?
-		    if (!is_null($response->getHeader('x-ms-continuation-NextTableName'))) {
-		        $returnValue = array_merge($returnValue, $this->listTables($response->getHeader('x-ms-continuation-NextTableName')));
-		    }
-
-		    return $returnValue;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Create table
-	 *
-	 * @param string $tableName Table name
-	 * @return Zend_Service_WindowsAzure_Storage_TableInstance
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function createTable($tableName = '')
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-			
-		// Generate request body
-		$requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-                        <entry
-                        	xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
-                        	xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
-                        	xmlns="http://www.w3.org/2005/Atom">
-                          <title />
-                          <updated>{tpl:Updated}</updated>
-                          <author>
-                            <name />
-                          </author>
-                          <id />
-                          <content type="application/xml">
-                            <m:properties>
-                              <d:TableName>{tpl:TableName}</d:TableName>
-                            </m:properties>
-                          </content>
-                        </entry>';
-		
-        $requestBody = $this->_fillTemplate($requestBody, array(
-            'BaseUrl' => $this->getBaseUrl(),
-            'TableName' => htmlspecialchars($tableName),
-        	'Updated' => $this->isoDate(),
-            'AccountName' => $this->_accountName
-        ));
-        
-        // Add header information
-        $headers = array();
-        $headers['Content-Type'] = 'application/atom+xml';
-        $headers['DataServiceVersion'] = '1.0;NetFx';
-        $headers['MaxDataServiceVersion'] = '1.0;NetFx';        
-
-		// Perform request
-		$response = $this->_performRequest('Tables', '', Zend_Http_Client::POST, $headers, true, $requestBody);
-		if ($response->isSuccessful()) {
-		    // Parse response
-		    $entry = $this->_parseResponse($response);
-		    
-		    $tableName = $entry->xpath('.//m:properties/d:TableName');
-		    $tableName = (string)$tableName[0];
-		        
-		    return new Zend_Service_WindowsAzure_Storage_TableInstance(
-		        (string)$entry->id,
-		        $tableName,
-		        (string)$entry->link['href'],
-		        (string)$entry->updated
-		    );
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete table
-	 *
-	 * @param string $tableName Table name
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteTable($tableName = '')
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-
-        // Add header information
-        $headers = array();
-        $headers['Content-Type'] = 'application/atom+xml';
-
-		// Perform request
-		$response = $this->_performRequest('Tables(\'' . $tableName . '\')', '', Zend_Http_Client::DELETE, $headers, true, null);
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Insert entity into table
-	 * 
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to insert
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntity
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null)
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if (is_null($entity)) {
-			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
-		}
-		                     
-		// Generate request body
-		$requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-                        <entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom">
-                          <title />
-                          <updated>{tpl:Updated}</updated>
-                          <author>
-                            <name />
-                          </author>
-                          <id />
-                          <content type="application/xml">
-                            <m:properties>
-                              {tpl:Properties}
-                            </m:properties>
-                          </content>
-                        </entry>';
-		
-        $requestBody = $this->_fillTemplate($requestBody, array(
-        	'Updated'    => $this->isoDate(),
-            'Properties' => $this->_generateAzureRepresentation($entity)
-        ));
-
-        // Add header information
-        $headers = array();
-        $headers['Content-Type'] = 'application/atom+xml';
-
-		// Perform request
-	    $response = null;
-	    if ($this->isInBatch()) {
-		    $this->getCurrentBatch()->enlistOperation($tableName, '', Zend_Http_Client::POST, $headers, true, $requestBody);
-		    return null;
-		} else {
-		    $response = $this->_performRequest($tableName, '', Zend_Http_Client::POST, $headers, true, $requestBody);
-		}
-		if ($response->isSuccessful()) {
-		    // Parse result
-		    $result = $this->_parseResponse($response);
-		    
-		    $timestamp = $result->xpath('//m:properties/d:Timestamp');
-		    $timestamp = (string)$timestamp[0];
-
-		    $etag      = $result->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
-		    $etag      = (string)$etag['etag'];
-		    
-		    // Update properties
-		    $entity->setTimestamp($timestamp);
-		    $entity->setEtag($etag);
-
-		    return $entity;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete entity from table
-	 * 
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to delete
-	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false)
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if (is_null($entity)) {
-			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
-		}
-		                     
-        // Add header information
-        $headers = array();
-        if (!$this->isInBatch()) {
-        	// http://social.msdn.microsoft.com/Forums/en-US/windowsazure/thread/9e255447-4dc7-458a-99d3-bdc04bdc5474/
-            $headers['Content-Type']   = 'application/atom+xml';
-        }
-        $headers['Content-Length'] = 0;
-        if (!$verifyEtag) {
-            $headers['If-Match']       = '*';
-        } else {
-            $headers['If-Match']       = $entity->getEtag();
-        }
-
-		// Perform request
-	    $response = null;
-	    if ($this->isInBatch()) {
-		    $this->getCurrentBatch()->enlistOperation($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', Zend_Http_Client::DELETE, $headers, true, null);
-		    return null;
-		} else {
-		    $response = $this->_performRequest($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', Zend_Http_Client::DELETE, $headers, true, null);
-		}
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Retrieve entity from table, by id
-	 * 
-	 * @param string $tableName    Table name
-	 * @param string $partitionKey Partition key
-	 * @param string $rowKey       Row key
-	 * @param string $entityClass  Entity class name* 
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntity
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function retrieveEntityById($tableName = '', $partitionKey = '', $rowKey = '', $entityClass = 'Zend_Service_WindowsAzure_Storage_DynamicTableEntity')
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if ($partitionKey === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Partition key is not specified.');
-		}
-		if ($rowKey === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Row key is not specified.');
-		}
-		if ($entityClass === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Entity class is not specified.');
-		}
-
-			
-		// Check for combined size of partition key and row key
-		// http://msdn.microsoft.com/en-us/library/dd179421.aspx
-		if (strlen($partitionKey . $rowKey) >= 256) {
-		    // Start a batch if possible
-		    if ($this->isInBatch()) {
-		        throw new Zend_Service_WindowsAzure_Exception('Entity cannot be retrieved. A transaction is required to retrieve the entity, but another transaction is already active.');
-		    }
-		        
-		    $this->startBatch();
-		}
-		
-		// Fetch entities from Azure
-        $result = $this->retrieveEntities(
-            $this->select()
-                 ->from($tableName)
-                 ->wherePartitionKey($partitionKey)
-                 ->whereRowKey($rowKey),
-            '',
-            $entityClass
-        );
-        
-        // Return
-        if (count($result) == 1) {
-            return $result[0];
-        }
-        
-        return null;
-	}
-	
-	/**
-	 * Create a new Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 * 
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function select()
-	{
-	    return new Zend_Service_WindowsAzure_Storage_TableEntityQuery();
-	}
-	
-	/**
-	 * Retrieve entities from table
-	 * 
-	 * @param string $tableName|Zend_Service_WindowsAzure_Storage_TableEntityQuery    Table name -or- Zend_Service_WindowsAzure_Storage_TableEntityQuery instance
-	 * @param string $filter                                                Filter condition (not applied when $tableName is a Zend_Service_WindowsAzure_Storage_TableEntityQuery instance)
-	 * @param string $entityClass                                           Entity class name
-	 * @param string $nextPartitionKey                                      Next partition key, used for listing entities when total amount of entities is > 1000.
-	 * @param string $nextRowKey                                            Next row key, used for listing entities when total amount of entities is > 1000.
-	 * @return array Array of Zend_Service_WindowsAzure_Storage_TableEntity
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function retrieveEntities($tableName = '', $filter = '', $entityClass = 'Zend_Service_WindowsAzure_Storage_DynamicTableEntity', $nextPartitionKey = null, $nextRowKey = null)
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if ($entityClass === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Entity class is not specified.');
-		}
-
-		// Convenience...
-		if (class_exists($filter)) {
-		    $entityClass = $filter;
-		    $filter = '';
-		}
-			
-		// Query string
-		$queryString = '';
-
-		// Determine query
-		if (is_string($tableName)) {
-		    // Option 1: $tableName is a string
-		    
-		    // Append parentheses
-		    $tableName .= '()';
-		    
-    	    // Build query
-    	    $query = array();
-    	    
-    		// Filter?
-    		if ($filter !== '') {
-    		    $query[] = '$filter=' . rawurlencode($filter);
-    		}
-    		    
-    	    // Build queryString
-    	    if (count($query) > 0)  {
-    	        $queryString = '?' . implode('&', $query);
-    	    }
-		} else if (get_class($tableName) == 'Zend_Service_WindowsAzure_Storage_TableEntityQuery') {
-		    // Option 2: $tableName is a Zend_Service_WindowsAzure_Storage_TableEntityQuery instance
-
-		    // Build queryString
-		    $queryString = $tableName->assembleQueryString(true);
-
-		    // Change $tableName
-		    $tableName = $tableName->assembleFrom(true);
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception('Invalid argument: $tableName');
-		}
-		
-		// Add continuation querystring parameters?
-		if (!is_null($nextPartitionKey) && !is_null($nextRowKey)) {
-		    if ($queryString !== '') {
-		        $queryString .= '&';
-		    }
-		        
-		    $queryString .= '&NextPartitionKey=' . rawurlencode($nextPartitionKey) . '&NextRowKey=' . rawurlencode($nextRowKey);
-		}
-
-		// Perform request
-	    $response = null;
-	    if ($this->isInBatch() && $this->getCurrentBatch()->getOperationCount() == 0) {
-		    $this->getCurrentBatch()->enlistOperation($tableName, $queryString, Zend_Http_Client::GET, array(), true, null);
-		    $response = $this->getCurrentBatch()->commit();
-		    
-		    // Get inner response (multipart)
-		    $innerResponse = $response->getBody();
-		    $innerResponse = substr($innerResponse, strpos($innerResponse, 'HTTP/1.1 200 OK'));
-		    $innerResponse = substr($innerResponse, 0, strpos($innerResponse, '--batchresponse'));
-		    $response = Zend_Http_Response::fromString($innerResponse);
-		} else {
-		    $response = $this->_performRequest($tableName, $queryString, Zend_Http_Client::GET, array(), true, null);
-		}
-		
-		if ($response->isSuccessful()) {
-		    // Parse result
-		    $result = $this->_parseResponse($response);
-		    if (!$result) {
-		        return array();
-		    }
-
-		    $entries = null;
-		    if ($result->entry) {
-    		    if (count($result->entry) > 1) {
-    		        $entries = $result->entry;
-    		    } else {
-    		        $entries = array($result->entry);
-    		    }
-		    } else {
-		        // This one is tricky... If we have properties defined, we have an entity.
-		        $properties = $result->xpath('//m:properties');
-		        if ($properties) {
-		            $entries = array($result);
-		        } else {
-		            return array();
-		        }
-		    }
-
-		    // Create return value
-		    $returnValue = array();		    
-		    foreach ($entries as $entry) {
-    		    // Parse properties
-    		    $properties = $entry->xpath('.//m:properties');
-    		    $properties = $properties[0]->children('http://schemas.microsoft.com/ado/2007/08/dataservices');
-    		    
-    		    // Create entity
-    		    $entity = new $entityClass('', '');
-    		    $entity->setAzureValues((array)$properties, true);
-    		    
-    		    // If we have a Zend_Service_WindowsAzure_Storage_DynamicTableEntity, make sure all property types are OK
-    		    if ($entity instanceof Zend_Service_WindowsAzure_Storage_DynamicTableEntity) {
-    		        foreach ($properties as $key => $value) {  
-    		            $attributes = $value->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
-    		            $type = (string)$attributes['type'];
-    		            if ($type !== '') {
-    		                $entity->setAzurePropertyType($key, $type);
-    		            }
-    		        }
-    		    }
-    
-    		    // Update etag
-    		    $etag      = $entry->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
-    		    $etag      = (string)$etag['etag'];
-    		    $entity->setEtag($etag);
-    		    
-    		    // Add to result
-    		    $returnValue[] = $entity;
-		    }
-
-			// More entities?
-		    if (!is_null($response->getHeader('x-ms-continuation-NextPartitionKey')) && !is_null($response->getHeader('x-ms-continuation-NextRowKey'))) {
-		        if (strpos($queryString, '$top') === false) {
-		            $returnValue = array_merge($returnValue, $this->retrieveEntities($tableName, $filter, $entityClass, $response->getHeader('x-ms-continuation-NextPartitionKey'), $response->getHeader('x-ms-continuation-NextRowKey')));
-		        }
-		    }
-		    
-		    // Return
-		    return $returnValue;
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Update entity by replacing it
-	 * 
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to update
-	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function updateEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false)
-	{
-	    return $this->_changeEntity(Zend_Http_Client::PUT, $tableName, $entity, $verifyEtag);
-	}
-	
-	/**
-	 * Update entity by adding or updating properties
-	 * 
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to update
-	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
-	 * @param array                               $properties  Properties to merge. All properties will be used when omitted.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function mergeEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false, $properties = array())
-	{
-		$mergeEntity = null;
-		if (is_array($properties) && count($properties) > 0) {
-			// Build a new object
-			$mergeEntity = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($entity->getPartitionKey(), $entity->getRowKey());
-			
-			// Keep only values mentioned in $properties
-			$azureValues = $entity->getAzureValues();
-			foreach ($azureValues as $key => $value) {
-				if (in_array($value->Name, $properties)) {
-					$mergeEntity->setAzureProperty($value->Name, $value->Value, $value->Type);
-				}
-			}
-		} else {
-			$mergeEntity = $entity;
-		}
-		
-	    return $this->_changeEntity(Zend_Http_Client::MERGE, $tableName, $mergeEntity, $verifyEtag);
-	}
-	
-	/**
-	 * Get error message from Zend_Http_Response
-	 * 
-	 * @param Zend_Http_Response $response Repsonse
-	 * @param string $alternativeError Alternative error message
-	 * @return string
-	 */
-	protected function _getErrorMessage(Zend_Http_Response $response, $alternativeError = 'Unknown error.')
-	{
-		$response = $this->_parseResponse($response);
-		if ($response && $response->message) {
-		    return (string)$response->message;
-		} else {
-		    return $alternativeError;
-		}
-	}
-	
-	/**
-	 * Update entity / merge entity
-	 * 
-	 * @param string                              $httpVerb    HTTP verb to use (PUT = update, MERGE = merge)
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to update
-	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false)
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if (is_null($entity)) {
-			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
-		}
-		                     
-        // Add header information
-        $headers = array();
-        $headers['Content-Type']   = 'application/atom+xml';
-        $headers['Content-Length'] = 0;
-        if (!$verifyEtag) {
-            $headers['If-Match']       = '*';
-        } else {
-            $headers['If-Match']       = $entity->getEtag();
-        }
-
-	    // Generate request body
-		$requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-                        <entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom">
-                          <title />
-                          <updated>{tpl:Updated}</updated>
-                          <author>
-                            <name />
-                          </author>
-                          <id />
-                          <content type="application/xml">
-                            <m:properties>
-                              {tpl:Properties}
-                            </m:properties>
-                          </content>
-                        </entry>';
-		
-        $requestBody = $this->_fillTemplate($requestBody, array(
-        	'Updated'    => $this->isoDate(),
-            'Properties' => $this->_generateAzureRepresentation($entity)
-        ));
-
-        // Add header information
-        $headers = array();
-        $headers['Content-Type'] = 'application/atom+xml';
-	    if (!$verifyEtag) {
-            $headers['If-Match']       = '*';
-        } else {
-            $headers['If-Match']       = $entity->getEtag();
-        }
-        
-		// Perform request
-		$response = null;
-	    if ($this->isInBatch()) {
-		    $this->getCurrentBatch()->enlistOperation($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody);
-		    return null;
-		} else {
-		    $response = $this->_performRequest($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody);
-		}
-		if ($response->isSuccessful()) {
-		    // Update properties
-			$entity->setEtag($response->getHeader('Etag'));
-			$entity->setTimestamp($response->getHeader('Last-modified'));
-
-		    return $entity;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Generate RFC 1123 compliant date string
-	 * 
-	 * @return string
-	 */
-	protected function _rfcDate()
-	{
-	    return gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123
-	}
-	
-	/**
-	 * Fill text template with variables from key/value array
-	 * 
-	 * @param string $templateText Template text
-	 * @param array $variables Array containing key/value pairs
-	 * @return string
-	 */
-	protected function _fillTemplate($templateText, $variables = array())
-	{
-	    foreach ($variables as $key => $value) {
-	        $templateText = str_replace('{tpl:' . $key . '}', $value, $templateText);
-	    }
-	    return $templateText;
-	}
-	
-	/**
-	 * Generate Azure representation from entity (creates atompub markup from properties)
-	 * 
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity
-	 * @return string
-	 */
-	protected function _generateAzureRepresentation(Zend_Service_WindowsAzure_Storage_TableEntity $entity = null)
-	{
-		// Generate Azure representation from entity
-		$azureRepresentation = array();
-		$azureValues         = $entity->getAzureValues();
-		foreach ($azureValues as $azureValue) {
-		    $value = array();
-		    $value[] = '<d:' . $azureValue->Name;
-		    if ($azureValue->Type != '') {
-		        $value[] = ' m:type="' . $azureValue->Type . '"';
-		    }
-		    if (is_null($azureValue->Value)) {
-		        $value[] = ' m:null="true"'; 
-		    }
-		    $value[] = '>';
-		    
-		    if (!is_null($azureValue->Value)) {
-		        if (strtolower($azureValue->Type) == 'edm.boolean') {
-		            $value[] = ($azureValue->Value == true ? '1' : '0');
-		        } else {
-		            $value[] = htmlspecialchars($azureValue->Value);
-		        }
-		    }
-		    
-		    $value[] = '</d:' . $azureValue->Name . '>';
-		    $azureRepresentation[] = implode('', $value);
-		}
-
-		return implode('', $azureRepresentation);
-	}
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/TableEntity.php b/lib/zend/Zend/Service/WindowsAzure/Storage/TableEntity.php
deleted file mode 100644
index 0cd1a5297c3..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/TableEntity.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_TableEntity
-{
-    /**
-     * Partition key
-     * 
-     * @var string
-     */
-    protected $_partitionKey;
-    
-    /**
-     * Row key
-     * 
-     * @var string
-     */
-    protected $_rowKey;
-    
-    /**
-     * Timestamp
-     * 
-     * @var string
-     */
-    protected $_timestamp = '1900-01-01T00:00:00';
-    
-    /**
-     * Etag
-     * 
-     * @var string
-     */
-    protected $_etag = '';
-    
-    /**
-     * Constructor
-     * 
-     * @param string  $partitionKey    Partition key
-     * @param string  $rowKey          Row key
-     */
-    public function __construct($partitionKey = '', $rowKey = '') 
-    {	        
-        $this->_partitionKey = $partitionKey;
-        $this->_rowKey       = $rowKey;
-    }
-    
-    /**
-     * Get partition key
-     * 
-     * @azure PartitionKey
-     * @return string
-     */
-    public function getPartitionKey()
-    {
-        return $this->_partitionKey;
-    }
-    
-    /**
-     * Set partition key
-     * 
-     * @azure PartitionKey
-     * @param string $value
-     */
-    public function setPartitionKey($value)
-    {
-        $this->_partitionKey = $value;
-    }
-    
-    /**
-     * Get row key
-     * 
-     * @azure RowKey
-     * @return string
-     */
-    public function getRowKey()
-    {
-        return $this->_rowKey;
-    }
-    
-    /**
-     * Set row key
-     * 
-     * @azure RowKey
-     * @param string $value
-     */
-    public function setRowKey($value)
-    {
-        $this->_rowKey = $value;
-    }
-    
-    /**
-     * Get timestamp
-     * 
-     * @azure Timestamp Edm.DateTime
-     * @return string
-     */
-    public function getTimestamp()
-    {
-        return $this->_timestamp;
-    }
-    
-    /**
-     * Set timestamp
-     * 
-     * @azure Timestamp Edm.DateTime
-     * @param string $value
-     */
-    public function setTimestamp($value = '1900-01-01T00:00:00')
-    {
-        $this->_timestamp = $value;
-    }
-    
-    /**
-     * Get etag
-     * 
-     * @return string
-     */
-    public function getEtag()
-    {
-        return $this->_etag;
-    }
-    
-    /**
-     * Set etag
-     * 
-     * @param string $value
-     */
-    public function setEtag($value = '')
-    {
-        $this->_etag = $value;
-    }
-    
-    /**
-     * Get Azure values
-     * 
-     * @return array
-     */
-    public function getAzureValues()
-    {
-        // Get accessors
-        $accessors = self::getAzureAccessors(get_class($this));
-        
-        // Loop accessors and retrieve values
-        $returnValue = array();
-        foreach ($accessors as $accessor) {
-            if ($accessor->EntityType == 'ReflectionProperty') {
-                $property = $accessor->EntityAccessor;
-                $returnValue[] = (object)array(
-                    'Name'  => $accessor->AzurePropertyName,
-                	'Type'  => $accessor->AzurePropertyType,
-                	'Value' => $this->$property,
-                );
-            } else if ($accessor->EntityType == 'ReflectionMethod' && substr(strtolower($accessor->EntityAccessor), 0, 3) == 'get') {
-                $method = $accessor->EntityAccessor;
-                $returnValue[] = (object)array(
-                    'Name'  => $accessor->AzurePropertyName,
-                	'Type'  => $accessor->AzurePropertyType,
-                	'Value' => $this->$method(),
-                );
-            }
-        }
-        
-        // Return
-        return $returnValue;
-    }
-    
-    /**
-     * Set Azure values
-     * 
-     * @param array $values
-     * @param boolean $throwOnError Throw Zend_Service_WindowsAzure_Exception when a property is not specified in $values?
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function setAzureValues($values = array(), $throwOnError = false)
-    {
-        // Get accessors
-        $accessors = self::getAzureAccessors(get_class($this));
-        
-        // Loop accessors and set values
-        $returnValue = array();
-        foreach ($accessors as $accessor) {
-            if (isset($values[$accessor->AzurePropertyName])) {
-                // Cast to correct type
-                if ($accessor->AzurePropertyType != '') {
-                    switch (strtolower($accessor->AzurePropertyType)) {
-        	            case 'edm.int32':
-        	            case 'edm.int64':
-        	                $values[$accessor->AzurePropertyName] = intval($values[$accessor->AzurePropertyName]); break;
-        	            case 'edm.boolean':
-        	                if ($values[$accessor->AzurePropertyName] == 'true' || $values[$accessor->AzurePropertyName] == '1')
-        	                    $values[$accessor->AzurePropertyName] = true;
-        	                else
-        	                    $values[$accessor->AzurePropertyName] = false;
-        	                break;
-        	            case 'edm.double':
-        	                $values[$accessor->AzurePropertyName] = floatval($values[$accessor->AzurePropertyName]); break;
-        	        }
-                }
-                
-                // Assign value
-                if ($accessor->EntityType == 'ReflectionProperty') {
-                    $property = $accessor->EntityAccessor;
-                    $this->$property = $values[$accessor->AzurePropertyName];
-                } else if ($accessor->EntityType == 'ReflectionMethod' && substr(strtolower($accessor->EntityAccessor), 0, 3) == 'set') {
-                    $method = $accessor->EntityAccessor;
-                    $this->$method($values[$accessor->AzurePropertyName]);
-                }
-            } else if ($throwOnError) {
-                throw new Zend_Service_WindowsAzure_Exception("Property '" . $accessor->AzurePropertyName . "' was not found in \$values array");    
-            }
-        }
-        
-        // Return
-        return $returnValue;
-    }
-    
-    /**
-     * Get Azure accessors from class
-     * 
-     * @param string $className Class to get accessors for
-     * @return array
-     */
-    public static function getAzureAccessors($className = '')
-    {
-        // List of accessors
-        $azureAccessors = array();
-        
-        // Get all types
-        $type = new ReflectionClass($className);
-        
-        // Loop all properties
-        $properties = $type->getProperties();
-        foreach ($properties as $property) {
-            $accessor = self::getAzureAccessor($property);
-            if (!is_null($accessor)) {
-                $azureAccessors[] = $accessor;
-            }
-        }
-        
-        // Loop all methods
-        $methods = $type->getMethods();
-        foreach ($methods as $method) {
-            $accessor = self::getAzureAccessor($method);
-            if (!is_null($accessor)) {
-                $azureAccessors[] = $accessor;
-            }
-        }
-        
-        // Return
-        return $azureAccessors;
-    }
-    
-    /**
-     * Get Azure accessor from reflection member
-     * 
-     * @param ReflectionProperty|ReflectionMethod $member
-     * @return object
-     */
-    public static function getAzureAccessor($member)
-    {
-        // Get comment
-        $docComment = $member->getDocComment();
-        
-        // Check for Azure comment
-        if (strpos($docComment, '@azure') === false)
-        {
-            return null;
-        }
-            
-        // Search for @azure contents
-        $azureComment = '';
-        $commentLines = explode("\n", $docComment);
-        foreach ($commentLines as $commentLine) {
-            if (strpos($commentLine, '@azure') !== false) {
-                $azureComment = trim(substr($commentLine, strpos($commentLine, '@azure') + 6));
-                while (strpos($azureComment, '  ') !== false) {
-                    $azureComment = str_replace('  ', ' ', $azureComment);
-                }
-                break;
-            }
-        }
-        
-        // Fetch @azure properties
-        $azureProperties = explode(' ', $azureComment);
-        return (object)array(
-            'EntityAccessor'    => $member->getName(),
-            'EntityType'        => get_class($member),
-            'AzurePropertyName' => $azureProperties[0],
-        	'AzurePropertyType' => isset($azureProperties[1]) ? $azureProperties[1] : ''
-        );
-    }
-}
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php b/lib/zend/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
deleted file mode 100644
index 8da0b0ffb9b..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_TableEntityQuery
-{
-    /**
-     * From
-     * 
-     * @var string
-     */
-	protected $_from  = '';
-	
-	/**
-	 * Where
-	 * 
-	 * @var array
-	 */
-	protected $_where = array();
-	
-	/**
-	 * Order by
-	 * 
-	 * @var array
-	 */
-	protected $_orderBy = array();
-	
-	/**
-	 * Top
-	 * 
-	 * @var int
-	 */
-	protected $_top = null;
-	
-	/**
-	 * Partition key
-	 * 
-	 * @var string
-	 */
-	protected $_partitionKey = null;
-
-	/**
-	 * Row key
-	 * 
-	 * @var string
-	 */
-	protected $_rowKey = null;
-	
-	/**
-	 * Select clause
-	 * 
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function select()
-	{
-		return $this;
-	}
-	
-	/**
-	 * From clause
-	 * 
-	 * @param string $name Table name to select entities from
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function from($name)
-	{
-		$this->_from = $name;
-		return $this;
-	}
-	
-	/**
-	 * Specify partition key
-	 * 
-	 * @param string $value Partition key to query for
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function wherePartitionKey($value = null)
-	{
-	    $this->_partitionKey = $value;
-	    return $this;
-	}
-	
-	/**
-	 * Specify row key
-	 * 
-	 * @param string $value Row key to query for
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function whereRowKey($value = null)
-	{
-	    $this->_rowKey = $value;
-	    return $this;
-	}
-	
-	/**
-	 * Add where clause
-	 * 
-	 * @param string       $condition   Condition, can contain question mark(s) (?) for parameter insertion.
-	 * @param string|array $value       Value(s) to insert in question mark (?) parameters.
-	 * @param string       $cond        Condition for the clause (and/or/not)
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function where($condition, $value = null, $cond = '')
-	{
-	    $condition = $this->_replaceOperators($condition);
-	    
-	    if (!is_null($value)) {
-	        $condition = $this->_quoteInto($condition, $value);
-	    }
-	    
-		if (count($this->_where) == 0) {
-			$cond = '';
-		} else if ($cond !== '') {
-			$cond = ' ' . strtolower(trim($cond)) . ' ';
-		}
-		
-		$this->_where[] = $cond . $condition;
-		return $this;
-	}
-
-	/**
-	 * Add where clause with AND condition
-	 * 
-	 * @param string       $condition   Condition, can contain question mark(s) (?) for parameter insertion.
-	 * @param string|array $value       Value(s) to insert in question mark (?) parameters.
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function andWhere($condition, $value = null)
-	{
-		return $this->where($condition, $value, 'and');
-	}
-	
-	/**
-	 * Add where clause with OR condition
-	 * 
-	 * @param string       $condition   Condition, can contain question mark(s) (?) for parameter insertion.
-	 * @param string|array $value       Value(s) to insert in question mark (?) parameters.
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function orWhere($condition, $value = null)
-	{
-		return $this->where($condition, $value, 'or');
-	}
-	
-	/**
-	 * OrderBy clause
-	 * 
-	 * @param string $column    Column to sort by
-	 * @param string $direction Direction to sort (asc/desc)
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function orderBy($column, $direction = 'asc')
-	{
-		$this->_orderBy[] = $column . ' ' . $direction;
-		return $this;
-	}
-    
-	/**
-	 * Top clause
-	 * 
-	 * @param int $top  Top to fetch
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-    public function top($top = null)
-    {
-        $this->_top  = (int)$top;
-        return $this;
-    }
-	
-    /**
-     * Assembles the query string
-     * 
-     * @param boolean $urlEncode Apply URL encoding to the query string
-     * @return string
-     */
-	public function assembleQueryString($urlEncode = false)
-	{
-		$query = array();
-		if (count($this->_where) != 0) {
-		    $filter = implode('', $this->_where);
-			$query[] = '$filter=' . ($urlEncode ? urlencode($filter) : $filter);
-		}
-		
-		if (count($this->_orderBy) != 0) {
-		    $orderBy = implode(',', $this->_orderBy);
-			$query[] = '$orderby=' . ($urlEncode ? urlencode($orderBy) : $orderBy);
-		}
-		
-		if (!is_null($this->_top)) {
-			$query[] = '$top=' . $this->_top;
-		}
-		
-		if (count($query) != 0) {
-			return '?' . implode('&', $query);
-		}
-		
-		return '';
-	}
-	
-	/**
-	 * Assemble from
-	 * 
-	 * @param boolean $includeParentheses Include parentheses? ()
-	 * @return string
-	 */
-	public function assembleFrom($includeParentheses = true)
-	{
-	    $identifier = '';
-	    if ($includeParentheses) {
-	        $identifier .= '(';
-	        
-	        if (!is_null($this->_partitionKey)) {
-	            $identifier .= 'PartitionKey=\'' . $this->_partitionKey . '\'';
-	        }
-	            
-	        if (!is_null($this->_partitionKey) && !is_null($this->_rowKey)) {
-	            $identifier .= ', ';
-	        }
-	            
-	        if (!is_null($this->_rowKey)) {
-	            $identifier .= 'RowKey=\'' . $this->_rowKey . '\'';
-	        }
-	            
-	        $identifier .= ')';
-	    }
-		return $this->_from . $identifier;
-	}
-	
-	/**
-	 * Assemble full query
-	 * 
-	 * @return string
-	 */
-	public function assembleQuery()
-	{
-		$assembledQuery = $this->assembleFrom();
-		
-		$queryString = $this->assembleQueryString();
-		if ($queryString !== '') {
-			$assembledQuery .= $queryString;
-		}
-		
-		return $assembledQuery;
-	}
-	
-	/**
-	 * Quotes a variable into a condition
-	 * 
-	 * @param string       $text   Condition, can contain question mark(s) (?) for parameter insertion.
-	 * @param string|array $value  Value(s) to insert in question mark (?) parameters.
-	 * @return string
-	 */
-	protected function _quoteInto($text, $value = null)
-	{
-		if (!is_array($value)) {
-	        $text = str_replace('?', '\'' . addslashes($value) . '\'', $text);
-	    } else {
-	        $i = 0;
-	        while(strpos($text, '?') !== false) {
-	            if (is_numeric($value[$i])) {
-	                $text = substr_replace($text, $value[$i++], strpos($text, '?'), 1);
-	            } else {
-	                $text = substr_replace($text, '\'' . addslashes($value[$i++]) . '\'', strpos($text, '?'), 1);
-	            }
-	        }
-	    }
-	    return $text;
-	}
-	
-	/**
-	 * Replace operators
-	 * 
-	 * @param string $text
-	 * @return string
-	 */
-	protected function _replaceOperators($text)
-	{
-	    $text = str_replace('==', 'eq',  $text);
-	    $text = str_replace('>',  'gt',  $text);
-	    $text = str_replace('<',  'lt',  $text);
-	    $text = str_replace('>=', 'ge',  $text);
-	    $text = str_replace('<=', 'le',  $text);
-	    $text = str_replace('!=', 'ne',  $text);
-	    
-	    $text = str_replace('&&', 'and', $text);
-	    $text = str_replace('||', 'or',  $text);
-	    $text = str_replace('!',  'not', $text);
-	    
-	    return $text;
-	}
-	
-	/**
-	 * __toString overload
-	 * 
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return $this->assembleQuery();
-	}
-}
\ No newline at end of file
diff --git a/lib/zend/Zend/Service/WindowsAzure/Storage/TableInstance.php b/lib/zend/Zend/Service/WindowsAzure/Storage/TableInstance.php
deleted file mode 100644
index b0671eadb8b..00000000000
--- a/lib/zend/Zend/Service/WindowsAzure/Storage/TableInstance.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string  $Id              Id
- * @property string  $Name            Name
- * @property string  $Href            Href
- * @property string  $Updated         Updated
- */
-class Zend_Service_WindowsAzure_Storage_TableInstance
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string  $id              Id
-     * @param string  $name            Name
-     * @param string  $href            Href
-     * @param string  $updated         Updated
-     */
-    public function __construct($id, $name, $href, $updated) 
-    {	        
-        $this->_data = array(
-            'id'               => $id,
-            'name'             => $name,
-            'href'             => $href,
-            'updated'          => $updated
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/lib/zend/Zend/Service/Yahoo.php b/lib/zend/Zend/Service/Yahoo.php
index 925232ccc4c..2503435e5aa 100644
--- a/lib/zend/Zend/Service/Yahoo.php
+++ b/lib/zend/Zend/Service/Yahoo.php
@@ -16,17 +16,19 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
 
 /**
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo
@@ -99,8 +101,7 @@ class Zend_Service_Yahoo
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -155,8 +156,7 @@ class Zend_Service_Yahoo
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -219,8 +219,7 @@ class Zend_Service_Yahoo
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -273,8 +272,7 @@ class Zend_Service_Yahoo
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -320,8 +318,7 @@ class Zend_Service_Yahoo
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -374,8 +371,7 @@ class Zend_Service_Yahoo
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
@@ -431,8 +427,7 @@ class Zend_Service_Yahoo
         }
 
         $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
+        $dom = Zend_Xml_Security::scan($response->getBody(), $dom);
         self::_checkErrors($dom);
 
         /**
diff --git a/lib/zend/Zend/Service/Yahoo/Image.php b/lib/zend/Zend/Service/Yahoo/Image.php
index 30f3757a5db..defdddec45f 100644
--- a/lib/zend/Zend/Service/Yahoo/Image.php
+++ b/lib/zend/Zend/Service/Yahoo/Image.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_Image
diff --git a/lib/zend/Zend/Service/Yahoo/ImageResult.php b/lib/zend/Zend/Service/Yahoo/ImageResult.php
index 5c2909efeda..5f38b9a3eff 100644
--- a/lib/zend/Zend/Service/Yahoo/ImageResult.php
+++ b/lib/zend/Zend/Service/Yahoo/ImageResult.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_ImageResult extends Zend_Service_Yahoo_Result
diff --git a/lib/zend/Zend/Service/Yahoo/ImageResultSet.php b/lib/zend/Zend/Service/Yahoo/ImageResultSet.php
index 38d7f01f910..b8274683219 100644
--- a/lib/zend/Zend/Service/Yahoo/ImageResultSet.php
+++ b/lib/zend/Zend/Service/Yahoo/ImageResultSet.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/ImageResult.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_ImageResultSet extends Zend_Service_Yahoo_ResultSet
diff --git a/lib/zend/Zend/Service/Yahoo/InlinkDataResult.php b/lib/zend/Zend/Service/Yahoo/InlinkDataResult.php
index 1ac6d1c24f6..f325aff8dcf 100644
--- a/lib/zend/Zend/Service/Yahoo/InlinkDataResult.php
+++ b/lib/zend/Zend/Service/Yahoo/InlinkDataResult.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Yahoo/Result.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_InlinkDataResult extends Zend_Service_Yahoo_Result
diff --git a/lib/zend/Zend/Service/Yahoo/InlinkDataResultSet.php b/lib/zend/Zend/Service/Yahoo/InlinkDataResultSet.php
index d03bc7b91c8..3a8b815d103 100644
--- a/lib/zend/Zend/Service/Yahoo/InlinkDataResultSet.php
+++ b/lib/zend/Zend/Service/Yahoo/InlinkDataResultSet.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Service/Yahoo/InlinkDataResult.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_InlinkDataResultSet extends Zend_Service_Yahoo_ResultSet
diff --git a/lib/zend/Zend/Service/Yahoo/LocalResult.php b/lib/zend/Zend/Service/Yahoo/LocalResult.php
index bd7d9142632..9993e92835a 100644
--- a/lib/zend/Zend/Service/Yahoo/LocalResult.php
+++ b/lib/zend/Zend/Service/Yahoo/LocalResult.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_LocalResult extends Zend_Service_Yahoo_Result
diff --git a/lib/zend/Zend/Service/Yahoo/LocalResultSet.php b/lib/zend/Zend/Service/Yahoo/LocalResultSet.php
index 50ddf35bf84..d2228244e6d 100644
--- a/lib/zend/Zend/Service/Yahoo/LocalResultSet.php
+++ b/lib/zend/Zend/Service/Yahoo/LocalResultSet.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/LocalResult.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_LocalResultSet extends Zend_Service_Yahoo_ResultSet
diff --git a/lib/zend/Zend/Service/Yahoo/NewsResult.php b/lib/zend/Zend/Service/Yahoo/NewsResult.php
index cb0e4327257..e71daef5789 100644
--- a/lib/zend/Zend/Service/Yahoo/NewsResult.php
+++ b/lib/zend/Zend/Service/Yahoo/NewsResult.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_NewsResult extends Zend_Service_Yahoo_Result
diff --git a/lib/zend/Zend/Service/Yahoo/NewsResultSet.php b/lib/zend/Zend/Service/Yahoo/NewsResultSet.php
index 695fad984aa..7f2c13120d1 100644
--- a/lib/zend/Zend/Service/Yahoo/NewsResultSet.php
+++ b/lib/zend/Zend/Service/Yahoo/NewsResultSet.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/NewsResult.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_NewsResultSet extends Zend_Service_Yahoo_ResultSet
diff --git a/lib/zend/Zend/Service/Yahoo/PageDataResult.php b/lib/zend/Zend/Service/Yahoo/PageDataResult.php
index 34aa988223f..a4aa74da251 100644
--- a/lib/zend/Zend/Service/Yahoo/PageDataResult.php
+++ b/lib/zend/Zend/Service/Yahoo/PageDataResult.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/Service/Yahoo/Result.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_PageDataResult extends Zend_Service_Yahoo_Result
diff --git a/lib/zend/Zend/Service/Yahoo/PageDataResultSet.php b/lib/zend/Zend/Service/Yahoo/PageDataResultSet.php
index f7e0c9d3a7a..60cd4a576f1 100644
--- a/lib/zend/Zend/Service/Yahoo/PageDataResultSet.php
+++ b/lib/zend/Zend/Service/Yahoo/PageDataResultSet.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -37,7 +37,7 @@ require_once 'Zend/Service/Yahoo/PageDataResult.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_PageDataResultSet extends Zend_Service_Yahoo_ResultSet
diff --git a/lib/zend/Zend/Service/Yahoo/Result.php b/lib/zend/Zend/Service/Yahoo/Result.php
index 23b5fa1bf11..fcd73d29d1a 100644
--- a/lib/zend/Zend/Service/Yahoo/Result.php
+++ b/lib/zend/Zend/Service/Yahoo/Result.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_Result
diff --git a/lib/zend/Zend/Service/Yahoo/ResultSet.php b/lib/zend/Zend/Service/Yahoo/ResultSet.php
index 57951d7179a..163cafb68b7 100644
--- a/lib/zend/Zend/Service/Yahoo/ResultSet.php
+++ b/lib/zend/Zend/Service/Yahoo/ResultSet.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_ResultSet implements SeekableIterator
diff --git a/lib/zend/Zend/Service/Yahoo/VideoResult.php b/lib/zend/Zend/Service/Yahoo/VideoResult.php
index c3f53578773..7aded46437e 100644
--- a/lib/zend/Zend/Service/Yahoo/VideoResult.php
+++ b/lib/zend/Zend/Service/Yahoo/VideoResult.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_VideoResult extends Zend_Service_Yahoo_Result
diff --git a/lib/zend/Zend/Service/Yahoo/VideoResultSet.php b/lib/zend/Zend/Service/Yahoo/VideoResultSet.php
index fe884cd7ee5..c26ff496e52 100644
--- a/lib/zend/Zend/Service/Yahoo/VideoResultSet.php
+++ b/lib/zend/Zend/Service/Yahoo/VideoResultSet.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/VideoResult.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_VideoResultSet extends Zend_Service_Yahoo_ResultSet
diff --git a/lib/zend/Zend/Service/Yahoo/WebResult.php b/lib/zend/Zend/Service/Yahoo/WebResult.php
index ffffb99c263..7fa318473a6 100644
--- a/lib/zend/Zend/Service/Yahoo/WebResult.php
+++ b/lib/zend/Zend/Service/Yahoo/WebResult.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_WebResult extends Zend_Service_Yahoo_Result
diff --git a/lib/zend/Zend/Service/Yahoo/WebResultSet.php b/lib/zend/Zend/Service/Yahoo/WebResultSet.php
index e704a86fe1b..267f04b4bdb 100644
--- a/lib/zend/Zend/Service/Yahoo/WebResultSet.php
+++ b/lib/zend/Zend/Service/Yahoo/WebResultSet.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/WebResult.php';
  * @category   Zend
  * @package    Zend_Service
  * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Yahoo_WebResultSet extends Zend_Service_Yahoo_ResultSet
diff --git a/lib/zend/Zend/Soap/AutoDiscover.php b/lib/zend/Zend/Soap/AutoDiscover.php
index 1440e5ab667..f1df112ab74 100644
--- a/lib/zend/Zend/Soap/AutoDiscover.php
+++ b/lib/zend/Zend/Soap/AutoDiscover.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage AutoDiscover
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -91,13 +91,21 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
      */
     protected $_bindingStyle = array('style' => 'rpc', 'transport' => 'http://schemas.xmlsoap.org/soap/http');
 
+    /**
+     * Name of the class to handle the WSDL creation.
+     *
+     * @var string
+     */
+    protected $_wsdlClass = 'Zend_Soap_Wsdl';
+
     /**
      * Constructor
      *
      * @param boolean|string|Zend_Soap_Wsdl_Strategy_Interface $strategy
      * @param string|Zend_Uri $uri
+     * @param string $wsdlClass
      */
-    public function __construct($strategy = true, $uri=null)
+    public function __construct($strategy = true, $uri=null, $wsdlClass=null)
     {
         $this->_reflection = new Zend_Server_Reflection();
         $this->setComplexTypeStrategy($strategy);
@@ -105,26 +113,30 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
         if($uri !== null) {
             $this->setUri($uri);
         }
+
+        if($wsdlClass !== null) {
+            $this->setWsdlClass($wsdlClass);
+        }
     }
 
     /**
      * Set the location at which the WSDL file will be availabe.
      *
      * @see Zend_Soap_Exception
-     * @throws Zend_Soap_AutoDiscover_Exception
      * @param  Zend_Uri|string $uri
      * @return Zend_Soap_AutoDiscover
+     * @throws Zend_Soap_AutoDiscover_Exception
      */
     public function setUri($uri)
     {
-        if(!is_string($uri) && !($uri instanceof Zend_Uri)) {
+        if (!is_string($uri) && !($uri instanceof Zend_Uri)) {
             require_once "Zend/Soap/AutoDiscover/Exception.php";
             throw new Zend_Soap_AutoDiscover_Exception("No uri given to Zend_Soap_AutoDiscover::setUri as string or Zend_Uri instance.");
         }
         $this->_uri = $uri;
 
         // change uri in WSDL file also if existant
-        if($this->_wsdl instanceof Zend_Soap_Wsdl) {
+        if ($this->_wsdl instanceof Zend_Soap_Wsdl) {
             $this->_wsdl->setUri($uri);
         }
 
@@ -150,6 +162,36 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
         return $uri;
     }
 
+    /**
+     * Set the name of the WSDL handling class.
+     *
+     * @see Zend_Soap_Exception
+     * @see Zend_Soap_Exception
+     * @param  string $wsdlClass
+     * @return Zend_Soap_AutoDiscover
+     * @throws Zend_Soap_AutoDiscover_Exception
+     */
+    public function setWsdlClass($wsdlClass)
+    {
+        if (!is_string($wsdlClass) && !is_subclass_of($wsdlClass, 'Zend_Soap_Wsdl')) {
+            require_once "Zend/Soap/AutoDiscover/Exception.php";
+            throw new Zend_Soap_AutoDiscover_Exception("No Zend_Soap_Wsdl subclass given to Zend_Soap_AutoDiscover::setWsdlClass as string.");
+        }
+        $this->_wsdlClass = $wsdlClass;
+
+        return $this;
+    }
+
+    /**
+     * Return the name of the WSDL handling class.
+     *
+     * @return string
+     */
+    public function getWsdlClass()
+    {
+        return $this->_wsdlClass;
+    }
+
     /**
      * Set options for all the binding operations soap:body elements.
      *
@@ -159,6 +201,7 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
      * @see    Zend_Soap_AutoDiscover_Exception
      * @param  array $operationStyle
      * @return Zend_Soap_AutoDiscover
+     * @throws Zend_Soap_AutoDiscover_Exception
      */
     public function setOperationBodyStyle(array $operationStyle=array())
     {
@@ -225,7 +268,9 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
      */
     protected function getRequestUriWithoutParameters()
     {
-        if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
+        if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { // IIS with Microsoft Rewrite Module
+            $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL'];
+        } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
             $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
         } elseif (isset($_SERVER['REQUEST_URI'])) {
             $requestUri = $_SERVER['REQUEST_URI'];
@@ -263,12 +308,13 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
      * @param string $class Class Name
      * @param string $namespace Class Namspace - Not Used
      * @param array $argv Arguments to instantiate the class - Not Used
+     * @return Zend_Soap_AutoDiscover
      */
     public function setClass($class, $namespace = '', $argv = null)
     {
         $uri = $this->getUri();
 
-        $wsdl = new Zend_Soap_Wsdl($class, $uri, $this->_strategy);
+        $wsdl = new $this->_wsdlClass($class, $uri, $this->_strategy);
 
         // The wsdl:types element must precede all other elements (WS-I Basic Profile 1.1 R2023)
         $wsdl->addSchemaTypeSection();
@@ -282,6 +328,8 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
             $this->_addFunctionToWsdl($method, $wsdl, $port, $binding);
         }
         $this->_wsdl = $wsdl;
+
+        return $this;
     }
 
     /**
@@ -289,6 +337,7 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
      *
      * @param string $function Function Name
      * @param string $namespace Function namespace - Not Used
+     * @return Zend_Soap_AutoDiscover
      */
     public function addFunction($function, $namespace = '')
     {
@@ -324,15 +373,17 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
             $this->_addFunctionToWsdl($method, $wsdl, $port, $binding);
         }
         $this->_wsdl = $wsdl;
+
+        return $this;
     }
 
     /**
      * Add a function to the WSDL document.
      *
-     * @param $function Zend_Server_Reflection_Function_Abstract function to add
-     * @param $wsdl Zend_Soap_Wsdl WSDL document
-     * @param $port object wsdl:portType
-     * @param $binding object wsdl:binding
+     * @param Zend_Server_Reflection_Function_Abstract $function function to add
+     * @param Zend_Soap_Wsdl                           $wsdl     WSDL document
+     * @param object                                   $port     wsdl:portType
+     * @param object                                   $binding  wsdl:binding
      * @return void
      */
     protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
@@ -430,7 +481,11 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
         }
 
         // Add the binding operation
-        $operation = $wsdl->addBindingOperation($binding, $function->getName(),  $this->_operationBodyStyle, $this->_operationBodyStyle);
+        if($isOneWayMessage == false) {
+            $operation = $wsdl->addBindingOperation($binding, $function->getName(),  $this->_operationBodyStyle, $this->_operationBodyStyle);
+        } else {
+            $operation = $wsdl->addBindingOperation($binding, $function->getName(),  $this->_operationBodyStyle);
+        }
         $wsdl->addSoapOperation($operation, $uri . '#' .$function->getName());
 
         // Add the function name to the list
@@ -442,6 +497,7 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
      *
      * @param string $fault
      * @param string|int $code
+     * @throws Zend_Soap_AutoDiscover_Exception
      */
     public function fault($fault = null, $code = null)
     {
@@ -466,6 +522,8 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
      * Proxy to WSDL dump function
      *
      * @param string $filename
+     * @return boolean
+     * @throws Zend_Soap_AutoDiscover_Exception
      */
     public function dump($filename)
     {
@@ -482,6 +540,9 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
 
     /**
      * Proxy to WSDL toXml() function
+     *
+     * @return string
+     * @throws Zend_Soap_AutoDiscover_Exception
      */
     public function toXml()
     {
@@ -510,6 +571,7 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
      * Load Functions
      *
      * @param unknown_type $definition
+     * @throws Zend_Soap_AutoDiscover_Exception
      */
     public function loadFunctions($definition)
     {
@@ -521,6 +583,7 @@ class Zend_Soap_AutoDiscover implements Zend_Server_Interface
      * Set Persistance
      *
      * @param int $mode
+     * @throws Zend_Soap_AutoDiscover_Exception
      */
     public function setPersistence($mode)
     {
diff --git a/lib/zend/Zend/Soap/AutoDiscover/Exception.php b/lib/zend/Zend/Soap/AutoDiscover/Exception.php
index dd1b75a981d..278ff8e1b0e 100644
--- a/lib/zend/Zend/Soap/AutoDiscover/Exception.php
+++ b/lib/zend/Zend/Soap/AutoDiscover/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage AutoDiscover
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
diff --git a/lib/zend/Zend/Soap/Client.php b/lib/zend/Zend/Soap/Client.php
index 3fc620a385d..9a3b754c35b 100644
--- a/lib/zend/Zend/Soap/Client.php
+++ b/lib/zend/Zend/Soap/Client.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,7 +41,7 @@ require_once 'Zend/Soap/Client/Common.php';
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Soap_Client
@@ -89,6 +89,7 @@ class Zend_Soap_Client
     protected $_features            = null;
     protected $_cache_wsdl          = null;
     protected $_user_agent          = null;
+    protected $_exceptions          = null;
 
     /**
      * WSDL used to access server
@@ -268,6 +269,9 @@ class Zend_Soap_Client
                 case 'user_agent':
                     $this->setUserAgent($value);
                     break;
+                case 'exceptions':
+                    $this->setExceptions($value);
+                    break;
 
                 // Not used now
                 // case 'connection_timeout':
@@ -315,13 +319,14 @@ class Zend_Soap_Client
         $options['cache_wsdl']     = $this->getWsdlCache();
         $options['features']       = $this->getSoapFeatures();
         $options['user_agent']     = $this->getUserAgent();
+        $options['exceptions']     = $this->getExceptions();
 
         foreach ($options as $key => $value) {
             /*
              * ugly hack as I don't know if checking for '=== null'
              * breaks some other option
              */
-            if ($key == 'user_agent') {
+            if (in_array($key, array('user_agent', 'cache_wsdl', 'compression', 'exceptions'))) {
                 if ($value === null) {
                     unset($options[$key]);
                 }
@@ -767,15 +772,17 @@ class Zend_Soap_Client
     /**
      * Set compression options
      *
-     * @param  int $compressionOptions
+     * @param  int|null $compressionOptions
      * @return Zend_Soap_Client
      */
     public function setCompressionOptions($compressionOptions)
     {
-        $this->_compression = $compressionOptions;
-
+        if ($compressionOptions === null) {
+            $this->_compression = null;
+        } else {
+            $this->_compression = (int)$compressionOptions;
+        }
         $this->_soapClient = null;
-
         return $this;
     }
 
@@ -857,17 +864,23 @@ class Zend_Soap_Client
     /**
      * Set the SOAP Wsdl Caching Options
      *
-     * @param string|int|boolean $caching
+     * @param string|int|boolean|null $caching
      * @return Zend_Soap_Client
      */
-    public function setWsdlCache($options)
+    public function setWsdlCache($caching)
     {
-        $this->_cache_wsdl = $options;
+        if ($caching === null) {
+            $this->_cache_wsdl = null;
+        } else {
+            $this->_cache_wsdl = (int)$caching;
+        }
         return $this;
     }
 
     /**
      * Get current SOAP Wsdl Caching option
+     *
+     * @return int
      */
     public function getWsdlCache()
     {
@@ -900,6 +913,39 @@ class Zend_Soap_Client
         return $this->_user_agent;
     }
 
+    /**
+     * Set the exceptions option
+     *
+     * The exceptions option is a boolean value defining whether soap errors
+     * throw exceptions.
+     *
+     * @see http://php.net/manual/soapclient.soapclient.php#refsect1-soapclient.soapclient-parameters
+     *
+     * @param bool $exceptions
+     * @return $this
+     */
+    public function setExceptions($exceptions)
+    {
+        $this->_exceptions = (bool) $exceptions;
+
+        return $this;
+    }
+
+    /**
+     * Get the exceptions option
+     *
+     * The exceptions option is a boolean value defining whether soap errors
+     * throw exceptions.
+     *
+     * @see http://php.net/manual/soapclient.soapclient.php#refsect1-soapclient.soapclient-parameters
+     *
+     * @return bool|null
+     */
+    public function getExceptions()
+    {
+        return $this->_exceptions;
+    }
+
     /**
      * Retrieve request XML
      *
diff --git a/lib/zend/Zend/Soap/Client/Common.php b/lib/zend/Zend/Soap/Client/Common.php
index d3eb8e21155..7880115ce73 100644
--- a/lib/zend/Zend/Soap/Client/Common.php
+++ b/lib/zend/Zend/Soap/Client/Common.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
diff --git a/lib/zend/Zend/Soap/Client/DotNet.php b/lib/zend/Zend/Soap/Client/DotNet.php
index 8a630f08bff..d031f4c368c 100644
--- a/lib/zend/Zend/Soap/Client/DotNet.php
+++ b/lib/zend/Zend/Soap/Client/DotNet.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
diff --git a/lib/zend/Zend/Soap/Client/Exception.php b/lib/zend/Zend/Soap/Client/Exception.php
index fc278a2c44f..8f6d0c627bc 100644
--- a/lib/zend/Zend/Soap/Client/Exception.php
+++ b/lib/zend/Zend/Soap/Client/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -26,7 +26,7 @@ require_once 'Zend/Exception.php';
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
diff --git a/lib/zend/Zend/Soap/Client/Local.php b/lib/zend/Zend/Soap/Client/Local.php
index 09b43d3613b..18a11b28266 100644
--- a/lib/zend/Zend/Soap/Client/Local.php
+++ b/lib/zend/Zend/Soap/Client/Local.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -83,8 +83,14 @@ class Zend_Soap_Client_Local extends Zend_Soap_Client
         // Perform request as is
         ob_start();
         $this->_server->handle($request);
-        $response = ob_get_contents();
-        ob_end_clean();
+        $response = ob_get_clean();
+ 
+        if ($response === null || $response === '') {
+            $serverResponse = $this->server->getResponse();
+            if ($serverResponse !== null) {
+                $response = $serverResponse;
+            }
+        }
 
         return $response;
     }
diff --git a/lib/zend/Zend/Soap/Server.php b/lib/zend/Zend/Soap/Server.php
index 469192c38cf..d1421d3eccf 100644
--- a/lib/zend/Zend/Soap/Server.php
+++ b/lib/zend/Zend/Soap/Server.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -24,6 +24,12 @@
  */
 require_once 'Zend/Server/Interface.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
+/** @see Zend_Xml_Exception */
+require_once 'Zend/Xml/Exception.php';
+
 /**
  * Zend_Soap_Server
  *
@@ -31,7 +37,7 @@ require_once 'Zend/Server/Interface.php';
  * @package    Zend_Soap
  * @subpackage Server
  * @uses       Zend_Server_Interface
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -86,7 +92,13 @@ class Zend_Soap_Server implements Zend_Server_Interface
      */
     protected $_wsdlCache;
 
-
+    /**
+     * WS-I compliant
+     * 
+     * @var boolean 
+     */
+    protected $_wsiCompliant;
+    
     /**
      * Registered fault exceptions
      * @var array
@@ -210,11 +222,16 @@ class Zend_Soap_Server implements Zend_Server_Interface
                     $this->setWsdl($value);
                     break;
                 case 'featues':
+                    trigger_error(__METHOD__ . ': the option "featues" is deprecated as of 1.10.x and will be removed with 2.0.0; use "features" instead', E_USER_NOTICE);
+                case 'features':
                     $this->setSoapFeatures($value);
                     break;
                 case 'cache_wsdl':
                     $this->setWsdlCache($value);
                     break;
+                case 'wsi_compliant':
+                    $this->setWsiCompliant($value);
+                    break;
                 default:
                     break;
             }
@@ -251,17 +268,42 @@ class Zend_Soap_Server implements Zend_Server_Interface
             $options['uri'] = $this->_uri;
         }
 
-        if(null !== $this->_features) {
+        if (null !== $this->_features) {
             $options['features'] = $this->_features;
         }
 
-        if(null !== $this->_wsdlCache) {
+        if (null !== $this->_wsdlCache) {
             $options['cache_wsdl'] = $this->_wsdlCache;
         }
 
+        if (null !== $this->_wsiCompliant) {
+            $options['wsi_compliant'] = $this->_wsiCompliant;
+        }
+        
         return $options;
     }
-
+    /**
+     * Set WS-I compliant
+     * 
+     * @param  boolean $value
+     * @return Zend_Soap_Server 
+     */
+    public function setWsiCompliant($value)
+    {
+        if (is_bool($value)) {
+            $this->_wsiCompliant = $value;
+        }
+        return $this;
+    }
+    /**
+     * Gt WS-I compliant
+     * 
+     * @return boolean
+     */
+    public function getWsiCompliant() 
+    {
+        return $this->_wsiCompliant;
+    }
     /**
      * Set encoding
      *
@@ -593,7 +635,12 @@ class Zend_Soap_Server implements Zend_Server_Interface
             throw new Zend_Soap_Server_Exception('An object has already been registered with this soap server instance');
         }
 
-        $this->_object = $object;
+        if ($this->_wsiCompliant) {
+            require_once 'Zend/Soap/Server/Proxy.php';
+            $this->_object = new Zend_Soap_Server_Proxy($object);
+        } else {
+            $this->_object = $object;
+        }    
 
         return $this;
     }
@@ -689,9 +736,16 @@ class Zend_Soap_Server implements Zend_Server_Interface
             }
 
             $dom = new DOMDocument();
-            if(strlen($xml) == 0 || !$dom->loadXML($xml)) {
+            try {
+                if(strlen($xml) == 0 || (!$dom = Zend_Xml_Security::scan($xml, $dom))) {
+                    require_once 'Zend/Soap/Server/Exception.php';
+                    throw new Zend_Soap_Server_Exception('Invalid XML');
+                }
+            } catch (Zend_Xml_Exception $e) {
                 require_once 'Zend/Soap/Server/Exception.php';
-                throw new Zend_Soap_Server_Exception('Invalid XML');
+                throw new Zend_Soap_Server_Exception(
+                    $e->getMessage()
+                );
             }
         }
         $this->_request = $xml;
@@ -766,6 +820,10 @@ class Zend_Soap_Server implements Zend_Server_Interface
         if (!empty($this->_class)) {
             $args = $this->_classArgs;
             array_unshift($args, $this->_class);
+            if ($this->_wsiCompliant) {
+                require_once 'Zend/Soap/Server/Proxy.php';
+                array_unshift($args, 'Zend_Soap_Server_Proxy');
+            } 
             call_user_func_array(array($server, 'setClass'), $args);
         }
 
@@ -818,19 +876,19 @@ class Zend_Soap_Server implements Zend_Server_Interface
         } catch (Zend_Soap_Server_Exception $e) {
             $setRequestException = $e;
         }
-
+        
         $soap = $this->_getSoap();
 
+        $fault = false;
         ob_start();
-        if($setRequestException instanceof Exception) {
-            // Send SOAP fault message if we've catched exception
-            $soap->fault("Sender", $setRequestException->getMessage());
+        if ($setRequestException instanceof Exception) {
+            // Create SOAP fault message if we've caught a request exception
+            $fault = $this->fault($setRequestException->getMessage(), 'Sender');
         } else {
             try {
-                $soap->handle($request);
+                $soap->handle($this->_request);
             } catch (Exception $e) {
                 $fault = $this->fault($e);
-                $soap->fault($fault->faultcode, $fault->faultstring);
             }
         }
         $this->_response = ob_get_clean();
@@ -839,6 +897,11 @@ class Zend_Soap_Server implements Zend_Server_Interface
         restore_error_handler();
         ini_set('display_errors', $displayErrorsOriginalState);
 
+        // Send a fault, if we have one
+        if ($fault) {
+            $soap->fault($fault->faultcode, $fault->faultstring);
+        }
+
         if (!$this->_returnResponse) {
             echo $this->_response;
             return;
diff --git a/lib/zend/Zend/Soap/Server/Exception.php b/lib/zend/Zend/Soap/Server/Exception.php
index de19a674272..1e8531896a9 100644
--- a/lib/zend/Zend/Soap/Server/Exception.php
+++ b/lib/zend/Zend/Soap/Server/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,7 +28,7 @@ require_once 'Zend/Exception.php';
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
diff --git a/lib/zend/Zend/Soap/Server/Proxy.php b/lib/zend/Zend/Soap/Server/Proxy.php
new file mode 100644
index 00000000000..93b6ab4e6a0
--- /dev/null
+++ b/lib/zend/Zend/Soap/Server/Proxy.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Soap
+ * @subpackage AutoDiscover
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+class Zend_Soap_Server_Proxy
+{
+    /**
+     * @var object
+     */
+    protected $_classInstance;
+    /**
+     * @var string
+     */
+    protected $_className;
+    /**
+     * Constructor
+     * 
+     * @param object $service 
+     */
+    public function  __construct($className, $classArgs = array())
+    {
+        $class = new ReflectionClass($className);
+        $constructor = $class->getConstructor();
+	if ($constructor === null) {
+            $this->_classInstance = $class->newInstance();
+	} else {
+            $this->_classInstance = $class->newInstanceArgs($classArgs);
+	}
+	$this->_className = $className;
+    }
+    /**
+     * Proxy for the WS-I compliant call
+     * 
+     * @param  string $name
+     * @param  string $arguments
+     * @return array 
+     */
+    public function __call($name, $arguments)
+    {
+        $result = call_user_func_array(array($this->_classInstance, $name), $this->_preProcessArguments($arguments));
+        return array("{$name}Result"=>$result);
+    }
+    /**
+     *  Pre process arguments
+     * 
+     * @param  mixed $arguments
+     * @return array 
+     */
+    protected function _preProcessArguments($arguments)
+    {
+        if (count($arguments) == 1 && is_object($arguments[0])) {
+            return get_object_vars($arguments[0]);
+	} else {
+            return $arguments;
+	}
+    }
+}
diff --git a/lib/zend/Zend/Soap/Wsdl.php b/lib/zend/Zend/Soap/Wsdl.php
index 5c9ceb40cac..afc5f687ca5 100644
--- a/lib/zend/Zend/Soap/Wsdl.php
+++ b/lib/zend/Zend/Soap/Wsdl.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Soap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,6 +29,9 @@ require_once "Zend/Soap/Wsdl/Strategy/Interface.php";
  */
 require_once "Zend/Soap/Wsdl/Strategy/Abstract.php";
 
+/** @see Zend_Xml_Security */
+require_once "Zend/Xml/Security.php";
+
 /**
  * Zend_Soap_Wsdl
  *
@@ -97,12 +100,11 @@ class Zend_Soap_Wsdl
                     xmlns:soap-enc='http://schemas.xmlsoap.org/soap/encoding/'
                     xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'></definitions>";
         $this->_dom = new DOMDocument();
-        if (!$this->_dom->loadXML($wsdl)) {
+        if (!$this->_dom = Zend_Xml_Security::scan($wsdl, $this->_dom)) {
             require_once 'Zend/Server/Exception.php';
             throw new Zend_Server_Exception('Unable to create DomDocument');
-        } else {
-            $this->_wsdl = $this->_dom->documentElement;
-        }
+        } 
+        $this->_wsdl = $this->_dom->documentElement;
 
         $this->setComplexTypeStrategy($strategy);
     }
@@ -126,7 +128,7 @@ class Zend_Soap_Wsdl
             $xml = $this->_dom->saveXML();
             $xml = str_replace($oldUri, $uri, $xml);
             $this->_dom = new DOMDocument();
-            $this->_dom->loadXML($xml);
+            $this->_dom = Zend_Xml_Security::scan($xml, $this->_dom);
         }
 
         return $this;
@@ -317,11 +319,17 @@ class Zend_Soap_Wsdl
 
         if (is_array($fault)) {
             $node = $this->_dom->createElement('fault');
+            /**
+             * Note. Do we really need name attribute to be also set at wsdl:fault node???
+             * W3C standard doesn't mention it (http://www.w3.org/TR/wsdl#_soap:fault)
+             * But some real world WSDLs use it, so it may be required for compatibility reasons.
+             */
             if (isset($fault['name'])) {
                 $node->setAttribute('name', $fault['name']);
             }
-            $soap_node = $this->_dom->createElement('soap:body');
-            foreach ($output as $name => $value) {
+
+            $soap_node = $this->_dom->createElement('soap:fault');
+            foreach ($fault as $name => $value) {
                 $soap_node->setAttribute($name, $value);
             }
             $node->appendChild($soap_node);
@@ -424,7 +432,7 @@ class Zend_Soap_Wsdl
         }
 
         $doc = $this->_dom->createElement('documentation');
-        $doc_cdata = $this->_dom->createTextNode($documentation);
+        $doc_cdata = $this->_dom->createTextNode(str_replace(array("\r\n", "\r"), "\n", $documentation));
         $doc->appendChild($doc_cdata);
 
         if($node->hasChildNodes()) {
@@ -537,28 +545,24 @@ class Zend_Soap_Wsdl
             case 'string':
             case 'str':
                 return 'xsd:string';
-                break;
+            case 'long':
+                return 'xsd:long';
             case 'int':
             case 'integer':
                 return 'xsd:int';
-                break;
             case 'float':
-            case 'double':
                 return 'xsd:float';
-                break;
+            case 'double':
+                return 'xsd:double';
             case 'boolean':
             case 'bool':
                 return 'xsd:boolean';
-                break;
             case 'array':
                 return 'soap-enc:Array';
-                break;
             case 'object':
                 return 'xsd:struct';
-                break;
             case 'mixed':
                 return 'xsd:anyType';
-                break;
             case 'void':
                 return '';
             default:
diff --git a/lib/zend/Zend/Soap/Wsdl/Exception.php b/lib/zend/Zend/Soap/Wsdl/Exception.php
index fc6e43dbe9d..029ef73b54e 100644
--- a/lib/zend/Zend/Soap/Wsdl/Exception.php
+++ b/lib/zend/Zend/Soap/Wsdl/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once "Zend/Exception.php";
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Soap_Wsdl_Exception extends Zend_Exception { }
\ No newline at end of file
+class Zend_Soap_Wsdl_Exception extends Zend_Exception { }
diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/Abstract.php b/lib/zend/Zend/Soap/Wsdl/Strategy/Abstract.php
index 220807e2e03..63abdba42b2 100644
--- a/lib/zend/Zend/Soap/Wsdl/Strategy/Abstract.php
+++ b/lib/zend/Zend/Soap/Wsdl/Strategy/Abstract.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once "Zend/Soap/Wsdl/Strategy/Interface.php";
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Soap_Wsdl_Strategy_Abstract implements Zend_Soap_Wsdl_Strategy_Interface
diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/AnyType.php b/lib/zend/Zend/Soap/Wsdl/Strategy/AnyType.php
index 813c995545b..bb0e011794e 100644
--- a/lib/zend/Zend/Soap/Wsdl/Strategy/AnyType.php
+++ b/lib/zend/Zend/Soap/Wsdl/Strategy/AnyType.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once "Zend/Soap/Wsdl/Strategy/Interface.php";
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Soap_Wsdl_Strategy_AnyType implements Zend_Soap_Wsdl_Strategy_Interface
@@ -56,4 +56,4 @@ class Zend_Soap_Wsdl_Strategy_AnyType implements Zend_Soap_Wsdl_Strategy_Interfa
     {
         return 'xsd:anyType';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php b/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
index 1ea69b5da67..3e7d6acbb64 100644
--- a/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
+++ b/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php";
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex extends Zend_Soap_Wsdl_Strategy_DefaultComplexType
@@ -46,9 +46,8 @@ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex extends Zend_Soap_Wsdl_Strategy
      */
     public function addComplexType($type)
     {
-        if(in_array($type, $this->_inProcess)) {
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception("Infinite recursion, cannot nest '".$type."' into itself.");
+        if (in_array($type, $this->_inProcess)) {
+            return "tns:" . $type;
         }
         $this->_inProcess[$type] = $type;
 
@@ -143,4 +142,4 @@ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex extends Zend_Soap_Wsdl_Strategy
     {
         return substr_count($type, "[]");
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php b/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php
index bbbd4740e15..0c04221a335 100644
--- a/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php
+++ b/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Soap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,7 +30,7 @@ require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php";
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence extends Zend_Soap_Wsdl_Strategy_DefaultComplexType
diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/Composite.php b/lib/zend/Zend/Soap/Wsdl/Strategy/Composite.php
index 39fd70a0cd6..eb531bfb054 100644
--- a/lib/zend/Zend/Soap/Wsdl/Strategy/Composite.php
+++ b/lib/zend/Zend/Soap/Wsdl/Strategy/Composite.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once "Zend/Soap/Wsdl/Strategy/Interface.php";
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Soap_Wsdl_Strategy_Composite implements Zend_Soap_Wsdl_Strategy_Interface
@@ -185,4 +185,4 @@ class Zend_Soap_Wsdl_Strategy_Composite implements Zend_Soap_Wsdl_Strategy_Inter
         $strategy->setContext($this->_context);
         return $strategy->addComplexType($type);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php b/lib/zend/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php
index ba7d1a16a1d..4bbf2a8f3b9 100644
--- a/lib/zend/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php
+++ b/lib/zend/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once "Zend/Soap/Wsdl/Strategy/Abstract.php";
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Soap_Wsdl_Strategy_DefaultComplexType extends Zend_Soap_Wsdl_Strategy_Abstract
@@ -55,6 +55,8 @@ class Zend_Soap_Wsdl_Strategy_DefaultComplexType extends Zend_Soap_Wsdl_Strategy
         $dom = $this->getContext()->toDomDocument();
         $class = new ReflectionClass($type);
 
+        $defaultProperties = $class->getDefaultProperties();
+
         $complexType = $dom->createElement('xsd:complexType');
         $complexType->setAttribute('name', $type);
 
@@ -68,8 +70,14 @@ class Zend_Soap_Wsdl_Strategy_DefaultComplexType extends Zend_Soap_Wsdl_Strategy
                  * node for describing other classes used as attribute types for current class
                  */
                 $element = $dom->createElement('xsd:element');
-                $element->setAttribute('name', $property->getName());
+                $element->setAttribute('name', $propertyName = $property->getName());
                 $element->setAttribute('type', $this->getContext()->getType(trim($matches[1][0])));
+
+                // If the default value is null, then this property is nillable.
+                if ($defaultProperties[$propertyName] === null) {
+                    $element->setAttribute('nillable', 'true');
+                }
+
                 $all->appendChild($element);
             }
         }
diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/Interface.php b/lib/zend/Zend/Soap/Wsdl/Strategy/Interface.php
index 456bc6ea318..9a576055cad 100644
--- a/lib/zend/Zend/Soap/Wsdl/Strategy/Interface.php
+++ b/lib/zend/Zend/Soap/Wsdl/Strategy/Interface.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Zend_Soap_Wsdl_Strategy_Interface
@@ -45,4 +45,4 @@ interface Zend_Soap_Wsdl_Strategy_Interface
      * @return string XSD type
      */
     public function addComplexType($type);
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Uri.php b/lib/zend/Zend/Uri.php
index 9db6375073d..e1660d8bf17 100644
--- a/lib/zend/Zend/Uri.php
+++ b/lib/zend/Zend/Uri.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Uri
@@ -53,7 +53,12 @@ abstract class Zend_Uri
      */
     public function __toString()
     {
-        return $this->getUri();
+        try {
+            return $this->getUri();
+        } catch (Exception $e) {
+            trigger_error($e->getMessage(), E_USER_WARNING);
+            return '';
+        }
     }
 
     /**
@@ -127,14 +132,12 @@ abstract class Zend_Uri
             }
         }
 
-        if (!class_exists($className)) {
-            require_once 'Zend/Loader.php';
-            try {
-                Zend_Loader::loadClass($className);
-            } catch (Exception $e) {
-                require_once 'Zend/Uri/Exception.php';
-                throw new Zend_Uri_Exception("\"$className\" not found");
-            }
+        require_once 'Zend/Loader.php';
+        try {
+            Zend_Loader::loadClass($className);
+        } catch (Exception $e) {
+            require_once 'Zend/Uri/Exception.php';
+            throw new Zend_Uri_Exception("\"$className\" not found");
         }
 
         $schemeHandler = new $className($scheme, $schemeSpecific);
diff --git a/lib/zend/Zend/Uri/Exception.php b/lib/zend/Zend/Uri/Exception.php
index 80b7e7d8b7b..f5a497edd0a 100644
--- a/lib/zend/Zend/Uri/Exception.php
+++ b/lib/zend/Zend/Uri/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Exception.php';
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Uri_Exception extends Zend_Exception
diff --git a/lib/zend/Zend/Uri/Http.php b/lib/zend/Zend/Uri/Http.php
index 9ac428569c0..b99f9f8169a 100644
--- a/lib/zend/Zend/Uri/Http.php
+++ b/lib/zend/Zend/Uri/Http.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -35,7 +35,7 @@ require_once 'Zend/Validate/Hostname.php';
  * @category  Zend
  * @package   Zend_Uri
  * @uses      Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Uri_Http extends Zend_Uri
@@ -217,24 +217,20 @@ class Zend_Uri_Http extends Zend_Uri
 
         // Additional decomposition to get username, password, host, and port
         $combo   = isset($matches[3]) === true ? $matches[3] : '';
-        $pattern = '~^(([^:@]*)(:([^@]*))?@)?([^:]+)(:(.*))?$~';
+        $pattern = '~^(([^:@]*)(:([^@]*))?@)?((?(?=[[])[[][^]]+[]]|[^:]+))(:(.*))?$~';        
         $status  = @preg_match($pattern, $combo, $matches);
         if ($status === false) {
             require_once 'Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Internal error: authority decomposition failed');
         }
-
-        // Failed decomposition; no further processing needed
-        if ($status === false) {
-            return;
-        }
-
+        
         // Save remaining URI components
         $this->_username = isset($matches[2]) === true ? $matches[2] : '';
         $this->_password = isset($matches[4]) === true ? $matches[4] : '';
-        $this->_host     = isset($matches[5]) === true ? $matches[5] : '';
+        $this->_host     = isset($matches[5]) === true 
+                         ? preg_replace('~^\[([^]]+)\]$~', '\1', $matches[5])  // Strip wrapper [] from IPv6 literal
+                         : '';
         $this->_port     = isset($matches[7]) === true ? $matches[7] : '';
-
     }
 
     /**
@@ -522,7 +518,7 @@ class Zend_Uri_Http extends Zend_Uri
     }
 
     /**
-     * Returns the path and filename portion of the URL, or FALSE if none.
+     * Returns the path and filename portion of the URL.
      *
      * @return string
      */
diff --git a/lib/zend/Zend/Validate.php b/lib/zend/Zend/Validate.php
new file mode 100644
index 00000000000..956d3119dc4
--- /dev/null
+++ b/lib/zend/Zend/Validate.php
@@ -0,0 +1,290 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Validate
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_Validate_Interface
+ */
+require_once 'Zend/Validate/Interface.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Validate
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Validate implements Zend_Validate_Interface
+{
+    /**
+     * Validator chain
+     *
+     * @var array
+     */
+    protected $_validators = array();
+
+    /**
+     * Array of validation failure messages
+     *
+     * @var array
+     */
+    protected $_messages = array();
+
+    /**
+     * Default Namespaces
+     *
+     * @var array
+     */
+    protected static $_defaultNamespaces = array();
+
+    /**
+     * Array of validation failure message codes
+     *
+     * @var array
+     * @deprecated Since 1.5.0
+     */
+    protected $_errors = array();
+
+    /**
+     * Adds a validator to the end of the chain
+     *
+     * If $breakChainOnFailure is true, then if the validator fails, the next validator in the chain,
+     * if one exists, will not be executed.
+     *
+     * @param  Zend_Validate_Interface $validator
+     * @param  boolean                 $breakChainOnFailure
+     * @return Zend_Validate Provides a fluent interface
+     */
+    public function addValidator(Zend_Validate_Interface $validator, $breakChainOnFailure = false)
+    {
+        $this->_validators[] = array(
+            'instance' => $validator,
+            'breakChainOnFailure' => (boolean) $breakChainOnFailure
+            );
+        return $this;
+    }
+
+    /**
+     * Returns true if and only if $value passes all validations in the chain
+     *
+     * Validators are run in the order in which they were added to the chain (FIFO).
+     *
+     * @param  mixed $value
+     * @return boolean
+     */
+    public function isValid($value)
+    {
+        $this->_messages = array();
+        $this->_errors   = array();
+        $result = true;
+        foreach ($this->_validators as $element) {
+            $validator = $element['instance'];
+            if ($validator->isValid($value)) {
+                continue;
+            }
+            $result = false;
+            $messages = $validator->getMessages();
+            $this->_messages = array_merge($this->_messages, $messages);
+            $this->_errors   = array_merge($this->_errors,   array_keys($messages));
+            if ($element['breakChainOnFailure']) {
+                break;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Defined by Zend_Validate_Interface
+     *
+     * Returns array of validation failure messages
+     *
+     * @return array
+     */
+    public function getMessages()
+    {
+        return $this->_messages;
+    }
+
+    /**
+     * Defined by Zend_Validate_Interface
+     *
+     * Returns array of validation failure message codes
+     *
+     * @return array
+     * @deprecated Since 1.5.0
+     */
+    public function getErrors()
+    {
+        return $this->_errors;
+    }
+
+    /**
+     * Returns the set default namespaces
+     *
+     * @return array
+     */
+    public static function getDefaultNamespaces()
+    {
+        return self::$_defaultNamespaces;
+    }
+
+    /**
+     * Sets new default namespaces
+     *
+     * @param array|string $namespace
+     * @return null
+     */
+    public static function setDefaultNamespaces($namespace)
+    {
+        if (!is_array($namespace)) {
+            $namespace = array((string) $namespace);
+        }
+
+        self::$_defaultNamespaces = $namespace;
+    }
+
+    /**
+     * Adds a new default namespace
+     *
+     * @param array|string $namespace
+     * @return null
+     */
+    public static function addDefaultNamespaces($namespace)
+    {
+        if (!is_array($namespace)) {
+            $namespace = array((string) $namespace);
+        }
+
+        self::$_defaultNamespaces = array_unique(array_merge(self::$_defaultNamespaces, $namespace));
+    }
+
+    /**
+     * Returns true when defaultNamespaces are set
+     *
+     * @return boolean
+     */
+    public static function hasDefaultNamespaces()
+    {
+        return (!empty(self::$_defaultNamespaces));
+    }
+
+    /**
+     * @param  mixed    $value
+     * @param  string   $classBaseName
+     * @param  array    $args          OPTIONAL
+     * @param  mixed    $namespaces    OPTIONAL
+     * @return boolean
+     * @throws Zend_Validate_Exception
+     */
+    public static function is($value, $classBaseName, array $args = array(), $namespaces = array())
+    {
+        $namespaces = array_merge((array) $namespaces, self::$_defaultNamespaces, array('Zend_Validate'));
+        $className  = ucfirst($classBaseName);
+        try {
+            if (!class_exists($className, false)) {
+                require_once 'Zend/Loader.php';
+                foreach($namespaces as $namespace) {
+                    $class = $namespace . '_' . $className;
+                    $file  = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+                    if (Zend_Loader::isReadable($file)) {
+                        Zend_Loader::loadClass($class);
+                        $className = $class;
+                        break;
+                    }
+                }
+            }
+
+            $class = new ReflectionClass($className);
+            if ($class->implementsInterface('Zend_Validate_Interface')) {
+                if ($class->hasMethod('__construct')) {
+                    $keys    = array_keys($args);
+                    $numeric = false;
+                    foreach($keys as $key) {
+                        if (is_numeric($key)) {
+                            $numeric = true;
+                            break;
+                        }
+                    }
+
+                    if ($numeric) {
+                        $object = $class->newInstanceArgs($args);
+                    } else {
+                        $object = $class->newInstance($args);
+                    }
+                } else {
+                    $object = $class->newInstance();
+                }
+
+                return $object->isValid($value);
+            }
+        } catch (Zend_Validate_Exception $ze) {
+            // if there is an exception while validating throw it
+            throw $ze;
+        } catch (Exception $e) {
+            // fallthrough and continue for missing validation classes
+        }
+
+        require_once 'Zend/Validate/Exception.php';
+        throw new Zend_Validate_Exception("Validate class not found from basename '$classBaseName'");
+    }
+
+    /**
+     * Returns the maximum allowed message length
+     *
+     * @return integer
+     */
+    public static function getMessageLength()
+    {
+        require_once 'Zend/Validate/Abstract.php';
+        return Zend_Validate_Abstract::getMessageLength();
+    }
+
+    /**
+     * Sets the maximum allowed message length
+     *
+     * @param integer $length
+     */
+    public static function setMessageLength($length = -1)
+    {
+        require_once 'Zend/Validate/Abstract.php';
+        Zend_Validate_Abstract::setMessageLength($length);
+    }
+
+    /**
+     * Returns the default translation object
+     *
+     * @return Zend_Translate_Adapter|null
+     */
+    public static function getDefaultTranslator($translator = null)
+    {
+        require_once 'Zend/Validate/Abstract.php';
+        return Zend_Validate_Abstract::getDefaultTranslator();
+    }
+
+    /**
+     * Sets a default translation object for all validation objects
+     *
+     * @param Zend_Translate|Zend_Translate_Adapter|null $translator
+     */
+    public static function setDefaultTranslator($translator = null)
+    {
+        require_once 'Zend/Validate/Abstract.php';
+        Zend_Validate_Abstract::setDefaultTranslator($translator);
+    }
+}
diff --git a/lib/zend/Zend/Validate/Abstract.php b/lib/zend/Zend/Validate/Abstract.php
index 7f978ee4f04..87998c576a2 100644
--- a/lib/zend/Zend/Validate/Abstract.php
+++ b/lib/zend/Zend/Validate/Abstract.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Interface.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
@@ -229,17 +229,23 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
             } else {
                 $value = $value->__toString();
             }
+        } elseif (is_array($value)) {
+            $value = $this->_implodeRecursive($value);
         } else {
-            $value = (string)$value;
+            $value = implode((array) $value);
         }
 
         if ($this->getObscureValue()) {
             $value = str_repeat('*', strlen($value));
         }
 
-        $message = str_replace('%value%', (string) $value, $message);
+        $message = str_replace('%value%', $value, $message);
         foreach ($this->_messageVariables as $ident => $property) {
-            $message = str_replace("%$ident%", (string) $this->$property, $message);
+            $message = str_replace(
+                "%$ident%",
+                implode(' ', (array) $this->$property),
+                $message
+            );
         }
 
         $length = self::getMessageLength();
@@ -250,6 +256,26 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
         return $message;
     }
 
+    /**
+     * Joins elements of a multidimensional array
+     *
+     * @param array $pieces
+     * @return string
+     */
+    protected function _implodeRecursive(array $pieces)
+    {
+        $values = array();
+        foreach ($pieces as $item) {
+            if (is_array($item)) {
+                $values[] = $this->_implodeRecursive($item);
+            } else {
+                $values[] = $item;
+            }
+        }
+
+        return implode(', ', $values);
+    }
+
     /**
      * @param  string $messageKey
      * @param  string $value      OPTIONAL
@@ -319,6 +345,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
      * Set translation object
      *
      * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Abstract
      */
     public function setTranslator($translator = null)
@@ -366,7 +393,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
      * Set default translation object for all validate objects
      *
      * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public static function setDefaultTranslator($translator = null)
     {
diff --git a/lib/zend/Zend/Validate/Alnum.php b/lib/zend/Zend/Validate/Alnum.php
index 1585e5f115f..5091830215d 100644
--- a/lib/zend/Zend/Validate/Alnum.php
+++ b/lib/zend/Zend/Validate/Alnum.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Alnum extends Zend_Validate_Abstract
@@ -57,7 +57,7 @@ class Zend_Validate_Alnum extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID      => "Invalid type given, value should be float, string, or integer",
+        self::INVALID      => "Invalid type given. String, integer or float expected",
         self::NOT_ALNUM    => "'%value%' contains characters which are non alphabetic and no digits",
         self::STRING_EMPTY => "'%value%' is an empty string",
     );
@@ -65,8 +65,7 @@ class Zend_Validate_Alnum extends Zend_Validate_Abstract
     /**
      * Sets default option values for this instance
      *
-     * @param  boolean|Zend_Config $allowWhiteSpace
-     * @return void
+     * @param boolean|Zend_Config $allowWhiteSpace
      */
     public function __construct($allowWhiteSpace = false)
     {
diff --git a/lib/zend/Zend/Validate/Alpha.php b/lib/zend/Zend/Validate/Alpha.php
index 894ed877443..c9ea9828f56 100644
--- a/lib/zend/Zend/Validate/Alpha.php
+++ b/lib/zend/Zend/Validate/Alpha.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Alpha extends Zend_Validate_Abstract
@@ -57,7 +57,7 @@ class Zend_Validate_Alpha extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID      => "Invalid type given, value should be a string",
+        self::INVALID      => "Invalid type given. String expected",
         self::NOT_ALPHA    => "'%value%' contains non alphabetic characters",
         self::STRING_EMPTY => "'%value%' is an empty string"
     );
@@ -65,8 +65,7 @@ class Zend_Validate_Alpha extends Zend_Validate_Abstract
     /**
      * Sets default option values for this instance
      *
-     * @param  boolean|Zend_Config $allowWhiteSpace
-     * @return void
+     * @param boolean|Zend_Config $allowWhiteSpace
      */
     public function __construct($allowWhiteSpace = false)
     {
diff --git a/lib/zend/Zend/Validate/Barcode.php b/lib/zend/Zend/Validate/Barcode.php
index 31b70f6ce63..4d48d516034 100644
--- a/lib/zend/Zend/Validate/Barcode.php
+++ b/lib/zend/Zend/Validate/Barcode.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Loader.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode extends Zend_Validate_Abstract
@@ -46,7 +46,7 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract
         self::FAILED         => "'%value%' failed checksum validation",
         self::INVALID_CHARS  => "'%value%' contains invalid characters",
         self::INVALID_LENGTH => "'%value%' should have a length of %length% characters",
-        self::INVALID        => "Invalid type given, value should be string",
+        self::INVALID        => "Invalid type given. String expected",
     );
 
     /**
@@ -77,7 +77,6 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract
      *
      * @param  string|Zend_Config|
      *         Zend_Validate_Barcode_BarcodeAdapter $adapter Barcode adapter to use
-     * @return void
      * @throws Zend_Validate_Exception
      */
     public function __construct($adapter)
@@ -126,7 +125,7 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract
      *
      * @param  string|Zend_Validate_Barcode $adapter Barcode adapter to use
      * @param  array  $options Options for this adapter
-     * @return void
+     * @return $this
      * @throws Zend_Validate_Exception
      */
     public function setAdapter($adapter, $options = null)
@@ -194,6 +193,17 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract
         $this->_length = $adapter->getLength();
         $result        = $adapter->checkLength($value);
         if (!$result) {
+            if (is_array($this->_length)) {
+                $temp = $this->_length;
+                $this->_length = "";
+                foreach($temp as $length) {
+                    $this->_length .= "/";
+                    $this->_length .= $length;
+                }
+
+                $this->_length = substr($this->_length, 1);
+            }
+
             $this->_error(self::INVALID_LENGTH);
             return false;
         }
@@ -214,4 +224,4 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Validate/Barcode/AdapterAbstract.php b/lib/zend/Zend/Validate/Barcode/AdapterAbstract.php
index 1514d94f317..05dc2b9faf1 100644
--- a/lib/zend/Zend/Validate/Barcode/AdapterAbstract.php
+++ b/lib/zend/Zend/Validate/Barcode/AdapterAbstract.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterInterface.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/AdapterInterface.php b/lib/zend/Zend/Validate/Barcode/AdapterInterface.php
index 424db32967e..8e96effbf46 100644
--- a/lib/zend/Zend/Validate/Barcode/AdapterInterface.php
+++ b/lib/zend/Zend/Validate/Barcode/AdapterInterface.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -22,7 +22,7 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Zend_Validate_Barcode_AdapterInterface
@@ -62,7 +62,7 @@ interface Zend_Validate_Barcode_AdapterInterface
      * Sets the checksum validation
      *
      * @param  boolean $check
-     * @return Zend_Validate_Barcode_Adapter Provides fluid interface
+     * @return Zend_Validate_Barcode_Adapter Provides a fluent interface
      */
     public function setCheck($check);
 }
diff --git a/lib/zend/Zend/Validate/Barcode/Code25.php b/lib/zend/Zend/Validate/Barcode/Code25.php
index 79ec830a1d5..a42048787b0 100644
--- a/lib/zend/Zend/Validate/Barcode/Code25.php
+++ b/lib/zend/Zend/Validate/Barcode/Code25.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Code25 extends Zend_Validate_Barcode_AdapterAbstract
@@ -54,8 +54,6 @@ class Zend_Validate_Barcode_Code25 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/lib/zend/Zend/Validate/Barcode/Code25interleaved.php b/lib/zend/Zend/Validate/Barcode/Code25interleaved.php
index 1442cf1ab5b..479aa03203c 100644
--- a/lib/zend/Zend/Validate/Barcode/Code25interleaved.php
+++ b/lib/zend/Zend/Validate/Barcode/Code25interleaved.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Code25interleaved extends Zend_Validate_Barcode_AdapterAbstract
@@ -54,8 +54,6 @@ class Zend_Validate_Barcode_Code25interleaved extends Zend_Validate_Barcode_Adap
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/lib/zend/Zend/Validate/Barcode/Code39.php b/lib/zend/Zend/Validate/Barcode/Code39.php
index 7679a6609e5..37b2f13afde 100644
--- a/lib/zend/Zend/Validate/Barcode/Code39.php
+++ b/lib/zend/Zend/Validate/Barcode/Code39.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Code39 extends Zend_Validate_Barcode_AdapterAbstract
@@ -67,8 +67,6 @@ class Zend_Validate_Barcode_Code39 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/lib/zend/Zend/Validate/Barcode/Code39ext.php b/lib/zend/Zend/Validate/Barcode/Code39ext.php
index 221683cf7bc..cd99c363c3a 100644
--- a/lib/zend/Zend/Validate/Barcode/Code39ext.php
+++ b/lib/zend/Zend/Validate/Barcode/Code39ext.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Code39ext extends Zend_Validate_Barcode_AdapterAbstract
@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_Code39ext extends Zend_Validate_Barcode_AdapterAbstr
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/lib/zend/Zend/Validate/Barcode/Code93.php b/lib/zend/Zend/Validate/Barcode/Code93.php
index c67a0fe8d69..e09ba17ec1f 100644
--- a/lib/zend/Zend/Validate/Barcode/Code93.php
+++ b/lib/zend/Zend/Validate/Barcode/Code93.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Code93 extends Zend_Validate_Barcode_AdapterAbstract
@@ -68,8 +68,6 @@ class Zend_Validate_Barcode_Code93 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/lib/zend/Zend/Validate/Barcode/Code93ext.php b/lib/zend/Zend/Validate/Barcode/Code93ext.php
index 1b7fd41df01..6879a893721 100644
--- a/lib/zend/Zend/Validate/Barcode/Code93ext.php
+++ b/lib/zend/Zend/Validate/Barcode/Code93ext.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Code93ext extends Zend_Validate_Barcode_AdapterAbstract
@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_Code93ext extends Zend_Validate_Barcode_AdapterAbstr
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/lib/zend/Zend/Validate/Barcode/Ean12.php b/lib/zend/Zend/Validate/Barcode/Ean12.php
index 4d2560b456e..e185233f5cf 100644
--- a/lib/zend/Zend/Validate/Barcode/Ean12.php
+++ b/lib/zend/Zend/Validate/Barcode/Ean12.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Ean12 extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Ean13.php b/lib/zend/Zend/Validate/Barcode/Ean13.php
index b8e83dc79d6..8daf54237b1 100644
--- a/lib/zend/Zend/Validate/Barcode/Ean13.php
+++ b/lib/zend/Zend/Validate/Barcode/Ean13.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Ean13 extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Ean14.php b/lib/zend/Zend/Validate/Barcode/Ean14.php
index 4959fa33b25..12cf49bbc58 100644
--- a/lib/zend/Zend/Validate/Barcode/Ean14.php
+++ b/lib/zend/Zend/Validate/Barcode/Ean14.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Ean14 extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Ean18.php b/lib/zend/Zend/Validate/Barcode/Ean18.php
index d027e7f667b..0f3df06b50c 100644
--- a/lib/zend/Zend/Validate/Barcode/Ean18.php
+++ b/lib/zend/Zend/Validate/Barcode/Ean18.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Ean18 extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Ean2.php b/lib/zend/Zend/Validate/Barcode/Ean2.php
index ad77e77f405..e2cec4b119f 100644
--- a/lib/zend/Zend/Validate/Barcode/Ean2.php
+++ b/lib/zend/Zend/Validate/Barcode/Ean2.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Ean2 extends Zend_Validate_Barcode_AdapterAbstract
@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_Ean2 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/lib/zend/Zend/Validate/Barcode/Ean5.php b/lib/zend/Zend/Validate/Barcode/Ean5.php
index 002b766692c..ff5b4bb2ae0 100644
--- a/lib/zend/Zend/Validate/Barcode/Ean5.php
+++ b/lib/zend/Zend/Validate/Barcode/Ean5.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Ean5 extends Zend_Validate_Barcode_AdapterAbstract
@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_Ean5 extends Zend_Validate_Barcode_AdapterAbstract
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/lib/zend/Zend/Validate/Barcode/Ean8.php b/lib/zend/Zend/Validate/Barcode/Ean8.php
index 6cc986536ce..6b1caa973e0 100644
--- a/lib/zend/Zend/Validate/Barcode/Ean8.php
+++ b/lib/zend/Zend/Validate/Barcode/Ean8.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Ean8 extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Gtin12.php b/lib/zend/Zend/Validate/Barcode/Gtin12.php
index 08d98c62d10..65ff5b9a21d 100644
--- a/lib/zend/Zend/Validate/Barcode/Gtin12.php
+++ b/lib/zend/Zend/Validate/Barcode/Gtin12.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Gtin12 extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Gtin13.php b/lib/zend/Zend/Validate/Barcode/Gtin13.php
index eaf6dcaccbe..382dccd726f 100644
--- a/lib/zend/Zend/Validate/Barcode/Gtin13.php
+++ b/lib/zend/Zend/Validate/Barcode/Gtin13.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Gtin13 extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Gtin14.php b/lib/zend/Zend/Validate/Barcode/Gtin14.php
index 98ccda82c50..6f291b8e3bc 100644
--- a/lib/zend/Zend/Validate/Barcode/Gtin14.php
+++ b/lib/zend/Zend/Validate/Barcode/Gtin14.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Gtin14 extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Identcode.php b/lib/zend/Zend/Validate/Barcode/Identcode.php
index 6287f6e9b2c..3f622fa639d 100644
--- a/lib/zend/Zend/Validate/Barcode/Identcode.php
+++ b/lib/zend/Zend/Validate/Barcode/Identcode.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Identcode extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Intelligentmail.php b/lib/zend/Zend/Validate/Barcode/Intelligentmail.php
index 9df61663ee0..cfa2a82e6dc 100644
--- a/lib/zend/Zend/Validate/Barcode/Intelligentmail.php
+++ b/lib/zend/Zend/Validate/Barcode/Intelligentmail.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_IntelligentMail extends Zend_Validate_Barcode_AdapterAbstract
@@ -48,8 +48,6 @@ class Zend_Validate_Barcode_IntelligentMail extends Zend_Validate_Barcode_Adapte
      * Constructor
      *
      * Sets check flag to false.
-     *
-     * @return void
      */
     public function __construct()
     {
diff --git a/lib/zend/Zend/Validate/Barcode/Issn.php b/lib/zend/Zend/Validate/Barcode/Issn.php
index 5c6783e29d2..a74fa5379ec 100644
--- a/lib/zend/Zend/Validate/Barcode/Issn.php
+++ b/lib/zend/Zend/Validate/Barcode/Issn.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Issn extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Itf14.php b/lib/zend/Zend/Validate/Barcode/Itf14.php
index 17dc9f175a3..4adc7447b21 100644
--- a/lib/zend/Zend/Validate/Barcode/Itf14.php
+++ b/lib/zend/Zend/Validate/Barcode/Itf14.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Itf14 extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Leitcode.php b/lib/zend/Zend/Validate/Barcode/Leitcode.php
index ca59ef2c5b0..b41b079ea9b 100644
--- a/lib/zend/Zend/Validate/Barcode/Leitcode.php
+++ b/lib/zend/Zend/Validate/Barcode/Leitcode.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Leitcode extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Planet.php b/lib/zend/Zend/Validate/Barcode/Planet.php
index 5383bd9d1e1..227bc25d275 100644
--- a/lib/zend/Zend/Validate/Barcode/Planet.php
+++ b/lib/zend/Zend/Validate/Barcode/Planet.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Planet extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Postnet.php b/lib/zend/Zend/Validate/Barcode/Postnet.php
index b8798add34a..5aed312cbf3 100644
--- a/lib/zend/Zend/Validate/Barcode/Postnet.php
+++ b/lib/zend/Zend/Validate/Barcode/Postnet.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Postnet extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Royalmail.php b/lib/zend/Zend/Validate/Barcode/Royalmail.php
index de6a4c8350e..98fa38e64e2 100644
--- a/lib/zend/Zend/Validate/Barcode/Royalmail.php
+++ b/lib/zend/Zend/Validate/Barcode/Royalmail.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Royalmail extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Sscc.php b/lib/zend/Zend/Validate/Barcode/Sscc.php
index c8c45253a43..e624d7d79c3 100644
--- a/lib/zend/Zend/Validate/Barcode/Sscc.php
+++ b/lib/zend/Zend/Validate/Barcode/Sscc.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Sscc extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Barcode/Upca.php b/lib/zend/Zend/Validate/Barcode/Upca.php
index ab425b17ff0..7757f2b1b4d 100644
--- a/lib/zend/Zend/Validate/Barcode/Upca.php
+++ b/lib/zend/Zend/Validate/Barcode/Upca.php
@@ -14,9 +14,9 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Upca.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version    $Id$
  */
 
 /**
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Upca extends Zend_Validate_Barcode_AdapterAbstract
@@ -49,4 +49,4 @@ class Zend_Validate_Barcode_Upca extends Zend_Validate_Barcode_AdapterAbstract
      * @var string
      */
     protected $_checksum = '_gtin';
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Validate/Barcode/Upce.php b/lib/zend/Zend/Validate/Barcode/Upce.php
index 399e40eae0f..1b2482578f1 100644
--- a/lib/zend/Zend/Validate/Barcode/Upce.php
+++ b/lib/zend/Zend/Validate/Barcode/Upce.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Barcode_Upce extends Zend_Validate_Barcode_AdapterAbstract
diff --git a/lib/zend/Zend/Validate/Between.php b/lib/zend/Zend/Validate/Between.php
index bf4d793ecad..53b68261dda 100644
--- a/lib/zend/Zend/Validate/Between.php
+++ b/lib/zend/Zend/Validate/Between.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Between extends Zend_Validate_Abstract
@@ -94,7 +94,7 @@ class Zend_Validate_Between extends Zend_Validate_Abstract
      *   'inclusive' => boolean, inclusive border values
      *
      * @param  array|Zend_Config $options
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
diff --git a/lib/zend/Zend/Validate/Callback.php b/lib/zend/Zend/Validate/Callback.php
index e43c20e119a..bb12ecf78d8 100644
--- a/lib/zend/Zend/Validate/Callback.php
+++ b/lib/zend/Zend/Validate/Callback.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Callback extends Zend_Validate_Abstract
@@ -49,7 +49,7 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract
      */
     protected $_messageTemplates = array(
         self::INVALID_VALUE    => "'%value%' is not valid",
-        self::INVALID_CALLBACK => "Failure within the callback, exception returned",
+        self::INVALID_CALLBACK => "An exception has been raised within the callback",
     );
 
     /**
@@ -69,10 +69,8 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  string|array $callback
-     * @param  mixed   $max
-     * @param  boolean $inclusive
-     * @return void
+     * @param  mixed $callback
+     * @throws Zend_Validate_Exception
      */
     public function __construct($callback = null)
     {
@@ -107,6 +105,7 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract
      * Sets the callback
      *
      * @param  string|array $callback
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Callback Provides a fluent interface
      */
     public function setCallback($callback)
@@ -132,7 +131,7 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract
     /**
      * Sets options for the callback
      *
-     * @param  mixed $max
+     * @param  mixed $options
      * @return Zend_Validate_Callback Provides a fluent interface
      */
     public function setOptions($options)
diff --git a/lib/zend/Zend/Validate/Ccnum.php b/lib/zend/Zend/Validate/Ccnum.php
index 605e6a33bed..c3c7029a388 100644
--- a/lib/zend/Zend/Validate/Ccnum.php
+++ b/lib/zend/Zend/Validate/Ccnum.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Ccnum extends Zend_Validate_Abstract
diff --git a/lib/zend/Zend/Validate/CreditCard.php b/lib/zend/Zend/Validate/CreditCard.php
index ca54579b3bf..170b622507d 100644
--- a/lib/zend/Zend/Validate/CreditCard.php
+++ b/lib/zend/Zend/Validate/CreditCard.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_CreditCard extends Zend_Validate_Abstract
@@ -64,13 +64,13 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::CHECKSUM       => "Luhn algorithm (mod-10 checksum) failed on '%value%'",
+        self::CHECKSUM       => "'%value%' seems to contain an invalid checksum",
         self::CONTENT        => "'%value%' must contain only digits",
-        self::INVALID        => "Invalid type given, value should be a string",
+        self::INVALID        => "Invalid type given. String expected",
         self::LENGTH         => "'%value%' contains an invalid amount of digits",
         self::PREFIX         => "'%value%' is not from an allowed institute",
-        self::SERVICE        => "Validation of '%value%' has been failed by the service",
-        self::SERVICEFAILURE => "The service returned a failure while validating '%value%'",
+        self::SERVICE        => "'%value%' seems to be an invalid creditcard number",
+        self::SERVICEFAILURE => "An exception has been raised while validating '%value%'",
     );
 
     /**
@@ -136,7 +136,7 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract
     /**
      * Constructor
      *
-     * @param string|array $type OPTIONAL Type of CCI to allow
+     * @param string|array|Zend_Config $options OPTIONAL Type of CCI to allow
      */
     public function __construct($options = array())
     {
@@ -176,7 +176,7 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract
      * Sets CCIs which are accepted by validation
      *
      * @param string|array $type Type to allow for validation
-     * @return Zend_Validate_CreditCard Provides a fluid interface
+     * @return Zend_Validate_CreditCard Provides a fluent interface
      */
     public function setType($type)
     {
@@ -188,7 +188,7 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract
      * Adds a CCI to be accepted by validation
      *
      * @param string|array $type Type to allow for validation
-     * @return Zend_Validate_CreditCard Provides a fluid interface
+     * @return Zend_Validate_CreditCard Provides a fluent interface
      */
     public function addType($type)
     {
@@ -222,7 +222,9 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract
     /**
      * Sets a new callback for service validation
      *
-     * @param unknown_type $service
+     * @param mixed $service
+     * @throws Zend_Validate_Exception
+     * @return $this
      */
     public function setService($service)
     {
diff --git a/lib/zend/Zend/Validate/Date.php b/lib/zend/Zend/Validate/Date.php
index 7e473a85f7e..e875aaf550f 100644
--- a/lib/zend/Zend/Validate/Date.php
+++ b/lib/zend/Zend/Validate/Date.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Date extends Zend_Validate_Abstract
@@ -42,7 +42,7 @@ class Zend_Validate_Date extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID        => "Invalid type given, value should be string, integer, array or Zend_Date",
+        self::INVALID        => "Invalid type given. String, integer, array or Zend_Date expected",
         self::INVALID_DATE   => "'%value%' does not appear to be a valid date",
         self::FALSEFORMAT    => "'%value%' does not fit the date format '%format%'",
     );
@@ -71,8 +71,7 @@ class Zend_Validate_Date extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  string|Zend_Config $options OPTIONAL
-     * @return void
+     * @param string|array|Zend_Config $options OPTIONAL
      */
     public function __construct($options = array())
     {
diff --git a/lib/zend/Zend/Validate/Db/Abstract.php b/lib/zend/Zend/Validate/Db/Abstract.php
index ddda9179f31..ffee51f2671 100644
--- a/lib/zend/Zend/Validate/Db/Abstract.php
+++ b/lib/zend/Zend/Validate/Db/Abstract.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,7 +30,7 @@ require_once 'Zend/Validate/Abstract.php';
  * @category   Zend
  * @package    Zend_Validate
  * @uses       Zend_Validate_Abstract
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
@@ -45,8 +45,8 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
      * @var array Message templates
      */
     protected $_messageTemplates = array(
-        self::ERROR_NO_RECORD_FOUND => 'No record matching %value% was found',
-        self::ERROR_RECORD_FOUND    => 'A record matching %value% was found',
+        self::ERROR_NO_RECORD_FOUND => "No record matching '%value%' was found",
+        self::ERROR_RECORD_FOUND    => "A record matching '%value%' was found",
     );
 
     /**
@@ -76,6 +76,12 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
      */
     protected $_adapter = null;
 
+    /**
+     * Select object to use. can be set, or will be auto-generated
+     * @var Zend_Db_Select
+     */
+    protected $_select;
+
     /**
      * Provides basic configuration for use with Zend_Validate_Db Validators
      * Setting $exclude allows a single record to be excluded from matching.
@@ -91,9 +97,14 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
      * 'adapter' => An optional database adapter to use
      *
      * @param array|Zend_Config $options Options to use for this validator
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
+        if ($options instanceof Zend_Db_Select) {
+            $this->setSelect($options);
+            return;
+        }
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         } else if (func_num_args() > 1) {
@@ -142,10 +153,21 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
     /**
      * Returns the set adapter
      *
+     * @throws Zend_Validate_Exception
      * @return Zend_Db_Adapter
      */
     public function getAdapter()
     {
+        /**
+         * Check for an adapter being defined. if not, fetch the default adapter.
+         */
+        if ($this->_adapter === null) {
+            $this->_adapter = Zend_Db_Table_Abstract::getDefaultAdapter();
+            if (null === $this->_adapter) {
+                require_once 'Zend/Validate/Exception.php';
+                throw new Zend_Validate_Exception('No database adapter present');
+            }
+        }
         return $this->_adapter;
     }
 
@@ -153,6 +175,7 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
      * Sets a new database adapter
      *
      * @param  Zend_Db_Adapter_Abstract $adapter
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Db_Abstract
      */
     public function setAdapter($adapter)
@@ -254,6 +277,61 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
         return $this;
     }
 
+    /**
+     * Sets the select object to be used by the validator
+     *
+     * @param Zend_Db_Select $select
+     * @throws Zend_Validate_Exception
+     * @return Zend_Validate_Db_Abstract
+     */
+    public function setSelect($select)
+    {
+        if (!$select instanceof Zend_Db_Select) {
+            throw new Zend_Validate_Exception('Select option must be a valid ' .
+                                              'Zend_Db_Select object');
+        }
+        $this->_select = $select;
+        return $this;
+    }
+
+    /**
+     * Gets the select object to be used by the validator.
+     * If no select object was supplied to the constructor,
+     * then it will auto-generate one from the given table,
+     * schema, field, and adapter options.
+     *
+     * @return Zend_Db_Select The Select object which will be used
+     */
+    public function getSelect()
+    {
+        if (null === $this->_select) {
+            $db = $this->getAdapter();
+            /**
+             * Build select object
+             */
+            $select = new Zend_Db_Select($db);
+            $select->from($this->_table, array($this->_field), $this->_schema);
+            if ($db->supportsParameters('named')) {
+                $select->where($db->quoteIdentifier($this->_field, true).' = :value'); // named
+            } else {
+                $select->where($db->quoteIdentifier($this->_field, true).' = ?'); // positional
+            }
+            if ($this->_exclude !== null) {
+                if (is_array($this->_exclude)) {
+                    $select->where(
+                          $db->quoteIdentifier($this->_exclude['field'], true) .
+                            ' != ?', $this->_exclude['value']
+                    );
+                } else {
+                    $select->where($this->_exclude);
+                }
+            }
+            $select->limit(1);
+            $this->_select = $select;
+        }
+        return $this->_select;
+    }
+
     /**
      * Run query and returns matches, or null if no matches are found.
      *
@@ -262,36 +340,15 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
      */
     protected function _query($value)
     {
-        /**
-         * Check for an adapter being defined. if not, fetch the default adapter.
-         */
-        if ($this->_adapter === null) {
-            $this->_adapter = Zend_Db_Table_Abstract::getDefaultAdapter();
-            if (null === $this->_adapter) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception('No database adapter present');
-            }
-        }
-
-        /**
-         * Build select object
-         */
-        $select = new Zend_Db_Select($this->_adapter);
-        $select->from($this->_table, array($this->_field), $this->_schema)
-               ->where($this->_adapter->quoteIdentifier($this->_field, true).' = ?', $value);
-        if ($this->_exclude !== null) {
-            if (is_array($this->_exclude)) {
-                $select->where($this->_adapter->quoteIdentifier($this->_exclude['field'], true).' != ?', $this->_exclude['value']);
-            } else {
-                $select->where($this->_exclude);
-            }
-        }
-        $select->limit(1);
-
+        $select = $this->getSelect();
         /**
          * Run query
          */
-        $result = $this->_adapter->fetchRow($select, array(), Zend_Db::FETCH_ASSOC);
+        $result = $select->getAdapter()->fetchRow(
+            $select,
+            array('value' => $value), // this should work whether db supports positional or named params
+            Zend_Db::FETCH_ASSOC
+            );
 
         return $result;
     }
diff --git a/lib/zend/Zend/Validate/Db/NoRecordExists.php b/lib/zend/Zend/Validate/Db/NoRecordExists.php
index 816c8f0a9b6..4dba8bc6315 100644
--- a/lib/zend/Zend/Validate/Db/NoRecordExists.php
+++ b/lib/zend/Zend/Validate/Db/NoRecordExists.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,7 +30,7 @@ require_once 'Zend/Validate/Db/Abstract.php';
  * @category   Zend
  * @package    Zend_Validate
  * @uses       Zend_Validate_Db_Abstract
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Db_NoRecordExists extends Zend_Validate_Db_Abstract
diff --git a/lib/zend/Zend/Validate/Db/RecordExists.php b/lib/zend/Zend/Validate/Db/RecordExists.php
index 4fc02ca6d4d..540af13bc68 100644
--- a/lib/zend/Zend/Validate/Db/RecordExists.php
+++ b/lib/zend/Zend/Validate/Db/RecordExists.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -30,7 +30,7 @@ require_once 'Zend/Validate/Db/Abstract.php';
  * @category   Zend
  * @package    Zend_Validate
  * @uses       Zend_Validate_Db_Abstract
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Db_RecordExists extends Zend_Validate_Db_Abstract
diff --git a/lib/zend/Zend/Validate/Digits.php b/lib/zend/Zend/Validate/Digits.php
index 59a45f90ddc..411c4c5b349 100644
--- a/lib/zend/Zend/Validate/Digits.php
+++ b/lib/zend/Zend/Validate/Digits.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Digits extends Zend_Validate_Abstract
@@ -49,9 +49,9 @@ class Zend_Validate_Digits extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::NOT_DIGITS   => "'%value%' contains characters which are not digits; but only digits are allowed",
+        self::NOT_DIGITS   => "'%value%' must contain only digits",
         self::STRING_EMPTY => "'%value%' is an empty string",
-        self::INVALID      => "Invalid type given, value should be string, integer or float",
+        self::INVALID      => "Invalid type given. String, integer or float expected",
     );
 
     /**
diff --git a/lib/zend/Zend/Validate/EmailAddress.php b/lib/zend/Zend/Validate/EmailAddress.php
index 7e9f0f0c72c..8bffcaec39d 100644
--- a/lib/zend/Zend/Validate/EmailAddress.php
+++ b/lib/zend/Zend/Validate/EmailAddress.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Validate/Hostname.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
@@ -51,29 +51,38 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID            => "Invalid type given, value should be a string",
-        self::INVALID_FORMAT     => "'%value%' is no valid email address in the basic format local-part@hostname",
-        self::INVALID_HOSTNAME   => "'%hostname%' is no valid hostname for email address '%value%'",
+        self::INVALID            => "Invalid type given. String expected",
+        self::INVALID_FORMAT     => "'%value%' is not a valid email address in the basic format local-part@hostname",
+        self::INVALID_HOSTNAME   => "'%hostname%' is not a valid hostname for email address '%value%'",
         self::INVALID_MX_RECORD  => "'%hostname%' does not appear to have a valid MX record for the email address '%value%'",
-        self::INVALID_SEGMENT    => "'%hostname%' is not in a routable network segment. The email address '%value%' should not be resolved from public network.",
+        self::INVALID_SEGMENT    => "'%hostname%' is not in a routable network segment. The email address '%value%' should not be resolved from public network",
         self::DOT_ATOM           => "'%localPart%' can not be matched against dot-atom format",
         self::QUOTED_STRING      => "'%localPart%' can not be matched against quoted-string format",
-        self::INVALID_LOCAL_PART => "'%localPart%' is no valid local part for email address '%value%'",
+        self::INVALID_LOCAL_PART => "'%localPart%' is not a valid local part for email address '%value%'",
         self::LENGTH_EXCEEDED    => "'%value%' exceeds the allowed length",
     );
 
     /**
+     * As of RFC5753 (JAN 2010), the following blocks are no longer reserved:
+     *   - 128.0.0.0/16
+     *   - 191.255.0.0/16
+     *   - 223.255.255.0/24
+     * @see http://tools.ietf.org/html/rfc5735#page-6
+     *
+     * As of RFC6598 (APR 2012), the following blocks are now reserved:
+     *   - 100.64.0.0/10
+     * @see http://tools.ietf.org/html/rfc6598#section-7
+     *
      * @see http://en.wikipedia.org/wiki/IPv4
      * @var array
      */
     protected $_invalidIp = array(
         '0'   => '0.0.0.0/8',
         '10'  => '10.0.0.0/8',
+        '100' => '100.64.0.0/10',
         '127' => '127.0.0.0/8',
-        '128' => '128.0.0.0/16',
         '169' => '169.254.0.0/16',
         '172' => '172.16.0.0/12',
-        '191' => '191.255.0.0/16',
         '192' => array(
             '192.0.0.0/24',
             '192.0.2.0/24',
@@ -81,7 +90,6 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
             '192.168.0.0/16'
         ),
         '198' => '198.18.0.0/15',
-        '223' => '223.255.255.0/24',
         '224' => '224.0.0.0/4',
         '240' => '240.0.0.0/4'
     );
@@ -124,8 +132,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
      * 'mx'       => If MX check should be enabled, boolean
      * 'deep'     => If a deep MX check should be done, boolean
      *
-     * @param array|Zend_Config $options OPTIONAL
-     * @return void
+     * @param array|string|Zend_Config $options OPTIONAL
      */
     public function __construct($options = array())
     {
@@ -163,7 +170,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
      * Set options for the email validator
      *
      * @param array $options
-     * @return Zend_Validate_EmailAddress fluid interface
+     * @return Zend_Validate_EmailAddress Provides a fluent inteface
      */
     public function setOptions(array $options = array())
     {
@@ -177,6 +184,8 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
             } else {
                 $this->setHostnameValidator($options['hostname']);
             }
+        } elseif ($this->_options['hostname'] == null) {
+            $this->setHostnameValidator();
         }
 
         if (array_key_exists('mx', $options)) {
@@ -205,17 +214,17 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
      */
     public function setMessage($messageString, $messageKey = null)
     {
-        $messageKeys = $messageKey;
         if ($messageKey === null) {
-            $keys = array_keys($this->_messageTemplates);
-            $messageKeys = current($keys);
+            $this->_options['hostname']->setMessage($messageString);
+            parent::setMessage($messageString);
+            return $this;
         }
 
-        if (!isset($this->_messageTemplates[$messageKeys])) {
+        if (!isset($this->_messageTemplates[$messageKey])) {
             $this->_options['hostname']->setMessage($messageString, $messageKey);
         }
 
-        $this->_messageTemplates[$messageKeys] = $messageString;
+        $this->_messageTemplates[$messageKey] = $messageString;
         return $this;
     }
 
@@ -232,7 +241,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
     /**
      * @param Zend_Validate_Hostname $hostnameValidator OPTIONAL
      * @param int                    $allow             OPTIONAL
-     * @return void
+     * @return $this
      */
     public function setHostnameValidator(Zend_Validate_Hostname $hostnameValidator = null, $allow = Zend_Validate_Hostname::ALLOW_DNS)
     {
@@ -273,7 +282,8 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
      * This only applies when DNS hostnames are validated
      *
      * @param boolean $mx Set allowed to true to validate for MX records, and false to not validate them
-     * @return Zend_Validate_EmailAddress Fluid Interface
+     * @throws Zend_Validate_Exception
+     * @return Zend_Validate_EmailAddress Provides a fluent inteface
      */
     public function setValidateMx($mx)
     {
@@ -300,7 +310,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
      * Set whether we check MX record should be a deep validation
      *
      * @param boolean $deep Set deep to true to perform a deep validation process for MX records
-     * @return Zend_Validate_EmailAddress Fluid Interface
+     * @return Zend_Validate_EmailAddress Provides a fluent inteface
      */
     public function setDeepMxCheck($deep)
     {
@@ -323,7 +333,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
      * or only the local part of the email address
      *
      * @param boolean $domain
-     * @return Zend_Validate_EmailAddress Fluid Interface
+     * @return Zend_Validate_EmailAddress Provides a fluent inteface
      */
     public function setDomainCheck($domain = true)
     {
@@ -414,15 +424,12 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
         if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->_localPart)) {
             $result = true;
         } else {
-            // Try quoted string format
+            // Try quoted string format (RFC 5321 Chapter 4.1.2)
 
-            // Quoted-string characters are: DQUOTE *([FWS] qtext/quoted-pair) [FWS] DQUOTE
-            // qtext: Non white space controls, and the rest of the US-ASCII characters not
-            //   including "\" or the quote character
-            $noWsCtl = '\x01-\x08\x0b\x0c\x0e-\x1f\x7f';
-            $qtext   = $noWsCtl . '\x21\x23-\x5b\x5d-\x7e';
-            $ws      = '\x20\x09';
-            if (preg_match('/^\x22([' . $ws . $qtext . '])*[$ws]?\x22$/', $this->_localPart)) {
+            // Quoted-string characters are: DQUOTE *(qtext/quoted-pair) DQUOTE
+            $qtext      = '\x20-\x21\x23-\x5b\x5d-\x7e'; // %d32-33 / %d35-91 / %d93-126
+            $quotedPair = '\x20-\x7e'; // %d92 %d32-126
+            if (preg_match('/^"(['. $qtext .']|\x5c[' . $quotedPair . '])*"$/', $this->localPart)) {
                 $result = true;
             } else {
                 $this->_error(self::DOT_ATOM);
@@ -442,7 +449,14 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
     private function _validateMXRecords()
     {
         $mxHosts = array();
-        $result = getmxrr($this->_hostname, $mxHosts);
+        $hostname = $this->_hostname;
+
+        //decode IDN domain name if possible
+        if (function_exists('idn_to_ascii')) {
+            $hostname = idn_to_ascii($this->_hostname);
+        }
+
+        $result = getmxrr($hostname, $mxHosts);
         if (!$result) {
             $this->_error(self::INVALID_MX_RECORD);
         } else if ($this->_options['deep'] && function_exists('checkdnsrr')) {
diff --git a/lib/zend/Zend/Validate/Exception.php b/lib/zend/Zend/Validate/Exception.php
index 750e70cb63b..4a4e2b2cbd4 100644
--- a/lib/zend/Zend/Validate/Exception.php
+++ b/lib/zend/Zend/Validate/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Exception.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Exception extends Zend_Exception
diff --git a/lib/zend/Zend/Validate/File/Count.php b/lib/zend/Zend/Validate/File/Count.php
index 8a0a430fd05..aa822dfb14b 100644
--- a/lib/zend/Zend/Validate/File/Count.php
+++ b/lib/zend/Zend/Validate/File/Count.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_Count extends Zend_Validate_Abstract
@@ -101,7 +101,7 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract
      * 'max': Maximum filecount
      *
      * @param  integer|array|Zend_Config $options Options for the adapter
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
@@ -210,6 +210,7 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract
      * Adds a file for validation
      *
      * @param string|array $file
+     * @return $this
      */
     public function addFile($file)
     {
diff --git a/lib/zend/Zend/Validate/File/Crc32.php b/lib/zend/Zend/Validate/File/Crc32.php
index 29e8bb3e5aa..9fd47271c65 100644
--- a/lib/zend/Zend/Validate/File/Crc32.php
+++ b/lib/zend/Zend/Validate/File/Crc32.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Hash.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash
@@ -47,7 +47,7 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash
     protected $_messageTemplates = array(
         self::DOES_NOT_MATCH => "File '%value%' does not match the given crc32 hashes",
         self::NOT_DETECTED   => "A crc32 hash could not be evaluated for the given file",
-        self::NOT_FOUND      => "File '%value%' could not be found",
+        self::NOT_FOUND      => "File '%value%' is not readable or does not exist",
     );
 
     /**
@@ -61,7 +61,8 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash
      * Sets validator options
      *
      * @param  string|array|Zend_Config $options
-     * @return void
+     * @throws Zend_Validate_Exception
+     * @return Zend_Validate_File_Crc32
      */
     public function __construct($options)
     {
@@ -176,4 +177,4 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash
 
         return $this->_throw($file, self::DOES_NOT_MATCH);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/Validate/File/ExcludeExtension.php b/lib/zend/Zend/Validate/File/ExcludeExtension.php
index 57fe95a7e0b..e894af6a342 100644
--- a/lib/zend/Zend/Validate/File/ExcludeExtension.php
+++ b/lib/zend/Zend/Validate/File/ExcludeExtension.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Extension.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension
@@ -45,7 +45,7 @@ class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension
      */
     protected $_messageTemplates = array(
         self::FALSE_EXTENSION => "File '%value%' has a false extension",
-        self::NOT_FOUND       => "File '%value%' could not be found",
+        self::NOT_FOUND       => "File '%value%' is not readable or does not exist",
     );
 
     /**
diff --git a/lib/zend/Zend/Validate/File/ExcludeMimeType.php b/lib/zend/Zend/Validate/File/ExcludeMimeType.php
index 233eee5975b..27d4f5ac3bc 100644
--- a/lib/zend/Zend/Validate/File/ExcludeMimeType.php
+++ b/lib/zend/Zend/Validate/File/ExcludeMimeType.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/MimeType.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType
@@ -38,6 +38,15 @@ class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType
     const NOT_DETECTED = 'fileExcludeMimeTypeNotDetected';
     const NOT_READABLE = 'fileExcludeMimeTypeNotReadable';
 
+    /**
+     * @var array Error message templates
+     */
+    protected $_messageTemplates = array(
+        self::FALSE_TYPE   => "File '%value%' has a false mimetype of '%type%'",
+        self::NOT_DETECTED => "The mimetype of file '%value%' could not be detected",
+        self::NOT_READABLE => "File '%value%' is not readable or does not exist",
+    );
+
     /**
      * Defined by Zend_Validate_Interface
      *
@@ -64,27 +73,10 @@ class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType
             return $this->_throw($file, self::NOT_READABLE);
         }
 
-        $mimefile = $this->getMagicFile();
-        if (class_exists('finfo', false)) {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
-            if (!empty($mimefile)) {
-                $mime = new finfo($const, $mimefile);
-            } else {
-                $mime = new finfo($const);
-            }
+        $this->_type = $this->_detectMimeType($value);
 
-            if (!empty($mime)) {
-                $this->_type = $mime->file($value);
-            }
-            unset($mime);
-        }
-
-        if (empty($this->_type)) {
-            if (function_exists('mime_content_type') && ini_get('mime_magic.magicfile')) {
-                $this->_type = mime_content_type($value);
-            } elseif ($this->_headerCheck) {
-                $this->_type = $file['type'];
-            }
+        if (empty($this->_type) && $this->_headerCheck) {
+            $this->_type = $file['type'];
         }
 
         if (empty($this->_type)) {
diff --git a/lib/zend/Zend/Validate/File/Exists.php b/lib/zend/Zend/Validate/File/Exists.php
index ffa5affe6de..8da1ccdd7d8 100644
--- a/lib/zend/Zend/Validate/File/Exists.php
+++ b/lib/zend/Zend/Validate/File/Exists.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_Exists extends Zend_Validate_Abstract
@@ -63,7 +63,7 @@ class Zend_Validate_File_Exists extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param  string|array|Zend_Config $directory
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($directory = array())
     {
@@ -113,6 +113,7 @@ class Zend_Validate_File_Exists extends Zend_Validate_Abstract
      * Adds the file directory which will be checked
      *
      * @param  string|array $directory The directory to add for validation
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_File_Extension Provides a fluent interface
      */
     public function addDirectory($directory)
diff --git a/lib/zend/Zend/Validate/File/Extension.php b/lib/zend/Zend/Validate/File/Extension.php
index ed5fff25e5b..92f9f06a87f 100644
--- a/lib/zend/Zend/Validate/File/Extension.php
+++ b/lib/zend/Zend/Validate/File/Extension.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_Extension extends Zend_Validate_Abstract
@@ -45,7 +45,7 @@ class Zend_Validate_File_Extension extends Zend_Validate_Abstract
      */
     protected $_messageTemplates = array(
         self::FALSE_EXTENSION => "File '%value%' has a false extension",
-        self::NOT_FOUND       => "File '%value%' could not be found",
+        self::NOT_FOUND       => "File '%value%' is not readable or does not exist",
     );
 
     /**
@@ -71,8 +71,7 @@ class Zend_Validate_File_Extension extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  string|array|Zend_Config $options
-     * @return void
+     * @param string|array|Zend_Config $options
      */
     public function __construct($options)
     {
@@ -196,6 +195,12 @@ class Zend_Validate_File_Extension extends Zend_Validate_Abstract
             $info['extension'] = substr($file['name'], strrpos($file['name'], '.') + 1);
         } else {
             $info = pathinfo($value);
+            if (!array_key_exists('extension', $info)) {
+                // From the manual at http://php.net/pathinfo:
+                // "If the path does not have an extension, no extension element
+                // will be returned (see second example below)."
+                return false;
+            }
         }
 
         $extensions = $this->getExtension();
diff --git a/lib/zend/Zend/Validate/File/FilesSize.php b/lib/zend/Zend/Validate/File/FilesSize.php
index 9565f876f30..b6481334162 100644
--- a/lib/zend/Zend/Validate/File/FilesSize.php
+++ b/lib/zend/Zend/Validate/File/FilesSize.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Size.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size
@@ -64,7 +64,7 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size
      * It also accepts an array with the keys 'min' and 'max'
      *
      * @param  integer|array|Zend_Config $options Options for this validator
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
diff --git a/lib/zend/Zend/Validate/File/Hash.php b/lib/zend/Zend/Validate/File/Hash.php
index 9d72fd21dae..54b036756fc 100644
--- a/lib/zend/Zend/Validate/File/Hash.php
+++ b/lib/zend/Zend/Validate/File/Hash.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_Hash extends Zend_Validate_Abstract
@@ -47,7 +47,7 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract
     protected $_messageTemplates = array(
         self::DOES_NOT_MATCH => "File '%value%' does not match the given hashes",
         self::NOT_DETECTED   => "A hash could not be evaluated for the given file",
-        self::NOT_FOUND      => "File '%value%' could not be found"
+        self::NOT_FOUND      => "File '%value%' is not readable or does not exist"
     );
 
     /**
@@ -61,7 +61,7 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param  string|array $options
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
@@ -109,6 +109,7 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract
      * Adds the hash for one or multiple files
      *
      * @param  string|array $options
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_File_Hash Provides a fluent interface
      */
     public function addHash($options)
diff --git a/lib/zend/Zend/Validate/File/ImageSize.php b/lib/zend/Zend/Validate/File/ImageSize.php
index 42d5e3c0cc0..871fef84ffb 100644
--- a/lib/zend/Zend/Validate/File/ImageSize.php
+++ b/lib/zend/Zend/Validate/File/ImageSize.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract
@@ -53,7 +53,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract
         self::HEIGHT_TOO_BIG   => "Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected",
         self::HEIGHT_TOO_SMALL => "Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected",
         self::NOT_DETECTED     => "The size of image '%value%' could not be detected",
-        self::NOT_READABLE     => "File '%value%' can not be read",
+        self::NOT_READABLE     => "File '%value%' is not readable or does not exist",
     );
 
     /**
@@ -120,7 +120,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract
      * - maxwidth
      *
      * @param  Zend_Config|array $options
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
diff --git a/lib/zend/Zend/Validate/File/IsCompressed.php b/lib/zend/Zend/Validate/File/IsCompressed.php
index 0b491d9842e..ce59423bd2b 100644
--- a/lib/zend/Zend/Validate/File/IsCompressed.php
+++ b/lib/zend/Zend/Validate/File/IsCompressed.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/MimeType.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType
@@ -46,15 +46,14 @@ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType
      */
     protected $_messageTemplates = array(
         self::FALSE_TYPE   => "File '%value%' is not compressed, '%type%' detected",
-        self::NOT_DETECTED => "The mimetype of file '%value%' could not been detected",
-        self::NOT_READABLE => "File '%value%' can not be read",
+        self::NOT_DETECTED => "The mimetype of file '%value%' could not be detected",
+        self::NOT_READABLE => "File '%value%' is not readable or does not exist",
     );
 
     /**
      * Sets validator options
      *
-     * @param  string|array|Zend_Config $compression
-     * @return void
+     * @param string|array|Zend_Config $mimetype
      */
     public function __construct($mimetype = array())
     {
@@ -94,6 +93,7 @@ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType
             'application/x-stuffit',
             'application/x-tar',
             'application/zip',
+            'application/x-zip',
             'application/zoo',
             'multipart/x-gzip',
         );
diff --git a/lib/zend/Zend/Validate/File/IsImage.php b/lib/zend/Zend/Validate/File/IsImage.php
index 23c996092d0..09a6e42ab2f 100644
--- a/lib/zend/Zend/Validate/File/IsImage.php
+++ b/lib/zend/Zend/Validate/File/IsImage.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/MimeType.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType
@@ -47,14 +47,13 @@ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType
     protected $_messageTemplates = array(
         self::FALSE_TYPE   => "File '%value%' is no image, '%type%' detected",
         self::NOT_DETECTED => "The mimetype of file '%value%' could not be detected",
-        self::NOT_READABLE => "File '%value%' can not be read",
+        self::NOT_READABLE => "File '%value%' is not readable or does not exist",
     );
 
     /**
      * Sets validator options
      *
-     * @param  string|array|Zend_Config $mimetype
-     * @return void
+     * @param string|array|Zend_Config $mimetype
      */
     public function __construct($mimetype = array())
     {
diff --git a/lib/zend/Zend/Validate/File/Md5.php b/lib/zend/Zend/Validate/File/Md5.php
index c1d5d0d0c0c..bfe0b6046ed 100644
--- a/lib/zend/Zend/Validate/File/Md5.php
+++ b/lib/zend/Zend/Validate/File/Md5.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Hash.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash
@@ -47,7 +47,7 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash
     protected $_messageTemplates = array(
         self::DOES_NOT_MATCH => "File '%value%' does not match the given md5 hashes",
         self::NOT_DETECTED   => "A md5 hash could not be evaluated for the given file",
-        self::NOT_FOUND      => "File '%value%' could not be found",
+        self::NOT_FOUND      => "File '%value%' is not readable or does not exist",
     );
 
     /**
@@ -63,7 +63,8 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash
      * $hash is the hash we accept for the file $file
      *
      * @param  string|array $options
-     * @return void
+     * @throws Zend_Validate_Exception
+     * @return Zend_Validate_File_Md5
      */
     public function __construct($options)
     {
@@ -93,7 +94,6 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash
      * Sets the md5 hash for one or multiple files
      *
      * @param  string|array $options
-     * @param  string       $algorithm (Deprecated) Algorithm to use, fixed to md5
      * @return Zend_Validate_File_Hash Provides a fluent interface
      */
     public function setHash($options)
@@ -123,7 +123,6 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash
      * Adds the md5 hash for one or multiple files
      *
      * @param  string|array $options
-     * @param  string       $algorithm (Deprecated) Algorithm to use, fixed to md5
      * @return Zend_Validate_File_Hash Provides a fluent interface
      */
     public function addHash($options)
diff --git a/lib/zend/Zend/Validate/File/MimeType.php b/lib/zend/Zend/Validate/File/MimeType.php
index f04a4d9120c..8741488368d 100644
--- a/lib/zend/Zend/Validate/File/MimeType.php
+++ b/lib/zend/Zend/Validate/File/MimeType.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,18 +29,17 @@ require_once 'Zend/Validate/Abstract.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
 {
-    /**#@+
+    /**
      * @const Error type constants
      */
     const FALSE_TYPE   = 'fileMimeTypeFalse';
     const NOT_DETECTED = 'fileMimeTypeNotDetected';
     const NOT_READABLE = 'fileMimeTypeNotReadable';
-    /**#@-*/
 
     /**
      * @var array Error message templates
@@ -48,7 +47,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
     protected $_messageTemplates = array(
         self::FALSE_TYPE   => "File '%value%' has a false mimetype of '%type%'",
         self::NOT_DETECTED => "The mimetype of file '%value%' could not be detected",
-        self::NOT_READABLE => "File '%value%' can not be read",
+        self::NOT_READABLE => "File '%value%' is not readable or does not exist",
     );
 
     /**
@@ -102,6 +101,12 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
         '/usr/share/file/magic.mgc',
     );
 
+    /**
+     * Indicates whether use of $_magicFiles should be attempted.
+     * @var boolean
+     */
+    protected $_tryCommonMagicFiles = true;
+
     /**
      * Option to allow header check
      *
@@ -109,13 +114,20 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
      */
     protected $_headerCheck = false;
 
+    /**
+     * Holds error information returned by finfo_open
+     *
+     * @var array
+     */
+    protected $_finfoError;
+
     /**
      * Sets validator options
      *
      * Mimetype to accept
      *
      * @param  string|array $mimetype MimeType
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($mimetype)
     {
@@ -144,14 +156,22 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
     /**
      * Returns the actual set magicfile
      *
+     * Note that for PHP 5.3.0 or higher, we don't use $_ENV['MAGIC'] or try to
+     * find a magic file in a common location as PHP now has a built-in internal
+     * magic file.
+     *
      * @return string
      */
     public function getMagicFile()
     {
-        if (null === $this->_magicfile) {
+        if (version_compare(PHP_VERSION, '5.3.0', '<')
+            && null === $this->_magicfile) {
             if (!empty($_ENV['MAGIC'])) {
                 $this->setMagicFile($_ENV['MAGIC']);
-            } elseif (!(@ini_get("safe_mode") == 'On' || @ini_get("safe_mode") === 1)) {
+            } elseif (
+                !(@ini_get("safe_mode") == 'On' || @ini_get("safe_mode") === 1)
+                && $this->shouldTryCommonMagicFiles() // @see ZF-11784
+            ) {
                 require_once 'Zend/Validate/Exception.php';
                 foreach ($this->_magicFiles as $file) {
                     // supressing errors which are thrown due to openbase_dir restrictions
@@ -181,7 +201,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
      *
      * @param  string $file
      * @throws Zend_Validate_Exception When finfo can not read the magicfile
-     * @return Zend_Validate_File_MimeType Provides fluid interface
+     * @return Zend_Validate_File_MimeType Provides a fluent interface
      */
     public function setMagicFile($file)
     {
@@ -191,16 +211,22 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
             $this->_magicfile = null;
             require_once 'Zend/Validate/Exception.php';
             throw new Zend_Validate_Exception('Magicfile can not be set. There is no finfo extension installed');
-        } else if (!is_readable($file)) {
+        } else if (!is_file($file) || !is_readable($file)) {
             require_once 'Zend/Validate/Exception.php';
             throw new Zend_Validate_Exception('The given magicfile can not be read');
         } else {
             $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
-            $this->_finfo = @finfo_open($const, $file);
+            set_error_handler(array($this, '_errorHandler'), E_NOTICE | E_WARNING);
+            $this->_finfo = finfo_open($const, $file);
+            restore_error_handler();
             if (empty($this->_finfo)) {
                 $this->_finfo = null;
                 require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception('The given magicfile is not accepted by finfo');
+                throw new Zend_Validate_Exception(
+                    sprintf('The given magicfile ("%s") is not accepted by finfo', $file),
+                    null,
+                    $this->_finfoError
+                );
             } else {
                 $this->_magicfile = $file;
             }
@@ -209,6 +235,32 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
         return $this;
     }
 
+    /**
+     * Enables or disables attempts to try the common magic file locations
+     * specified by Zend_Validate_File_MimeType::_magicFiles
+     *
+     * @param  boolean $flag
+     * @return Zend_Validate_File_MimeType Provides fluent interface
+     * @see http://framework.zend.com/issues/browse/ZF-11784
+     */
+    public function setTryCommonMagicFilesFlag($flag = true)
+    {
+        $this->_tryCommonMagicFiles = (boolean) $flag;
+
+        return $this;
+    }
+
+    /**
+     * Accessor for Zend_Validate_File_MimeType::_magicFiles
+     *
+     * @return boolean
+     * @see http://framework.zend.com/issues/browse/ZF-11784
+     */
+    public function shouldTryCommonMagicFiles()
+    {
+        return $this->_tryCommonMagicFiles;
+    }
+
     /**
      * Returns the Header Check option
      *
@@ -223,8 +275,8 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
      * Defines if the http header should be used
      * Note that this is unsave and therefor the default value is false
      *
-     * @param  boolean $checkHeader
-     * @return Zend_Validate_File_MimeType Provides fluid interface
+     * @param  boolean $headerCheck
+     * @return Zend_Validate_File_MimeType Provides a fluent interface
      */
     public function enableHeaderCheck($headerCheck = true)
     {
@@ -266,6 +318,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
      * Adds the mimetypes
      *
      * @param  string|array $mimetype The mimetypes to add for validation
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_File_Extension Provides a fluent interface
      */
     public function addMimeType($mimetype)
@@ -329,27 +382,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
             return $this->_throw($file, self::NOT_READABLE);
         }
 
-        $mimefile = $this->getMagicFile();
-        if (class_exists('finfo', false)) {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
-            if (!empty($mimefile) && empty($this->_finfo)) {
-                $this->_finfo = @finfo_open($const, $mimefile);
-            }
-
-            if (empty($this->_finfo)) {
-                $this->_finfo = @finfo_open($const);
-            }
-
-            $this->_type = null;
-            if (!empty($this->_finfo)) {
-                $this->_type = finfo_file($this->_finfo, $value);
-            }
-        }
-
-        if (empty($this->_type) &&
-            (function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))) {
-                $this->_type = mime_content_type($value);
-        }
+        $this->_type = $this->_detectMimeType($value);
 
         if (empty($this->_type) && $this->_headerCheck) {
             $this->_type = $file['type'];
@@ -389,4 +422,55 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
         $this->_error($errorType);
         return false;
     }
+
+    /**
+     * Try to detect mime type of given file.
+     * @param string $file File which mime type should be detected
+     * @return string File mime type or null if not detected
+     */
+    protected function _detectMimeType($file)
+    {
+        $mimefile = $this->getMagicFile();
+        $type = null;
+
+        if (class_exists('finfo', false)) {
+            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
+
+            if (!empty($mimefile) && empty($this->_finfo)) {
+                set_error_handler(array($this, '_errorHandler'), E_NOTICE | E_WARNING);
+                $this->_finfo = finfo_open($const, $mimefile);
+                restore_error_handler();
+            }
+
+            if (empty($this->_finfo)) {
+                set_error_handler(array($this, '_errorHandler'), E_NOTICE | E_WARNING);
+                $this->_finfo = finfo_open($const);
+                restore_error_handler();
+            }
+
+            if (!empty($this->_finfo)) {
+                $type = finfo_file($this->_finfo, $file);
+            }
+        }
+
+        if (empty($type) &&
+            (function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))) {
+                $type = mime_content_type($file);
+        }
+
+        return $type;
+    }
+
+    /**
+     * Saves the provided error information by finfo_open to this instance
+     *
+     * @param integer $errno
+     * @param string  $errstr
+     * @param string  $errfile
+     * @param integer $errline
+     */
+    protected function _errorHandler($errno, $errstr, $errfile, $errline)
+    {
+        $this->_finfoError = new ErrorException($errstr, $errno, 0, $errfile, $errline);
+    }
 }
diff --git a/lib/zend/Zend/Validate/File/NotExists.php b/lib/zend/Zend/Validate/File/NotExists.php
index 8fb5efe9e00..bf58dce229e 100644
--- a/lib/zend/Zend/Validate/File/NotExists.php
+++ b/lib/zend/Zend/Validate/File/NotExists.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Exists.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_NotExists extends Zend_Validate_File_Exists
diff --git a/lib/zend/Zend/Validate/File/Sha1.php b/lib/zend/Zend/Validate/File/Sha1.php
index 18bb9f1a9dc..e4076139bb2 100644
--- a/lib/zend/Zend/Validate/File/Sha1.php
+++ b/lib/zend/Zend/Validate/File/Sha1.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Hash.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash
@@ -47,7 +47,7 @@ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash
     protected $_messageTemplates = array(
         self::DOES_NOT_MATCH => "File '%value%' does not match the given sha1 hashes",
         self::NOT_DETECTED   => "A sha1 hash could not be evaluated for the given file",
-        self::NOT_FOUND      => "File '%value%' could not be found",
+        self::NOT_FOUND      => "File '%value%' is not readable or does not exist",
     );
 
     /**
@@ -63,7 +63,8 @@ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash
      * $hash is the hash we accept for the file $file
      *
      * @param  string|array $options
-     * @return void
+     * @throws Zend_Validate_Exception
+     * @return Zend_Validate_File_Sha1
      */
     public function __construct($options)
     {
diff --git a/lib/zend/Zend/Validate/File/Size.php b/lib/zend/Zend/Validate/File/Size.php
index 5f7922276b5..bc9dea0d231 100644
--- a/lib/zend/Zend/Validate/File/Size.php
+++ b/lib/zend/Zend/Validate/File/Size.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_Size extends Zend_Validate_Abstract
@@ -48,7 +48,7 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract
     protected $_messageTemplates = array(
         self::TOO_BIG   => "Maximum allowed size for file '%value%' is '%max%' but '%size%' detected",
         self::TOO_SMALL => "Minimum expected size for file '%value%' is '%min%' but '%size%' detected",
-        self::NOT_FOUND => "File '%value%' could not be found",
+        self::NOT_FOUND => "File '%value%' is not readable or does not exist",
     );
 
     /**
@@ -99,6 +99,7 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract
      * 'bytestring': Use bytestring or real size for messages
      *
      * @param  integer|array $options Options for the adapter
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
diff --git a/lib/zend/Zend/Validate/File/Upload.php b/lib/zend/Zend/Validate/File/Upload.php
index 1bb0e3c4370..5eae769846a 100644
--- a/lib/zend/Zend/Validate/File/Upload.php
+++ b/lib/zend/Zend/Validate/File/Upload.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_Upload extends Zend_Validate_Abstract
@@ -78,8 +78,7 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract
      * If no files are given the $_FILES array will be used automatically.
      * NOTE: This validator will only work with HTTP POST uploads!
      *
-     * @param  array|Zend_Config $files Array of files in syntax of Zend_File_Transfer
-     * @return void
+     * @param array|Zend_Config $files Array of files in syntax of Zend_File_Transfer
      */
     public function __construct($files = array())
     {
@@ -93,7 +92,7 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract
     /**
      * Returns the array of set files
      *
-     * @param  string $files (Optional) The file to return in detail
+     * @param  string $file (Optional) The file to return in detail
      * @return array
      * @throws Zend_Validate_Exception If file is not found
      */
@@ -136,6 +135,11 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract
             $this->_files = $files;
         }
 
+        // see ZF-10738
+        if (is_null($this->_files)) {
+            $this->_files = array();
+        }
+
         foreach($this->_files as $file => $content) {
             if (!isset($content['error'])) {
                 unset($this->_files[$file]);
@@ -152,6 +156,7 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract
      *
      * @param  string $value Single file to check for upload errors, when giving null the $_FILES array
      *                       from initialization will be used
+     * @param  string|null   $file
      * @return boolean
      */
     public function isValid($value, $file = null)
@@ -180,40 +185,40 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract
             switch($content['error']) {
                 case 0:
                     if (!is_uploaded_file($content['tmp_name'])) {
-                        $this->_throw($file, self::ATTACK);
+                        $this->_throw($content, self::ATTACK);
                     }
                     break;
 
                 case 1:
-                    $this->_throw($file, self::INI_SIZE);
+                    $this->_throw($content, self::INI_SIZE);
                     break;
 
                 case 2:
-                    $this->_throw($file, self::FORM_SIZE);
+                    $this->_throw($content, self::FORM_SIZE);
                     break;
 
                 case 3:
-                    $this->_throw($file, self::PARTIAL);
+                    $this->_throw($content, self::PARTIAL);
                     break;
 
                 case 4:
-                    $this->_throw($file, self::NO_FILE);
+                    $this->_throw($content, self::NO_FILE);
                     break;
 
                 case 6:
-                    $this->_throw($file, self::NO_TMP_DIR);
+                    $this->_throw($content, self::NO_TMP_DIR);
                     break;
 
                 case 7:
-                    $this->_throw($file, self::CANT_WRITE);
+                    $this->_throw($content, self::CANT_WRITE);
                     break;
 
                 case 8:
-                    $this->_throw($file, self::EXTENSION);
+                    $this->_throw($content, self::EXTENSION);
                     break;
 
                 default:
-                    $this->_throw($file, self::UNKNOWN);
+                    $this->_throw($content, self::UNKNOWN);
                     break;
             }
         }
diff --git a/lib/zend/Zend/Validate/File/WordCount.php b/lib/zend/Zend/Validate/File/WordCount.php
index 5b76c3e6ffd..42c79a5bd53 100644
--- a/lib/zend/Zend/Validate/File/WordCount.php
+++ b/lib/zend/Zend/Validate/File/WordCount.php
@@ -14,7 +14,7 @@
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  * @version   $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Count.php';
  *
  * @category  Zend
  * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_File_WordCount extends Zend_Validate_File_Count
@@ -48,7 +48,7 @@ class Zend_Validate_File_WordCount extends Zend_Validate_File_Count
     protected $_messageTemplates = array(
         self::TOO_MUCH => "Too much words, maximum '%max%' are allowed but '%count%' were counted",
         self::TOO_LESS => "Too less words, minimum '%min%' are expected but '%count%' were counted",
-        self::NOT_FOUND => "File '%value%' could not be found",
+        self::NOT_FOUND => "File '%value%' is not readable or does not exist",
     );
 
     /**
diff --git a/lib/zend/Zend/Validate/Float.php b/lib/zend/Zend/Validate/Float.php
index c74286aa219..f0879a54100 100644
--- a/lib/zend/Zend/Validate/Float.php
+++ b/lib/zend/Zend/Validate/Float.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Locale/Format.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Float extends Zend_Validate_Abstract
@@ -44,7 +44,7 @@ class Zend_Validate_Float extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID   => "Invalid type given, value should be float, string, or integer",
+        self::INVALID   => "Invalid type given. String, integer or float expected",
         self::NOT_FLOAT => "'%value%' does not appear to be a float",
     );
 
@@ -91,6 +91,7 @@ class Zend_Validate_Float extends Zend_Validate_Abstract
      * Sets the locale to use
      *
      * @param string|Zend_Locale $locale
+     * @return $this
      */
     public function setLocale($locale = null)
     {
diff --git a/lib/zend/Zend/Validate/GreaterThan.php b/lib/zend/Zend/Validate/GreaterThan.php
index f9df5f09b9c..5dd0579cdb6 100644
--- a/lib/zend/Zend/Validate/GreaterThan.php
+++ b/lib/zend/Zend/Validate/GreaterThan.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_GreaterThan extends Zend_Validate_Abstract
@@ -60,7 +60,7 @@ class Zend_Validate_GreaterThan extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param  mixed|Zend_Config $min
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($min)
     {
diff --git a/lib/zend/Zend/Validate/Hex.php b/lib/zend/Zend/Validate/Hex.php
index aa0e0a04b19..c6f780974d6 100644
--- a/lib/zend/Zend/Validate/Hex.php
+++ b/lib/zend/Zend/Validate/Hex.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Hex extends Zend_Validate_Abstract
@@ -41,7 +41,7 @@ class Zend_Validate_Hex extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID => "Invalid type given, value should be a string",
+        self::INVALID => "Invalid type given. String expected",
         self::NOT_HEX => "'%value%' has not only hexadecimal digit characters",
     );
 
diff --git a/lib/zend/Zend/Validate/Hostname.php b/lib/zend/Zend/Validate/Hostname.php
index 3e9eac72589..dc04961aa53 100644
--- a/lib/zend/Zend/Validate/Hostname.php
+++ b/lib/zend/Zend/Validate/Hostname.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,36 +41,38 @@ require_once 'Zend/Validate/Ip.php';
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Hostname extends Zend_Validate_Abstract
 {
-    const INVALID                 = 'hostnameInvalid';
-    const IP_ADDRESS_NOT_ALLOWED  = 'hostnameIpAddressNotAllowed';
-    const UNKNOWN_TLD             = 'hostnameUnknownTld';
-    const INVALID_DASH            = 'hostnameDashCharacter';
-    const INVALID_HOSTNAME_SCHEMA = 'hostnameInvalidHostnameSchema';
-    const UNDECIPHERABLE_TLD      = 'hostnameUndecipherableTld';
-    const INVALID_HOSTNAME        = 'hostnameInvalidHostname';
-    const INVALID_LOCAL_NAME      = 'hostnameInvalidLocalName';
-    const LOCAL_NAME_NOT_ALLOWED  = 'hostnameLocalNameNotAllowed';
     const CANNOT_DECODE_PUNYCODE  = 'hostnameCannotDecodePunycode';
+    const INVALID                 = 'hostnameInvalid';
+    const INVALID_DASH            = 'hostnameDashCharacter';
+    const INVALID_HOSTNAME        = 'hostnameInvalidHostname';
+    const INVALID_HOSTNAME_SCHEMA = 'hostnameInvalidHostnameSchema';
+    const INVALID_LOCAL_NAME      = 'hostnameInvalidLocalName';
+    const INVALID_URI             = 'hostnameInvalidUri';
+    const IP_ADDRESS_NOT_ALLOWED  = 'hostnameIpAddressNotAllowed';
+    const LOCAL_NAME_NOT_ALLOWED  = 'hostnameLocalNameNotAllowed';
+    const UNDECIPHERABLE_TLD      = 'hostnameUndecipherableTld';
+    const UNKNOWN_TLD             = 'hostnameUnknownTld';
 
     /**
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID                 => "Invalid type given, value should be a string",
-        self::IP_ADDRESS_NOT_ALLOWED  => "'%value%' appears to be an IP address, but IP addresses are not allowed",
-        self::UNKNOWN_TLD             => "'%value%' appears to be a DNS hostname but cannot match TLD against known list",
-        self::INVALID_DASH            => "'%value%' appears to be a DNS hostname but contains a dash in an invalid position",
-        self::INVALID_HOSTNAME_SCHEMA => "'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'",
-        self::UNDECIPHERABLE_TLD      => "'%value%' appears to be a DNS hostname but cannot extract TLD part",
-        self::INVALID_HOSTNAME        => "'%value%' does not match the expected structure for a DNS hostname",
-        self::INVALID_LOCAL_NAME      => "'%value%' does not appear to be a valid local network name",
-        self::LOCAL_NAME_NOT_ALLOWED  => "'%value%' appears to be a local network name but local network names are not allowed",
         self::CANNOT_DECODE_PUNYCODE  => "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded",
+        self::INVALID                 => "Invalid type given. String expected",
+        self::INVALID_DASH            => "'%value%' appears to be a DNS hostname but contains a dash in an invalid position",
+        self::INVALID_HOSTNAME        => "'%value%' does not match the expected structure for a DNS hostname",
+        self::INVALID_HOSTNAME_SCHEMA => "'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'",
+        self::INVALID_LOCAL_NAME      => "'%value%' does not appear to be a valid local network name",
+        self::INVALID_URI             => "'%value%' does not appear to be a valid URI hostname",
+        self::IP_ADDRESS_NOT_ALLOWED  => "'%value%' appears to be an IP address, but IP addresses are not allowed",
+        self::LOCAL_NAME_NOT_ALLOWED  => "'%value%' appears to be a local network name but local network names are not allowed",
+        self::UNDECIPHERABLE_TLD      => "'%value%' appears to be a DNS hostname but cannot extract TLD part",
+        self::UNKNOWN_TLD             => "'%value%' appears to be a DNS hostname but cannot match TLD against known list",
     );
 
     /**
@@ -98,35 +100,875 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
     /**
      * Allows all types of hostnames
      */
-    const ALLOW_ALL   = 7;
+    const ALLOW_URI = 8;
+
+    /**
+     * Allows all types of hostnames
+     */
+    const ALLOW_ALL = 15;
 
     /**
      * Array of valid top-level-domains
      *
-     * @see ftp://data.iana.org/TLD/tlds-alpha-by-domain.txt  List of all TLDs by domain
+     * Version 2014112800, Last Updated Fri Nov 28 07:07:01 2014 UTC
+     *
+     * @see http://data.iana.org/TLD/tlds-alpha-by-domain.txt  List of all TLDs by domain
      * @see http://www.iana.org/domains/root/db/ Official list of supported TLDs
      * @var array
      */
     protected $_validTlds = array(
-        'ac', 'ad', 'ae', 'aero', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'arpa',
-        'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi',
-        'biz', 'bj', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cat', 'cc',
-        'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'com', 'coop', 'cr', 'cu',
-        'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'edu', 'ee', 'eg', 'er',
-        'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg',
-        'gh', 'gi', 'gl', 'gm', 'gn', 'gov', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk',
-        'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'info', 'int', 'io', 'iq',
-        'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp',
-        'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly',
-        'ma', 'mc', 'md', 'me', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn', 'mo', 'mobi', 'mp',
-        'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'name', 'nc',
-        'ne', 'net', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'org', 'pa', 'pe',
-        'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt', 'pw', 'py', 'qa', 're',
-        'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl',
-        'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th',
-        'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua',
-        'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws',
-        'ye', 'yt', 'yu', 'za', 'zm', 'zw'
+        'abogado',
+        'ac',
+        'academy',
+        'accountants',
+        'active',
+        'actor',
+        'ad',
+        'ae',
+        'aero',
+        'af',
+        'ag',
+        'agency',
+        'ai',
+        'airforce',
+        'al',
+        'allfinanz',
+        'alsace',
+        'am',
+        'an',
+        'android',
+        'ao',
+        'aq',
+        'ar',
+        'archi',
+        'army',
+        'arpa',
+        'as',
+        'asia',
+        'associates',
+        'at',
+        'attorney',
+        'au',
+        'auction',
+        'audio',
+        'autos',
+        'aw',
+        'ax',
+        'axa',
+        'az',
+        'ba',
+        'band',
+        'bar',
+        'bargains',
+        'bayern',
+        'bb',
+        'bd',
+        'be',
+        'beer',
+        'berlin',
+        'best',
+        'bf',
+        'bg',
+        'bh',
+        'bi',
+        'bid',
+        'bike',
+        'bio',
+        'biz',
+        'bj',
+        'black',
+        'blackfriday',
+        'bloomberg',
+        'blue',
+        'bm',
+        'bmw',
+        'bn',
+        'bnpparibas',
+        'bo',
+        'boo',
+        'boutique',
+        'br',
+        'brussels',
+        'bs',
+        'bt',
+        'budapest',
+        'build',
+        'builders',
+        'business',
+        'buzz',
+        'bv',
+        'bw',
+        'by',
+        'bz',
+        'bzh',
+        'ca',
+        'cab',
+        'cal',
+        'camera',
+        'camp',
+        'cancerresearch',
+        'capetown',
+        'capital',
+        'caravan',
+        'cards',
+        'care',
+        'career',
+        'careers',
+        'casa',
+        'cash',
+        'cat',
+        'catering',
+        'cc',
+        'cd',
+        'center',
+        'ceo',
+        'cern',
+        'cf',
+        'cg',
+        'ch',
+        'channel',
+        'cheap',
+        'christmas',
+        'chrome',
+        'church',
+        'ci',
+        'citic',
+        'city',
+        'ck',
+        'cl',
+        'claims',
+        'cleaning',
+        'click',
+        'clinic',
+        'clothing',
+        'club',
+        'cm',
+        'cn',
+        'co',
+        'coach',
+        'codes',
+        'coffee',
+        'college',
+        'cologne',
+        'com',
+        'community',
+        'company',
+        'computer',
+        'condos',
+        'construction',
+        'consulting',
+        'contractors',
+        'cooking',
+        'cool',
+        'coop',
+        'country',
+        'cr',
+        'credit',
+        'creditcard',
+        'cricket',
+        'crs',
+        'cruises',
+        'cu',
+        'cuisinella',
+        'cv',
+        'cw',
+        'cx',
+        'cy',
+        'cymru',
+        'cz',
+        'dad',
+        'dance',
+        'dating',
+        'day',
+        'de',
+        'deals',
+        'degree',
+        'delivery',
+        'democrat',
+        'dental',
+        'dentist',
+        'desi',
+        'diamonds',
+        'diet',
+        'digital',
+        'direct',
+        'directory',
+        'discount',
+        'dj',
+        'dk',
+        'dm',
+        'dnp',
+        'do',
+        'domains',
+        'durban',
+        'dvag',
+        'dz',
+        'eat',
+        'ec',
+        'edu',
+        'education',
+        'ee',
+        'eg',
+        'email',
+        'emerck',
+        'energy',
+        'engineer',
+        'engineering',
+        'enterprises',
+        'equipment',
+        'er',
+        'es',
+        'esq',
+        'estate',
+        'et',
+        'eu',
+        'eus',
+        'events',
+        'everbank',
+        'exchange',
+        'expert',
+        'exposed',
+        'fail',
+        'farm',
+        'feedback',
+        'fi',
+        'finance',
+        'financial',
+        'firmdale',
+        'fish',
+        'fishing',
+        'fitness',
+        'fj',
+        'fk',
+        'flights',
+        'florist',
+        'flsmidth',
+        'fly',
+        'fm',
+        'fo',
+        'foo',
+        'forsale',
+        'foundation',
+        'fr',
+        'frl',
+        'frogans',
+        'fund',
+        'furniture',
+        'futbol',
+        'ga',
+        'gal',
+        'gallery',
+        'gb',
+        'gbiz',
+        'gd',
+        'ge',
+        'gent',
+        'gf',
+        'gg',
+        'gh',
+        'gi',
+        'gift',
+        'gifts',
+        'gives',
+        'gl',
+        'glass',
+        'gle',
+        'global',
+        'globo',
+        'gm',
+        'gmail',
+        'gmo',
+        'gmx',
+        'gn',
+        'google',
+        'gop',
+        'gov',
+        'gp',
+        'gq',
+        'gr',
+        'graphics',
+        'gratis',
+        'green',
+        'gripe',
+        'gs',
+        'gt',
+        'gu',
+        'guide',
+        'guitars',
+        'guru',
+        'gw',
+        'gy',
+        'hamburg',
+        'haus',
+        'healthcare',
+        'help',
+        'here',
+        'hiphop',
+        'hiv',
+        'hk',
+        'hm',
+        'hn',
+        'holdings',
+        'holiday',
+        'homes',
+        'horse',
+        'host',
+        'hosting',
+        'house',
+        'how',
+        'hr',
+        'ht',
+        'hu',
+        'ibm',
+        'id',
+        'ie',
+        'il',
+        'im',
+        'immo',
+        'immobilien',
+        'in',
+        'industries',
+        'info',
+        'ing',
+        'ink',
+        'institute',
+        'insure',
+        'int',
+        'international',
+        'investments',
+        'io',
+        'iq',
+        'ir',
+        'is',
+        'it',
+        'je',
+        'jetzt',
+        'jm',
+        'jo',
+        'jobs',
+        'joburg',
+        'jp',
+        'juegos',
+        'kaufen',
+        'ke',
+        'kg',
+        'kh',
+        'ki',
+        'kim',
+        'kitchen',
+        'kiwi',
+        'km',
+        'kn',
+        'koeln',
+        'kp',
+        'kr',
+        'krd',
+        'kred',
+        'kw',
+        'ky',
+        'kz',
+        'la',
+        'lacaixa',
+        'land',
+        'lawyer',
+        'lb',
+        'lc',
+        'lds',
+        'lease',
+        'legal',
+        'lgbt',
+        'li',
+        'life',
+        'lighting',
+        'limited',
+        'limo',
+        'link',
+        'lk',
+        'loans',
+        'london',
+        'lotto',
+        'lr',
+        'ls',
+        'lt',
+        'ltda',
+        'lu',
+        'luxe',
+        'luxury',
+        'lv',
+        'ly',
+        'ma',
+        'madrid',
+        'maison',
+        'management',
+        'mango',
+        'market',
+        'marketing',
+        'mc',
+        'md',
+        'me',
+        'media',
+        'meet',
+        'melbourne',
+        'meme',
+        'memorial',
+        'menu',
+        'mg',
+        'mh',
+        'miami',
+        'mil',
+        'mini',
+        'mk',
+        'ml',
+        'mm',
+        'mn',
+        'mo',
+        'mobi',
+        'moda',
+        'moe',
+        'monash',
+        'money',
+        'mormon',
+        'mortgage',
+        'moscow',
+        'motorcycles',
+        'mov',
+        'mp',
+        'mq',
+        'mr',
+        'ms',
+        'mt',
+        'mu',
+        'museum',
+        'mv',
+        'mw',
+        'mx',
+        'my',
+        'mz',
+        'na',
+        'nagoya',
+        'name',
+        'navy',
+        'nc',
+        'ne',
+        'net',
+        'network',
+        'neustar',
+        'new',
+        'nexus',
+        'nf',
+        'ng',
+        'ngo',
+        'nhk',
+        'ni',
+        'ninja',
+        'nl',
+        'no',
+        'np',
+        'nr',
+        'nra',
+        'nrw',
+        'nu',
+        'nyc',
+        'nz',
+        'okinawa',
+        'om',
+        'ong',
+        'onl',
+        'ooo',
+        'org',
+        'organic',
+        'otsuka',
+        'ovh',
+        'pa',
+        'paris',
+        'partners',
+        'parts',
+        'party',
+        'pe',
+        'pf',
+        'pg',
+        'ph',
+        'pharmacy',
+        'photo',
+        'photography',
+        'photos',
+        'physio',
+        'pics',
+        'pictures',
+        'pink',
+        'pizza',
+        'pk',
+        'pl',
+        'place',
+        'plumbing',
+        'pm',
+        'pn',
+        'pohl',
+        'poker',
+        'post',
+        'pr',
+        'praxi',
+        'press',
+        'pro',
+        'prod',
+        'productions',
+        'prof',
+        'properties',
+        'property',
+        'ps',
+        'pt',
+        'pub',
+        'pw',
+        'py',
+        'qa',
+        'qpon',
+        'quebec',
+        're',
+        'realtor',
+        'recipes',
+        'red',
+        'rehab',
+        'reise',
+        'reisen',
+        'reit',
+        'ren',
+        'rentals',
+        'repair',
+        'report',
+        'republican',
+        'rest',
+        'restaurant',
+        'reviews',
+        'rich',
+        'rio',
+        'rip',
+        'ro',
+        'rocks',
+        'rodeo',
+        'rs',
+        'rsvp',
+        'ru',
+        'ruhr',
+        'rw',
+        'ryukyu',
+        'sa',
+        'saarland',
+        'sarl',
+        'sb',
+        'sc',
+        'sca',
+        'scb',
+        'schmidt',
+        'schule',
+        'science',
+        'scot',
+        'sd',
+        'se',
+        'services',
+        'sexy',
+        'sg',
+        'sh',
+        'shiksha',
+        'shoes',
+        'si',
+        'singles',
+        'sj',
+        'sk',
+        'sl',
+        'sm',
+        'sn',
+        'so',
+        'social',
+        'software',
+        'sohu',
+        'solar',
+        'solutions',
+        'soy',
+        'space',
+        'spiegel',
+        'sr',
+        'st',
+        'su',
+        'supplies',
+        'supply',
+        'support',
+        'surf',
+        'surgery',
+        'suzuki',
+        'sv',
+        'sx',
+        'sy',
+        'sydney',
+        'systems',
+        'sz',
+        'taipei',
+        'tatar',
+        'tattoo',
+        'tax',
+        'tc',
+        'td',
+        'technology',
+        'tel',
+        'tf',
+        'tg',
+        'th',
+        'tienda',
+        'tips',
+        'tirol',
+        'tj',
+        'tk',
+        'tl',
+        'tm',
+        'tn',
+        'to',
+        'today',
+        'tokyo',
+        'tools',
+        'top',
+        'town',
+        'toys',
+        'tp',
+        'tr',
+        'trade',
+        'training',
+        'travel',
+        'tt',
+        'tui',
+        'tv',
+        'tw',
+        'tz',
+        'ua',
+        'ug',
+        'uk',
+        'university',
+        'uno',
+        'uol',
+        'us',
+        'uy',
+        'uz',
+        'va',
+        'vacations',
+        'vc',
+        've',
+        'vegas',
+        'ventures',
+        'versicherung',
+        'vet',
+        'vg',
+        'vi',
+        'viajes',
+        'villas',
+        'vision',
+        'vlaanderen',
+        'vn',
+        'vodka',
+        'vote',
+        'voting',
+        'voto',
+        'voyage',
+        'vu',
+        'wales',
+        'wang',
+        'watch',
+        'webcam',
+        'website',
+        'wed',
+        'wedding',
+        'wf',
+        'whoswho',
+        'wien',
+        'wiki',
+        'williamhill',
+        'wme',
+        'work',
+        'works',
+        'world',
+        'ws',
+        'wtc',
+        'wtf',
+        'xn--1qqw23a',
+        'xn--3bst00m',
+        'xn--3ds443g',
+        'xn--3e0b707e',
+        'xn--45brj9c',
+        'xn--45q11c',
+        'xn--4gbrim',
+        'xn--55qw42g',
+        'xn--55qx5d',
+        'xn--6frz82g',
+        'xn--6qq986b3xl',
+        'xn--80adxhks',
+        'xn--80ao21a',
+        'xn--80asehdb',
+        'xn--80aswg',
+        'xn--90a3ac',
+        'xn--c1avg',
+        'xn--cg4bki',
+        'xn--clchc0ea0b2g2a9gcd',
+        'xn--czr694b',
+        'xn--czru2d',
+        'xn--d1acj3b',
+        'xn--d1alf',
+        'xn--fiq228c5hs',
+        'xn--fiq64b',
+        'xn--fiqs8s',
+        'xn--fiqz9s',
+        'xn--flw351e',
+        'xn--fpcrj9c3d',
+        'xn--fzc2c9e2c',
+        'xn--gecrj9c',
+        'xn--h2brj9c',
+        'xn--i1b6b1a6a2e',
+        'xn--io0a7i',
+        'xn--j1amh',
+        'xn--j6w193g',
+        'xn--kprw13d',
+        'xn--kpry57d',
+        'xn--kput3i',
+        'xn--l1acc',
+        'xn--lgbbat1ad8j',
+        'xn--mgb9awbf',
+        'xn--mgba3a4f16a',
+        'xn--mgbaam7a8h',
+        'xn--mgbab2bd',
+        'xn--mgbayh7gpa',
+        'xn--mgbbh1a71e',
+        'xn--mgbc0a9azcg',
+        'xn--mgberp4a5d4ar',
+        'xn--mgbx4cd0ab',
+        'xn--ngbc5azd',
+        'xn--node',
+        'xn--nqv7f',
+        'xn--nqv7fs00ema',
+        'xn--o3cw4h',
+        'xn--ogbpf8fl',
+        'xn--p1acf',
+        'xn--p1ai',
+        'xn--pgbs0dh',
+        'xn--q9jyb4c',
+        'xn--qcka1pmc',
+        'xn--rhqv96g',
+        'xn--s9brj9c',
+        'xn--ses554g',
+        'xn--unup4y',
+        'xn--vermgensberater-ctb',
+        'xn--vermgensberatung-pwb',
+        'xn--vhquv',
+        'xn--wgbh1c',
+        'xn--wgbl6a',
+        'xn--xhq521b',
+        'xn--xkc2al3hye2a',
+        'xn--xkc2dl3a5ee0h',
+        'xn--yfro4i67o',
+        'xn--ygbi2ammx',
+        'xn--zfr164b',
+        'xxx',
+        'xyz',
+        'yachts',
+        'yandex',
+        'ye',
+        'yoga',
+        'yokohama',
+        'youtube',
+        'yt',
+        'za',
+        'zip',
+        'zm',
+        'zone',
+        'zw',
+        '测试',
+        'परीक्षा',
+        '佛山',
+        '集团',
+        '在线',
+        '한국',
+        'ভারত',
+        '八卦',
+        'موقع',
+        'বাংলা',
+        '公益',
+        '公司',
+        '移动',
+        '我爱你',
+        'москва',
+        'испытание',
+        'қаз',
+        'онлайн',
+        'сайт',
+        'срб',
+        'бел',
+        '테스트',
+        'орг',
+        '삼성',
+        'சிங்கப்பூர்',
+        '商标',
+        '商城',
+        'дети',
+        'мкд',
+        'טעסט',
+        '中文网',
+        '中信',
+        '中国',
+        '中國',
+        '谷歌',
+        'భారత్',
+        'ලංකා',
+        '測試',
+        'ભારત',
+        'भारत',
+        'آزمایشی',
+        'பரிட்சை',
+        'संगठन',
+        '网络',
+        'укр',
+        '香港',
+        'δοκιμή',
+        'إختبار',
+        '台湾',
+        '台灣',
+        '手机',
+        'мон',
+        'الجزائر',
+        'عمان',
+        'ایران',
+        'امارات',
+        'بازار',
+        'پاکستان',
+        'الاردن',
+        'بھارت',
+        'المغرب',
+        'السعودية',
+        'سودان',
+        'عراق',
+        'مليسيا',
+        'شبكة',
+        'გე',
+        '机构',
+        '组织机构',
+        'ไทย',
+        'سورية',
+        'рус',
+        'рф',
+        'تونس',
+        'みんな',
+        'グーグル',
+        '世界',
+        'ਭਾਰਤ',
+        '网址',
+        '游戏',
+        'vermögensberater',
+        'vermögensberatung',
+        '企业',
+        'مصر',
+        'قطر',
+        '广东',
+        'இலங்கை',
+        'இந்தியா',
+        'հայ',
+        '新加坡',
+        'فلسطين',
+        'テスト',
+        '政务',
     );
 
     /**
@@ -144,6 +986,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
      * (.BIZ) International http://www.iana.org/domains/idn-tables/
      * (.BR) Brazil http://registro.br/faq/faq6.html
      * (.BV) Bouvett Island http://www.norid.no/domeneregistrering/idn/idn_nyetegn.en.html
+     * (.CA) Canada http://www.iana.org/domains/idn-tables/tables/ca_fr_1.0.html
      * (.CAT) Catalan http://www.iana.org/domains/idn-tables/tables/cat_ca_1.0.html
      * (.CH) Switzerland https://nic.switch.ch/reg/ocView.action?res=EF6GW2JBPVTG67DLNIQXU234MN6SC33JNQQGI7L6#anhang1
      * (.CL) Chile http://www.iana.org/domains/idn-tables/tables/cl_latn_1.0.html
@@ -172,6 +1015,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
      * (.PR) Puerto Rico http://www.nic.pr/idn_rules.asp
      * (.PT) Portugal https://online.dns.pt/dns_2008/do?com=DS;8216320233;111;+PAGE(4000058)+K-CAT-CODIGO(C.125)+RCNT(100);
      * (.RU) Russia http://www.iana.org/domains/idn-tables/tables/ru_ru-ru_1.0.html
+     * (.RS) Serbia http://www.iana.org/domains/idn-tables/tables/rs_sr-rs_1.0.pdf
      * (.SA) Saudi Arabia http://www.iana.org/domains/idn-tables/tables/sa_ar_1.0.html
      * (.SE) Sweden http://www.iis.se/english/IDN_campaignsite.shtml?lang=en
      * (.SH) Saint Helena http://www.nic.sh/SH-IDN-Policy.pdf
@@ -179,6 +1023,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
      * (.TH) Thailand http://www.iana.org/domains/idn-tables/tables/th_th-th_1.0.html
      * (.TM) Turkmenistan http://www.nic.tm/TM-IDN-Policy.pdf
      * (.TR) Turkey https://www.nic.tr/index.php
+     * (.UA) Ukraine http://www.iana.org/domains/idn-tables/tables/ua_cyrl_1.2.html
      * (.VE) Venice http://www.iana.org/domains/idn-tables/tables/ve_es_1.0.html
      * (.VN) Vietnam http://www.vnnic.vn/english/5-6-300-2-2-04-20071115.htm#1.%20Introduction
      *
@@ -192,24 +1037,27 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
         'BIZ' => 'Hostname/Biz.php',
         'BR'  => array(1 => '/^[\x{002d}0-9a-zà-ãçéíó-õúü]{1,63}$/iu'),
         'BV'  => array(1 => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøüčđńŋšŧž]{1,63}$/iu'),
+        'CA'  => array(1 => '/^[\x{002d}0-9a-zàâæçéèêëîïôœùûüÿ\x{00E0}\x{00E2}\x{00E7}\x{00E8}\x{00E9}\x{00EA}\x{00EB}\x{00EE}\x{00EF}\x{00F4}\x{00F9}\x{00FB}\x{00FC}\x{00E6}\x{0153}\x{00FF}]{1,63}$/iu'),
         'CAT' => array(1 => '/^[\x{002d}0-9a-z·àç-éíïòóúü]{1,63}$/iu'),
         'CH'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿœ]{1,63}$/iu'),
         'CL'  => array(1 => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu'),
         'CN'  => 'Hostname/Cn.php',
-        'COM' => 'Zend/Validate/Hostname/Com.php',
-        'DE'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
-        'DK'  => array(1 => '/^[\x{002d}0-9a-zäéöü]{1,63}$/iu'),
+        'COM' => 'Hostname/Com.php',
+        'DE'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťßţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
+        'DK'  => array(1 => '/^[\x{002d}0-9a-zäéöüæøå]{1,63}$/iu'),
         'ES'  => array(1 => '/^[\x{002d}0-9a-zàáçèéíïñòóúü·]{1,63}$/iu'),
         'EU'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ]{1,63}$/iu',
             2 => '/^[\x{002d}0-9a-zāăąćĉċčďđēĕėęěĝğġģĥħĩīĭįıĵķĺļľŀłńņňʼnŋōŏőœŕŗřśŝšťŧũūŭůűųŵŷźżž]{1,63}$/iu',
             3 => '/^[\x{002d}0-9a-zșț]{1,63}$/iu',
             4 => '/^[\x{002d}0-9a-zΐάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ]{1,63}$/iu',
             5 => '/^[\x{002d}0-9a-zабвгдежзийклмнопрстуфхцчшщъыьэюя]{1,63}$/iu',
-            6 => '/^[\x{002d}0-9a-zἀ-ἇἐ-ἕἠ-ἧἰ-ἷὀ-ὅὐ-ὗὠ-ὧὰ-ώᾀ-ᾇᾐ-ᾗᾠ-ᾧᾰ-ᾴᾶᾷῂῃῄῆῇῐ-ΐῖῗῠ-ῧῲῳῴῶῷ]{1,63}$/iu'),
+            6 => '/^[\x{002d}0-9a-zἀ-ἇἐ-ἕἠ-ἧἰ-ἷὀ-ὅὐ-ὗὠ-ὧὰ-ὼώᾀ-ᾇᾐ-ᾗᾠ-ᾧᾰ-ᾴᾶᾷῂῃῄῆῇῐ-ῒΐῖῗῠ-ῧῲῳῴῶῷ]{1,63}$/iu'),
         'FI'  => array(1 => '/^[\x{002d}0-9a-zäåö]{1,63}$/iu'),
         'GR'  => array(1 => '/^[\x{002d}0-9a-zΆΈΉΊΌΎ-ΡΣ-ώἀ-ἕἘ-Ἕἠ-ὅὈ-Ὅὐ-ὗὙὛὝὟ-ώᾀ-ᾴᾶ-ᾼῂῃῄῆ-ῌῐ-ΐῖ-Ίῠ-Ῥῲῳῴῶ-ῼ]{1,63}$/iu'),
-        'HK'  => 'Zend/Validate/Hostname/Cn.php',
+        'HK'  => 'Hostname/Cn.php',
         'HU'  => array(1 => '/^[\x{002d}0-9a-záéíóöúüőű]{1,63}$/iu'),
+        'IL'  => array(1 => '/^[\x{002d}0-9\x{05D0}-\x{05EA}]{1,63}$/iu',
+            2 => '/^[\x{002d}0-9a-z]{1,63}$/i'),
         'INFO'=> array(1 => '/^[\x{002d}0-9a-zäåæéöøü]{1,63}$/iu',
             2 => '/^[\x{002d}0-9a-záéíóöúüőű]{1,63}$/iu',
             3 => '/^[\x{002d}0-9a-záæéíðóöúýþ]{1,63}$/iu',
@@ -220,15 +1068,16 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
             8 => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu'),
         'IO'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
         'IS'  => array(1 => '/^[\x{002d}0-9a-záéýúíóþæöð]{1,63}$/iu'),
-        'JP'  => 'Zend/Validate/Hostname/Jp.php',
+        'IT'  => array(1 => '/^[\x{002d}0-9a-zàâäèéêëìîïòôöùûüæœçÿß-]{1,63}$/iu'),
+        'JP'  => 'Hostname/Jp.php',
         'KR'  => array(1 => '/^[\x{AC00}-\x{D7A3}]{1,17}$/iu'),
         'LI'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿœ]{1,63}$/iu'),
         'LT'  => array(1 => '/^[\x{002d}0-9ąčęėįšųūž]{1,63}$/iu'),
         'MD'  => array(1 => '/^[\x{002d}0-9ăâîşţ]{1,63}$/iu'),
         'MUSEUM' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿāăąćċčďđēėęěğġģħīįıķĺļľłńņňŋōőœŕŗřśşšţťŧūůűųŵŷźżžǎǐǒǔ\x{01E5}\x{01E7}\x{01E9}\x{01EF}ə\x{0292}ẁẃẅỳ]{1,63}$/iu'),
-        'NET' => 'Zend/Validate/Hostname/Com.php',
+        'NET' => 'Hostname/Com.php',
         'NO'  => array(1 => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøüčđńŋšŧž]{1,63}$/iu'),
-        'NU'  => 'Zend/Validate/Hostname/Com.php',
+        'NU'  => 'Hostname/Com.php',
         'ORG' => array(1 => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu',
             2 => '/^[\x{002d}0-9a-zóąćęłńśźż]{1,63}$/iu',
             3 => '/^[\x{002d}0-9a-záäåæéëíðóöøúüýþ]{1,63}$/iu',
@@ -272,21 +1121,43 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
             33=> '/^[\x{002d}0-9א-ת]{1,63}$/iu'),
         'PR'  => array(1 => '/^[\x{002d}0-9a-záéíóúñäëïüöâêîôûàèùæçœãõ]{1,63}$/iu'),
         'PT'  => array(1 => '/^[\x{002d}0-9a-záàâãçéêíóôõú]{1,63}$/iu'),
+        'RS'  => array(1 => '/^[\x{002D}\x{0030}-\x{0039}\x{0061}-\x{007A}\x{0107}\x{010D}\x{0111}\x{0161}\x{017E}]{1,63}$/iu)'),
         'RU'  => array(1 => '/^[\x{002d}0-9а-яё]{1,63}$/iu'),
         'SA'  => array(1 => '/^[\x{002d}.0-9\x{0621}-\x{063A}\x{0641}-\x{064A}\x{0660}-\x{0669}]{1,63}$/iu'),
         'SE'  => array(1 => '/^[\x{002d}0-9a-zäåéöü]{1,63}$/iu'),
         'SH'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
+        'SI'  => array(
+            1 => '/^[\x{002d}0-9a-zà-öø-ÿ]{1,63}$/iu',
+            2 => '/^[\x{002d}0-9a-zāăąćĉċčďđēĕėęěĝğġģĥħĩīĭįıĵķĺļľŀłńņňʼnŋōŏőœŕŗřśŝšťŧũūŭůűųŵŷźżž]{1,63}$/iu',
+            3 => '/^[\x{002d}0-9a-zșț]{1,63}$/iu'),
         'SJ'  => array(1 => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøüčđńŋšŧž]{1,63}$/iu'),
         'TH'  => array(1 => '/^[\x{002d}0-9a-z\x{0E01}-\x{0E3A}\x{0E40}-\x{0E4D}\x{0E50}-\x{0E59}]{1,63}$/iu'),
         'TM'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿāăąćĉċčďđēėęěĝġģĥħīįĵķĺļľŀłńņňŋőœŕŗřśŝşšţťŧūŭůűųŵŷźżž]{1,63}$/iu'),
-        'TW'  => 'Zend/Validate/Hostname/Cn.php',
+        'TW'  => 'Hostname/Cn.php',
         'TR'  => array(1 => '/^[\x{002d}0-9a-zğıüşöç]{1,63}$/iu'),
+        'UA'  => array(1 => '/^[\x{002d}0-9a-zабвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљњћќѝўџґӂʼ]{1,63}$/iu'),
         'VE'  => array(1 => '/^[\x{002d}0-9a-záéíóúüñ]{1,63}$/iu'),
         'VN'  => array(1 => '/^[ÀÁÂÃÈÉÊÌÍÒÓÔÕÙÚÝàáâãèéêìíòóôõùúýĂăĐđĨĩŨũƠơƯư\x{1EA0}-\x{1EF9}]{1,63}$/iu'),
-        'ایران' => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
-        '中国' => 'Zend/Validate/Hostname/Cn.php',
-        '公司' => 'Zend/Validate/Hostname/Cn.php',
-        '网络' => 'Zend/Validate/Hostname/Cn.php'
+        'мон' => array(1 => '/^[\x{002d}0-9\x{0430}-\x{044F}]{1,63}$/iu'),
+        'срб' => array(1 => '/^[\x{002d}0-9а-ик-шђјљњћџ]{1,63}$/iu'),
+        'сайт' => array(1 => '/^[\x{002d}0-9а-яёіїѝйўґг]{1,63}$/iu'),
+        'онлайн' => array(1 => '/^[\x{002d}0-9а-яёіїѝйўґг]{1,63}$/iu'),
+        '中国' => 'Hostname/Cn.php',
+        '中國' => 'Hostname/Cn.php',
+        'ලංකා' => array(1 => '/^[\x{0d80}-\x{0dff}]{1,63}$/iu'),
+        '香港' => 'Hostname/Cn.php',
+        '台湾' => 'Hostname/Cn.php',
+        '台灣' => 'Hostname/Cn.php',
+        'امارات'   => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
+        'الاردن'    => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
+        'السعودية' => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
+        'ไทย' => array(1 => '/^[\x{002d}0-9a-z\x{0E01}-\x{0E3A}\x{0E40}-\x{0E4D}\x{0E50}-\x{0E59}]{1,63}$/iu'),
+        'рф' => array(1 => '/^[\x{002d}0-9а-яё]{1,63}$/iu'),
+        'تونس' => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
+        'مصر' => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
+        'இலங்கை' => array(1 => '/^[\x{0b80}-\x{0bff}]{1,63}$/iu'),
+        'فلسطين' => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
+        'شبكة'  => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
     );
 
     protected $_idnLength = array(
@@ -315,12 +1186,8 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param integer          $allow       OPTIONAL Set what types of hostname to allow (default ALLOW_DNS)
-     * @param boolean          $validateIdn OPTIONAL Set whether IDN domains are validated (default true)
-     * @param boolean          $validateTld OPTIONAL Set whether the TLD element of a hostname is validated (default true)
-     * @param Zend_Validate_Ip $ipValidator OPTIONAL
-     * @return void
      * @see http://www.iana.org/cctld/specifications-policies-cctlds-01apr02.htm  Technical Specifications for ccTLDs
+     * @param array $options Validator options
      */
     public function __construct($options = array())
     {
@@ -397,7 +1264,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
 
     /**
      * @param Zend_Validate_Ip $ipValidator OPTIONAL
-     * @return void;
+     * @return Zend_Validate_Hostname
      */
     public function setIpValidator(Zend_Validate_Ip $ipValidator = null)
     {
@@ -447,6 +1314,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
      * This only applies when DNS hostnames are validated
      *
      * @param boolean $allowed Set allowed to true to validate IDNs, and false to not validate them
+     * @return $this
      */
     public function setValidateIdn ($allowed)
     {
@@ -470,6 +1338,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
      * This only applies when DNS hostnames are validated
      *
      * @param boolean $allowed Set allowed to true to validate TLDs, and false to not validate them
+     * @return $this
      */
     public function setValidateTld ($allowed)
     {
@@ -495,7 +1364,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
 
         $this->_setValue($value);
         // Check input against IP address schema
-        if (preg_match('/^[0-9.a-e:.]*$/i', $value) &&
+        if (preg_match('/^[0-9a-f:.]*$/i', $value) &&
             $this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) {
             if (!($this->_options['allow'] & self::ALLOW_IP)) {
                 $this->_error(self::IP_ADDRESS_NOT_ALLOWED);
@@ -505,20 +1374,52 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
             }
         }
 
-        // Check input against DNS hostname schema
+        // RFC3986 3.2.2 states:
+        //
+        //     The rightmost domain label of a fully qualified domain name
+        //     in DNS may be followed by a single "." and should be if it is
+        //     necessary to distinguish between the complete domain name and
+        //     some local domain.
+        //
+        // (see ZF-6363)
+
+        // Local hostnames are allowed to be partitial (ending '.')
+        if ($this->_options['allow'] & self::ALLOW_LOCAL) {
+            if (substr($value, -1) === '.') {
+                $value = substr($value, 0, -1);
+                if (substr($value, -1) === '.') {
+                    // Empty hostnames (ending '..') are not allowed
+                    $this->_error(self::INVALID_LOCAL_NAME);
+                    return false;
+                }
+            }
+        }
+
         $domainParts = explode('.', $value);
+
+        // Prevent partitial IP V4 adresses (ending '.')
+        if ((count($domainParts) == 4) && preg_match('/^[0-9.a-e:.]*$/i', $value) &&
+            $this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) {
+            $this->_error(self::INVALID_LOCAL_NAME);
+        }
+
+        // Check input against DNS hostname schema
         if ((count($domainParts) > 1) && (strlen($value) >= 4) && (strlen($value) <= 254)) {
             $status = false;
 
-            $origenc = iconv_get_encoding('internal_encoding');
-            iconv_set_encoding('internal_encoding', 'UTF-8');
+            $origenc = PHP_VERSION_ID < 50600
+                        ? iconv_get_encoding('internal_encoding')
+                        : ini_get('default_charset');
+            if (PHP_VERSION_ID < 50600) {
+                iconv_set_encoding('internal_encoding', 'UTF-8');
+            } else {
+                ini_set('default_charset', 'UTF-8');
+            }
             do {
                 // First check TLD
                 $matches = array();
-                if (preg_match('/([^.]{2,10})$/i', end($domainParts), $matches) ||
-                    (end($domainParts) == 'ایران') || (end($domainParts) == '中国') ||
-                    (end($domainParts) == '公司') || (end($domainParts) == '网络')) {
-
+                if (preg_match('/([^.]{2,63})$/iu', end($domainParts), $matches)
+                    || (array_key_exists(end($domainParts), $this->_validIdns))) {
                     reset($domainParts);
 
                     // Hostname characters are: *(label dot)(label dot label); max 254 chars
@@ -527,13 +1428,17 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
                     // ldh: alpha / digit / dash
 
                     // Match TLD against known list
-                    $this->_tld = strtolower($matches[1]);
+                    $this->_tld = $matches[1];
                     if ($this->_options['tld']) {
-                        if (!in_array($this->_tld, $this->_validTlds)) {
+                        if (!in_array(strtolower($this->_tld), $this->_validTlds)
+                            && !in_array($this->_tld, $this->_validTlds)) {
                             $this->_error(self::UNKNOWN_TLD);
                             $status = false;
                             break;
                         }
+                        // We have already validated that the TLD is fine. We don't want it to go through the below
+                        // checks as new UTF-8 TLDs will incorrectly fail if there is no IDN regex for it.
+                        array_pop($domainParts);
                     }
 
                     /**
@@ -553,6 +1458,12 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
                     // Check each hostname part
                     $check = 0;
                     foreach ($domainParts as $domainPart) {
+                        // If some domain part is empty (i.e. zend..com), it's invalid
+                        if (empty($domainPart) && $domainPart !== '0') {
+                            $this->_error(self::INVALID_HOSTNAME);
+                            return false;
+                        }
+
                         // Decode Punycode domainnames to IDN
                         if (strpos($domainPart, 'xn--') === 0) {
                             $domainPart = $this->decodePunycode(substr($domainPart, 4));
@@ -573,7 +1484,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
                         // Check each domain part
                         $checked = false;
                         foreach($regexChars as $regexKey => $regexChar) {
-                            $status = @preg_match($regexChar, $domainPart);
+                            $status = preg_match($regexChar, $domainPart);
                             if ($status > 0) {
                                 $length = 63;
                                 if (array_key_exists(strtoupper($this->_tld), $this->_idnLength)
@@ -607,7 +1518,11 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
                 }
             } while (false);
 
-            iconv_set_encoding('internal_encoding', $origenc);
+            if (PHP_VERSION_ID < 50600) {
+                iconv_set_encoding('internal_encoding', $origenc);
+            } else {
+                ini_set('default_charset', $origenc);
+            }
             // If the input passes as an Internet domain name, and domain names are allowed, then the hostname
             // passes validation
             if ($status && ($this->_options['allow'] & self::ALLOW_DNS)) {
@@ -617,8 +1532,17 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
             $this->_error(self::INVALID_HOSTNAME);
         }
 
+        // Check for URI Syntax (RFC3986)
+        if ($this->_options['allow'] & self::ALLOW_URI) {
+            if (preg_match("/^([a-zA-Z0-9-._~!$&\'()*+,;=]|%[[:xdigit:]]{2}){1,254}$/i", $value)) {
+                return true;
+            } else {
+                $this->_error(self::INVALID_URI);
+            }
+        }
+
         // Check input against local network name schema; last chance to pass validation
-        $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}){1,254}$/';
+        $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}[\x2e]{0,1}){1,254}$/';
         $status = @preg_match($regexLocal, $value);
 
         // If the input passes as a local network name, and local network names are allowed, then the
@@ -650,22 +1574,19 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
      */
     protected function decodePunycode($encoded)
     {
-        $found = preg_match('/([^a-z0-9\x2d]{1,10})$/i', $encoded);
-        if (empty($encoded) || ($found > 0)) {
-            // no punycode encoded string, return as is
+        if (!preg_match('/^[a-z0-9-]+$/i', $encoded)) {
+            // no punycode encoded string
             $this->_error(self::CANNOT_DECODE_PUNYCODE);
             return false;
         }
 
+        $decoded = array();
         $separator = strrpos($encoded, '-');
         if ($separator > 0) {
             for ($x = 0; $x < $separator; ++$x) {
                 // prepare decoding matrix
                 $decoded[] = ord($encoded[$x]);
             }
-        } else {
-            $this->_error(self::CANNOT_DECODE_PUNYCODE);
-            return false;
         }
 
         $lengthd = count($decoded);
diff --git a/lib/zend/Zend/Validate/Hostname/Biz.php b/lib/zend/Zend/Validate/Hostname/Biz.php
index 090dffd6cfb..eb1bea22d9d 100644
--- a/lib/zend/Zend/Validate/Hostname/Biz.php
+++ b/lib/zend/Zend/Validate/Hostname/Biz.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 return array(
diff --git a/lib/zend/Zend/Validate/Hostname/Cn.php b/lib/zend/Zend/Validate/Hostname/Cn.php
index 33138b98df3..816e499a9b0 100644
--- a/lib/zend/Zend/Validate/Hostname/Cn.php
+++ b/lib/zend/Zend/Validate/Hostname/Cn.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 return array(
diff --git a/lib/zend/Zend/Validate/Hostname/Com.php b/lib/zend/Zend/Validate/Hostname/Com.php
index 931b80742a4..873dd522b7f 100644
--- a/lib/zend/Zend/Validate/Hostname/Com.php
+++ b/lib/zend/Zend/Validate/Hostname/Com.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 return array(
@@ -184,8 +184,6 @@ return array(
     68 => '/^[\x{A000}-\x{A48F}]{1,63}$/iu',
     69 => '/^[\x{A490}-\x{A4CF}]{1,63}$/iu',
     70 => '/^[\x{AC00}-\x{D7AF}]{1,63}$/iu',
-    71 => '/^[\x{D800}-\x{DB7F}]{1,63}$/iu',
-    72 => '/^[\x{DC00}-\x{DFFF}]{1,63}$/iu',
     73 => '/^[\x{F900}-\x{FAFF}]{1,63}$/iu',
     74 => '/^[\x{FB00}-\x{FB4F}]{1,63}$/iu',
     75 => '/^[\x{FB50}-\x{FDFF}]{1,63}$/iu',
@@ -195,4 +193,4 @@ return array(
     79 => '/^[\x{20000}-\x{2A6DF}]{1,63}$/iu',
     80 => '/^[\x{2F800}-\x{2FA1F}]{1,63}$/iu'
 
-);
\ No newline at end of file
+);
diff --git a/lib/zend/Zend/Validate/Hostname/Jp.php b/lib/zend/Zend/Validate/Hostname/Jp.php
index be0946781bc..caca994b941 100644
--- a/lib/zend/Zend/Validate/Hostname/Jp.php
+++ b/lib/zend/Zend/Validate/Hostname/Jp.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 return array(
diff --git a/lib/zend/Zend/Validate/Iban.php b/lib/zend/Zend/Validate/Iban.php
index ba9450b821c..e19c1a8d0e5 100644
--- a/lib/zend/Zend/Validate/Iban.php
+++ b/lib/zend/Zend/Validate/Iban.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php';
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Iban extends Zend_Validate_Abstract
@@ -63,51 +63,76 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract
      */
     protected $_ibanregex = array(
         'AD' => '/^AD[0-9]{2}[0-9]{8}[A-Z0-9]{12}$/',
+        'AE' => '/^AE[0-9]{2}[0-9]{3}[0-9]{16}$/',
+        'AL' => '/^AL[0-9]{2}[0-9]{8}[A-Z0-9]{16}$/',
         'AT' => '/^AT[0-9]{2}[0-9]{5}[0-9]{11}$/',
+        'AZ' => '/^AZ[0-9]{2}[0-9]{4}[A-Z0-9]{20}$/',
         'BA' => '/^BA[0-9]{2}[0-9]{6}[0-9]{10}$/',
         'BE' => '/^BE[0-9]{2}[0-9]{3}[0-9]{9}$/',
         'BG' => '/^BG[0-9]{2}[A-Z]{4}[0-9]{4}[0-9]{2}[A-Z0-9]{8}$/',
+        'BH' => '/^BH[0-9]{2}[A-Z]{4}[A-Z0-9]{14}$/',
+        'BR' => '/^BR[0-9]{2}[0-9]{8}[0-9]{5}[0-9]{10}[A-Z]{1}[A-Z0-9]{1}$/',
         'CH' => '/^CH[0-9]{2}[0-9]{5}[A-Z0-9]{12}$/',
+        'CR' => '/^CR[0-9]{2}[0-9]{3}[0-9]{14}$/',
         'CS' => '/^CS[0-9]{2}[0-9]{3}[0-9]{15}$/',
         'CY' => '/^CY[0-9]{2}[0-9]{8}[A-Z0-9]{16}$/',
         'CZ' => '/^CZ[0-9]{2}[0-9]{4}[0-9]{16}$/',
         'DE' => '/^DE[0-9]{2}[0-9]{8}[0-9]{10}$/',
         'DK' => '/^DK[0-9]{2}[0-9]{4}[0-9]{10}$/',
+        'DO' => '/^DO[0-9]{2}[A-Z0-9]{4}[0-9]{20}$/',
         'EE' => '/^EE[0-9]{2}[0-9]{4}[0-9]{12}$/',
         'ES' => '/^ES[0-9]{2}[0-9]{8}[0-9]{12}$/',
-        'FR' => '/^FR[0-9]{2}[0-9]{10}[A-Z0-9]{13}$/',
+        'FR' => '/^FR[0-9]{2}[0-9]{10}[A-Z0-9]{11}[0-9]{2}$/',
         'FI' => '/^FI[0-9]{2}[0-9]{6}[0-9]{8}$/',
+        'FO' => '/^FO[0-9]{2}[0-9]{4}[0-9]{9}[0-9]{1}$/',
         'GB' => '/^GB[0-9]{2}[A-Z]{4}[0-9]{14}$/',
+        'GE' => '/^GE[0-9]{2}[A-Z]{2}[0-9]{16}$/',
         'GI' => '/^GI[0-9]{2}[A-Z]{4}[A-Z0-9]{15}$/',
+        'GL' => '/^GL[0-9]{2}[0-9]{4}[0-9]{9}[0-9]{1}$/',
         'GR' => '/^GR[0-9]{2}[0-9]{7}[A-Z0-9]{16}$/',
+        'GT' => '/^GT[0-9]{2}[A-Z0-9]{4}[A-Z0-9]{20}$/',
         'HR' => '/^HR[0-9]{2}[0-9]{7}[0-9]{10}$/',
         'HU' => '/^HU[0-9]{2}[0-9]{7}[0-9]{1}[0-9]{15}[0-9]{1}$/',
         'IE' => '/^IE[0-9]{2}[A-Z0-9]{4}[0-9]{6}[0-9]{8}$/',
+        'IL' => '/^IL[0-9]{2}[0-9]{3}[0-9]{3}[0-9]{13}$/',
         'IS' => '/^IS[0-9]{2}[0-9]{4}[0-9]{18}$/',
         'IT' => '/^IT[0-9]{2}[A-Z]{1}[0-9]{10}[A-Z0-9]{12}$/',
+        'KW' => '/^KW[0-9]{2}[A-Z]{4}[0-9]{3}[0-9]{22}$/',
+        'KZ' => '/^KZ[A-Z]{2}[0-9]{2}[0-9]{3}[A-Z0-9]{13}$/',
+        'LB' => '/^LB[0-9]{2}[0-9]{4}[A-Z0-9]{20}$/',
         'LI' => '/^LI[0-9]{2}[0-9]{5}[A-Z0-9]{12}$/',
         'LU' => '/^LU[0-9]{2}[0-9]{3}[A-Z0-9]{13}$/',
         'LT' => '/^LT[0-9]{2}[0-9]{5}[0-9]{11}$/',
         'LV' => '/^LV[0-9]{2}[A-Z]{4}[A-Z0-9]{13}$/',
+        'MC' => '/^MC[0-9]{2}[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$/',
+        'MD' => '/^MD[0-9]{2}[A-Z0-9]{20}$/',
+        'ME' => '/^ME[0-9]{2}[0-9]{3}[0-9]{13}[0-9]{2}$/',
         'MK' => '/^MK[0-9]{2}[A-Z]{3}[A-Z0-9]{10}[0-9]{2}$/',
+        'MR' => '/^MR13[0-9]{5}[0-9]{5}[0-9]{11}[0-9]{2}$/',
+        'MU' => '/^MU[0-9]{2}[A-Z]{4}[0-9]{2}[0-9]{2}[0-9]{12}[0-9]{3}[A-Z]{2}$/',
         'MT' => '/^MT[0-9]{2}[A-Z]{4}[0-9]{5}[A-Z0-9]{18}$/',
         'NL' => '/^NL[0-9]{2}[A-Z]{4}[0-9]{10}$/',
         'NO' => '/^NO[0-9]{2}[0-9]{4}[0-9]{7}$/',
+        'PK' => '/^PK[0-9]{2}[A-Z]{4}[0-9]{16}$/',
         'PL' => '/^PL[0-9]{2}[0-9]{8}[0-9]{16}$/',
+        'PS' => '/^PS[0-9]{2}[A-Z]{4}[0-9]{21}$/',
         'PT' => '/^PT[0-9]{2}[0-9]{8}[0-9]{13}$/',
         'RO' => '/^RO[0-9]{2}[A-Z]{4}[A-Z0-9]{16}$/',
+        'RS' => '/^RS[0-9]{2}[0-9]{3}[0-9]{13}[0-9]{2}$/',
+        'SA' => '/^SA[0-9]{2}[0-9]{2}[A-Z0-9]{18}$/',
         'SE' => '/^SE[0-9]{2}[0-9]{3}[0-9]{17}$/',
         'SI' => '/^SI[0-9]{2}[0-9]{5}[0-9]{8}[0-9]{2}$/',
         'SK' => '/^SK[0-9]{2}[0-9]{4}[0-9]{16}$/',
+        'SM' => '/^SM[0-9]{2}[A-Z]{1}[0-9]{5}[0-9]{5}[A-Z0-9]{12}$/',
         'TN' => '/^TN[0-9]{2}[0-9]{5}[0-9]{15}$/',
-        'TR' => '/^TR[0-9]{2}[0-9]{5}[A-Z0-9]{17}$/'
+        'TR' => '/^TR[0-9]{2}[0-9]{5}[A-Z0-9]{17}$/',
+        'VG' => '/^VG[0-9]{2}[A-Z]{4}[0-9]{16}$/'
     );
 
     /**
      * Sets validator options
      *
-     * @param  string|Zend_Config|Zend_Locale $locale OPTIONAL
-     * @return void
+     * @param string|Zend_Config|Zend_Locale $locale OPTIONAL
      */
     public function __construct($locale = null)
     {
@@ -149,6 +174,8 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract
      * Sets the locale option
      *
      * @param  string|Zend_Locale $locale
+     * @throws Zend_Locale_Exception
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Date provides a fluent interface
      */
     public function setLocale($locale = null)
diff --git a/lib/zend/Zend/Validate/Identical.php b/lib/zend/Zend/Validate/Identical.php
index b78cb2b0c9e..97f3b8cce72 100644
--- a/lib/zend/Zend/Validate/Identical.php
+++ b/lib/zend/Zend/Validate/Identical.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -25,7 +25,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Identical extends Zend_Validate_Abstract
@@ -64,8 +64,7 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  mixed $token
-     * @return void
+     * @param mixed $token
      */
     public function __construct($token = null)
     {
@@ -102,7 +101,7 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract
      */
     public function setToken($token)
     {
-        $this->_tokenString = (string) $token;
+        $this->_tokenString = $token;
         $this->_token       = $token;
         return $this;
     }
@@ -121,6 +120,7 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract
      * Sets the strict parameter
      *
      * @param Zend_Validate_Identical
+     * @return $this
      */
     public function setStrict($strict)
     {
@@ -140,7 +140,7 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract
      */
     public function isValid($value, $context = null)
     {
-        $this->_setValue((string) $value);
+        $this->_setValue($value);
 
         if (($context !== null) && isset($context) && array_key_exists($this->getToken(), $context)) {
             $token = $context[$this->getToken()];
diff --git a/lib/zend/Zend/Validate/InArray.php b/lib/zend/Zend/Validate/InArray.php
index 9b4ae7f34c7..3f3ec243a24 100644
--- a/lib/zend/Zend/Validate/InArray.php
+++ b/lib/zend/Zend/Validate/InArray.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_InArray extends Zend_Validate_Abstract
@@ -65,8 +65,8 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  array|Zend_Config $haystack
-     * @return void
+     * @param array|Zend_Config $options Validator options
+     * @throws Zend_Validate_Exception
      */
     public function __construct($options)
     {
diff --git a/lib/zend/Zend/Validate/Int.php b/lib/zend/Zend/Validate/Int.php
index 828e7232409..1bcf31dba0b 100644
--- a/lib/zend/Zend/Validate/Int.php
+++ b/lib/zend/Zend/Validate/Int.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Locale/Format.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Int extends Zend_Validate_Abstract
@@ -44,7 +44,7 @@ class Zend_Validate_Int extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID => "Invalid type given, value should be string or integer",
+        self::INVALID => "Invalid type given. String or integer expected",
         self::NOT_INT => "'%value%' does not appear to be an integer",
     );
 
@@ -93,6 +93,7 @@ class Zend_Validate_Int extends Zend_Validate_Abstract
      * Sets the locale to use
      *
      * @param string|Zend_Locale $locale
+     * @return $this
      */
     public function setLocale($locale = null)
     {
diff --git a/lib/zend/Zend/Validate/Interface.php b/lib/zend/Zend/Validate/Interface.php
index 6f020e0a1b8..f1d0883c305 100644
--- a/lib/zend/Zend/Validate/Interface.php
+++ b/lib/zend/Zend/Validate/Interface.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -22,7 +22,7 @@
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Zend_Validate_Interface
@@ -36,7 +36,7 @@ interface Zend_Validate_Interface
      *
      * @param  mixed $value
      * @return boolean
-     * @throws Zend_Valid_Exception If validation of $value is impossible
+     * @throws Zend_Validate_Exception If validation of $value is impossible
      */
     public function isValid($value);
 
diff --git a/lib/zend/Zend/Validate/Ip.php b/lib/zend/Zend/Validate/Ip.php
index cebac55a088..ede95e92c02 100644
--- a/lib/zend/Zend/Validate/Ip.php
+++ b/lib/zend/Zend/Validate/Ip.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Ip extends Zend_Validate_Abstract
@@ -39,7 +39,7 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID        => "Invalid type given, value should be a string",
+        self::INVALID        => "Invalid type given. String expected",
         self::NOT_IP_ADDRESS => "'%value%' does not appear to be a valid IP address",
     );
 
@@ -57,7 +57,6 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param array $options OPTIONAL Options to set, see the manual for all available options
-     * @return void
      */
     public function __construct($options = array())
     {
@@ -91,6 +90,7 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract
      * Sets the options for this validator
      *
      * @param array $options
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_Ip
      */
     public function setOptions($options)
@@ -141,6 +141,7 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract
      * Validates an IPv4 address
      *
      * @param string $value
+     * @return bool
      */
     protected function _validateIPv4($value) {
         $ip2long = ip2long($value);
diff --git a/lib/zend/Zend/Validate/Isbn.php b/lib/zend/Zend/Validate/Isbn.php
index c8345f27279..86c0c5c4960 100644
--- a/lib/zend/Zend/Validate/Isbn.php
+++ b/lib/zend/Zend/Validate/Isbn.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Isbn extends Zend_Validate_Abstract
@@ -44,8 +44,8 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID => "Invalid type given, value should be string or integer",
-        self::NO_ISBN => "'%value%' is no valid ISBN number",
+        self::INVALID => "Invalid type given. String or integer expected",
+        self::NO_ISBN => "'%value%' is not a valid ISBN number",
     );
 
     /**
@@ -67,7 +67,6 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract
      *
      * @param  Zend_Config|array $options
      * @throws Zend_Validate_Exception When $options is not valid
-     * @return void
      */
     public function __construct($options = array())
     {
diff --git a/lib/zend/Zend/Validate/Ldap/Dn.php b/lib/zend/Zend/Validate/Ldap/Dn.php
new file mode 100644
index 00000000000..3033cec1ef0
--- /dev/null
+++ b/lib/zend/Zend/Validate/Ldap/Dn.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Validate
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Abstract.php 24807 2012-05-15 12:10:42Z adamlundrigan $
+ */
+
+/**
+ * @see Zend_Validate_Interface
+ */
+require_once 'Zend/Validate/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Validate
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Validate_Ldap_Dn extends Zend_Validate_Abstract
+{
+
+    const MALFORMED = 'malformed';
+    
+    /**
+     * Validation failure message template definitions.
+     *
+     * @var array
+     */
+    protected $_messageTemplates = array(
+        self::MALFORMED => 'DN is malformed',
+    );
+    
+    /**
+     * Defined by Zend_Validate_Interface.
+     *
+     * Returns true if and only if $value is a valid DN.
+     *
+     * @param string $value The value to be validated.
+     * 
+     * @return boolean
+     */
+    public function isValid($value) 
+    {
+        $valid = Zend_Ldap_Dn::checkDn($value);
+        if ($valid === false) {
+            $this->_error(self::MALFORMED);
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/lib/zend/Zend/Validate/LessThan.php b/lib/zend/Zend/Validate/LessThan.php
index ef3e195da17..41c28115bd8 100644
--- a/lib/zend/Zend/Validate/LessThan.php
+++ b/lib/zend/Zend/Validate/LessThan.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_LessThan extends Zend_Validate_Abstract
@@ -59,7 +59,7 @@ class Zend_Validate_LessThan extends Zend_Validate_Abstract
      * Sets validator options
      *
      * @param  mixed|Zend_Config $max
-     * @return void
+     * @throws Zend_Validate_Exception
      */
     public function __construct($max)
     {
diff --git a/lib/zend/Zend/Validate/NotEmpty.php b/lib/zend/Zend/Validate/NotEmpty.php
index 7cc53fef620..1bb3ceb82e6 100644
--- a/lib/zend/Zend/Validate/NotEmpty.php
+++ b/lib/zend/Zend/Validate/NotEmpty.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,36 +27,42 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_NotEmpty extends Zend_Validate_Abstract
 {
-    const BOOLEAN      = 1;
-    const INTEGER      = 2;
-    const FLOAT        = 4;
-    const STRING       = 8;
-    const ZERO         = 16;
-    const EMPTY_ARRAY  = 32;
-    const NULL         = 64;
-    const PHP          = 127;
-    const SPACE        = 128;
-    const ALL          = 255;
+    const BOOLEAN       = 1;
+    const INTEGER       = 2;
+    const FLOAT         = 4;
+    const STRING        = 8;
+    const ZERO          = 16;
+    const EMPTY_ARRAY   = 32;
+    const NULL          = 64;
+    const PHP           = 127;
+    const SPACE         = 128;
+    const OBJECT        = 256;
+    const OBJECT_STRING = 512;
+    const OBJECT_COUNT  = 1024;
+    const ALL           = 2047;
 
     const INVALID  = 'notEmptyInvalid';
     const IS_EMPTY = 'isEmpty';
 
     protected $_constants = array(
-        self::BOOLEAN      => 'boolean',
-        self::INTEGER      => 'integer',
-        self::FLOAT        => 'float',
-        self::STRING       => 'string',
-        self::ZERO         => 'zero',
-        self::EMPTY_ARRAY  => 'array',
-        self::NULL         => 'null',
-        self::PHP          => 'php',
-        self::SPACE        => 'space',
-        self::ALL          => 'all'
+        self::BOOLEAN       => 'boolean',
+        self::INTEGER       => 'integer',
+        self::FLOAT         => 'float',
+        self::STRING        => 'string',
+        self::ZERO          => 'zero',
+        self::EMPTY_ARRAY   => 'array',
+        self::NULL          => 'null',
+        self::PHP           => 'php',
+        self::SPACE         => 'space',
+        self::OBJECT        => 'object',
+        self::OBJECT_STRING => 'objectstring',
+        self::OBJECT_COUNT  => 'objectcount',
+        self::ALL           => 'all',
     );
 
     /**
@@ -64,7 +70,7 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract
      */
     protected $_messageTemplates = array(
         self::IS_EMPTY => "Value is required and can't be empty",
-        self::INVALID  => "Invalid type given, value should be float, string, array, boolean or integer",
+        self::INVALID  => "Invalid type given. String, integer, float, boolean or array expected",
     );
 
     /**
@@ -72,7 +78,7 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract
      *
      * @var integer
      */
-    protected $_type = 237;
+    protected $_type = 493;
 
     /**
      * Constructor
@@ -151,14 +157,50 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract
      */
     public function isValid($value)
     {
-        if (!is_null($value) && !is_string($value) && !is_int($value) && !is_float($value) &&
-            !is_bool($value) && !is_array($value)) {
+        if ($value !== null && !is_string($value) && !is_int($value) && !is_float($value) &&
+            !is_bool($value) && !is_array($value) && !is_object($value)) {
             $this->_error(self::INVALID);
             return false;
         }
 
         $type    = $this->getType();
         $this->_setValue($value);
+        $object  = false;
+
+        // OBJECT_COUNT (countable object)
+        if ($type >= self::OBJECT_COUNT) {
+            $type -= self::OBJECT_COUNT;
+            $object = true;
+
+            if (is_object($value) && ($value instanceof Countable) && (count($value) == 0)) {
+                $this->_error(self::IS_EMPTY);
+                return false;
+            }
+        }
+
+        // OBJECT_STRING (object's toString)
+        if ($type >= self::OBJECT_STRING) {
+            $type -= self::OBJECT_STRING;
+            $object = true;
+
+            if ((is_object($value) && (!method_exists($value, '__toString'))) ||
+                (is_object($value) && (method_exists($value, '__toString')) && (((string) $value) == ""))) {
+                $this->_error(self::IS_EMPTY);
+                return false;
+            }
+        }
+
+        // OBJECT (object)
+        if ($type >= self::OBJECT) {
+            $type -= self::OBJECT;
+            // fall trough, objects are always not empty
+        } else if ($object === false) {
+            // object not allowed but object given -> return false
+            if (is_object($value)) {
+                $this->_error(self::IS_EMPTY);
+                return false;
+            }
+        }
 
         // SPACE ('   ')
         if ($type >= self::SPACE) {
@@ -172,7 +214,7 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract
         // NULL (null)
         if ($type >= self::NULL) {
             $type -= self::NULL;
-            if (is_null($value)) {
+            if ($value === null) {
                 $this->_error(self::IS_EMPTY);
                 return false;
             }
diff --git a/lib/zend/Zend/Validate/PostCode.php b/lib/zend/Zend/Validate/PostCode.php
index b969d15d986..7f00d04db86 100644
--- a/lib/zend/Zend/Validate/PostCode.php
+++ b/lib/zend/Zend/Validate/PostCode.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -32,7 +32,7 @@ require_once 'Zend/Locale/Format.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_PostCode extends Zend_Validate_Abstract
@@ -44,7 +44,7 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID  => "Invalid type given. The value should be a string or a integer",
+        self::INVALID  => "Invalid type given. String or integer expected",
         self::NO_MATCH => "'%value%' does not appear to be a postal code",
     );
 
@@ -119,7 +119,7 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract
      * @param string|Zend_Locale $locale
      * @throws Zend_Validate_Exception On unrecognised region
      * @throws Zend_Validate_Exception On not detected format
-     * @return Zend_Validate_PostCode  Provides fluid interface
+     * @return Zend_Validate_PostCode  Provides a fluent interface
      */
     public function setLocale($locale = null)
     {
@@ -162,7 +162,7 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract
      *
      * @param string $format
      * @throws Zend_Validate_Exception On empty format
-     * @return Zend_Validate_PostCode  Provides fluid interface
+     * @return Zend_Validate_PostCode  Provides a fluent interface
      */
     public function setFormat($format)
     {
diff --git a/lib/zend/Zend/Validate/Regex.php b/lib/zend/Zend/Validate/Regex.php
index 3c31eb9789e..5b4360a228b 100644
--- a/lib/zend/Zend/Validate/Regex.php
+++ b/lib/zend/Zend/Validate/Regex.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Regex extends Zend_Validate_Abstract
@@ -40,7 +40,7 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID   => "Invalid type given, value should be string, integer or float",
+        self::INVALID   => "Invalid type given. String, integer or float expected",
         self::NOT_MATCH => "'%value%' does not match against pattern '%pattern%'",
         self::ERROROUS  => "There was an internal error while using the pattern '%pattern%'",
     );
@@ -64,7 +64,6 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract
      *
      * @param  string|Zend_Config $pattern
      * @throws Zend_Validate_Exception On missing 'pattern' parameter
-     * @return void
      */
     public function __construct($pattern)
     {
diff --git a/lib/zend/Zend/Validate/Sitemap/Changefreq.php b/lib/zend/Zend/Validate/Sitemap/Changefreq.php
index dc7cb3dbb65..b9f653f431a 100644
--- a/lib/zend/Zend/Validate/Sitemap/Changefreq.php
+++ b/lib/zend/Zend/Validate/Sitemap/Changefreq.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Validate/Abstract.php';
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Sitemap_Changefreq extends Zend_Validate_Abstract
@@ -51,8 +51,8 @@ class Zend_Validate_Sitemap_Changefreq extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::NOT_VALID => "'%value%' is no valid sitemap changefreq",
-        self::INVALID   => "Invalid type given, the value should be a string",
+        self::NOT_VALID => "'%value%' is not a valid sitemap changefreq",
+        self::INVALID   => "Invalid type given. String expected",
     );
 
     /**
diff --git a/lib/zend/Zend/Validate/Sitemap/Lastmod.php b/lib/zend/Zend/Validate/Sitemap/Lastmod.php
index cd3932ad9fc..1e81828f1c2 100644
--- a/lib/zend/Zend/Validate/Sitemap/Lastmod.php
+++ b/lib/zend/Zend/Validate/Sitemap/Lastmod.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Validate/Abstract.php';
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Sitemap_Lastmod extends Zend_Validate_Abstract
@@ -57,8 +57,8 @@ class Zend_Validate_Sitemap_Lastmod extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::NOT_VALID => "'%value%' is no valid sitemap lastmod",
-        self::INVALID   => "Invalid type given, the value should be a string",
+        self::NOT_VALID => "'%value%' is not a valid sitemap lastmod",
+        self::INVALID   => "Invalid type given. String expected",
     );
 
     /**
diff --git a/lib/zend/Zend/Validate/Sitemap/Loc.php b/lib/zend/Zend/Validate/Sitemap/Loc.php
index 4a8f62b1044..24c78ed8a9f 100644
--- a/lib/zend/Zend/Validate/Sitemap/Loc.php
+++ b/lib/zend/Zend/Validate/Sitemap/Loc.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -38,7 +38,7 @@ require_once 'Zend/Uri.php';
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Sitemap_Loc extends Zend_Validate_Abstract
@@ -56,8 +56,8 @@ class Zend_Validate_Sitemap_Loc extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::NOT_VALID => "'%value%' is no valid sitemap location",
-        self::INVALID   => "Invalid type given, the value should be a string",
+        self::NOT_VALID => "'%value%' is not a valid sitemap location",
+        self::INVALID   => "Invalid type given. String expected",
     );
 
     /**
diff --git a/lib/zend/Zend/Validate/Sitemap/Priority.php b/lib/zend/Zend/Validate/Sitemap/Priority.php
index 1cabb8b4d24..0f85f0997e1 100644
--- a/lib/zend/Zend/Validate/Sitemap/Priority.php
+++ b/lib/zend/Zend/Validate/Sitemap/Priority.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/Validate/Abstract.php';
  * @category   Zend
  * @package    Zend_Validate
  * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_Sitemap_Priority extends Zend_Validate_Abstract
@@ -51,8 +51,8 @@ class Zend_Validate_Sitemap_Priority extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::NOT_VALID => "'%value%' is no valid sitemap priority",
-        self::INVALID   => "Invalid type given, the value should be a integer, a float or a numeric string",
+        self::NOT_VALID => "'%value%' is not a valid sitemap priority",
+        self::INVALID   => "Invalid type given. Numeric string, integer or float expected",
     );
 
     /**
diff --git a/lib/zend/Zend/Validate/StringLength.php b/lib/zend/Zend/Validate/StringLength.php
index 313b6ea8a84..b562c42fd09 100644
--- a/lib/zend/Zend/Validate/StringLength.php
+++ b/lib/zend/Zend/Validate/StringLength.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php';
 /**
  * @category   Zend
  * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Validate_StringLength extends Zend_Validate_Abstract
@@ -40,7 +40,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract
      * @var array
      */
     protected $_messageTemplates = array(
-        self::INVALID   => "Invalid type given, value should be a string",
+        self::INVALID   => "Invalid type given. String expected",
         self::TOO_SHORT => "'%value%' is less than %min% characters long",
         self::TOO_LONG  => "'%value%' is more than %max% characters long",
     );
@@ -79,8 +79,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract
     /**
      * Sets validator options
      *
-     * @param  integer|array|Zend_Config $options
-     * @return void
+     * @param integer|array|Zend_Config $options
      */
     public function __construct($options = array())
     {
@@ -194,19 +193,30 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract
      * Sets a new encoding to use
      *
      * @param string $encoding
+     * @throws Zend_Validate_Exception
      * @return Zend_Validate_StringLength
      */
     public function setEncoding($encoding = null)
     {
         if ($encoding !== null) {
-            $orig   = iconv_get_encoding('internal_encoding');
-            $result = iconv_set_encoding('internal_encoding', $encoding);
+            $orig = PHP_VERSION_ID < 50600
+                        ? iconv_get_encoding('internal_encoding')
+                        : ini_get('default_charset');
+            if (PHP_VERSION_ID < 50600) {
+                $result = iconv_set_encoding('internal_encoding', $encoding);
+            } else {
+                $result = ini_set('default_charset', $encoding);
+            }
             if (!$result) {
                 require_once 'Zend/Validate/Exception.php';
                 throw new Zend_Validate_Exception('Given encoding not supported on this OS!');
             }
 
-            iconv_set_encoding('internal_encoding', $orig);
+            if (PHP_VERSION_ID < 50600) {
+                iconv_set_encoding('internal_encoding', $orig);
+            } else {
+                ini_set('default_charset', $orig);
+            }
         }
 
         $this->_encoding = $encoding;
diff --git a/lib/zend/Zend/Version.php b/lib/zend/Zend/Version.php
index e1e8de226b4..a5f244f711e 100644
--- a/lib/zend/Zend/Version.php
+++ b/lib/zend/Zend/Version.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Version
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -24,7 +24,7 @@
  *
  * @category   Zend
  * @package    Zend_Version
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 final class Zend_Version
@@ -32,14 +32,21 @@ final class Zend_Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '1.10.6';
+    const VERSION = '1.12.16';
+
+    /**
+     * The latest stable version Zend Framework available
+     *
+     * @var string
+     */
+    protected static $_latestVersion;
 
     /**
      * Compare the specified Zend Framework version string $version
      * with the current Zend_Version::VERSION of Zend Framework.
      *
      * @param  string  $version  A version string (e.g. "0.7.1").
-     * @return boolean           -1 if the $version is older,
+     * @return int           -1 if the $version is older,
      *                           0 if they are the same,
      *                           and +1 if $version is newer.
      *
@@ -50,4 +57,25 @@ final class Zend_Version
         $version = preg_replace('/(\d)pr(\d?)/', '$1a$2', $version);
         return version_compare($version, strtolower(self::VERSION));
     }
+
+    /**
+     * Fetches the version of the latest stable release
+     *
+     * @link http://framework.zend.com/download/latest
+     * @return string
+     */
+    public static function getLatest()
+    {
+        if (null === self::$_latestVersion) {
+            self::$_latestVersion = 'not available';
+
+            $handle = fopen('http://framework.zend.com/api/zf-version', 'r');
+            if (false !== $handle) {
+                self::$_latestVersion = stream_get_contents($handle);
+                fclose($handle);
+            }
+        }
+
+        return self::$_latestVersion;
+    }
 }
diff --git a/lib/zend/Zend/View.php b/lib/zend/Zend/View.php
new file mode 100644
index 00000000000..6b8f3e56508
--- /dev/null
+++ b/lib/zend/Zend/View.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract master class for extension.
+ */
+require_once 'Zend/View/Abstract.php';
+
+
+/**
+ * Concrete class for handling view scripts.
+ *
+ * @category  Zend
+ * @package   Zend_View
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ *
+ * Convenience methods for build in helpers (@see __call):
+ *
+ * @method string baseUrl($file = null)
+ * @method string currency($value = null, $currency = null)
+ * @method Zend_View_Helper_Cycle cycle(array $data = array(), $name = Zend_View_Helper_Cycle::DEFAULT_NAME)
+ * @method Zend_View_Helper_Doctype doctype($doctype = null)
+ * @method string fieldset($name, $content, $attribs = null)
+ * @method string form($name, $attribs = null, $content = false)
+ * @method string formButton($name, $value = null, $attribs = null)
+ * @method string formCheckbox($name, $value = null, $attribs = null, array $checkedOptions = null)
+ * @method string formErrors($errors, array $options = null)
+ * @method string formFile($name, $attribs = null)
+ * @method string formHidden($name, $value = null, array $attribs = null)
+ * @method string formImage($name, $value = null, $attribs = null)
+ * @method string formLabel($name, $value = null, array $attribs = null)
+ * @method string formMultiCheckbox($name, $value = null, $attribs = null, $options = null, $listsep = "<br />\n")
+ * @method string formNote($name, $value = null)
+ * @method string formPassword($name, $value = null, $attribs = null)
+ * @method string formRadio($name, $value = null, $attribs = null, $options = null, $listsep = "<br />\n")
+ * @method string formReset($name = '', $value = 'Reset', $attribs = null)
+ * @method string formSelect($name, $value = null, $attribs = null, $options = null, $listsep = "<br />\n")
+ * @method string formSubmit($name, $value = null, $attribs = null)
+ * @method string formText($name, $value = null, $attribs = null)
+ * @method string formTextarea($name, $value = null, $attribs = null)
+ * @method Zend_View_Helper_Gravatar gravatar($email = "", $options = array(), $attribs = array())
+ * @method Zend_View_Helper_HeadLink headLink(array $attributes = null, $placement = Zend_View_Helper_Placeholder_Container_Abstract::APPEND)
+ * @method Zend_View_Helper_HeadMeta headMeta($content = null, $keyValue = null, $keyType = 'name', $modifiers = array(), $placement = Zend_View_Helper_Placeholder_Container_Abstract::APPEND)
+ * @method Zend_View_Helper_HeadScript headScript($mode = Zend_View_Helper_HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
+ * @method Zend_View_Helper_HeadStyle headStyle($content = null, $placement = 'APPEND', $attributes = array())
+ * @method Zend_View_Helper_HeadTitle headTitle($title = null, $setType = null)
+ * @method string htmlFlash($data, array $attribs = array(), array $params = array(), $content = null)
+ * @method string htmlList(array $items, $ordered = false, $attribs = false, $escape = true)
+ * @method string htmlObject($data, $type, array $attribs = array(), array $params = array(), $content = null)
+ * @method string htmlPage($data, array $attribs = array(), array $params = array(), $content = null)
+ * @method string htmlQuicktime($data, array $attribs = array(), array $params = array(), $content = null)
+ * @method Zend_View_Helper_InlineScript inlineScript($mode = Zend_View_Helper_HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
+ * @method string|void json($data, $keepLayouts = false, $encodeData = true)
+ * @method Zend_View_Helper_Layout layout()
+ * @method Zend_View_Helper_Navigation navigation(Zend_Navigation_Container $container = null)
+ * @method string paginationControl(Zend_Paginator $paginator = null, $scrollingStyle = null, $partial = null, $params = null)
+ * @method string partial($name = null, $module = null, $model = null)
+ * @method string partialLoop($name = null, $module = null, $model = null)
+ * @method Zend_View_Helper_Placeholder_Container_Abstract placeholder($name)
+ * @method void renderToPlaceholder($script, $placeholder)
+ * @method string serverUrl($requestUri = null)
+ * @method string translate($messageid = null)
+ * @method string url(array $urlOptions = array(), $name = null, $reset = false, $encode = true)
+ * @method Zend_Http_UserAgent userAgent(Zend_Http_UserAgent $userAgent = null)
+ */
+class Zend_View extends Zend_View_Abstract
+{
+    /**
+     * Whether or not to use streams to mimic short tags
+     * @var bool
+     */
+    private $_useViewStream = false;
+
+    /**
+     * Whether or not to use stream wrapper if short_open_tag is false
+     * @var bool
+     */
+    private $_useStreamWrapper = false;
+
+    /**
+     * Constructor
+     *
+     * Register Zend_View_Stream stream wrapper if short tags are disabled.
+     *
+     * @param  array $config
+     * @return void
+     */
+    public function __construct($config = array())
+    {
+        $this->_useViewStream = (bool) ini_get('short_open_tag') ? false : true;
+        if ($this->_useViewStream) {
+            if (!in_array('zend.view', stream_get_wrappers())) {
+                require_once 'Zend/View/Stream.php';
+                stream_wrapper_register('zend.view', 'Zend_View_Stream');
+            }
+        }
+
+        if (array_key_exists('useStreamWrapper', $config)) {
+            $this->setUseStreamWrapper($config['useStreamWrapper']);
+        }
+
+        parent::__construct($config);
+    }
+
+    /**
+     * Set flag indicating if stream wrapper should be used if short_open_tag is off
+     *
+     * @param  bool $flag
+     * @return Zend_View
+     */
+    public function setUseStreamWrapper($flag)
+    {
+        $this->_useStreamWrapper = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Should the stream wrapper be used if short_open_tag is off?
+     *
+     * @return bool
+     */
+    public function useStreamWrapper()
+    {
+        return $this->_useStreamWrapper;
+    }
+
+    /**
+     * Includes the view script in a scope with only public $this variables.
+     *
+     * @param string The view script to execute.
+     */
+    protected function _run()
+    {
+        if ($this->_useViewStream && $this->useStreamWrapper()) {
+            include 'zend.view://' . func_get_arg(0);
+        } else {
+            include func_get_arg(0);
+        }
+    }
+}
diff --git a/lib/zend/Zend/View/Abstract.php b/lib/zend/Zend/View/Abstract.php
new file mode 100644
index 00000000000..ffcefee19b8
--- /dev/null
+++ b/lib/zend/Zend/View/Abstract.php
@@ -0,0 +1,1200 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** @see Zend_Loader */
+require_once 'Zend/Loader.php';
+
+/** @see Zend_Loader_PluginLoader */
+require_once 'Zend/Loader/PluginLoader.php';
+
+/** @see Zend_View_Interface */
+require_once 'Zend/View/Interface.php';
+
+/**
+ * Abstract class for Zend_View to help enforce private constructs.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_View_Abstract implements Zend_View_Interface
+{
+    /**
+     * Path stack for script, helper, and filter directories.
+     *
+     * @var array
+     */
+    private $_path = array(
+        'script' => array(),
+        'helper' => array(),
+        'filter' => array(),
+    );
+
+    /**
+     * Script file name to execute
+     *
+     * @var string
+     */
+    private $_file = null;
+
+    /**
+     * Instances of helper objects.
+     *
+     * @var array
+     */
+    private $_helper = array();
+
+    /**
+     * Map of helper => class pairs to help in determining helper class from
+     * name
+     * @var array
+     */
+    private $_helperLoaded = array();
+
+    /**
+     * Map of helper => classfile pairs to aid in determining helper classfile
+     * @var array
+     */
+    private $_helperLoadedDir = array();
+
+    /**
+     * Stack of Zend_View_Filter names to apply as filters.
+     * @var array
+     */
+    private $_filter = array();
+
+    /**
+     * Stack of Zend_View_Filter objects that have been loaded
+     * @var array
+     */
+    private $_filterClass = array();
+
+    /**
+     * Map of filter => class pairs to help in determining filter class from
+     * name
+     * @var array
+     */
+    private $_filterLoaded = array();
+
+    /**
+     * Map of filter => classfile pairs to aid in determining filter classfile
+     * @var array
+     */
+    private $_filterLoadedDir = array();
+
+    /**
+     * Callback for escaping.
+     *
+     * @var string
+     */
+    private $_escape = 'htmlspecialchars';
+
+    /**
+     * Encoding to use in escaping mechanisms; defaults to utf-8
+     * @var string
+     */
+    private $_encoding = 'UTF-8';
+
+    /**
+     * Flag indicating whether or not LFI protection for rendering view scripts is enabled
+     * @var bool
+     */
+    private $_lfiProtectionOn = true;
+
+    /**
+     * Plugin loaders
+     * @var array
+     */
+    private $_loaders = array();
+
+    /**
+     * Plugin types
+     * @var array
+     */
+    private $_loaderTypes = array('filter', 'helper');
+
+    /**
+     * Strict variables flag; when on, undefined variables accessed in the view
+     * scripts will trigger notices
+     * @var boolean
+     */
+    private $_strictVars = false;
+
+    /**
+     * Constructor.
+     *
+     * @param array $config Configuration key-value pairs.
+     */
+    public function __construct($config = array())
+    {
+        // set inital paths and properties
+        $this->setScriptPath(null);
+
+        // $this->setHelperPath(null);
+        $this->setFilterPath(null);
+
+        // user-defined escaping callback
+        if (array_key_exists('escape', $config)) {
+            $this->setEscape($config['escape']);
+        }
+
+        // encoding
+        if (array_key_exists('encoding', $config)) {
+            $this->setEncoding($config['encoding']);
+        }
+
+        // base path
+        if (array_key_exists('basePath', $config)) {
+            $prefix = 'Zend_View';
+            if (array_key_exists('basePathPrefix', $config)) {
+                $prefix = $config['basePathPrefix'];
+            }
+            $this->setBasePath($config['basePath'], $prefix);
+        }
+
+        // user-defined view script path
+        if (array_key_exists('scriptPath', $config)) {
+            $this->addScriptPath($config['scriptPath']);
+        }
+
+        // user-defined helper path
+        if (array_key_exists('helperPath', $config)) {
+            if (is_array($config['helperPath'])) {
+                foreach ($config['helperPath'] as $prefix => $path) {
+                    $this->addHelperPath($path, $prefix);
+                }
+            } else {
+                $prefix = 'Zend_View_Helper';
+                if (array_key_exists('helperPathPrefix', $config)) {
+                    $prefix = $config['helperPathPrefix'];
+                }
+                $this->addHelperPath($config['helperPath'], $prefix);
+            }
+        }
+
+        // user-defined filter path
+        if (array_key_exists('filterPath', $config)) {
+            if (is_array($config['filterPath'])) {
+                foreach ($config['filterPath'] as $prefix => $path) {
+                    $this->addFilterPath($path, $prefix);
+                }
+            } else {
+                $prefix = 'Zend_View_Filter';
+                if (array_key_exists('filterPathPrefix', $config)) {
+                    $prefix = $config['filterPathPrefix'];
+                }
+                $this->addFilterPath($config['filterPath'], $prefix);
+            }
+        }
+
+        // user-defined filters
+        if (array_key_exists('filter', $config)) {
+            $this->addFilter($config['filter']);
+        }
+
+        // strict vars
+        if (array_key_exists('strictVars', $config)) {
+            $this->strictVars($config['strictVars']);
+        }
+
+        // LFI protection flag
+        if (array_key_exists('lfiProtectionOn', $config)) {
+            $this->setLfiProtection($config['lfiProtectionOn']);
+        }
+
+        if (array_key_exists('assign', $config)
+            && is_array($config['assign'])
+        ) {
+            foreach ($config['assign'] as $key => $value) {
+                $this->assign($key, $value);
+            }
+        }
+
+        $this->init();
+    }
+
+    /**
+     * Return the template engine object
+     *
+     * Returns the object instance, as it is its own template engine
+     *
+     * @return Zend_View_Abstract
+     */
+    public function getEngine()
+    {
+        return $this;
+    }
+
+    /**
+     * Allow custom object initialization when extending Zend_View_Abstract or
+     * Zend_View
+     *
+     * Triggered by {@link __construct() the constructor} as its final action.
+     *
+     * @return void
+     */
+    public function init()
+    {
+    }
+
+    /**
+     * Prevent E_NOTICE for nonexistent values
+     *
+     * If {@link strictVars()} is on, raises a notice.
+     *
+     * @param  string $key
+     * @return null
+     */
+    public function __get($key)
+    {
+        if ($this->_strictVars) {
+            trigger_error('Key "' . $key . '" does not exist', E_USER_NOTICE);
+        }
+
+        return null;
+    }
+
+    /**
+     * Allows testing with empty() and isset() to work inside
+     * templates.
+     *
+     * @param  string $key
+     * @return boolean
+     */
+    public function __isset($key)
+    {
+        if ('_' != substr($key, 0, 1)) {
+            return isset($this->$key);
+        }
+
+        return false;
+    }
+
+    /**
+     * Directly assigns a variable to the view script.
+     *
+     * Checks first to ensure that the caller is not attempting to set a
+     * protected or private member (by checking for a prefixed underscore); if
+     * not, the public member is set; otherwise, an exception is raised.
+     *
+     * @param string $key The variable name.
+     * @param mixed $val The variable value.
+     * @return void
+     * @throws Zend_View_Exception if an attempt to set a private or protected
+     * member is detected
+     */
+    public function __set($key, $val)
+    {
+        if ('_' != substr($key, 0, 1)) {
+            $this->$key = $val;
+            return;
+        }
+
+        require_once 'Zend/View/Exception.php';
+        $e = new Zend_View_Exception('Setting private or protected class members is not allowed');
+        $e->setView($this);
+        throw $e;
+    }
+
+    /**
+     * Allows unset() on object properties to work
+     *
+     * @param string $key
+     * @return void
+     */
+    public function __unset($key)
+    {
+        if ('_' != substr($key, 0, 1) && isset($this->$key)) {
+            unset($this->$key);
+        }
+    }
+
+    /**
+     * Accesses a helper object from within a script.
+     *
+     * If the helper class has a 'view' property, sets it with the current view
+     * object.
+     *
+     * @param string $name The helper name.
+     * @param array $args The parameters for the helper.
+     * @return string The result of the helper output.
+     */
+    public function __call($name, $args)
+    {
+        // is the helper already loaded?
+        $helper = $this->getHelper($name);
+
+        // call the helper method
+        return call_user_func_array(
+            array($helper, $name),
+            $args
+        );
+    }
+
+    /**
+     * Given a base path, sets the script, helper, and filter paths relative to it
+     *
+     * Assumes a directory structure of:
+     * <code>
+     * basePath/
+     *     scripts/
+     *     helpers/
+     *     filters/
+     * </code>
+     *
+     * @param  string $path
+     * @param  string $prefix Prefix to use for helper and filter paths
+     * @return Zend_View_Abstract
+     */
+    public function setBasePath($path, $classPrefix = 'Zend_View')
+    {
+        $path        = rtrim($path, '/');
+        $path        = rtrim($path, '\\');
+        $path       .= DIRECTORY_SEPARATOR;
+        $classPrefix = rtrim($classPrefix, '_') . '_';
+        $this->setScriptPath($path . 'scripts');
+        $this->setHelperPath($path . 'helpers', $classPrefix . 'Helper');
+        $this->setFilterPath($path . 'filters', $classPrefix . 'Filter');
+        return $this;
+    }
+
+    /**
+     * Given a base path, add script, helper, and filter paths relative to it
+     *
+     * Assumes a directory structure of:
+     * <code>
+     * basePath/
+     *     scripts/
+     *     helpers/
+     *     filters/
+     * </code>
+     *
+     * @param  string $path
+     * @param  string $prefix Prefix to use for helper and filter paths
+     * @return Zend_View_Abstract
+     */
+    public function addBasePath($path, $classPrefix = 'Zend_View')
+    {
+        $path        = rtrim($path, '/');
+        $path        = rtrim($path, '\\');
+        $path       .= DIRECTORY_SEPARATOR;
+        $classPrefix = rtrim($classPrefix, '_') . '_';
+        $this->addScriptPath($path . 'scripts');
+        $this->addHelperPath($path . 'helpers', $classPrefix . 'Helper');
+        $this->addFilterPath($path . 'filters', $classPrefix . 'Filter');
+        return $this;
+    }
+
+    /**
+     * Adds to the stack of view script paths in LIFO order.
+     *
+     * @param string|array The directory (-ies) to add.
+     * @return Zend_View_Abstract
+     */
+    public function addScriptPath($path)
+    {
+        $this->_addPath('script', $path);
+        return $this;
+    }
+
+    /**
+     * Resets the stack of view script paths.
+     *
+     * To clear all paths, use Zend_View::setScriptPath(null).
+     *
+     * @param string|array The directory (-ies) to set as the path.
+     * @return Zend_View_Abstract
+     */
+    public function setScriptPath($path)
+    {
+        $this->_path['script'] = array();
+        $this->_addPath('script', $path);
+        return $this;
+    }
+
+    /**
+     * Return full path to a view script specified by $name
+     *
+     * @param  string $name
+     * @return false|string False if script not found
+     * @throws Zend_View_Exception if no script directory set
+     */
+    public function getScriptPath($name)
+    {
+        try {
+            $path = $this->_script($name);
+            return $path;
+        } catch (Zend_View_Exception $e) {
+            if (strstr($e->getMessage(), 'no view script directory set')) {
+                throw $e;
+            }
+
+            return false;
+        }
+    }
+
+    /**
+     * Returns an array of all currently set script paths
+     *
+     * @return array
+     */
+    public function getScriptPaths()
+    {
+        return $this->_getPaths('script');
+    }
+
+    /**
+     * Set plugin loader for a particular plugin type
+     *
+     * @param  Zend_Loader_PluginLoader $loader
+     * @param  string $type
+     * @return Zend_View_Abstract
+     */
+    public function setPluginLoader(Zend_Loader_PluginLoader $loader, $type)
+    {
+        $type = strtolower($type);
+        if (!in_array($type, $this->_loaderTypes)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception(sprintf('Invalid plugin loader type "%s"', $type));
+            $e->setView($this);
+            throw $e;
+        }
+
+        $this->_loaders[$type] = $loader;
+        return $this;
+    }
+
+    /**
+     * Retrieve plugin loader for a specific plugin type
+     *
+     * @param  string $type
+     * @return Zend_Loader_PluginLoader
+     */
+    public function getPluginLoader($type)
+    {
+        $type = strtolower($type);
+        if (!in_array($type, $this->_loaderTypes)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception(sprintf('Invalid plugin loader type "%s"; cannot retrieve', $type));
+            $e->setView($this);
+            throw $e;
+        }
+
+        if (!array_key_exists($type, $this->_loaders)) {
+            $prefix     = 'Zend_View_';
+            $pathPrefix = 'Zend/View/';
+
+            $pType = ucfirst($type);
+            switch ($type) {
+                case 'filter':
+                case 'helper':
+                default:
+                    $prefix     .= $pType;
+                    $pathPrefix .= $pType;
+                    $loader = new Zend_Loader_PluginLoader(array(
+                        $prefix => $pathPrefix
+                    ));
+                    $this->_loaders[$type] = $loader;
+                    break;
+            }
+        }
+        return $this->_loaders[$type];
+    }
+
+    /**
+     * Adds to the stack of helper paths in LIFO order.
+     *
+     * @param string|array The directory (-ies) to add.
+     * @param string $classPrefix Class prefix to use with classes in this
+     * directory; defaults to Zend_View_Helper
+     * @return Zend_View_Abstract
+     */
+    public function addHelperPath($path, $classPrefix = 'Zend_View_Helper_')
+    {
+        return $this->_addPluginPath('helper', $classPrefix, (array) $path);
+    }
+
+    /**
+     * Resets the stack of helper paths.
+     *
+     * To clear all paths, use Zend_View::setHelperPath(null).
+     *
+     * @param string|array $path The directory (-ies) to set as the path.
+     * @param string $classPrefix The class prefix to apply to all elements in
+     * $path; defaults to Zend_View_Helper
+     * @return Zend_View_Abstract
+     */
+    public function setHelperPath($path, $classPrefix = 'Zend_View_Helper_')
+    {
+        unset($this->_loaders['helper']);
+        return $this->addHelperPath($path, $classPrefix);
+    }
+
+    /**
+     * Get full path to a helper class file specified by $name
+     *
+     * @param  string $name
+     * @return string|false False on failure, path on success
+     */
+    public function getHelperPath($name)
+    {
+        return $this->_getPluginPath('helper', $name);
+    }
+
+    /**
+     * Returns an array of all currently set helper paths
+     *
+     * @return array
+     */
+    public function getHelperPaths()
+    {
+        return $this->getPluginLoader('helper')->getPaths();
+    }
+
+    /**
+     * Registers a helper object, bypassing plugin loader
+     *
+     * @param  Zend_View_Helper_Abstract|object $helper
+     * @param  string $name
+     * @return Zend_View_Abstract
+     * @throws Zend_View_Exception
+     */
+    public function registerHelper($helper, $name)
+    {
+        if (!is_object($helper)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('View helper must be an object');
+            $e->setView($this);
+            throw $e;
+        }
+
+        if (!$helper instanceof Zend_View_Interface) {
+            if (!method_exists($helper, $name)) {
+                require_once 'Zend/View/Exception.php';
+                $e =  new Zend_View_Exception(
+                    'View helper must implement Zend_View_Interface or have a method matching the name provided'
+                );
+                $e->setView($this);
+                throw $e;
+            }
+        }
+
+        if (method_exists($helper, 'setView')) {
+            $helper->setView($this);
+        }
+
+        $name = ucfirst($name);
+        $this->_helper[$name] = $helper;
+        return $this;
+    }
+
+    /**
+     * Get a helper by name
+     *
+     * @param  string $name
+     * @return object
+     */
+    public function getHelper($name)
+    {
+        return $this->_getPlugin('helper', $name);
+    }
+
+    /**
+     * Get array of all active helpers
+     *
+     * Only returns those that have already been instantiated.
+     *
+     * @return array
+     */
+    public function getHelpers()
+    {
+        return $this->_helper;
+    }
+
+    /**
+     * Adds to the stack of filter paths in LIFO order.
+     *
+     * @param string|array The directory (-ies) to add.
+     * @param string $classPrefix Class prefix to use with classes in this
+     * directory; defaults to Zend_View_Filter
+     * @return Zend_View_Abstract
+     */
+    public function addFilterPath($path, $classPrefix = 'Zend_View_Filter_')
+    {
+        return $this->_addPluginPath('filter', $classPrefix, (array) $path);
+    }
+
+    /**
+     * Resets the stack of filter paths.
+     *
+     * To clear all paths, use Zend_View::setFilterPath(null).
+     *
+     * @param string|array The directory (-ies) to set as the path.
+     * @param string $classPrefix The class prefix to apply to all elements in
+     * $path; defaults to Zend_View_Filter
+     * @return Zend_View_Abstract
+     */
+    public function setFilterPath($path, $classPrefix = 'Zend_View_Filter_')
+    {
+        unset($this->_loaders['filter']);
+        return $this->addFilterPath($path, $classPrefix);
+    }
+
+    /**
+     * Get full path to a filter class file specified by $name
+     *
+     * @param  string $name
+     * @return string|false False on failure, path on success
+     */
+    public function getFilterPath($name)
+    {
+        return $this->_getPluginPath('filter', $name);
+    }
+
+    /**
+     * Get a filter object by name
+     *
+     * @param  string $name
+     * @return object
+     */
+    public function getFilter($name)
+    {
+        return $this->_getPlugin('filter', $name);
+    }
+
+    /**
+     * Return array of all currently active filters
+     *
+     * Only returns those that have already been instantiated.
+     *
+     * @return array
+     */
+    public function getFilters()
+    {
+        return $this->_filter;
+    }
+
+    /**
+     * Returns an array of all currently set filter paths
+     *
+     * @return array
+     */
+    public function getFilterPaths()
+    {
+        return $this->getPluginLoader('filter')->getPaths();
+    }
+
+    /**
+     * Return associative array of path types => paths
+     *
+     * @return array
+     */
+    public function getAllPaths()
+    {
+        $paths = $this->_path;
+        $paths['helper'] = $this->getHelperPaths();
+        $paths['filter'] = $this->getFilterPaths();
+        return $paths;
+    }
+
+    /**
+     * Add one or more filters to the stack in FIFO order.
+     *
+     * @param string|array One or more filters to add.
+     * @return Zend_View_Abstract
+     */
+    public function addFilter($name)
+    {
+        foreach ((array) $name as $val) {
+            $this->_filter[] = $val;
+        }
+        return $this;
+    }
+
+    /**
+     * Resets the filter stack.
+     *
+     * To clear all filters, use Zend_View::setFilter(null).
+     *
+     * @param string|array One or more filters to set.
+     * @return Zend_View_Abstract
+     */
+    public function setFilter($name)
+    {
+        $this->_filter = array();
+        $this->addFilter($name);
+        return $this;
+    }
+
+    /**
+     * Sets the _escape() callback.
+     *
+     * @param mixed $spec The callback for _escape() to use.
+     * @return Zend_View_Abstract
+     */
+    public function setEscape($spec)
+    {
+        $this->_escape = $spec;
+        return $this;
+    }
+
+    /**
+     * Set LFI protection flag
+     *
+     * @param  bool $flag
+     * @return Zend_View_Abstract
+     */
+    public function setLfiProtection($flag)
+    {
+        $this->_lfiProtectionOn = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Return status of LFI protection flag
+     *
+     * @return bool
+     */
+    public function isLfiProtectionOn()
+    {
+        return $this->_lfiProtectionOn;
+    }
+
+    /**
+     * Assigns variables to the view script via differing strategies.
+     *
+     * Zend_View::assign('name', $value) assigns a variable called 'name'
+     * with the corresponding $value.
+     *
+     * Zend_View::assign($array) assigns the array keys as variable
+     * names (with the corresponding array values).
+     *
+     * @see    __set()
+     * @param  string|array The assignment strategy to use.
+     * @param  mixed (Optional) If assigning a named variable, use this
+     * as the value.
+     * @return Zend_View_Abstract Fluent interface
+     * @throws Zend_View_Exception if $spec is neither a string nor an array,
+     * or if an attempt to set a private or protected member is detected
+     */
+    public function assign($spec, $value = null)
+    {
+        // which strategy to use?
+        if (is_string($spec)) {
+            // assign by name and value
+            if ('_' == substr($spec, 0, 1)) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception('Setting private or protected class members is not allowed');
+                $e->setView($this);
+                throw $e;
+            }
+            $this->$spec = $value;
+        } elseif (is_array($spec)) {
+            // assign from associative array
+            $error = false;
+            foreach ($spec as $key => $val) {
+                if ('_' == substr($key, 0, 1)) {
+                    $error = true;
+                    break;
+                }
+                $this->$key = $val;
+            }
+            if ($error) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception('Setting private or protected class members is not allowed');
+                $e->setView($this);
+                throw $e;
+            }
+        } else {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('assign() expects a string or array, received ' . gettype($spec));
+            $e->setView($this);
+            throw $e;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return list of all assigned variables
+     *
+     * Returns all public properties of the object. Reflection is not used
+     * here as testing reflection properties for visibility is buggy.
+     *
+     * @return array
+     */
+    public function getVars()
+    {
+        $vars   = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if ('_' == substr($key, 0, 1)) {
+                unset($vars[$key]);
+            }
+        }
+
+        return $vars;
+    }
+
+    /**
+     * Clear all assigned variables
+     *
+     * Clears all variables assigned to Zend_View either via {@link assign()} or
+     * property overloading ({@link __set()}).
+     *
+     * @return void
+     */
+    public function clearVars()
+    {
+        $vars   = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if ('_' != substr($key, 0, 1)) {
+                unset($this->$key);
+            }
+        }
+    }
+
+    /**
+     * Processes a view script and returns the output.
+     *
+     * @param string $name The script name to process.
+     * @return string The script output.
+     */
+    public function render($name)
+    {
+        // find the script file name using the parent private method
+        $this->_file = $this->_script($name);
+        unset($name); // remove $name from local scope
+
+        ob_start();
+        $this->_run($this->_file);
+
+        return $this->_filter(ob_get_clean()); // filter output
+    }
+
+    /**
+     * Escapes a value for output in a view script.
+     *
+     * If escaping mechanism is one of htmlspecialchars or htmlentities, uses
+     * {@link $_encoding} setting.
+     *
+     * @param mixed $var The output to escape.
+     * @return mixed The escaped value.
+     */
+    public function escape($var)
+    {
+        if (in_array($this->_escape, array('htmlspecialchars', 'htmlentities'))) {
+            return call_user_func($this->_escape, $var, ENT_COMPAT, $this->_encoding);
+        }
+
+        if (1 == func_num_args()) {
+            return call_user_func($this->_escape, $var);
+        }
+        $args = func_get_args();
+        return call_user_func_array($this->_escape, $args);
+    }
+
+    /**
+     * Set encoding to use with htmlentities() and htmlspecialchars()
+     *
+     * @param string $encoding
+     * @return Zend_View_Abstract
+     */
+    public function setEncoding($encoding)
+    {
+        $this->_encoding = $encoding;
+        return $this;
+    }
+
+    /**
+     * Return current escape encoding
+     *
+     * @return string
+     */
+    public function getEncoding()
+    {
+        return $this->_encoding;
+    }
+
+    /**
+     * Enable or disable strict vars
+     *
+     * If strict variables are enabled, {@link __get()} will raise a notice
+     * when a variable is not defined.
+     *
+     * Use in conjunction with {@link Zend_View_Helper_DeclareVars the declareVars() helper}
+     * to enforce strict variable handling in your view scripts.
+     *
+     * @param  boolean $flag
+     * @return Zend_View_Abstract
+     */
+    public function strictVars($flag = true)
+    {
+        $this->_strictVars = ($flag) ? true : false;
+
+        return $this;
+    }
+
+    /**
+     * Finds a view script from the available directories.
+     *
+     * @param string $name The base name of the script.
+     * @return void
+     */
+    protected function _script($name)
+    {
+        if ($this->isLfiProtectionOn() && preg_match('#\.\.[\\\/]#', $name)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Requested scripts may not include parent directory traversal ("../", "..\\" notation)');
+            $e->setView($this);
+            throw $e;
+        }
+
+        if (0 == count($this->_path['script'])) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('no view script directory set; unable to determine location for view script');
+            $e->setView($this);
+            throw $e;
+        }
+
+        foreach ($this->_path['script'] as $dir) {
+            if (is_readable($dir . $name)) {
+                return $dir . $name;
+            }
+        }
+
+        require_once 'Zend/View/Exception.php';
+        $message = "script '$name' not found in path ("
+                 . implode(PATH_SEPARATOR, $this->_path['script'])
+                 . ")";
+        $e = new Zend_View_Exception($message);
+        $e->setView($this);
+        throw $e;
+    }
+
+    /**
+     * Applies the filter callback to a buffer.
+     *
+     * @param string $buffer The buffer contents.
+     * @return string The filtered buffer.
+     */
+    private function _filter($buffer)
+    {
+        // loop through each filter class
+        foreach ($this->_filter as $name) {
+            // load and apply the filter class
+            $filter = $this->getFilter($name);
+            $buffer = call_user_func(array($filter, 'filter'), $buffer);
+        }
+
+        // done!
+        return $buffer;
+    }
+
+    /**
+     * Adds paths to the path stack in LIFO order.
+     *
+     * Zend_View::_addPath($type, 'dirname') adds one directory
+     * to the path stack.
+     *
+     * Zend_View::_addPath($type, $array) adds one directory for
+     * each array element value.
+     *
+     * In the case of filter and helper paths, $prefix should be used to
+     * specify what class prefix to use with the given path.
+     *
+     * @param string $type The path type ('script', 'helper', or 'filter').
+     * @param string|array $path The path specification.
+     * @param string $prefix Class prefix to use with path (helpers and filters
+     * only)
+     * @return void
+     */
+    private function _addPath($type, $path, $prefix = null)
+    {
+        foreach ((array) $path as $dir) {
+            // attempt to strip any possible separator and
+            // append the system directory separator
+            $dir  = rtrim($dir, '/');
+            $dir  = rtrim($dir, '\\');
+            $dir .= '/';
+
+            switch ($type) {
+                case 'script':
+                    // add to the top of the stack.
+                    array_unshift($this->_path[$type], $dir);
+                    break;
+                case 'filter':
+                case 'helper':
+                default:
+                    // add as array with prefix and dir keys
+                    array_unshift($this->_path[$type], array('prefix' => $prefix, 'dir' => $dir));
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Resets the path stack for helpers and filters.
+     *
+     * @param string $type The path type ('helper' or 'filter').
+     * @param string|array $path The directory (-ies) to set as the path.
+     * @param string $classPrefix Class prefix to apply to elements of $path
+     */
+    private function _setPath($type, $path, $classPrefix = null)
+    {
+        $dir = DIRECTORY_SEPARATOR . ucfirst($type) . DIRECTORY_SEPARATOR;
+
+        switch ($type) {
+            case 'script':
+                $this->_path[$type] = array(dirname(__FILE__) . $dir);
+                $this->_addPath($type, $path);
+                break;
+            case 'filter':
+            case 'helper':
+            default:
+                $this->_path[$type] = array(array(
+                    'prefix' => 'Zend_View_' . ucfirst($type) . '_',
+                    'dir'    => dirname(__FILE__) . $dir
+                ));
+                $this->_addPath($type, $path, $classPrefix);
+                break;
+        }
+    }
+
+    /**
+     * Return all paths for a given path type
+     *
+     * @param string $type The path type  ('helper', 'filter', 'script')
+     * @return array
+     */
+    private function _getPaths($type)
+    {
+        return $this->_path[$type];
+    }
+
+    /**
+     * Register helper class as loaded
+     *
+     * @param  string $name
+     * @param  string $class
+     * @param  string $file path to class file
+     * @return void
+     */
+    private function _setHelperClass($name, $class, $file)
+    {
+        $this->_helperLoadedDir[$name] = $file;
+        $this->_helperLoaded[$name]    = $class;
+    }
+
+    /**
+     * Register filter class as loaded
+     *
+     * @param  string $name
+     * @param  string $class
+     * @param  string $file path to class file
+     * @return void
+     */
+    private function _setFilterClass($name, $class, $file)
+    {
+        $this->_filterLoadedDir[$name] = $file;
+        $this->_filterLoaded[$name]    = $class;
+    }
+
+    /**
+     * Add a prefixPath for a plugin type
+     *
+     * @param  string $type
+     * @param  string $classPrefix
+     * @param  array $paths
+     * @return Zend_View_Abstract
+     */
+    private function _addPluginPath($type, $classPrefix, array $paths)
+    {
+        $loader = $this->getPluginLoader($type);
+        foreach ($paths as $path) {
+            $loader->addPrefixPath($classPrefix, $path);
+        }
+        return $this;
+    }
+
+    /**
+     * Get a path to a given plugin class of a given type
+     *
+     * @param  string $type
+     * @param  string $name
+     * @return string|false
+     */
+    private function _getPluginPath($type, $name)
+    {
+        $loader = $this->getPluginLoader($type);
+        if ($loader->isLoaded($name)) {
+            return $loader->getClassPath($name);
+        }
+
+        try {
+            $loader->load($name);
+            return $loader->getClassPath($name);
+        } catch (Zend_Loader_Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Retrieve a plugin object
+     *
+     * @param  string $type
+     * @param  string $name
+     * @return object
+     */
+    private function _getPlugin($type, $name)
+    {
+        $name = ucfirst($name);
+        switch ($type) {
+            case 'filter':
+                $storeVar = '_filterClass';
+                $store    = $this->_filterClass;
+                break;
+            case 'helper':
+                $storeVar = '_helper';
+                $store    = $this->_helper;
+                break;
+        }
+
+        if (!isset($store[$name])) {
+            $class = $this->getPluginLoader($type)->load($name);
+            $store[$name] = new $class();
+            if (method_exists($store[$name], 'setView')) {
+                $store[$name]->setView($this);
+            }
+        }
+
+        $this->$storeVar = $store;
+        return $store[$name];
+    }
+
+    /**
+     * Use to include the view script in a scope that only allows public
+     * members.
+     *
+     * @return mixed
+     */
+    abstract protected function _run();
+}
diff --git a/lib/zend/Zend/View/Exception.php b/lib/zend/Zend/View/Exception.php
new file mode 100644
index 00000000000..93078bcf8e1
--- /dev/null
+++ b/lib/zend/Zend/View/Exception.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+
+/**
+ * Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+
+/**
+ * Exception for Zend_View class.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Exception extends Zend_Exception
+{
+    protected $view = null;
+
+    public function setView(Zend_View_Interface $view = null)
+    {
+        $this->view = $view;
+        return $this;
+    }
+
+    public function getView()
+    {
+        return $this->view;
+    }
+}
diff --git a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php b/lib/zend/Zend/View/Helper/Abstract.php
similarity index 50%
rename from lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php
rename to lib/zend/Zend/View/Helper/Abstract.php
index 0b295f3cc79..da481bbe337 100644
--- a/lib/zend/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php
+++ b/lib/zend/Zend/View/Helper/Abstract.php
@@ -13,54 +13,52 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
 /**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
+ * @see Zend_View_Helper_Interface
  */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
+require_once 'Zend/View/Helper/Interface.php';
 
 /**
  * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
+abstract class Zend_View_Helper_Abstract implements Zend_View_Helper_Interface
 {
     /**
+     * View object
      *
-     * @var float
+     * @var Zend_View_Interface
      */
-    public $geoLatitude = null;
+    public $view = null;
 
     /**
+     * Set the View object
      *
-     * @var float
+     * @param  Zend_View_Interface $view
+     * @return Zend_View_Helper_Abstract
      */
-    public $geoLongitude = null;
-
-    /**
-     * @return float
-     */
-    public function getLatitude()
+    public function setView(Zend_View_Interface $view)
     {
-        return $this->geoLatitude;
+        $this->view = $view;
+        return $this;
     }
 
     /**
-     * @return float
+     * Strategy pattern: currently unutilized
+     *
+     * @return void
      */
-    public function getLongitude()
+    public function direct()
     {
-        return $this->geoLongitude;
     }
 }
diff --git a/lib/zend/Zend/View/Helper/Action.php b/lib/zend/Zend/View/Helper/Action.php
new file mode 100644
index 00000000000..a4b83af5826
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Action.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Helper for rendering output of a controller action
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Action extends Zend_View_Helper_Abstract
+{
+    /**
+     * @var string
+     */
+    public $defaultModule;
+
+    /**
+     * @var Zend_Controller_Dispatcher_Interface
+     */
+    public $dispatcher;
+
+    /**
+     * @var Zend_Controller_Request_Abstract
+     */
+    public $request;
+
+    /**
+     * @var Zend_Controller_Response_Abstract
+     */
+    public $response;
+
+    /**
+     * Constructor
+     *
+     * Grab local copies of various MVC objects
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $front   = Zend_Controller_Front::getInstance();
+        $modules = $front->getControllerDirectory();
+        if (empty($modules)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Action helper depends on valid front controller instance');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $request  = $front->getRequest();
+        $response = $front->getResponse();
+
+        if (empty($request) || empty($response)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Action view helper requires both a registered request and response object in the front controller instance');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $this->request       = clone $request;
+        $this->response      = clone $response;
+        $this->dispatcher    = clone $front->getDispatcher();
+        $this->defaultModule = $front->getDefaultModule();
+    }
+
+    /**
+     * Reset object states
+     *
+     * @return void
+     */
+    public function resetObjects()
+    {
+        $params = $this->request->getUserParams();
+        foreach (array_keys($params) as $key) {
+            $this->request->setParam($key, null);
+        }
+
+        $this->response->clearBody();
+        $this->response->clearHeaders()
+                       ->clearRawHeaders();
+    }
+
+    /**
+     * Retrieve rendered contents of a controller action
+     *
+     * If the action results in a forward or redirect, returns empty string.
+     *
+     * @param  string $action
+     * @param  string $controller
+     * @param  string $module Defaults to default module
+     * @param  array $params
+     * @return string
+     */
+    public function action($action, $controller, $module = null, array $params = array())
+    {
+        $this->resetObjects();
+        if (null === $module) {
+            $module = $this->defaultModule;
+        }
+
+        // clone the view object to prevent over-writing of view variables
+        $viewRendererObj = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
+        Zend_Controller_Action_HelperBroker::addHelper(clone $viewRendererObj);
+
+        $this->request->setParams($params)
+                      ->setModuleName($module)
+                      ->setControllerName($controller)
+                      ->setActionName($action)
+                      ->setDispatched(true);
+
+        $this->dispatcher->dispatch($this->request, $this->response);
+
+        // reset the viewRenderer object to it's original state
+        Zend_Controller_Action_HelperBroker::addHelper($viewRendererObj);
+
+
+        if (!$this->request->isDispatched()
+            || $this->response->isRedirect())
+        {
+            // forwards and redirects render nothing
+            return '';
+        }
+
+        $return = $this->response->getBody();
+        $this->resetObjects();
+        return $return;
+    }
+
+    /**
+     * Clone the current View
+     *
+     * @return Zend_View_Interface
+     */
+    public function cloneView()
+    {
+        $view = clone $this->view;
+        $view->clearVars();
+        return $view;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/BaseUrl.php b/lib/zend/Zend/View/Helper/BaseUrl.php
new file mode 100644
index 00000000000..8af36bbdda2
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/BaseUrl.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** @see Zend_View_Helper_Abstract */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Helper for retrieving the BaseUrl
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_BaseUrl extends Zend_View_Helper_Abstract
+{
+    /**
+     * BaseUrl
+     *
+     * @var string
+     */
+    protected $_baseUrl;
+
+    /**
+     * Returns site's base url, or file with base url prepended
+     *
+     * $file is appended to the base url for simplicity
+     *
+     * @param  string|null $file
+     * @return string
+     */
+    public function baseUrl($file = null)
+    {
+        // Get baseUrl
+        $baseUrl = $this->getBaseUrl();
+
+        // Remove trailing slashes
+        if (null !== $file) {
+            $file = '/' . ltrim($file, '/\\');
+        }
+
+        return $baseUrl . $file;
+    }
+
+    /**
+     * Set BaseUrl
+     *
+     * @param  string $base
+     * @return Zend_View_Helper_BaseUrl
+     */
+    public function setBaseUrl($base)
+    {
+        $this->_baseUrl = rtrim($base, '/\\');
+        return $this;
+    }
+
+    /**
+     * Get BaseUrl
+     *
+     * @return string
+     */
+    public function getBaseUrl()
+    {
+        if ($this->_baseUrl === null) {
+            /** @see Zend_Controller_Front */
+            require_once 'Zend/Controller/Front.php';
+            $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
+
+            // Remove scriptname, eg. index.php from baseUrl
+            $baseUrl = $this->_removeScriptName($baseUrl);
+
+            $this->setBaseUrl($baseUrl);
+        }
+
+        return $this->_baseUrl;
+    }
+
+    /**
+     * Remove Script filename from baseurl
+     *
+     * @param  string $url
+     * @return string
+     */
+    protected function _removeScriptName($url)
+    {
+        if (!isset($_SERVER['SCRIPT_NAME'])) {
+            // We can't do much now can we? (Well, we could parse out by ".")
+            return $url;
+        }
+
+        if (($pos = strripos($url, basename($_SERVER['SCRIPT_NAME']))) !== false) {
+            $url = substr($url, 0, $pos);
+        }
+
+        return $url;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Currency.php b/lib/zend/Zend/View/Helper/Currency.php
new file mode 100644
index 00000000000..592185f7195
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Currency.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Currency view helper
+ *
+ * @category  Zend
+ * @package   Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Currency extends Zend_View_Helper_Abstract
+{
+    /**
+     * Currency object
+     *
+     * @var Zend_Currency
+     */
+    protected $_currency;
+
+    /**
+     * Constructor for manually handling
+     *
+     * @param  Zend_Currency $currency Instance of Zend_Currency
+     * @return void
+     */
+    public function __construct($currency = null)
+    {
+        if ($currency === null) {
+            require_once 'Zend/Registry.php';
+            if (Zend_Registry::isRegistered('Zend_Currency')) {
+                $currency = Zend_Registry::get('Zend_Currency');
+            }
+        }
+
+        $this->setCurrency($currency);
+    }
+
+    /**
+     * Output a formatted currency
+     *
+     * @param  integer|float            $value    Currency value to output
+     * @param  string|Zend_Locale|array $currency OPTIONAL Currency to use for
+     *                                            this call
+     * @return string Formatted currency
+     */
+    public function currency($value = null, $currency = null)
+    {
+        if ($value === null) {
+            return $this;
+        }
+
+        if (is_string($currency) || ($currency instanceof Zend_Locale)) {
+            require_once 'Zend/Locale.php';
+            if (Zend_Locale::isLocale($currency)) {
+                $currency = array('locale' => $currency);
+            }
+        }
+
+        if (is_string($currency)) {
+            $currency = array('currency' => $currency);
+        }
+
+        if (is_array($currency)) {
+            return $this->_currency->toCurrency($value, $currency);
+        }
+
+        return $this->_currency->toCurrency($value);
+    }
+
+    /**
+     * Sets a currency to use
+     *
+     * @param  Zend_Currency|String|Zend_Locale $currency Currency to use
+     * @throws Zend_View_Exception When no or a false currency was set
+     * @return Zend_View_Helper_Currency
+     */
+    public function setCurrency($currency = null)
+    {
+        if (!$currency instanceof Zend_Currency) {
+            require_once 'Zend/Currency.php';
+            $currency = new Zend_Currency($currency);
+        }
+        $this->_currency = $currency;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve currency object
+     *
+     * @return Zend_Currency|null
+     */
+    public function getCurrency()
+    {
+        return $this->_currency;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Cycle.php b/lib/zend/Zend/View/Helper/Cycle.php
new file mode 100644
index 00000000000..eb5fd5132bc
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Cycle.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * Helper for alternating between set of values
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Cycle implements Iterator
+{
+
+    /**
+     * Default name
+     * @var string
+     */
+    const DEFAULT_NAME = 'default';
+
+    /**
+     * Pointers
+     *
+     * @var array
+     */
+    protected $_pointers = array(self::DEFAULT_NAME =>-1) ;
+
+    /**
+     * Array of values
+     *
+     * @var array
+     */
+    protected $_data = array(self::DEFAULT_NAME=>array());
+
+    /**
+     * Actual name of cycle
+     *
+     * @var string
+     */
+    protected $_name = self::DEFAULT_NAME;
+
+    /**
+     * Add elements to alternate
+     *
+     * @param array $data
+     * @param string $name
+     * @return Zend_View_Helper_Cycle
+     */
+    public function cycle(array $data = array(), $name = self::DEFAULT_NAME)
+    {
+        if(!empty($data))
+           $this->_data[$name] = $data;
+
+        $this->setName($name);
+        return $this;
+    }
+
+    /**
+     * Add elements to alternate
+     *
+     * @param array $data
+     * @param string $name
+     * @return Zend_View_Helper_Cycle
+     */
+    public function assign(Array $data , $name = self::DEFAULT_NAME)
+    {
+        $this->setName($name);
+        $this->_data[$name] = $data;
+        $this->rewind();
+        return $this;
+    }
+
+    /**
+     * Sets actual name of cycle
+     *
+     * @param string $name
+     * @return Zend_View_Helper_Cycle
+     */
+    public function setName($name = self::DEFAULT_NAME)
+    {
+       $this->_name = $name;
+
+       if(!isset($this->_data[$this->_name]))
+         $this->_data[$this->_name] = array();
+
+       if(!isset($this->_pointers[$this->_name]))
+         $this->rewind();
+
+       return $this;
+    }
+
+    /**
+     * Gets actual name of cycle
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+
+    /**
+     * Return all elements
+     *
+     * @return array
+     */
+    public function getAll()
+    {
+        return $this->_data[$this->_name];
+    }
+
+    /**
+     * Turn helper into string
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return (string) $this->_data[$this->_name][$this->key()];
+    }
+
+    /**
+     * Cast to string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Move to next value
+     *
+     * @return Zend_View_Helper_Cycle
+     */
+    public function next()
+    {
+        $count = count($this->_data[$this->_name]);
+        if ($this->_pointers[$this->_name] == ($count - 1))
+            $this->_pointers[$this->_name] = 0;
+        else
+            $this->_pointers[$this->_name] = ++$this->_pointers[$this->_name];
+        return $this;
+    }
+
+    /**
+     * Move to previous value
+     *
+     * @return Zend_View_Helper_Cycle
+     */
+    public function prev()
+    {
+        $count = count($this->_data[$this->_name]);
+        if ($this->_pointers[$this->_name] <= 0)
+            $this->_pointers[$this->_name] = $count - 1;
+        else
+            $this->_pointers[$this->_name] = --$this->_pointers[$this->_name];
+        return $this;
+    }
+
+    /**
+     * Return iteration number
+     *
+     * @return int
+     */
+    public function key()
+    {
+        if ($this->_pointers[$this->_name] < 0)
+            return 0;
+        else
+            return $this->_pointers[$this->_name];
+    }
+
+    /**
+     * Rewind pointer
+     *
+     * @return Zend_View_Helper_Cycle
+     */
+    public function rewind()
+    {
+        $this->_pointers[$this->_name] = -1;
+        return $this;
+    }
+
+    /**
+     * Check if element is valid
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        return isset($this->_data[$this->_name][$this->key()]);
+    }
+
+    /**
+     * Return  current element
+     *
+     * @return mixed
+     */
+    public function current()
+    {
+        return $this->_data[$this->_name][$this->key()];
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/DeclareVars.php b/lib/zend/Zend/View/Helper/DeclareVars.php
new file mode 100644
index 00000000000..4663d4a41c1
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/DeclareVars.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Helper for declaring default values of template variables
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_DeclareVars extends Zend_View_Helper_Abstract
+{
+    /**
+     * The view object that created this helper object.
+     * @var Zend_View
+     */
+    public $view;
+
+    /**
+     * Declare template vars to set default values and avoid notices when using strictVars
+     *
+     * Primarily for use when using {@link Zend_View_Abstract::strictVars() Zend_View strictVars()},
+     * this helper can be used to declare template variables that may or may
+     * not already be set in the view object, as well as to set default values.
+     * Arrays passed as arguments to the method will be used to set default
+     * values; otherwise, if the variable does not exist, it is set to an empty
+     * string.
+     *
+     * Usage:
+     * <code>
+     * $this->declareVars(
+     *     'varName1',
+     *     'varName2',
+     *     array('varName3' => 'defaultValue',
+     *           'varName4' => array()
+     *     )
+     * );
+     * </code>
+     *
+     * @param string|array variable number of arguments, all string names of variables to test
+     * @return void
+     */
+    public function declareVars()
+    {
+        $args = func_get_args();
+        foreach($args as $key) {
+            if (is_array($key)) {
+                foreach ($key as $name => $value) {
+                    $this->_declareVar($name, $value);
+                }
+            } else if (!isset($view->$key)) {
+                $this->_declareVar($key);
+            }
+        }
+    }
+
+    /**
+     * Set a view variable
+     *
+     * Checks to see if a $key is set in the view object; if not, sets it to $value.
+     *
+     * @param  string $key
+     * @param  string $value Defaults to an empty string
+     * @return void
+     */
+    protected function _declareVar($key, $value = '')
+    {
+        if (!isset($this->view->$key)) {
+            $this->view->$key = $value;
+        }
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Doctype.php b/lib/zend/Zend/View/Helper/Doctype.php
new file mode 100644
index 00000000000..ca63b4dea77
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Doctype.php
@@ -0,0 +1,242 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Registry */
+require_once 'Zend/Registry.php';
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Helper for setting and retrieving the doctype
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract
+{
+    /**#@+
+     * DocType constants
+     */
+    const XHTML11             = 'XHTML11';
+    const XHTML1_STRICT       = 'XHTML1_STRICT';
+    const XHTML1_TRANSITIONAL = 'XHTML1_TRANSITIONAL';
+    const XHTML1_FRAMESET     = 'XHTML1_FRAMESET';
+    const XHTML1_RDFA         = 'XHTML1_RDFA';
+    const XHTML1_RDFA11       = 'XHTML1_RDFA11';
+    const XHTML_BASIC1        = 'XHTML_BASIC1';
+    const XHTML5              = 'XHTML5';
+    const HTML4_STRICT        = 'HTML4_STRICT';
+    const HTML4_LOOSE         = 'HTML4_LOOSE';
+    const HTML4_FRAMESET      = 'HTML4_FRAMESET';
+    const HTML5               = 'HTML5';
+    const CUSTOM_XHTML        = 'CUSTOM_XHTML';
+    const CUSTOM              = 'CUSTOM';
+    /**#@-*/
+
+    /**
+     * Default DocType
+     * @var string
+     */
+    protected $_defaultDoctype = self::HTML4_LOOSE;
+
+    /**
+     * Registry containing current doctype and mappings
+     * @var ArrayObject
+     */
+    protected $_registry;
+
+    /**
+     * Registry key in which helper is stored
+     * @var string
+     */
+    protected $_regKey = 'Zend_View_Helper_Doctype';
+
+    /**
+     * Constructor
+     *
+     * Map constants to doctype strings, and set default doctype
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        if (!Zend_Registry::isRegistered($this->_regKey)) {
+            $this->_registry = new ArrayObject(array(
+                'doctypes' => array(
+                    self::XHTML11             => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+                    self::XHTML1_STRICT       => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+                    self::XHTML1_TRANSITIONAL => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+                    self::XHTML1_FRAMESET     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+                    self::XHTML1_RDFA         => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
+                    self::XHTML1_RDFA11       => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
+                    self::XHTML_BASIC1        => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">',
+                    self::XHTML5              => '<!DOCTYPE html>',
+                    self::HTML4_STRICT        => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+                    self::HTML4_LOOSE         => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+                    self::HTML4_FRAMESET      => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+                    self::HTML5               => '<!DOCTYPE html>',
+                )
+            ));
+            Zend_Registry::set($this->_regKey, $this->_registry);
+            $this->setDoctype($this->_defaultDoctype);
+        } else {
+            $this->_registry = Zend_Registry::get($this->_regKey);
+        }
+    }
+
+    /**
+     * Set or retrieve doctype
+     *
+     * @param  string $doctype
+     * @return Zend_View_Helper_Doctype
+     */
+    public function doctype($doctype = null)
+    {
+        if (null !== $doctype) {
+            switch ($doctype) {
+                case self::XHTML11:
+                case self::XHTML1_STRICT:
+                case self::XHTML1_TRANSITIONAL:
+                case self::XHTML1_FRAMESET:
+                case self::XHTML_BASIC1:
+                case self::XHTML1_RDFA:
+                case self::XHTML1_RDFA11:
+                case self::XHTML5:
+                case self::HTML4_STRICT:
+                case self::HTML4_LOOSE:
+                case self::HTML4_FRAMESET:
+                case self::HTML5:
+                    $this->setDoctype($doctype);
+                    break;
+                default:
+                    if (substr($doctype, 0, 9) != '<!DOCTYPE') {
+                        require_once 'Zend/View/Exception.php';
+                        $e = new Zend_View_Exception('The specified doctype is malformed');
+                        $e->setView($this->view);
+                        throw $e;
+                    }
+                    if (stristr($doctype, 'xhtml')) {
+                        $type = self::CUSTOM_XHTML;
+                    } else {
+                        $type = self::CUSTOM;
+                    }
+                    $this->setDoctype($type);
+                    $this->_registry['doctypes'][$type] = $doctype;
+                    break;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set doctype
+     *
+     * @param  string $doctype
+     * @return Zend_View_Helper_Doctype
+     */
+    public function setDoctype($doctype)
+    {
+        $this->_registry['doctype'] = $doctype;
+        return $this;
+    }
+
+    /**
+     * Retrieve doctype
+     *
+     * @return string
+     */
+    public function getDoctype()
+    {
+        return $this->_registry['doctype'];
+    }
+
+    /**
+     * Get doctype => string mappings
+     *
+     * @return array
+     */
+    public function getDoctypes()
+    {
+        return $this->_registry['doctypes'];
+    }
+
+    /**
+     * Is doctype XHTML?
+     *
+     * @return boolean
+     */
+    public function isXhtml()
+    {
+        return (stristr($this->getDoctype(), 'xhtml') ? true : false);
+    }
+
+    /**
+     * Is doctype strict?
+     *
+     * @return boolean
+     */
+    public function isStrict()
+    {
+        switch ( $this->getDoctype() )
+        {
+            case self::XHTML1_STRICT:
+            case self::XHTML11:
+            case self::HTML4_STRICT:
+                return true;
+            default: 
+                return false;
+        }
+    }
+    
+    /**
+     * Is doctype HTML5? (HeadMeta uses this for validation)
+     *
+     * @return booleean
+     */
+    public function isHtml5() {
+        return (stristr($this->doctype(), '<!DOCTYPE html>') ? true : false);
+    }
+    
+    /**
+     * Is doctype RDFa?
+     *
+     * @return booleean
+     */
+    public function isRdfa() {
+        return (stristr($this->getDoctype(), 'rdfa') ? true : false);
+    }
+
+    /**
+     * String representation of doctype
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $doctypes = $this->getDoctypes();
+        return $doctypes[$this->getDoctype()];
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Fieldset.php b/lib/zend/Zend/View/Helper/Fieldset.php
new file mode 100644
index 00000000000..fce37b9341e
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Fieldset.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_FormElement */
+require_once 'Zend/View/Helper/FormElement.php';
+
+/**
+ * Helper for rendering fieldsets
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Fieldset extends Zend_View_Helper_FormElement
+{
+    /**
+     * Render HTML form
+     *
+     * @param  string $name Form name
+     * @param  string $content Form content
+     * @param  array $attribs HTML form attributes
+     * @return string
+     */
+    public function fieldset($name, $content, $attribs = null)
+    {
+        $info = $this->_getInfo($name, $content, $attribs);
+        extract($info);
+
+        // get legend
+        $legend = '';
+        if (isset($attribs['legend'])) {
+            $legendString = trim($attribs['legend']);
+            if (!empty($legendString)) {
+                $legend = '<legend>'
+                        . (($escape) ? $this->view->escape($legendString) : $legendString)
+                        . '</legend>' . PHP_EOL;
+            }
+            unset($attribs['legend']);
+        }
+
+        // get id
+        if (!empty($id)) {
+            $id = ' id="' . $this->view->escape($id) . '"';
+        } else {
+            $id = '';
+        }
+
+        // render fieldset
+        $xhtml = '<fieldset'
+               . $id
+               . $this->_htmlAttribs($attribs)
+               . '>'
+               . $legend
+               . $content
+               . '</fieldset>';
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Form.php b/lib/zend/Zend/View/Helper/Form.php
new file mode 100644
index 00000000000..514bdd9016a
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Form.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_FormElement */
+require_once 'Zend/View/Helper/FormElement.php';
+
+/**
+ * Helper for rendering HTML forms
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Form extends Zend_View_Helper_FormElement
+{
+    /**
+     * Render HTML form
+     *
+     * @param  string $name Form name
+     * @param  null|array $attribs HTML form attributes
+     * @param  false|string $content Form content
+     * @return string
+     */
+    public function form($name, $attribs = null, $content = false)
+    {
+        $info = $this->_getInfo($name, $content, $attribs);
+        extract($info);
+
+        if (!empty($id)) {
+            $id = ' id="' . $this->view->escape($id) . '"';
+        } else {
+            $id = '';
+        }
+
+        if (array_key_exists('id', $attribs) && empty($attribs['id'])) {
+            unset($attribs['id']);
+        }
+        
+        if (!empty($name) && !($this->_isXhtml() && $this->_isStrictDoctype())) {
+            $name = ' name="' . $this->view->escape($name) . '"';
+        } else {
+            $name = '';
+        }
+        
+        if ($this->_isHtml5() && array_key_exists('action', $attribs) && !$attribs['action']) {
+            unset($attribs['action']);
+        }
+
+        if ( array_key_exists('name', $attribs) && empty($attribs['id'])) {
+            unset($attribs['id']);
+        }
+
+        $xhtml = '<form'
+               . $id
+               . $name
+               . $this->_htmlAttribs($attribs)
+               . '>';
+
+        if (false !== $content) {
+            $xhtml .= $content
+                   .  '</form>';
+        }
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormButton.php b/lib/zend/Zend/View/Helper/FormButton.php
new file mode 100644
index 00000000000..abdd9f8f33f
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormButton.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a "button" element
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormButton extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates a 'button' element.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param mixed $value The element value.
+     *
+     * @param array $attribs Attributes for the element tag.
+     *
+     * @return string The element XHTML.
+     */
+    public function formButton($name, $value = null, $attribs = null)
+    {
+        $info    = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, id, value, attribs, options, listsep, disable, escape
+
+        // Get content
+        $content = '';
+        if (isset($attribs['content'])) {
+            $content = $attribs['content'];
+            unset($attribs['content']);
+        } else {
+            $content = $value;
+        }
+
+        // Ensure type is sane
+        $type = 'button';
+        if (isset($attribs['type'])) {
+            $attribs['type'] = strtolower($attribs['type']);
+            if (in_array($attribs['type'], array('submit', 'reset', 'button'))) {
+                $type = $attribs['type'];
+            }
+            unset($attribs['type']);
+        }
+
+        // build the element
+        if ($disable) {
+            $attribs['disabled'] = 'disabled';
+        }
+
+        $content = ($escape) ? $this->view->escape($content) : $content;
+
+        $xhtml = '<button'
+                . ' name="' . $this->view->escape($name) . '"'
+                . ' id="' . $this->view->escape($id) . '"'
+                . ' type="' . $type . '"';
+
+        // add a value if one is given
+        if (!empty($value)) {
+            $xhtml .= ' value="' . $this->view->escape($value) . '"';
+        }
+
+        // add attributes and close start tag
+        $xhtml .= $this->_htmlAttribs($attribs) . '>';
+
+        // add content and end tag
+        $xhtml .= $content . '</button>';
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormCheckbox.php b/lib/zend/Zend/View/Helper/FormCheckbox.php
new file mode 100644
index 00000000000..fd6f4ae5b5d
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormCheckbox.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a "checkbox" element
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormCheckbox extends Zend_View_Helper_FormElement
+{
+    /**
+     * Default checked/unchecked options
+     * @var array
+     */
+    protected static $_defaultCheckedOptions = array(
+        'checkedValue'   => '1',
+        'uncheckedValue' => '0'
+    );
+
+    /**
+     * Generates a 'checkbox' element.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     * @param mixed $value The element value.
+     * @param array $attribs Attributes for the element tag.
+     * @return string The element XHTML.
+     */
+    public function formCheckbox($name, $value = null, $attribs = null, array $checkedOptions = null)
+    {
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, id, value, attribs, options, listsep, disable
+
+        $checked = false;
+        if (isset($attribs['checked']) && $attribs['checked']) {
+            $checked = true;
+            unset($attribs['checked']);
+        } elseif (isset($attribs['checked'])) {
+            $checked = false;
+            unset($attribs['checked']);
+        }
+
+        $checkedOptions = self::determineCheckboxInfo($value, $checked, $checkedOptions);
+
+        // is the element disabled?
+        $disabled = '';
+        if ($disable) {
+            $disabled = ' disabled="disabled"';
+        }
+
+        // build the element
+        $xhtml = '';
+        if ((!$disable && !strstr($name, '[]'))
+            && (empty($attribs['disableHidden']) || !$attribs['disableHidden'])
+        ) {
+            $xhtml = $this->_hidden($name, $checkedOptions['uncheckedValue']);
+        }
+
+        if (array_key_exists('disableHidden', $attribs)) {
+            unset($attribs['disableHidden']);
+        }
+
+        $xhtml .= '<input type="checkbox"'
+                . ' name="' . $this->view->escape($name) . '"'
+                . ' id="' . $this->view->escape($id) . '"'
+                . ' value="' . $this->view->escape($checkedOptions['checkedValue']) . '"'
+                . $checkedOptions['checkedString']
+                . $disabled
+                . $this->_htmlAttribs($attribs)
+                . $this->getClosingBracket();
+
+        return $xhtml;
+    }
+
+    /**
+     * Determine checkbox information
+     *
+     * @param  string $value
+     * @param  bool $checked
+     * @param  array|null $checkedOptions
+     * @return array
+     */
+    public static function determineCheckboxInfo($value, $checked, array $checkedOptions = null)
+    {
+        // Checked/unchecked values
+        $checkedValue   = null;
+        $uncheckedValue = null;
+        if (is_array($checkedOptions)) {
+            if (array_key_exists('checkedValue', $checkedOptions)) {
+                $checkedValue = (string) $checkedOptions['checkedValue'];
+                unset($checkedOptions['checkedValue']);
+            }
+            if (array_key_exists('uncheckedValue', $checkedOptions)) {
+                $uncheckedValue = (string) $checkedOptions['uncheckedValue'];
+                unset($checkedOptions['uncheckedValue']);
+            }
+            if (null === $checkedValue) {
+                $checkedValue = (string) array_shift($checkedOptions);
+            }
+            if (null === $uncheckedValue) {
+                $uncheckedValue = (string) array_shift($checkedOptions);
+            }
+        } elseif ($value !== null) {
+            $uncheckedValue = self::$_defaultCheckedOptions['uncheckedValue'];
+        } else {
+            $checkedValue   = self::$_defaultCheckedOptions['checkedValue'];
+            $uncheckedValue = self::$_defaultCheckedOptions['uncheckedValue'];
+        }
+
+        // is the element checked?
+        $checkedString = '';
+        if ($checked || ((string) $value === $checkedValue)) {
+            $checkedString = ' checked="checked"';
+            $checked = true;
+        } else {
+            $checked = false;
+        }
+
+        // Checked value should be value if no checked options provided
+        if ($checkedValue == null) {
+            $checkedValue = $value;
+        }
+
+        return array(
+            'checked'        => $checked,
+            'checkedString'  => $checkedString,
+            'checkedValue'   => $checkedValue,
+            'uncheckedValue' => $uncheckedValue,
+        );
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormElement.php b/lib/zend/Zend/View/Helper/FormElement.php
new file mode 100644
index 00000000000..8c1373b38ce
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormElement.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_HtmlElement
+ */
+require_once 'Zend/View/Helper/HtmlElement.php';
+
+/**
+ * Base helper for form elements.  Extend this, don't use it on its own.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_View_Helper_FormElement extends Zend_View_Helper_HtmlElement
+{
+    /**
+     * @var Zend_Translate_Adapter|null
+     */
+    protected $_translator;
+
+    /**
+     * Get translator
+     *
+     * @return Zend_Translate_Adapter|null
+     */
+    public function getTranslator()
+    {
+         return $this->_translator;
+    }
+
+    /**
+     * Set translator
+     *
+     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
+     * @return Zend_View_Helper_FormElement
+     */
+    public function setTranslator($translator = null)
+    {
+        if (null === $translator) {
+            $this->_translator = null;
+        } elseif ($translator instanceof Zend_Translate_Adapter) {
+            $this->_translator = $translator;
+        } elseif ($translator instanceof Zend_Translate) {
+            $this->_translator = $translator->getAdapter();
+        } else {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid translator specified');
+            $e->setView($this->view);
+            throw $e;
+        }
+         return $this;
+    }
+
+    /**
+     * Converts parameter arguments to an element info array.
+     *
+     * E.g, formExample($name, $value, $attribs, $options, $listsep) is
+     * the same thing as formExample(array('name' => ...)).
+     *
+     * Note that you cannot pass a 'disable' param; you need to pass
+     * it as an 'attribs' key.
+     *
+     * @access protected
+     *
+     * @return array An element info array with keys for name, value,
+     * attribs, options, listsep, disable, and escape.
+     */
+    protected function _getInfo($name, $value = null, $attribs = null,
+        $options = null, $listsep = null
+    ) {
+        // the baseline info.  note that $name serves a dual purpose;
+        // if an array, it's an element info array that will override
+        // these baseline values.  as such, ignore it for the 'name'
+        // if it's an array.
+        $info = array(
+            'name'    => is_array($name) ? '' : $name,
+            'id'      => is_array($name) ? '' : $name,
+            'value'   => $value,
+            'attribs' => $attribs,
+            'options' => $options,
+            'listsep' => $listsep,
+            'disable' => false,
+            'escape'  => true,
+        );
+
+        // override with named args
+        if (is_array($name)) {
+            // only set keys that are already in info
+            foreach ($info as $key => $val) {
+                if (isset($name[$key])) {
+                    $info[$key] = $name[$key];
+                }
+            }
+
+            // If all helper options are passed as an array, attribs may have
+            // been as well
+            if (null === $attribs) {
+                $attribs = $info['attribs'];
+            }
+        }
+
+        $attribs = (array)$attribs;
+
+        // Normalize readonly tag
+        if (array_key_exists('readonly', $attribs)) {
+            $attribs['readonly'] = 'readonly';
+        }
+
+        // Disable attribute
+        if (array_key_exists('disable', $attribs)) {
+           if (is_scalar($attribs['disable'])) {
+                // disable the element
+                $info['disable'] = (bool)$attribs['disable'];
+            } else if (is_array($attribs['disable'])) {
+                $info['disable'] = $attribs['disable'];
+            }
+        }
+
+        // Set ID for element
+        if (array_key_exists('id', $attribs)) {
+            $info['id'] = (string)$attribs['id'];
+        } else if ('' !== $info['name']) {
+            $info['id'] = trim(strtr($info['name'],
+                                     array('[' => '-', ']' => '')), '-');
+        }
+        
+        // Remove NULL name attribute override
+        if (array_key_exists('name', $attribs) && is_null($attribs['name'])) {
+        	unset($attribs['name']);
+        }
+        
+        // Override name in info if specified in attribs
+        if (array_key_exists('name', $attribs) && $attribs['name'] != $info['name']) {
+            $info['name'] = $attribs['name'];
+        }
+
+        // Determine escaping from attributes
+        if (array_key_exists('escape', $attribs)) {
+            $info['escape'] = (bool)$attribs['escape'];
+        }
+
+        // Determine listsetp from attributes
+        if (array_key_exists('listsep', $attribs)) {
+            $info['listsep'] = (string)$attribs['listsep'];
+        }
+
+        // Remove attribs that might overwrite the other keys. We do this LAST
+        // because we needed the other attribs values earlier.
+        foreach ($info as $key => $val) {
+            if (array_key_exists($key, $attribs)) {
+                unset($attribs[$key]);
+            }
+        }
+        $info['attribs'] = $attribs;
+
+        // done!
+        return $info;
+    }
+
+    /**
+     * Creates a hidden element.
+     *
+     * We have this as a common method because other elements often
+     * need hidden elements for their operation.
+     *
+     * @access protected
+     *
+     * @param string $name The element name.
+     * @param string $value The element value.
+     * @param array  $attribs Attributes for the element.
+     *
+     * @return string A hidden element.
+     */
+    protected function _hidden($name, $value = null, $attribs = null)
+    {
+        return '<input type="hidden"'
+             . ' name="' . $this->view->escape($name) . '"'
+             . ' value="' . $this->view->escape($value) . '"'
+             . $this->_htmlAttribs($attribs) . $this->getClosingBracket();
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormErrors.php b/lib/zend/Zend/View/Helper/FormErrors.php
new file mode 100644
index 00000000000..4e092b1157b
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormErrors.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to render errors for a form element
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormErrors extends Zend_View_Helper_FormElement
+{
+    /**
+     * @var Zend_Form_Element
+     */
+    protected $_element;
+
+    /**#@+
+     * @var string Element block start/end tags and separator
+     */
+    protected $_htmlElementEnd       = '</li></ul>';
+    protected $_htmlElementStart     = '<ul%s><li>';
+    protected $_htmlElementSeparator = '</li><li>';
+    /**#@-*/
+
+    /**
+     * Render form errors
+     *
+     * @param  string|array $errors Error(s) to render
+     * @param  array $options
+     * @return string
+     */
+    public function formErrors($errors, array $options = null)
+    {
+        $escape = true;
+        if (isset($options['escape'])) {
+            $escape = (bool) $options['escape'];
+            unset($options['escape']);
+        }
+
+        if (empty($options['class'])) {
+            $options['class'] = 'errors';
+        }
+
+        if (isset($options['elementStart'])) {
+            $this->setElementStart($options['elementStart']);
+        }
+        if (isset($options['elementEnd'])) {
+            $this->setElementEnd($options['elementEnd']);
+        }
+        if (isset($options['elementSeparator'])) {
+            $this->setElementSeparator($options['elementSeparator']);
+        }
+
+        $start = $this->getElementStart();
+        if (strstr($start, '%s')) {
+            $attribs = $this->_htmlAttribs($options);
+            $start   = sprintf($start, $attribs);
+        }
+
+        if ($escape) {
+            foreach ($errors as $key => $error) {
+                $errors[$key] = $this->view->escape($error);
+            }
+        }
+
+        $html  = $start
+               . implode($this->getElementSeparator(), (array) $errors)
+               . $this->getElementEnd();
+
+        return $html;
+    }
+
+    /**
+     * Set end string for displaying errors
+     *
+     * @param  string $string
+     * @return Zend_View_Helper_FormErrors
+     */
+    public function setElementEnd($string)
+    {
+        $this->_htmlElementEnd = (string) $string;
+        return $this;
+    }
+
+    /**
+     * Retrieve end string for displaying errors
+     *
+     * @return string
+     */
+    public function getElementEnd()
+    {
+        return $this->_htmlElementEnd;
+    }
+
+    /**
+     * Set separator string for displaying errors
+     *
+     * @param  string $string
+     * @return Zend_View_Helper_FormErrors
+     */
+    public function setElementSeparator($string)
+    {
+        $this->_htmlElementSeparator = (string) $string;
+        return $this;
+    }
+
+    /**
+     * Retrieve separator string for displaying errors
+     *
+     * @return string
+     */
+    public function getElementSeparator()
+    {
+        return $this->_htmlElementSeparator;
+    }
+
+    /**
+     * Set start string for displaying errors
+     *
+     * @param  string $string
+     * @return Zend_View_Helper_FormErrors
+     */
+    public function setElementStart($string)
+    {
+        $this->_htmlElementStart = (string) $string;
+        return $this;
+    }
+
+    /**
+     * Retrieve start string for displaying errors
+     *
+     * @return string
+     */
+    public function getElementStart()
+    {
+        return $this->_htmlElementStart;
+    }
+
+}
diff --git a/lib/zend/Zend/View/Helper/FormFile.php b/lib/zend/Zend/View/Helper/FormFile.php
new file mode 100644
index 00000000000..1ea7bfc85c7
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormFile.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a "file" element
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormFile extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates a 'file' element.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param array $attribs Attributes for the element tag.
+     *
+     * @return string The element XHTML.
+     */
+    public function formFile($name, $attribs = null)
+    {
+        $info = $this->_getInfo($name, null, $attribs);
+        extract($info); // name, id, value, attribs, options, listsep, disable
+
+        // is it disabled?
+        $disabled = '';
+        if ($disable) {
+            $disabled = ' disabled="disabled"';
+        }
+
+        // build the element
+        $xhtml = '<input type="file"'
+                . ' name="' . $this->view->escape($name) . '"'
+                . ' id="' . $this->view->escape($id) . '"'
+                . $disabled
+                . $this->_htmlAttribs($attribs)
+                . $this->getClosingBracket();
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormHidden.php b/lib/zend/Zend/View/Helper/FormHidden.php
new file mode 100644
index 00000000000..fbd2b7396a2
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormHidden.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a "hidden" element
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormHidden extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates a 'hidden' element.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     * @param mixed $value The element value.
+     * @param array $attribs Attributes for the element tag.
+     * @return string The element XHTML.
+     */
+    public function formHidden($name, $value = null, array $attribs = null)
+    {
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, value, attribs, options, listsep, disable
+        if (isset($id)) {
+            if (isset($attribs) && is_array($attribs)) {
+                $attribs['id'] = $id;
+            } else {
+                $attribs = array('id' => $id);
+            }
+        }
+        return $this->_hidden($name, $value, $attribs);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormImage.php b/lib/zend/Zend/View/Helper/FormImage.php
new file mode 100644
index 00000000000..be3daa3d074
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormImage.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate an "image" element
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormImage extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates an 'image' element.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param mixed $value The source ('src="..."') for the image.
+     *
+     * @param array $attribs Attributes for the element tag.
+     *
+     * @return string The element XHTML.
+     */
+    public function formImage($name, $value = null, $attribs = null)
+    {
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, value, attribs, options, listsep, disable
+
+        // Determine if we should use the value or the src attribute
+        if (isset($attribs['src'])) {
+            $src = ' src="' . $this->view->escape($attribs['src']) . '"';
+            unset($attribs['src']);
+        } else {
+            $src = ' src="' . $this->view->escape($value) . '"';
+            unset($value);
+        }
+
+        // Do we have a value?
+        if (isset($value) && !empty($value)) {
+            $value = ' value="' . $this->view->escape($value) . '"';
+        } else {
+            $value = '';
+        }
+
+        // Disabled?
+        $disabled = '';
+        if ($disable) {
+            $disabled = ' disabled="disabled"';
+        }
+
+        // build the element
+        $xhtml = '<input type="image"'
+                . ' name="' . $this->view->escape($name) . '"'
+                . ' id="' . $this->view->escape($id) . '"'
+                . $src
+                . $value
+                . $disabled
+                . $this->_htmlAttribs($attribs)
+                . $this->getClosingBracket();
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormLabel.php b/lib/zend/Zend/View/Helper/FormLabel.php
new file mode 100644
index 00000000000..f4e034f9bba
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormLabel.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_View_Helper_FormElement **/
+require_once 'Zend/View/Helper/FormElement.php';
+
+/**
+ * Form label helper
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormLabel extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates a 'label' element.
+     *
+     * @param  string $name The form element name for which the label is being generated
+     * @param  string $value The label text
+     * @param  array $attribs Form element attributes (used to determine if disabled)
+     * @return string The element XHTML.
+     */
+    public function formLabel($name, $value = null, array $attribs = null)
+    {
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, value, attribs, options, listsep, disable, escape
+
+        // build the element
+        if ($disable) {
+            // disabled; display nothing
+            return  '';
+        }
+
+        $value = ($escape) ? $this->view->escape($value) : $value;
+        $for   = (empty($attribs['disableFor']) || !$attribs['disableFor'])
+               ? ' for="' . $this->view->escape($id) . '"'
+               : '';
+        if (array_key_exists('disableFor', $attribs)) {
+            unset($attribs['disableFor']);
+        }
+
+        // enabled; display label
+        $xhtml = '<label'
+                . $for
+                . $this->_htmlAttribs($attribs)
+                . '>' . $value . '</label>';
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormMultiCheckbox.php b/lib/zend/Zend/View/Helper/FormMultiCheckbox.php
new file mode 100644
index 00000000000..49386cc4541
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormMultiCheckbox.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/** Zend_View_Helper_FormRadio */
+require_once 'Zend/View/Helper/FormRadio.php';
+
+
+/**
+ * Helper to generate a set of checkbox button elements
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormMultiCheckbox extends Zend_View_Helper_FormRadio
+{
+    /**
+     * Input type to use
+     * @var string
+     */
+    protected $_inputType = 'checkbox';
+
+    /**
+     * Whether or not this element represents an array collection by default
+     * @var bool
+     */
+    protected $_isArray = true;
+
+    /**
+     * Generates a set of checkbox button elements.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param mixed $value The checkbox value to mark as 'checked'.
+     *
+     * @param array $options An array of key-value pairs where the array
+     * key is the checkbox value, and the array value is the radio text.
+     *
+     * @param array|string $attribs Attributes added to each radio.
+     *
+     * @return string The radio buttons XHTML.
+     */
+    public function formMultiCheckbox($name, $value = null, $attribs = null,
+        $options = null, $listsep = "<br />\n")
+    {
+        return $this->formRadio($name, $value, $attribs, $options, $listsep);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormNote.php b/lib/zend/Zend/View/Helper/FormNote.php
new file mode 100644
index 00000000000..e051fdcc311
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormNote.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to show an HTML note
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormNote extends Zend_View_Helper_FormElement
+{
+    /**
+    * Helper to show a "note" based on a hidden value.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param array $value The note to display.  HTML is *not* escaped; the
+     * note is displayed as-is.
+     *
+     * @return string The element XHTML.
+     */
+    public function formNote($name, $value = null)
+    {
+        $info = $this->_getInfo($name, $value);
+        extract($info); // name, value, attribs, options, listsep, disable
+        return $value;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormPassword.php b/lib/zend/Zend/View/Helper/FormPassword.php
new file mode 100644
index 00000000000..cb42c4b75c1
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormPassword.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a "password" element
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormPassword extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates a 'password' element.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param mixed $value The element value.
+     *
+     * @param array $attribs Attributes for the element tag.
+     *
+     * @return string The element XHTML.
+     */
+    public function formPassword($name, $value = null, $attribs = null)
+    {
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, value, attribs, options, listsep, disable
+
+        // is it disabled?
+        $disabled = '';
+        if ($disable) {
+            // disabled
+            $disabled = ' disabled="disabled"';
+        }
+
+        // determine the XHTML value
+        $valueString = ' value=""';
+        if (array_key_exists('renderPassword', $attribs)) {
+            if ($attribs['renderPassword']) {
+                $valueString = ' value="' . $this->view->escape($value) . '"';
+            }
+            unset($attribs['renderPassword']);
+        }
+
+        // render the element
+        $xhtml = '<input type="password"'
+                . ' name="' . $this->view->escape($name) . '"'
+                . ' id="' . $this->view->escape($id) . '"'
+                . $valueString
+                . $disabled
+                . $this->_htmlAttribs($attribs)
+                . $this->getClosingBracket();
+
+        return $xhtml;
+    }
+
+}
diff --git a/lib/zend/Zend/View/Helper/FormRadio.php b/lib/zend/Zend/View/Helper/FormRadio.php
new file mode 100644
index 00000000000..fa26a076b45
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormRadio.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a set of radio button elements
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormRadio extends Zend_View_Helper_FormElement
+{
+    /**
+     * Input type to use
+     * @var string
+     */
+    protected $_inputType = 'radio';
+
+    /**
+     * Whether or not this element represents an array collection by default
+     * @var bool
+     */
+    protected $_isArray = false;
+
+    /**
+     * Generates a set of radio button elements.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param mixed $value The radio value to mark as 'checked'.
+     *
+     * @param array $options An array of key-value pairs where the array
+     * key is the radio value, and the array value is the radio text.
+     *
+     * @param array|string $attribs Attributes added to each radio.
+     *
+     * @return string The radio buttons XHTML.
+     */
+    public function formRadio($name, $value = null, $attribs = null,
+        $options = null, $listsep = "<br />\n")
+    {
+
+        $info = $this->_getInfo($name, $value, $attribs, $options, $listsep);
+        extract($info); // name, value, attribs, options, listsep, disable
+
+        // retrieve attributes for labels (prefixed with 'label_' or 'label')
+        $label_attribs = array();
+        foreach ($attribs as $key => $val) {
+            $tmp    = false;
+            $keyLen = strlen($key);
+            if ((6 < $keyLen) && (substr($key, 0, 6) == 'label_')) {
+                $tmp = substr($key, 6);
+            } elseif ((5 < $keyLen) && (substr($key, 0, 5) == 'label')) {
+                $tmp = substr($key, 5);
+            }
+
+            if ($tmp) {
+                // make sure first char is lowercase
+                $tmp[0] = strtolower($tmp[0]);
+                $label_attribs[$tmp] = $val;
+                unset($attribs[$key]);
+            }
+        }
+
+        $labelPlacement = 'append';
+        foreach ($label_attribs as $key => $val) {
+            switch (strtolower($key)) {
+                case 'placement':
+                    unset($label_attribs[$key]);
+                    $val = strtolower($val);
+                    if (in_array($val, array('prepend', 'append'))) {
+                        $labelPlacement = $val;
+                    }
+                    break;
+            }
+        }
+
+        // the radio button values and labels
+        $options = (array) $options;
+
+        // build the element
+        $xhtml = '';
+        $list  = array();
+
+        // should the name affect an array collection?
+        $name = $this->view->escape($name);
+        if ($this->_isArray && ('[]' != substr($name, -2))) {
+            $name .= '[]';
+        }
+
+        // ensure value is an array to allow matching multiple times
+        $value = (array) $value;
+
+        // Set up the filter - Alnum + hyphen + underscore
+        require_once 'Zend/Filter/PregReplace.php';
+        $pattern = @preg_match('/\pL/u', 'a') 
+            ? '/[^\p{L}\p{N}\-\_]/u'    // Unicode
+            : '/[^a-zA-Z0-9\-\_]/';     // No Unicode
+        $filter = new Zend_Filter_PregReplace($pattern, "");
+        
+        // add radio buttons to the list.
+        foreach ($options as $opt_value => $opt_label) {
+
+            // Should the label be escaped?
+            if ($escape) {
+                $opt_label = $this->view->escape($opt_label);
+            }
+
+            // is it disabled?
+            $disabled = '';
+            if (true === $disable) {
+                $disabled = ' disabled="disabled"';
+            } elseif (is_array($disable) && in_array($opt_value, $disable)) {
+                $disabled = ' disabled="disabled"';
+            }
+
+            // is it checked?
+            $checked = '';
+            if (in_array($opt_value, $value)) {
+                $checked = ' checked="checked"';
+            }
+
+            // generate ID
+            $optId = $id . '-' . $filter->filter($opt_value);
+
+            // Wrap the radios in labels
+            $radio = '<label'
+                    . $this->_htmlAttribs($label_attribs) . '>'
+                    . (('prepend' == $labelPlacement) ? $opt_label : '')
+                    . '<input type="' . $this->_inputType . '"'
+                    . ' name="' . $name . '"'
+                    . ' id="' . $optId . '"'
+                    . ' value="' . $this->view->escape($opt_value) . '"'
+                    . $checked
+                    . $disabled
+                    . $this->_htmlAttribs($attribs)
+                    . $this->getClosingBracket()
+                    . (('append' == $labelPlacement) ? $opt_label : '')
+                    . '</label>';
+
+            // add to the array of radio buttons
+            $list[] = $radio;
+        }
+        
+        // XHTML or HTML for standard list separator?
+        if (!$this->_isXhtml() && false !== strpos($listsep, '<br />')) {
+            $listsep = str_replace('<br />', '<br>', $listsep);
+        }
+
+        // done!
+        $xhtml .= implode($listsep, $list);
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormReset.php b/lib/zend/Zend/View/Helper/FormReset.php
new file mode 100644
index 00000000000..a4e62826dea
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormReset.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a "reset" button
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormReset extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates a 'reset' button.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param mixed $value The element value.
+     *
+     * @param array $attribs Attributes for the element tag.
+     *
+     * @return string The element XHTML.
+     */
+    public function formReset($name = '', $value = 'Reset', $attribs = null)
+    {
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, value, attribs, options, listsep, disable
+
+        // check if disabled
+        $disabled = '';
+        if ($disable) {
+            $disabled = ' disabled="disabled"';
+        }
+
+        // Render button
+        $xhtml = '<input type="reset"'
+               . ' name="' . $this->view->escape($name) . '"'
+               . ' id="' . $this->view->escape($id) . '"'
+               . $disabled;
+
+        // add a value if one is given
+        if (! empty($value)) {
+            $xhtml .= ' value="' . $this->view->escape($value) . '"';
+        }
+
+        // add attributes, close, and return
+        $xhtml .= $this->_htmlAttribs($attribs) . $this->getClosingBracket();
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormSelect.php b/lib/zend/Zend/View/Helper/FormSelect.php
new file mode 100644
index 00000000000..8654f3d0e7b
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormSelect.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate "select" list of options
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormSelect extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates 'select' list of options.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param mixed $value The option value to mark as 'selected'; if an
+     * array, will mark all values in the array as 'selected' (used for
+     * multiple-select elements).
+     *
+     * @param array|string $attribs Attributes added to the 'select' tag.
+     * the optional 'optionClasses' attribute is used to add a class to
+     * the options within the select (associative array linking the option
+     * value to the desired class)
+     *
+     * @param array $options An array of key-value pairs where the array
+     * key is the radio value, and the array value is the radio text.
+     *
+     * @param string $listsep When disabled, use this list separator string
+     * between list values.
+     *
+     * @return string The select tag and options XHTML.
+     */
+    public function formSelect($name, $value = null, $attribs = null,
+        $options = null, $listsep = "<br />\n")
+    {
+        $info = $this->_getInfo($name, $value, $attribs, $options, $listsep);
+        extract($info); // name, id, value, attribs, options, listsep, disable
+
+        // force $value to array so we can compare multiple values to multiple
+        // options; also ensure it's a string for comparison purposes.
+        $value = array_map('strval', (array) $value);
+
+        // check if element may have multiple values
+        $multiple = '';
+
+        if (substr($name, -2) == '[]') {
+            // multiple implied by the name
+            $multiple = ' multiple="multiple"';
+        }
+
+        if (isset($attribs['multiple'])) {
+            // Attribute set
+            if ($attribs['multiple']) {
+                // True attribute; set multiple attribute
+                $multiple = ' multiple="multiple"';
+
+                // Make sure name indicates multiple values are allowed
+                if (!empty($multiple) && (substr($name, -2) != '[]')) {
+                    $name .= '[]';
+                }
+            } else {
+                // False attribute; ensure attribute not set
+                $multiple = '';
+            }
+            unset($attribs['multiple']);
+        }
+
+        // handle the options classes
+        $optionClasses = array();
+        if (isset($attribs['optionClasses'])) {
+            $optionClasses = $attribs['optionClasses'];
+            unset($attribs['optionClasses']);
+        }
+        
+        // now start building the XHTML.
+        $disabled = '';
+        if (true === $disable) {
+            $disabled = ' disabled="disabled"';
+        }
+
+        // Build the surrounding select element first.
+        $xhtml = '<select'
+                . ' name="' . $this->view->escape($name) . '"'
+                . ' id="' . $this->view->escape($id) . '"'
+                . $multiple
+                . $disabled
+                . $this->_htmlAttribs($attribs)
+                . ">\n    ";
+
+        // build the list of options
+        $list       = array();
+        $translator = $this->getTranslator();
+        foreach ((array) $options as $opt_value => $opt_label) {
+            if (is_array($opt_label)) {
+                $opt_disable = '';
+                if (is_array($disable) && in_array($opt_value, $disable)) {
+                    $opt_disable = ' disabled="disabled"';
+                }
+                if (null !== $translator) {
+                    $opt_value = $translator->translate($opt_value);
+                }
+                $opt_id = ' id="' . $this->view->escape($id) . '-optgroup-'
+                        . $this->view->escape($opt_value) . '"';
+                $list[] = '<optgroup'
+                        . $opt_disable
+                        . $opt_id
+                        . ' label="' . $this->view->escape($opt_value) .'">';
+                foreach ($opt_label as $val => $lab) {
+                    $list[] = $this->_build($val, $lab, $value, $disable, $optionClasses);
+                }
+                $list[] = '</optgroup>';
+            } else {
+                $list[] = $this->_build($opt_value, $opt_label, $value, $disable, $optionClasses);
+            }
+        }
+
+        // add the options to the xhtml and close the select
+        $xhtml .= implode("\n    ", $list) . "\n</select>";
+
+        return $xhtml;
+    }
+
+    /**
+     * Builds the actual <option> tag
+     *
+     * @param string $value Options Value
+     * @param string $label Options Label
+     * @param array  $selected The option value(s) to mark as 'selected'
+     * @param array|bool $disable Whether the select is disabled, or individual options are
+     * @param array $optionClasses The classes to associate with each option value
+     * @return string Option Tag XHTML
+     */
+    protected function _build($value, $label, $selected, $disable, $optionClasses = array())
+    {
+        if (is_bool($disable)) {
+            $disable = array();
+        }
+
+        $class = null;
+        if (array_key_exists($value, $optionClasses)) {
+            $class = $optionClasses[$value];
+        }
+
+
+        $opt = '<option'
+             . ' value="' . $this->view->escape($value) . '"';
+
+             if ($class) {
+             $opt .= ' class="' . $class . '"';
+         }
+        // selected?
+        if (in_array((string) $value, $selected)) {
+            $opt .= ' selected="selected"';
+        }
+
+        // disabled?
+        if (in_array($value, $disable)) {
+            $opt .= ' disabled="disabled"';
+        }
+
+        $opt .= '>' . $this->view->escape($label) . "</option>";
+
+        return $opt;
+    }
+
+}
diff --git a/lib/zend/Zend/View/Helper/FormSubmit.php b/lib/zend/Zend/View/Helper/FormSubmit.php
new file mode 100644
index 00000000000..72223e203e3
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormSubmit.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a "submit" button
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormSubmit extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates a 'submit' button.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param mixed $value The element value.
+     *
+     * @param array $attribs Attributes for the element tag.
+     *
+     * @return string The element XHTML.
+     */
+    public function formSubmit($name, $value = null, $attribs = null)
+    {
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, value, attribs, options, listsep, disable, id
+        // check if disabled
+        $disabled = '';
+        if ($disable) {
+            $disabled = ' disabled="disabled"';
+        }
+
+        if ($id) {
+            $id = ' id="' . $this->view->escape($id) . '"';
+        }
+
+        // Render the button.
+        $xhtml = '<input type="submit"'
+               . ' name="' . $this->view->escape($name) . '"'
+               . $id
+               . ' value="' . $this->view->escape($value) . '"'
+               . $disabled
+               . $this->_htmlAttribs($attribs)
+               . $this->getClosingBracket();
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormText.php b/lib/zend/Zend/View/Helper/FormText.php
new file mode 100644
index 00000000000..9b9f58135ea
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormText.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a "text" element
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormText extends Zend_View_Helper_FormElement
+{
+    /**
+     * Generates a 'text' element.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are used in place of added parameters.
+     *
+     * @param mixed $value The element value.
+     *
+     * @param array $attribs Attributes for the element tag.
+     *
+     * @return string The element XHTML.
+     */
+    public function formText($name, $value = null, $attribs = null)
+    {
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, value, attribs, options, listsep, disable
+
+        // build the element
+        $disabled = '';
+        if ($disable) {
+            // disabled
+            $disabled = ' disabled="disabled"';
+        }
+
+        $xhtml = '<input type="text"'
+                . ' name="' . $this->view->escape($name) . '"'
+                . ' id="' . $this->view->escape($id) . '"'
+                . ' value="' . $this->view->escape($value) . '"'
+                . $disabled
+                . $this->_htmlAttribs($attribs)
+                . $this->getClosingBracket();
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/FormTextarea.php b/lib/zend/Zend/View/Helper/FormTextarea.php
new file mode 100644
index 00000000000..c384fc4da6b
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/FormTextarea.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Abstract class for extension
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+
+/**
+ * Helper to generate a "textarea" element
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_FormTextarea extends Zend_View_Helper_FormElement
+{
+    /**
+     * The default number of rows for a textarea.
+     *
+     * @access public
+     *
+     * @var int
+     */
+    public $rows = 24;
+
+    /**
+     * The default number of columns for a textarea.
+     *
+     * @access public
+     *
+     * @var int
+     */
+    public $cols = 80;
+
+    /**
+     * Generates a 'textarea' element.
+     *
+     * @access public
+     *
+     * @param string|array $name If a string, the element name.  If an
+     * array, all other parameters are ignored, and the array elements
+     * are extracted in place of added parameters.
+     *
+     * @param mixed $value The element value.
+     *
+     * @param array $attribs Attributes for the element tag.
+     *
+     * @return string The element XHTML.
+     */
+    public function formTextarea($name, $value = null, $attribs = null)
+    {
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info); // name, value, attribs, options, listsep, disable
+
+        // is it disabled?
+        $disabled = '';
+        if ($disable) {
+            // disabled.
+            $disabled = ' disabled="disabled"';
+        }
+
+        // Make sure that there are 'rows' and 'cols' values
+        // as required by the spec.  noted by Orjan Persson.
+        if (empty($attribs['rows'])) {
+            $attribs['rows'] = (int) $this->rows;
+        }
+        if (empty($attribs['cols'])) {
+            $attribs['cols'] = (int) $this->cols;
+        }
+
+        // build the element
+        $xhtml = '<textarea name="' . $this->view->escape($name) . '"'
+                . ' id="' . $this->view->escape($id) . '"'
+                . $disabled
+                . $this->_htmlAttribs($attribs) . '>'
+                . $this->view->escape($value) . '</textarea>';
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Gravatar.php b/lib/zend/Zend/View/Helper/Gravatar.php
new file mode 100644
index 00000000000..dab1f799f62
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Gravatar.php
@@ -0,0 +1,363 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id: Doctype.php 16971 2009-07-22 18:05:45Z mikaelkael $
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_HtmlElement */
+require_once 'Zend/View/Helper/HtmlElement.php';
+
+/**
+ * Helper for retrieving avatars from gravatar.com
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link http://pl.gravatar.com/site/implement/url
+ */
+class Zend_View_Helper_Gravatar extends Zend_View_Helper_HtmlElement
+{
+
+    /**
+     * URL to gravatar service
+     */
+    const GRAVATAR_URL = 'http://www.gravatar.com/avatar';
+    /**
+     * Secure URL to gravatar service
+     */
+    const GRAVATAR_URL_SECURE = 'https://secure.gravatar.com/avatar';
+
+    /**
+     * Gravatar rating
+     */
+    const RATING_G  = 'g';
+    const RATING_PG = 'pg';
+    const RATING_R  = 'r';
+    const RATING_X  = 'x';
+
+    /**
+     * Default gravatar image value constants
+     */
+    const DEFAULT_404       = '404';
+    const DEFAULT_MM        = 'mm';
+    const DEFAULT_IDENTICON = 'identicon';
+    const DEFAULT_MONSTERID = 'monsterid';
+    const DEFAULT_WAVATAR   = 'wavatar';
+
+    /**
+     * Options
+     *
+     * @var array
+     */
+    protected $_options = array(
+        'img_size'    => 80,
+        'default_img' => self::DEFAULT_MM,
+        'rating'      => self::RATING_G,
+        'secure'      => null,
+    );
+
+    /**
+     * Email Adress
+     *
+     * @var string
+     */
+    protected $_email;
+
+    /**
+     * Attributes for HTML image tag
+     *
+     * @var array
+     */
+    protected $_attribs;
+
+    /**
+     * Returns an avatar from gravatar's service.
+     *
+     * $options may include the following:
+     * - 'img_size' int height of img to return
+     * - 'default_img' string img to return if email adress has not found
+     * - 'rating' string rating parameter for avatar
+     * - 'secure' bool load from the SSL or Non-SSL location
+     *
+     * @see    http://pl.gravatar.com/site/implement/url
+     * @see    http://pl.gravatar.com/site/implement/url More information about gravatar's service.
+     * @param  string|null $email Email adress.
+     * @param  null|array $options Options
+     * @param  array $attribs Attributes for image tag (title, alt etc.)
+     * @return Zend_View_Helper_Gravatar
+     */
+    public function gravatar($email = "", $options = array(), $attribs = array())
+    {
+        $this->setEmail($email);
+        $this->setOptions($options);
+        $this->setAttribs($attribs);
+        return $this;
+    }
+
+    /**
+     * Configure state
+     *
+     * @param  array $options
+     * @return Zend_View_Helper_Gravatar
+     */
+    public function setOptions(array $options)
+    {
+        foreach ($options as $key => $value) {
+            $method = 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
+            if (method_exists($this, $method)) {
+                $this->{$method}($value);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get img size
+     *
+     * @return int The img size
+     */
+    public function getImgSize()
+    {
+        return $this->_options['img_size'];
+    }
+
+    /**
+     * Set img size in pixels
+     *
+     * @param int $imgSize Size of img must be between 1 and 512
+     * @return Zend_View_Helper_Gravatar
+     */
+    public function setImgSize($imgSize)
+    {
+        $this->_options['img_size'] = (int) $imgSize;
+        return $this;
+    }
+
+    /**
+     * Get default img
+     *
+     * @return string
+     */
+    public function getDefaultImg()
+    {
+        return $this->_options['default_img'];
+    }
+
+    /**
+     * Set default img
+     *
+     * Can be either an absolute URL to an image, or one of the DEFAULT_* constants
+     *
+     * @param string $defaultImg
+     * @link http://pl.gravatar.com/site/implement/url More information about default image.
+     * @return Zend_View_Helper_Gravatar
+     */
+    public function setDefaultImg($defaultImg)
+    {
+        $this->_options['default_img'] = urlencode($defaultImg);
+        return $this;
+    }
+
+    /**
+     *  Set rating value
+     *
+     * Must be one of the RATING_* constants
+     *
+     * @param string $rating Value for rating. Allowed values are: g, px, r,x
+     * @link http://pl.gravatar.com/site/implement/url More information about rating.
+     * @throws Zend_View_Exception
+     */
+    public function setRating($rating)
+    {
+        switch ($rating) {
+            case self::RATING_G:
+            case self::RATING_PG:
+            case self::RATING_R:
+            case self::RATING_X:
+                $this->_options['rating'] = $rating;
+                break;
+            default:
+                require_once 'Zend/View/Exception.php';
+                throw new Zend_View_Exception(sprintf(
+                    'The rating value "%s" is not allowed',
+                    $rating
+                ));
+        }
+        return $this;
+    }
+
+    /**
+     * Get rating value
+     *
+     * @return string
+     */
+    public function getRating()
+    {
+        return $this->_options['rating'];
+    }
+
+    /**
+     * Set email adress
+     *
+     * @param string $email
+     * @return Zend_View_Helper_Gravatar
+     */
+    public function setEmail( $email )
+    {
+        $this->_email = $email;
+        return $this;
+    }
+
+    /**
+     * Get email adress
+     *
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->_email;
+    }
+
+    /**
+     * Load from an SSL or No-SSL location?
+     *
+     * @param bool $flag
+     * @return Zend_View_Helper_Gravatar
+     */
+    public function setSecure($flag)
+    {
+        $this->_options['secure'] = ($flag === null) ? null : (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Get an SSL or a No-SSL location
+     *
+     * @return bool
+     */
+    public function getSecure()
+    {
+        if ($this->_options['secure'] === null) {
+            return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
+        }
+        return $this->_options['secure'];
+    }
+
+    /**
+     * Get attribs of image
+     *
+     * Warning!
+     * If you set src attrib, you get it, but this value will be overwritten in
+     * protected method _setSrcAttribForImg(). And finally your get other src
+     * value!
+     *
+     * @return array
+     */
+    public function getAttribs()
+    {
+        return $this->_attribs;
+    }
+
+    /**
+     * Set attribs for image tag
+     *
+     * Warning! You shouldn't set src attrib for image tag.
+     * This attrib is overwritten in protected method _setSrcAttribForImg().
+     * This method(_setSrcAttribForImg) is called in public method getImgTag().
+
+     * @param array $attribs
+     * @return Zend_View_Helper_Gravatar
+     */
+    public function setAttribs(array $attribs)
+    {
+        $this->_attribs = $attribs;
+        return $this;
+    }
+
+    /**
+     * Get URL to gravatar's service.
+     *
+     * @return string URL
+     */
+    protected function _getGravatarUrl()
+    {
+        return ($this->getSecure() === false) ? self::GRAVATAR_URL : self::GRAVATAR_URL_SECURE;
+    }
+
+    /**
+     * Get avatar url (including size, rating and default image oprions)
+     *
+     * @return string
+     */
+    protected function _getAvatarUrl()
+    {
+        $src = $this->_getGravatarUrl()
+             . '/'
+             . md5(strtolower(trim($this->getEmail())))
+             . '?s='
+             . $this->getImgSize()
+             . '&d='
+             . $this->getDefaultImg()
+             . '&r='
+             . $this->getRating();
+        return $src;
+    }
+
+    /**
+     * Set src attrib for image.
+     *
+     * You shouldn't set a own url value!
+     * It sets value, uses protected method _getAvatarUrl.
+     *
+     * If already exsist overwritten.
+     */
+    protected function _setSrcAttribForImg()
+    {
+        $attribs        = $this->getAttribs();
+        $attribs['src'] = $this->_getAvatarUrl();
+        $this->setAttribs($attribs);
+    }
+
+    /**
+     * Return valid image tag
+     *
+     * @return string
+     */
+    public function getImgTag()
+    {
+        $this->_setSrcAttribForImg();
+        $html = '<img'
+              . $this->_htmlAttribs($this->getAttribs())
+              . $this->getClosingBracket();
+
+        return $html;
+    }
+
+    /**
+     * Return valid image tag
+     *
+     * @return string
+     */
+    public function  __toString()
+    {
+        return $this->getImgTag();
+
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HeadLink.php b/lib/zend/Zend/View/Helper/HeadLink.php
new file mode 100644
index 00000000000..61bf0a29d3b
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HeadLink.php
@@ -0,0 +1,478 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Zend_Layout_View_Helper_HeadLink
+ *
+ * @see        http://www.w3.org/TR/xhtml1/dtds.html
+ * @uses       Zend_View_Helper_Placeholder_Container_Standalone
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @method $this appendAlternate($href, $type, $title, $extras)
+ * @method $this appendStylesheet($href, $media = 'screen', $conditionalStylesheet = false, array $extras = array())
+ * @method $this offsetSetAlternate($index, $href, $type, $title, $extras)
+ * @method $this offsetSetStylesheet($index, $href, $media = 'screen', $conditionalStylesheet = false, array $extras = array())
+ * @method $this prependAlternate($href, $type, $title, $extras)
+ * @method $this prependStylesheet($href, $media = 'screen', $conditionalStylesheet = false, array $extras = array())
+ * @method $this setAlternate($href, $type, $title, $extras)
+ * @method $this setStylesheet($href, $media = 'screen', $conditionalStylesheet = false, array $extras = array())
+ */
+class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+    /**
+     * $_validAttributes
+     *
+     * @var array
+     */
+    protected $_itemKeys = array(
+        'charset',
+        'href',
+        'hreflang',
+        'id',
+        'media',
+        'rel',
+        'rev',
+        'type',
+        'title',
+        'extras',
+        'sizes',
+    );
+
+    /**
+     * @var string registry key
+     */
+    protected $_regKey = 'Zend_View_Helper_HeadLink';
+
+    /**
+     * Constructor
+     *
+     * Use PHP_EOL as separator
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setSeparator(PHP_EOL);
+    }
+
+    /**
+     * headLink() - View Helper Method
+     *
+     * Returns current object instance. Optionally, allows passing array of
+     * values to build link.
+     *
+     * @return Zend_View_Helper_HeadLink
+     */
+    public function headLink(array $attributes = null, $placement = Zend_View_Helper_Placeholder_Container_Abstract::APPEND)
+    {
+        if (null !== $attributes) {
+            $item = $this->createData($attributes);
+            switch ($placement) {
+                case Zend_View_Helper_Placeholder_Container_Abstract::SET:
+                    $this->set($item);
+                    break;
+                case Zend_View_Helper_Placeholder_Container_Abstract::PREPEND:
+                    $this->prepend($item);
+                    break;
+                case Zend_View_Helper_Placeholder_Container_Abstract::APPEND:
+                default:
+                    $this->append($item);
+                    break;
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Overload method access
+     *
+     * Creates the following virtual methods:
+     * - appendStylesheet($href, $media, $conditionalStylesheet, $extras)
+     * - offsetSetStylesheet($index, $href, $media, $conditionalStylesheet, $extras)
+     * - prependStylesheet($href, $media, $conditionalStylesheet, $extras)
+     * - setStylesheet($href, $media, $conditionalStylesheet, $extras)
+     * - appendAlternate($href, $type, $title, $extras)
+     * - offsetSetAlternate($index, $href, $type, $title, $extras)
+     * - prependAlternate($href, $type, $title, $extras)
+     * - setAlternate($href, $type, $title, $extras)
+     *
+     * Items that may be added in the future:
+     * - Navigation?  need to find docs on this
+     *   - public function appendStart()
+     *   - public function appendContents()
+     *   - public function appendPrev()
+     *   - public function appendNext()
+     *   - public function appendIndex()
+     *   - public function appendEnd()
+     *   - public function appendGlossary()
+     *   - public function appendAppendix()
+     *   - public function appendHelp()
+     *   - public function appendBookmark()
+     * - Other?
+     *   - public function appendCopyright()
+     *   - public function appendChapter()
+     *   - public function appendSection()
+     *   - public function appendSubsection()
+     *
+     * @param mixed $method
+     * @param mixed $args
+     * @return void
+     */
+    public function __call($method, $args)
+    {
+        if (preg_match('/^(?P<action>set|(ap|pre)pend|offsetSet)(?P<type>Stylesheet|Alternate)$/', $method, $matches)) {
+            $argc   = count($args);
+            $action = $matches['action'];
+            $type   = $matches['type'];
+            $index  = null;
+
+            if ('offsetSet' == $action) {
+                if (0 < $argc) {
+                    $index = array_shift($args);
+                    --$argc;
+                }
+            }
+
+            if (1 > $argc) {
+                require_once 'Zend/View/Exception.php';
+                $e =  new Zend_View_Exception(sprintf('%s requires at least one argument', $method));
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            if (is_array($args[0])) {
+                $item = $this->createData($args[0]);
+            } else {
+                $dataMethod = 'createData' . $type;
+                $item       = $this->$dataMethod($args);
+            }
+
+            if ($item) {
+                if ('offsetSet' == $action) {
+                    $this->offsetSet($index, $item);
+                } else {
+                    $this->$action($item);
+                }
+            }
+
+            return $this;
+        }
+
+        return parent::__call($method, $args);
+    }
+
+    /**
+     * Check if value is valid
+     *
+     * @param  mixed $value
+     * @return boolean
+     */
+    protected function _isValid($value)
+    {
+        if (!$value instanceof stdClass) {
+            return false;
+        }
+
+        $vars         = get_object_vars($value);
+        $keys         = array_keys($vars);
+        $intersection = array_intersect($this->_itemKeys, $keys);
+        if (empty($intersection)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * append()
+     *
+     * @param  array $value
+     * @return void
+     */
+    public function append($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('append() expects a data token; please use one of the custom append*() methods');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->append($value);
+    }
+
+    /**
+     * offsetSet()
+     *
+     * @param  string|int $index
+     * @param  array $value
+     * @return void
+     */
+    public function offsetSet($index, $value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('offsetSet() expects a data token; please use one of the custom offsetSet*() methods');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->offsetSet($index, $value);
+    }
+
+    /**
+     * prepend()
+     *
+     * @param  array $value
+     * @return Zend_Layout_ViewHelper_HeadLink
+     */
+    public function prepend($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('prepend() expects a data token; please use one of the custom prepend*() methods');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->prepend($value);
+    }
+
+    /**
+     * set()
+     *
+     * @param  array $value
+     * @return Zend_Layout_ViewHelper_HeadLink
+     */
+    public function set($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('set() expects a data token; please use one of the custom set*() methods');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->set($value);
+    }
+
+
+    /**
+     * Create HTML link element from data item
+     *
+     * @param  stdClass $item
+     * @return string
+     */
+    public function itemToString(stdClass $item)
+    {
+        $attributes = (array) $item;
+        $link       = '<link ';
+
+        foreach ($this->_itemKeys as $itemKey) {
+            if (isset($attributes[$itemKey])) {
+                if(is_array($attributes[$itemKey])) {
+                    foreach($attributes[$itemKey] as $key => $value) {
+                        $link .= sprintf('%s="%s" ', $key, ($this->_autoEscape) ? $this->_escape($value) : $value);
+                    }
+                } else {
+                    $link .= sprintf('%s="%s" ', $itemKey, ($this->_autoEscape) ? $this->_escape($attributes[$itemKey]) : $attributes[$itemKey]);
+                }
+            }
+        }
+
+        if ($this->view instanceof Zend_View_Abstract) {
+            $link .= ($this->view->doctype()->isXhtml()) ? '/>' : '>';
+        } else {
+            $link .= '/>';
+        }
+
+        if (($link == '<link />') || ($link == '<link >')) {
+            return '';
+        }
+
+        if (isset($attributes['conditionalStylesheet'])
+            && !empty($attributes['conditionalStylesheet'])
+            && is_string($attributes['conditionalStylesheet']))
+        {
+            if (str_replace(' ', '', $attributes['conditionalStylesheet']) === '!IE') {
+                $link = '<!-->' . $link . '<!--';
+            }
+            $link = '<!--[if ' . $attributes['conditionalStylesheet'] . ']>' . $link . '<![endif]-->';
+        }
+
+        return $link;
+    }
+
+    /**
+     * Render link elements as string
+     *
+     * @param  string|int $indent
+     * @return string
+     */
+    public function toString($indent = null)
+    {
+        $indent = (null !== $indent)
+                ? $this->getWhitespace($indent)
+                : $this->getIndent();
+
+        $items = array();
+        $this->getContainer()->ksort();
+        foreach ($this as $item) {
+            $items[] = $this->itemToString($item);
+        }
+
+        return $indent . implode($this->_escape($this->getSeparator()) . $indent, $items);
+    }
+
+    /**
+     * Create data item for stack
+     *
+     * @param  array $attributes
+     * @return stdClass
+     */
+    public function createData(array $attributes)
+    {
+        $data = (object) $attributes;
+        return $data;
+    }
+
+    /**
+     * Create item for stylesheet link item
+     *
+     * @param  array $args
+     * @return stdClass|false Returns fals if stylesheet is a duplicate
+     */
+    public function createDataStylesheet(array $args)
+    {
+        $rel                   = 'stylesheet';
+        $type                  = 'text/css';
+        $media                 = 'screen';
+        $conditionalStylesheet = false;
+        $href                  = array_shift($args);
+
+        if ($this->_isDuplicateStylesheet($href)) {
+            return false;
+        }
+
+        if (0 < count($args)) {
+            $media = array_shift($args);
+            if(is_array($media)) {
+                $media = implode(',', $media);
+            } else {
+                $media = (string) $media;
+            }
+        }
+        if (0 < count($args)) {
+            $conditionalStylesheet = array_shift($args);
+            if(!empty($conditionalStylesheet) && is_string($conditionalStylesheet)) {
+                $conditionalStylesheet = (string) $conditionalStylesheet;
+            } else {
+                $conditionalStylesheet = null;
+            }
+        }
+
+        if(0 < count($args) && is_array($args[0])) {
+            $extras = array_shift($args);
+            $extras = (array) $extras;
+        }
+
+        $attributes = compact('rel', 'type', 'href', 'media', 'conditionalStylesheet', 'extras');
+        return $this->createData($this->_applyExtras($attributes));
+    }
+
+    /**
+     * Is the linked stylesheet a duplicate?
+     *
+     * @param  string $uri
+     * @return bool
+     */
+    protected function _isDuplicateStylesheet($uri)
+    {
+        foreach ($this->getContainer() as $item) {
+            if (($item->rel == 'stylesheet') && ($item->href == $uri)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Create item for alternate link item
+     *
+     * @param  array $args
+     * @return stdClass
+     */
+    public function createDataAlternate(array $args)
+    {
+        if (3 > count($args)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception(sprintf('Alternate tags require 3 arguments; %s provided', count($args)));
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $rel   = 'alternate';
+        $href  = array_shift($args);
+        $type  = array_shift($args);
+        $title = array_shift($args);
+
+        if(0 < count($args) && is_array($args[0])) {
+            $extras = array_shift($args);
+            $extras = (array) $extras;
+
+            if(isset($extras['media']) && is_array($extras['media'])) {
+                $extras['media'] = implode(',', $extras['media']);
+            }
+        }
+
+        $href  = (string) $href;
+        $type  = (string) $type;
+        $title = (string) $title;
+
+        $attributes = compact('rel', 'href', 'type', 'title', 'extras');
+        return $this->createData($this->_applyExtras($attributes));
+    }
+
+    /**
+     * Apply any overrides specified in the 'extras' array
+     * @param array $attributes
+     * @return array
+     */
+    protected function _applyExtras($attributes)
+    {
+        if (isset($attributes['extras'])) {
+            foreach ($attributes['extras'] as $eKey=>$eVal) {
+                if (isset($attributes[$eKey])) {
+                    $attributes[$eKey] = $eVal;
+                    unset($attributes['extras'][$eKey]);
+                }
+            }
+        }
+        return $attributes;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HeadMeta.php b/lib/zend/Zend/View/Helper/HeadMeta.php
new file mode 100644
index 00000000000..de58edd5dcc
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HeadMeta.php
@@ -0,0 +1,449 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Zend_Layout_View_Helper_HeadMeta
+ *
+ * @see        http://www.w3.org/TR/xhtml1/dtds.html
+ * @uses       Zend_View_Helper_Placeholder_Container_Standalone
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @method $this appendHttpEquiv($keyValue, $content, $conditionalHttpEquiv)
+ * @method $this appendName($keyValue, $content, $conditionalName)
+ * @method $this appendProperty($property, $content, $modifiers)
+ * @method $this offsetSetHttpEquiv($index, $keyValue, $content, $conditionalHttpEquiv)
+ * @method $this offsetSetName($index, $keyValue, $content, $conditionalName)
+ * @method $this offsetSetProperty($index, $property, $content, $modifiers)
+ * @method $this prependHttpEquiv($keyValue, $content, $conditionalHttpEquiv)
+ * @method $this prependName($keyValue, $content, $conditionalName)
+ * @method $this prependProperty($property, $content, $modifiers)
+ * @method $this setCharset($charset)
+ * @method $this setHttpEquiv($keyValue, $content, $modifiers)
+ * @method $this setName($keyValue, $content, $modifiers)
+ * @method $this setProperty($property, $content, $modifiers)
+ */
+class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+    /**
+     * Types of attributes
+     * @var array
+     */
+    protected $_typeKeys     = array('name', 'http-equiv', 'charset', 'property');
+    protected $_requiredKeys = array('content');
+    protected $_modifierKeys = array('lang', 'scheme');
+
+    /**
+     * @var string registry key
+     */
+    protected $_regKey = 'Zend_View_Helper_HeadMeta';
+
+    /**
+     * Constructor
+     *
+     * Set separator to PHP_EOL
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setSeparator(PHP_EOL);
+    }
+
+    /**
+     * Retrieve object instance; optionally add meta tag
+     *
+     * @param  string $content
+     * @param  string $keyValue
+     * @param  string $keyType
+     * @param  array $modifiers
+     * @param  string $placement
+     * @return Zend_View_Helper_HeadMeta
+     */
+    public function headMeta($content = null, $keyValue = null, $keyType = 'name', $modifiers = array(), $placement = Zend_View_Helper_Placeholder_Container_Abstract::APPEND)
+    {
+        if ((null !== $content) && (null !== $keyValue)) {
+            $item   = $this->createData($keyType, $keyValue, $content, $modifiers);
+            $action = strtolower($placement);
+            switch ($action) {
+                case 'append':
+                case 'prepend':
+                case 'set':
+                    $this->$action($item);
+                    break;
+                default:
+                    $this->append($item);
+                    break;
+            }
+        }
+
+        return $this;
+    }
+
+    protected function _normalizeType($type)
+    {
+        switch ($type) {
+            case 'Name':
+                return 'name';
+            case 'HttpEquiv':
+                return 'http-equiv';
+            case 'Property':
+                return 'property';
+            default:
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception(sprintf('Invalid type "%s" passed to _normalizeType', $type));
+                $e->setView($this->view);
+                throw $e;
+        }
+    }
+
+    /**
+     * Overload method access
+     *
+     * Allows the following 'virtual' methods:
+     * - appendName($keyValue, $content, $modifiers = array())
+     * - offsetGetName($index, $keyValue, $content, $modifers = array())
+     * - prependName($keyValue, $content, $modifiers = array())
+     * - setName($keyValue, $content, $modifiers = array())
+     * - appendHttpEquiv($keyValue, $content, $modifiers = array())
+     * - offsetGetHttpEquiv($index, $keyValue, $content, $modifers = array())
+     * - prependHttpEquiv($keyValue, $content, $modifiers = array())
+     * - setHttpEquiv($keyValue, $content, $modifiers = array())
+     * - appendProperty($keyValue, $content, $modifiers = array())
+     * - offsetGetProperty($index, $keyValue, $content, $modifiers = array())
+     * - prependProperty($keyValue, $content, $modifiers = array())
+     * - setProperty($keyValue, $content, $modifiers = array())
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return Zend_View_Helper_HeadMeta
+     */
+    public function __call($method, $args)
+    {
+        if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property)$/', $method, $matches)) {
+            $action = $matches['action'];
+            $type   = $this->_normalizeType($matches['type']);
+            $argc   = count($args);
+            $index  = null;
+
+            if ('offsetSet' == $action) {
+                if (0 < $argc) {
+                    $index = array_shift($args);
+                    --$argc;
+                }
+            }
+
+            if (2 > $argc) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception('Too few arguments provided; requires key value, and content');
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            if (3 > $argc) {
+                $args[] = array();
+            }
+
+            $item  = $this->createData($type, $args[0], $args[1], $args[2]);
+
+            if ('offsetSet' == $action) {
+                return $this->offsetSet($index, $item);
+            }
+
+            $this->$action($item);
+            return $this;
+        }
+
+        return parent::__call($method, $args);
+    }
+
+    /**
+     * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8">
+     *
+     * Not valid in a non-HTML5 doctype
+     *
+     * @param string $charset
+     * @return Zend_View_Helper_HeadMeta Provides a fluent interface
+     */
+    public function setCharset($charset)
+    {
+        $item = new stdClass;
+        $item->type = 'charset';
+        $item->charset = $charset;
+        $item->content = null;
+        $item->modifiers = array();
+        $this->set($item);
+        return $this;
+    }
+
+    /**
+     * Determine if item is valid
+     *
+     * @param  mixed $item
+     * @return boolean
+     */
+    protected function _isValid($item)
+    {
+        if ((!$item instanceof stdClass)
+            || !isset($item->type)
+            || !isset($item->modifiers))
+        {
+            return false;
+        }
+
+        $isHtml5 = is_null($this->view) ? false : $this->view->doctype()->isHtml5();
+
+        if (!isset($item->content)
+        && (! $isHtml5 || (! $isHtml5 && $item->type !== 'charset'))) {
+            return false;
+        }
+
+        // <meta property= ... /> is only supported with doctype RDFa
+        if ( !is_null($this->view) && !$this->view->doctype()->isRdfa()
+            && $item->type === 'property') {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Append
+     *
+     * @param  string $value
+     * @return void
+     * @throws Zend_View_Exception
+     */
+    public function append($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid value passed to append; please use appendMeta()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->append($value);
+    }
+
+    /**
+     * OffsetSet
+     *
+     * @param  string|int $index
+     * @param  string $value
+     * @return void
+     * @throws Zend_View_Exception
+     */
+    public function offsetSet($index, $value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e =  new Zend_View_Exception('Invalid value passed to offsetSet; please use offsetSetName() or offsetSetHttpEquiv()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->offsetSet($index, $value);
+    }
+
+    /**
+     * OffsetUnset
+     *
+     * @param  string|int $index
+     * @return void
+     * @throws Zend_View_Exception
+     */
+    public function offsetUnset($index)
+    {
+        if (!in_array($index, $this->getContainer()->getKeys())) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid index passed to offsetUnset()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->offsetUnset($index);
+    }
+
+    /**
+     * Prepend
+     *
+     * @param  string $value
+     * @return void
+     * @throws Zend_View_Exception
+     */
+    public function prepend($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid value passed to prepend; please use prependMeta()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->prepend($value);
+    }
+
+    /**
+     * Set
+     *
+     * @param  string $value
+     * @return void
+     * @throws Zend_View_Exception
+     */
+    public function set($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid value passed to set; please use setMeta()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $container = $this->getContainer();
+        foreach ($container->getArrayCopy() as $index => $item) {
+            if ($item->type == $value->type && $item->{$item->type} == $value->{$value->type}) {
+                $this->offsetUnset($index);
+            }
+        }
+
+        return $this->append($value);
+    }
+
+    /**
+     * Build meta HTML string
+     *
+     * @param  string $type
+     * @param  string $typeValue
+     * @param  string $content
+     * @param  array $modifiers
+     * @return string
+     */
+    public function itemToString(stdClass $item)
+    {
+        if (!in_array($item->type, $this->_typeKeys)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception(sprintf('Invalid type "%s" provided for meta', $item->type));
+            $e->setView($this->view);
+            throw $e;
+        }
+        $type = $item->type;
+
+        $modifiersString = '';
+        foreach ($item->modifiers as $key => $value) {
+            if (!is_null($this->view) && $this->view->doctype()->isHtml5()
+            && $key == 'scheme') {
+                require_once 'Zend/View/Exception.php';
+                throw new Zend_View_Exception('Invalid modifier '
+                . '"scheme" provided; not supported by HTML5');
+            }
+            if (!in_array($key, $this->_modifierKeys)) {
+                continue;
+            }
+            $modifiersString .= $key . '="' . $this->_escape($value) . '" ';
+        }
+
+        if ($this->view instanceof Zend_View_Abstract) {
+            if ($this->view->doctype()->isHtml5()
+            && $type == 'charset') {
+                $tpl = ($this->view->doctype()->isXhtml())
+                    ? '<meta %s="%s"/>'
+                    : '<meta %s="%s">';
+            } elseif ($this->view->doctype()->isXhtml()) {
+                $tpl = '<meta %s="%s" content="%s" %s/>';
+            } else {
+                $tpl = '<meta %s="%s" content="%s" %s>';
+            }
+        } else {
+            $tpl = '<meta %s="%s" content="%s" %s/>';
+        }
+
+        $meta = sprintf(
+            $tpl,
+            $type,
+            $this->_escape($item->$type),
+            $this->_escape($item->content),
+            $modifiersString
+        );
+        
+        if (isset($item->modifiers['conditional'])
+            && !empty($item->modifiers['conditional'])
+            && is_string($item->modifiers['conditional']))
+        {
+            if (str_replace(' ', '', $item->modifiers['conditional']) === '!IE') {
+                $meta = '<!-->' . $meta . '<!--';
+            }
+            $meta = '<!--[if ' . $this->_escape($item->modifiers['conditional']) . ']>' . $meta . '<![endif]-->';
+        }
+        
+        return $meta;
+    }
+
+    /**
+     * Render placeholder as string
+     *
+     * @param  string|int $indent
+     * @return string
+     */
+    public function toString($indent = null)
+    {
+        $indent = (null !== $indent)
+                ? $this->getWhitespace($indent)
+                : $this->getIndent();
+
+        $items = array();
+        $this->getContainer()->ksort();
+        try {
+            foreach ($this as $item) {
+                $items[] = $this->itemToString($item);
+            }
+        } catch (Zend_View_Exception $e) {
+            trigger_error($e->getMessage(), E_USER_WARNING);
+            return '';
+        }
+        return $indent . implode($this->_escape($this->getSeparator()) . $indent, $items);
+    }
+
+    /**
+     * Create data item for inserting into stack
+     *
+     * @param  string $type
+     * @param  string $typeValue
+     * @param  string $content
+     * @param  array $modifiers
+     * @return stdClass
+     */
+    public function createData($type, $typeValue, $content, array $modifiers)
+    {
+        $data            = new stdClass;
+        $data->type      = $type;
+        $data->$type     = $typeValue;
+        $data->content   = $content;
+        $data->modifiers = $modifiers;
+        return $data;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HeadScript.php b/lib/zend/Zend/View/Helper/HeadScript.php
new file mode 100644
index 00000000000..062bed1b0cd
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HeadScript.php
@@ -0,0 +1,520 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Helper for setting and retrieving script elements for HTML head section
+ *
+ * @uses       Zend_View_Helper_Placeholder_Container_Standalone
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @method $this appendFile($src, $type = 'text/javascript', array $attrs = array())
+ * @method $this appendScript($script, $type = 'text/javascript', array $attrs = array())
+ * @method $this offsetSetFile($index, $src, $type = 'text/javascript', array $attrs = array())
+ * @method $this offsetSetScript($index, $script, $type = 'text/javascript', array $attrs = array())
+ * @method $this prependFile($src, $type = 'text/javascript', array $attrs = array())
+ * @method $this prependScript($script, $type = 'text/javascript', array $attrs = array())
+ * @method $this setFile($src, $type = 'text/javascript', array $attrs = array())
+ * @method $this setScript($script, $type = 'text/javascript', array $attrs = array())
+ */
+class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+    /**#@+
+     * Script type contants
+     * @const string
+     */
+    const FILE   = 'FILE';
+    const SCRIPT = 'SCRIPT';
+    /**#@-*/
+
+    /**
+     * Registry key for placeholder
+     * @var string
+     */
+    protected $_regKey = 'Zend_View_Helper_HeadScript';
+
+    /**
+     * Are arbitrary attributes allowed?
+     * @var bool
+     */
+    protected $_arbitraryAttributes = false;
+
+    /**#@+
+     * Capture type and/or attributes (used for hinting during capture)
+     * @var string
+     */
+    protected $_captureLock;
+    protected $_captureScriptType  = null;
+    protected $_captureScriptAttrs = null;
+    protected $_captureType;
+    /**#@-*/
+
+    /**
+     * Optional allowed attributes for script tag
+     * @var array
+     */
+    protected $_optionalAttributes = array(
+        'charset', 'defer', 'language', 'src'
+    );
+
+    /**
+     * Required attributes for script tag
+     * @var string
+     */
+    protected $_requiredAttributes = array('type');
+
+    /**
+     * Whether or not to format scripts using CDATA; used only if doctype
+     * helper is not accessible
+     * @var bool
+     */
+    public $useCdata = false;
+
+    /**
+     * Constructor
+     *
+     * Set separator to PHP_EOL.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setSeparator(PHP_EOL);
+    }
+
+    /**
+     * Return headScript object
+     *
+     * Returns headScript helper object; optionally, allows specifying a script
+     * or script file to include.
+     *
+     * @param  string $mode Script or file
+     * @param  string $spec Script/url
+     * @param  string $placement Append, prepend, or set
+     * @param  array $attrs Array of script attributes
+     * @param  string $type Script type and/or array of script attributes
+     * @return Zend_View_Helper_HeadScript
+     */
+    public function headScript($mode = Zend_View_Helper_HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
+    {
+        if ((null !== $spec) && is_string($spec)) {
+            $action    = ucfirst(strtolower($mode));
+            $placement = strtolower($placement);
+            switch ($placement) {
+                case 'set':
+                case 'prepend':
+                case 'append':
+                    $action = $placement . $action;
+                    break;
+                default:
+                    $action = 'append' . $action;
+                    break;
+            }
+            $this->$action($spec, $type, $attrs);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Start capture action
+     *
+     * @param  mixed $captureType
+     * @param  string $typeOrAttrs
+     * @return void
+     */
+    public function captureStart($captureType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $type = 'text/javascript', $attrs = array())
+    {
+        if ($this->_captureLock) {
+            require_once 'Zend/View/Helper/Placeholder/Container/Exception.php';
+            $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest headScript captures');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $this->_captureLock        = true;
+        $this->_captureType        = $captureType;
+        $this->_captureScriptType  = $type;
+        $this->_captureScriptAttrs = $attrs;
+        ob_start();
+    }
+
+    /**
+     * End capture action and store
+     *
+     * @return void
+     */
+    public function captureEnd()
+    {
+        $content                   = ob_get_clean();
+        $type                      = $this->_captureScriptType;
+        $attrs                     = $this->_captureScriptAttrs;
+        $this->_captureScriptType  = null;
+        $this->_captureScriptAttrs = null;
+        $this->_captureLock        = false;
+
+        switch ($this->_captureType) {
+            case Zend_View_Helper_Placeholder_Container_Abstract::SET:
+            case Zend_View_Helper_Placeholder_Container_Abstract::PREPEND:
+            case Zend_View_Helper_Placeholder_Container_Abstract::APPEND:
+                $action = strtolower($this->_captureType) . 'Script';
+                break;
+            default:
+                $action = 'appendScript';
+                break;
+        }
+        $this->$action($content, $type, $attrs);
+    }
+
+    /**
+     * Overload method access
+     *
+     * Allows the following method calls:
+     * - appendFile($src, $type = 'text/javascript', $attrs = array())
+     * - offsetSetFile($index, $src, $type = 'text/javascript', $attrs = array())
+     * - prependFile($src, $type = 'text/javascript', $attrs = array())
+     * - setFile($src, $type = 'text/javascript', $attrs = array())
+     * - appendScript($script, $type = 'text/javascript', $attrs = array())
+     * - offsetSetScript($index, $src, $type = 'text/javascript', $attrs = array())
+     * - prependScript($script, $type = 'text/javascript', $attrs = array())
+     * - setScript($script, $type = 'text/javascript', $attrs = array())
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return Zend_View_Helper_HeadScript
+     * @throws Zend_View_Exception if too few arguments or invalid method
+     */
+    public function __call($method, $args)
+    {
+        if (preg_match('/^(?P<action>set|(ap|pre)pend|offsetSet)(?P<mode>File|Script)$/', $method, $matches)) {
+            if (1 > count($args)) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception(sprintf('Method "%s" requires at least one argument', $method));
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            $action  = $matches['action'];
+            $mode    = strtolower($matches['mode']);
+            $type    = 'text/javascript';
+            $attrs   = array();
+
+            if ('offsetSet' == $action) {
+                $index = array_shift($args);
+                if (1 > count($args)) {
+                    require_once 'Zend/View/Exception.php';
+                    $e = new Zend_View_Exception(sprintf('Method "%s" requires at least two arguments, an index and source', $method));
+                    $e->setView($this->view);
+                    throw $e;
+                }
+            }
+
+            $content = $args[0];
+
+            if (isset($args[1])) {
+                $type = (string) $args[1];
+            }
+            if (isset($args[2])) {
+                $attrs = (array) $args[2];
+            }
+
+            switch ($mode) {
+                case 'script':
+                    $item = $this->createData($type, $attrs, $content);
+                    if ('offsetSet' == $action) {
+                        $this->offsetSet($index, $item);
+                    } else {
+                        $this->$action($item);
+                    }
+                    break;
+                case 'file':
+                default:
+                    if (!$this->_isDuplicate($content) || $action=='set') {
+                        $attrs['src'] = $content;
+                        $item = $this->createData($type, $attrs);
+                        if ('offsetSet' == $action) {
+                            $this->offsetSet($index, $item);
+                        } else {
+                            $this->$action($item);
+                        }
+                    }
+                    break;
+            }
+
+            return $this;
+        }
+
+        return parent::__call($method, $args);
+    }
+
+    /**
+     * Is the file specified a duplicate?
+     *
+     * @param  string $file
+     * @return bool
+     */
+    protected function _isDuplicate($file)
+    {
+        foreach ($this->getContainer() as $item) {
+            if (($item->source === null)
+                && array_key_exists('src', $item->attributes)
+                && ($file == $item->attributes['src']))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Is the script provided valid?
+     *
+     * @param  mixed $value
+     * @param  string $method
+     * @return bool
+     */
+    protected function _isValid($value)
+    {
+        if ((!$value instanceof stdClass)
+            || !isset($value->type)
+            || (!isset($value->source) && !isset($value->attributes)))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Override append
+     *
+     * @param  string $value
+     * @return void
+     */
+    public function append($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid argument passed to append(); please use one of the helper methods, appendScript() or appendFile()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->append($value);
+    }
+
+    /**
+     * Override prepend
+     *
+     * @param  string $value
+     * @return void
+     */
+    public function prepend($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid argument passed to prepend(); please use one of the helper methods, prependScript() or prependFile()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->prepend($value);
+    }
+
+    /**
+     * Override set
+     *
+     * @param  string $value
+     * @return void
+     */
+    public function set($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid argument passed to set(); please use one of the helper methods, setScript() or setFile()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->set($value);
+    }
+
+    /**
+     * Override offsetSet
+     *
+     * @param  string|int $index
+     * @param  mixed $value
+     * @return void
+     */
+    public function offsetSet($index, $value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid argument passed to offsetSet(); please use one of the helper methods, offsetSetScript() or offsetSetFile()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->offsetSet($index, $value);
+    }
+
+    /**
+     * Set flag indicating if arbitrary attributes are allowed
+     *
+     * @param  bool $flag
+     * @return Zend_View_Helper_HeadScript
+     */
+    public function setAllowArbitraryAttributes($flag)
+    {
+        $this->_arbitraryAttributes = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Are arbitrary attributes allowed?
+     *
+     * @return bool
+     */
+    public function arbitraryAttributesAllowed()
+    {
+        return $this->_arbitraryAttributes;
+    }
+
+    /**
+     * Create script HTML
+     *
+     * @param  string $type
+     * @param  array $attributes
+     * @param  string $content
+     * @param  string|int $indent
+     * @return string
+     */
+    public function itemToString($item, $indent, $escapeStart, $escapeEnd)
+    {
+        $attrString = '';
+        if (!empty($item->attributes)) {
+            foreach ($item->attributes as $key => $value) {
+                if ((!$this->arbitraryAttributesAllowed() && !in_array($key, $this->_optionalAttributes))
+                    || in_array($key, array('conditional', 'noescape')))
+                {
+                    continue;
+                }
+                if ('defer' == $key) {
+                    $value = 'defer';
+                }
+                $attrString .= sprintf(' %s="%s"', $key, ($this->_autoEscape) ? $this->_escape($value) : $value);
+            }
+        }
+
+        $addScriptEscape = !(isset($item->attributes['noescape']) && filter_var($item->attributes['noescape'], FILTER_VALIDATE_BOOLEAN));
+
+        $type = ($this->_autoEscape) ? $this->_escape($item->type) : $item->type;
+        $html  = '<script type="' . $type . '"' . $attrString . '>';
+        if (!empty($item->source)) {
+            $html .= PHP_EOL ;
+
+            if ($addScriptEscape) {
+                $html .= $indent . '    ' . $escapeStart . PHP_EOL;
+            }
+
+            $html .= $indent . '    ' . $item->source;
+
+            if ($addScriptEscape) {
+                $html .= $indent . '    ' . $escapeEnd . PHP_EOL;
+            }
+
+            $html .= $indent;
+        }
+        $html .= '</script>';
+
+        if (isset($item->attributes['conditional'])
+            && !empty($item->attributes['conditional'])
+            && is_string($item->attributes['conditional']))
+        {
+            // inner wrap with comment end and start if !IE
+            if (str_replace(' ', '', $item->attributes['conditional']) === '!IE') {
+                $html = '<!-->' . $html . '<!--';
+            }
+            $html = $indent . '<!--[if ' . $item->attributes['conditional'] . ']>' . $html . '<![endif]-->';
+        } else {
+            $html = $indent . $html;
+        }
+
+        return $html;
+    }
+
+    /**
+     * Retrieve string representation
+     *
+     * @param  string|int $indent
+     * @return string
+     */
+    public function toString($indent = null)
+    {
+        $indent = (null !== $indent)
+                ? $this->getWhitespace($indent)
+                : $this->getIndent();
+
+        if ($this->view) {
+            $useCdata = $this->view->doctype()->isXhtml() ? true : false;
+        } else {
+            $useCdata = $this->useCdata ? true : false;
+        }
+        $escapeStart = ($useCdata) ? '//<![CDATA[' : '//<!--';
+        $escapeEnd   = ($useCdata) ? '//]]>'       : '//-->';
+
+        $items = array();
+        $this->getContainer()->ksort();
+        foreach ($this as $item) {
+            if (!$this->_isValid($item)) {
+                continue;
+            }
+
+            $items[] = $this->itemToString($item, $indent, $escapeStart, $escapeEnd);
+        }
+
+        $return = implode($this->getSeparator(), $items);
+        return $return;
+    }
+
+    /**
+     * Create data item containing all necessary components of script
+     *
+     * @param  string $type
+     * @param  array $attributes
+     * @param  string $content
+     * @return stdClass
+     */
+    public function createData($type, array $attributes, $content = null)
+    {
+        $data             = new stdClass();
+        $data->type       = $type;
+        $data->attributes = $attributes;
+        $data->source     = $content;
+        return $data;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HeadStyle.php b/lib/zend/Zend/View/Helper/HeadStyle.php
new file mode 100644
index 00000000000..fc571bc9e02
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HeadStyle.php
@@ -0,0 +1,433 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Helper for setting and retrieving stylesheets
+ *
+ * @uses       Zend_View_Helper_Placeholder_Container_Standalone
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @method $this appendStyle($content, array $attributes = array())
+ * @method $this offsetSetStyle($index, $content, array $attributes = array())
+ * @method $this prependStyle($content, array $attributes = array())
+ * @method $this setStyle($content, array $attributes = array())
+ */
+class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+    /**
+     * Registry key for placeholder
+     * @var string
+     */
+    protected $_regKey = 'Zend_View_Helper_HeadStyle';
+
+    /**
+     * Allowed optional attributes
+     * @var array
+     */
+    protected $_optionalAttributes = array('lang', 'title', 'media', 'dir');
+
+    /**
+     * Allowed media types
+     * @var array
+     */
+    protected $_mediaTypes = array(
+        'all', 'aural', 'braille', 'handheld', 'print',
+        'projection', 'screen', 'tty', 'tv'
+    );
+
+    /**
+     * Capture type and/or attributes (used for hinting during capture)
+     * @var string
+     */
+    protected $_captureAttrs = null;
+
+    /**
+     * Capture lock
+     * @var bool
+     */
+    protected $_captureLock;
+
+    /**
+     * Capture type (append, prepend, set)
+     * @var string
+     */
+    protected $_captureType;
+
+    /**
+     * Constructor
+     *
+     * Set separator to PHP_EOL.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setSeparator(PHP_EOL);
+    }
+
+    /**
+     * Return headStyle object
+     *
+     * Returns headStyle helper object; optionally, allows specifying
+     *
+     * @param  string $content Stylesheet contents
+     * @param  string $placement Append, prepend, or set
+     * @param  string|array $attributes Optional attributes to utilize
+     * @return Zend_View_Helper_HeadStyle
+     */
+    public function headStyle($content = null, $placement = 'APPEND', $attributes = array())
+    {
+        if ((null !== $content) && is_string($content)) {
+            switch (strtoupper($placement)) {
+                case 'SET':
+                    $action = 'setStyle';
+                    break;
+                case 'PREPEND':
+                    $action = 'prependStyle';
+                    break;
+                case 'APPEND':
+                default:
+                    $action = 'appendStyle';
+                    break;
+            }
+            $this->$action($content, $attributes);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Overload method calls
+     *
+     * Allows the following method calls:
+     * - appendStyle($content, $attributes = array())
+     * - offsetSetStyle($index, $content, $attributes = array())
+     * - prependStyle($content, $attributes = array())
+     * - setStyle($content, $attributes = array())
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return void
+     * @throws Zend_View_Exception When no $content provided or invalid method
+     */
+    public function __call($method, $args)
+    {
+        if (preg_match('/^(?P<action>set|(ap|pre)pend|offsetSet)(Style)$/', $method, $matches)) {
+            $index  = null;
+            $argc   = count($args);
+            $action = $matches['action'];
+
+            if ('offsetSet' == $action) {
+                if (0 < $argc) {
+                    $index = array_shift($args);
+                    --$argc;
+                }
+            }
+
+            if (1 > $argc) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception(sprintf('Method "%s" requires minimally content for the stylesheet', $method));
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            $content = $args[0];
+            $attrs   = array();
+            if (isset($args[1])) {
+                $attrs = (array) $args[1];
+            }
+
+            $item = $this->createData($content, $attrs);
+
+            if ('offsetSet' == $action) {
+                $this->offsetSet($index, $item);
+            } else {
+                $this->$action($item);
+            }
+
+            return $this;
+        }
+
+        return parent::__call($method, $args);
+    }
+
+    /**
+     * Determine if a value is a valid style tag
+     *
+     * @param  mixed $value
+     * @param  string $method
+     * @return boolean
+     */
+    protected function _isValid($value)
+    {
+        if ((!$value instanceof stdClass)
+            || !isset($value->content)
+            || !isset($value->attributes))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Override append to enforce style creation
+     *
+     * @param  mixed $value
+     * @return void
+     */
+    public function append($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid value passed to append; please use appendStyle()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->append($value);
+    }
+
+    /**
+     * Override offsetSet to enforce style creation
+     *
+     * @param  string|int $index
+     * @param  mixed $value
+     * @return void
+     */
+    public function offsetSet($index, $value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid value passed to offsetSet; please use offsetSetStyle()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->offsetSet($index, $value);
+    }
+
+    /**
+     * Override prepend to enforce style creation
+     *
+     * @param  mixed $value
+     * @return void
+     */
+    public function prepend($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid value passed to prepend; please use prependStyle()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->prepend($value);
+    }
+
+    /**
+     * Override set to enforce style creation
+     *
+     * @param  mixed $value
+     * @return void
+     */
+    public function set($value)
+    {
+        if (!$this->_isValid($value)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('Invalid value passed to set; please use setStyle()');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this->getContainer()->set($value);
+    }
+
+    /**
+     * Start capture action
+     *
+     * @param  mixed $captureType
+     * @param  string $typeOrAttrs
+     * @return void
+     */
+    public function captureStart($type = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $attrs = null)
+    {
+        if ($this->_captureLock) {
+            require_once 'Zend/View/Helper/Placeholder/Container/Exception.php';
+            $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest headStyle captures');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $this->_captureLock        = true;
+        $this->_captureAttrs       = $attrs;
+        $this->_captureType        = $type;
+        ob_start();
+    }
+
+    /**
+     * End capture action and store
+     *
+     * @return void
+     */
+    public function captureEnd()
+    {
+        $content             = ob_get_clean();
+        $attrs               = $this->_captureAttrs;
+        $this->_captureAttrs = null;
+        $this->_captureLock  = false;
+
+        switch ($this->_captureType) {
+            case Zend_View_Helper_Placeholder_Container_Abstract::SET:
+                $this->setStyle($content, $attrs);
+                break;
+            case Zend_View_Helper_Placeholder_Container_Abstract::PREPEND:
+                $this->prependStyle($content, $attrs);
+                break;
+            case Zend_View_Helper_Placeholder_Container_Abstract::APPEND:
+            default:
+                $this->appendStyle($content, $attrs);
+                break;
+        }
+    }
+
+    /**
+     * Convert content and attributes into valid style tag
+     *
+     * @param  stdClass $item Item to render
+     * @param  string $indent Indentation to use
+     * @return string
+     */
+    public function itemToString(stdClass $item, $indent)
+    {
+        $attrString = '';
+        if (!empty($item->attributes)) {
+            $enc = 'UTF-8';
+            if ($this->view instanceof Zend_View_Interface
+                && method_exists($this->view, 'getEncoding')
+            ) {
+                $enc = $this->view->getEncoding();
+            }
+            foreach ($item->attributes as $key => $value) {
+                if (!in_array($key, $this->_optionalAttributes)) {
+                    continue;
+                }
+                if ('media' == $key) {
+                    if(false === strpos($value, ',')) {
+                        if (!in_array($value, $this->_mediaTypes)) {
+                            continue;
+                        }
+                    } else {
+                        $media_types = explode(',', $value);
+                        $value = '';
+                        foreach($media_types as $type) {
+                            $type = trim($type);
+                            if (!in_array($type, $this->_mediaTypes)) {
+                                continue;
+                            }
+                            $value .= $type .',';
+                        }
+                        $value = substr($value, 0, -1);
+                    }
+                }
+                $attrString .= sprintf(' %s="%s"', $key, htmlspecialchars($value, ENT_COMPAT, $enc));
+            }
+        }
+
+        $escapeStart = $indent . '<!--'. PHP_EOL;
+        $escapeEnd = $indent . '-->'. PHP_EOL;
+        if (isset($item->attributes['conditional'])
+            && !empty($item->attributes['conditional'])
+            && is_string($item->attributes['conditional'])
+        ) {
+            $escapeStart = null;
+            $escapeEnd = null;
+        }
+
+        $html = '<style type="text/css"' . $attrString . '>' . PHP_EOL
+              . $escapeStart . $indent . $item->content . PHP_EOL . $escapeEnd
+              . '</style>';
+
+        if (null == $escapeStart && null == $escapeEnd) {
+            if (str_replace(' ', '', $item->attributes['conditional']) === '!IE') {
+                $html = '<!-->' . $html . '<!--';
+            }
+            $html = '<!--[if ' . $item->attributes['conditional'] . ']>' . $html . '<![endif]-->';
+        }
+
+        return $html;
+    }
+
+    /**
+     * Create string representation of placeholder
+     *
+     * @param  string|int $indent
+     * @return string
+     */
+    public function toString($indent = null)
+    {
+        $indent = (null !== $indent)
+                ? $this->getWhitespace($indent)
+                : $this->getIndent();
+
+        $items = array();
+        $this->getContainer()->ksort();
+        foreach ($this as $item) {
+            if (!$this->_isValid($item)) {
+                continue;
+            }
+            $items[] = $this->itemToString($item, $indent);
+        }
+
+        $return = $indent . implode($this->getSeparator() . $indent, $items);
+        $return = preg_replace("/(\r\n?|\n)/", '$1' . $indent, $return);
+        return $return;
+    }
+
+    /**
+     * Create data item for use in stack
+     *
+     * @param  string $content
+     * @param  array $attributes
+     * @return stdClass
+     */
+    public function createData($content, array $attributes)
+    {
+        if (!isset($attributes['media'])) {
+            $attributes['media'] = 'screen';
+        } else if(is_array($attributes['media'])) {
+            $attributes['media'] = implode(',', $attributes['media']);
+        }
+
+        $data = new stdClass();
+        $data->content    = $content;
+        $data->attributes = $attributes;
+
+        return $data;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HeadTitle.php b/lib/zend/Zend/View/Helper/HeadTitle.php
new file mode 100644
index 00000000000..8f3d9d0dbc0
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HeadTitle.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Helper for setting and retrieving title element for HTML head
+ *
+ * @uses       Zend_View_Helper_Placeholder_Container_Standalone
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+    /**
+     * Registry key for placeholder
+     * @var string
+     */
+    protected $_regKey = 'Zend_View_Helper_HeadTitle';
+
+    /**
+     * Whether or not auto-translation is enabled
+     * @var boolean
+     */
+    protected $_translate = false;
+
+    /**
+     * Translation object
+     *
+     * @var Zend_Translate_Adapter
+     */
+    protected $_translator;
+
+    /**
+     * Default title rendering order (i.e. order in which each title attached)
+     *
+     * @var string
+     */
+    protected $_defaultAttachOrder = null;
+
+    /**
+     * Retrieve placeholder for title element and optionally set state
+     *
+     * @param  string $title
+     * @param  string $setType
+     * @return Zend_View_Helper_HeadTitle
+     */
+    public function headTitle($title = null, $setType = null)
+    {
+        if (null === $setType) {
+            $setType = (null === $this->getDefaultAttachOrder())
+                     ? Zend_View_Helper_Placeholder_Container_Abstract::APPEND
+                     : $this->getDefaultAttachOrder();
+        }
+        $title = (string) $title;
+        if ($title !== '') {
+            if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
+                $this->set($title);
+            } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
+                $this->prepend($title);
+            } else {
+                $this->append($title);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set a default order to add titles
+     *
+     * @param string $setType
+     */
+    public function setDefaultAttachOrder($setType)
+    {
+        if (!in_array($setType, array(
+            Zend_View_Helper_Placeholder_Container_Abstract::APPEND,
+            Zend_View_Helper_Placeholder_Container_Abstract::SET,
+            Zend_View_Helper_Placeholder_Container_Abstract::PREPEND
+        ))) {
+            require_once 'Zend/View/Exception.php';
+            throw new Zend_View_Exception("You must use a valid attach order: 'PREPEND', 'APPEND' or 'SET'");
+        }
+
+        $this->_defaultAttachOrder = $setType;
+        return $this;
+    }
+
+    /**
+     * Get the default attach order, if any.
+     *
+     * @return mixed
+     */
+    public function getDefaultAttachOrder()
+    {
+        return $this->_defaultAttachOrder;
+    }
+
+    /**
+     * Sets a translation Adapter for translation
+     *
+     * @param  Zend_Translate|Zend_Translate_Adapter $translate
+     * @return Zend_View_Helper_HeadTitle
+     */
+    public function setTranslator($translate)
+    {
+        if ($translate instanceof Zend_Translate_Adapter) {
+            $this->_translator = $translate;
+        } elseif ($translate instanceof Zend_Translate) {
+            $this->_translator = $translate->getAdapter();
+        } else {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception("You must set an instance of Zend_Translate or Zend_Translate_Adapter");
+            $e->setView($this->view);
+            throw $e;
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve translation object
+     *
+     * If none is currently registered, attempts to pull it from the registry
+     * using the key 'Zend_Translate'.
+     *
+     * @return Zend_Translate_Adapter|null
+     */
+    public function getTranslator()
+    {
+        if (null === $this->_translator) {
+            require_once 'Zend/Registry.php';
+            if (Zend_Registry::isRegistered('Zend_Translate')) {
+                $this->setTranslator(Zend_Registry::get('Zend_Translate'));
+            }
+        }
+        return $this->_translator;
+    }
+
+    /**
+     * Enables translation
+     *
+     * @return Zend_View_Helper_HeadTitle
+     */
+    public function enableTranslation()
+    {
+        $this->_translate = true;
+        return $this;
+    }
+
+    /**
+     * Disables translation
+     *
+     * @return Zend_View_Helper_HeadTitle
+     */
+    public function disableTranslation()
+    {
+        $this->_translate = false;
+        return $this;
+    }
+
+    /**
+     * Turn helper into string
+     *
+     * @param  string|null $indent
+     * @param  string|null $locale
+     * @return string
+     */
+    public function toString($indent = null, $locale = null)
+    {
+        $indent = (null !== $indent)
+                ? $this->getWhitespace($indent)
+                : $this->getIndent();
+
+        $items = array();
+
+        if($this->_translate && $translator = $this->getTranslator()) {
+            foreach ($this as $item) {
+                $items[] = $translator->translate($item, $locale);
+            }
+        } else {
+            foreach ($this as $item) {
+                $items[] = $item;
+            }
+        }
+
+        $separator = $this->getSeparator();
+        $output = '';
+        if(($prefix = $this->getPrefix())) {
+            $output  .= $prefix;
+        }
+        $output .= implode($separator, $items);
+        if(($postfix = $this->getPostfix())) {
+            $output .= $postfix;
+        }
+
+        $output = ($this->_autoEscape) ? $this->_escape($output) : $output;
+
+        return $indent . '<title>' . $output . '</title>';
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HtmlElement.php b/lib/zend/Zend/View/Helper/HtmlElement.php
new file mode 100644
index 00000000000..263fcd32d22
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HtmlElement.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_Abstract
+ */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_View_Helper_HtmlElement extends Zend_View_Helper_Abstract
+{
+    /**
+     * EOL character
+     */
+    const EOL = "\n";
+
+    /**
+     * The tag closing bracket
+     *
+     * @var string
+     */
+    protected $_closingBracket = null;
+
+    /**
+     * Get the tag closing bracket
+     *
+     * @return string
+     */
+    public function getClosingBracket()
+    {
+        if (!$this->_closingBracket) {
+            if ($this->_isXhtml()) {
+                $this->_closingBracket = ' />';
+            } else {
+                $this->_closingBracket = '>';
+            }
+        }
+
+        return $this->_closingBracket;
+    }
+
+    /**
+     * Is doctype XHTML?
+     *
+     * @return boolean
+     */
+    protected function _isXhtml()
+    {
+        $doctype = $this->view->doctype();
+        return $doctype->isXhtml();
+    }
+
+    /**
+     * Is doctype HTML5?
+     *
+     * @return boolean
+     */
+    protected function _isHtml5()
+    {
+        $doctype = $this->view->doctype();
+        return $doctype->isHtml5();
+    }
+
+    /**
+     * Is doctype strict?
+     *
+     * @return boolean
+     */
+    protected function _isStrictDoctype()
+    {
+        $doctype = $this->view->doctype();
+        return $doctype->isStrict();
+    }
+    
+    /**
+     * Converts an associative array to a string of tag attributes.
+     *
+     * @access public
+     *
+     * @param array $attribs From this array, each key-value pair is
+     * converted to an attribute name and value.
+     *
+     * @return string The XHTML for the attributes.
+     */
+    protected function _htmlAttribs($attribs)
+    {
+        $xhtml = '';
+        foreach ((array) $attribs as $key => $val) {
+            $key = $this->view->escape($key);
+
+            if (('on' == substr($key, 0, 2)) || ('constraints' == $key)) {
+                // Don't escape event attributes; _do_ substitute double quotes with singles
+                if (!is_scalar($val)) {
+                    // non-scalar data should be cast to JSON first
+                    require_once 'Zend/Json.php';
+                    $val = Zend_Json::encode($val);
+                }
+                // Escape single quotes inside event attribute values.
+                // This will create html, where the attribute value has
+                // single quotes around it, and escaped single quotes or
+                // non-escaped double quotes inside of it
+                $val = str_replace('\'', '&#39;', $val);
+            } else {
+                if (is_array($val)) {
+                    $val = implode(' ', $val);
+                }
+                $val = $this->view->escape($val);
+            }
+
+            if ('id' == $key) {
+                $val = $this->_normalizeId($val);
+            }
+
+            if (strpos($val, '"') !== false) {
+                $xhtml .= " $key='$val'";
+            } else {
+                $xhtml .= " $key=\"$val\"";
+            }
+
+        }
+        return $xhtml;
+    }
+
+    /**
+     * Normalize an ID
+     *
+     * @param  string $value
+     * @return string
+     */
+    protected function _normalizeId($value)
+    {
+        if (strstr($value, '[')) {
+            if ('[]' == substr($value, -2)) {
+                $value = substr($value, 0, strlen($value) - 2);
+            }
+            $value = trim($value, ']');
+            $value = str_replace('][', '-', $value);
+            $value = str_replace('[', '-', $value);
+        }
+        return $value;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HtmlFlash.php b/lib/zend/Zend/View/Helper/HtmlFlash.php
new file mode 100644
index 00000000000..3edcf1afcef
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HtmlFlash.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_HtmlObject
+ */
+require_once 'Zend/View/Helper/HtmlObject.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_HtmlFlash extends Zend_View_Helper_HtmlObject
+{
+    /**
+     * Default file type for a flash applet
+     *
+     */
+    const TYPE = 'application/x-shockwave-flash';
+
+    /**
+     * Output a flash movie object tag
+     *
+     * @param string $data The flash file
+     * @param array  $attribs Attribs for the object tag
+     * @param array  $params Params for in the object tag
+     * @param string $content Alternative content
+     * @return string
+     */
+    public function htmlFlash($data, array $attribs = array(), array $params = array(), $content = null)
+    {
+        // Params
+        $params = array_merge(array('movie'   => $data,
+                                    'quality' => 'high'), $params);
+
+        return $this->htmlObject($data, self::TYPE, $attribs, $params, $content);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HtmlList.php b/lib/zend/Zend/View/Helper/HtmlList.php
new file mode 100644
index 00000000000..471ade4808f
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HtmlList.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Zend_View_Helper_FormELement
+ */
+require_once 'Zend/View/Helper/FormElement.php';
+
+/**
+ * Helper for ordered and unordered lists
+ *
+ * @uses Zend_View_Helper_FormElement
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_HtmlList extends Zend_View_Helper_FormElement
+{
+
+    /**
+     * Generates a 'List' element.
+     *
+     * @param array   $items   Array with the elements of the list
+     * @param boolean $ordered Specifies ordered/unordered list; default unordered
+     * @param array   $attribs Attributes for the ol/ul tag.
+     * @return string The list XHTML.
+     */
+    public function htmlList(array $items, $ordered = false, $attribs = false, $escape = true)
+    {
+        if (!is_array($items)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('First param must be an array');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $list = '';
+
+        foreach ($items as $item) {
+            if (!is_array($item)) {
+                if ($escape) {
+                    $item = $this->view->escape($item);
+                }
+                $list .= '<li>' . $item . '</li>' . self::EOL;
+            } else {
+                if (6 < strlen($list)) {
+                    $list = substr($list, 0, strlen($list) - 6)
+                     . $this->htmlList($item, $ordered, $attribs, $escape) . '</li>' . self::EOL;
+                } else {
+                    $list .= '<li>' . $this->htmlList($item, $ordered, $attribs, $escape) . '</li>' . self::EOL;
+                }
+            }
+        }
+
+        if ($attribs) {
+            $attribs = $this->_htmlAttribs($attribs);
+        } else {
+            $attribs = '';
+        }
+
+        $tag = 'ul';
+        if ($ordered) {
+            $tag = 'ol';
+        }
+
+        return '<' . $tag . $attribs . '>' . self::EOL . $list . '</' . $tag . '>' . self::EOL;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HtmlObject.php b/lib/zend/Zend/View/Helper/HtmlObject.php
new file mode 100644
index 00000000000..1eddfea5eeb
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HtmlObject.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_HtmlElement
+ */
+require_once 'Zend/View/Helper/HtmlElement.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_HtmlObject extends Zend_View_Helper_HtmlElement
+{
+    /**
+     * Output an object set
+     *
+     * @param string $data The data file
+     * @param string $type Data file type
+     * @param array  $attribs Attribs for the object tag
+     * @param array  $params Params for in the object tag
+     * @param string $content Alternative content for object
+     * @return string
+     */
+    public function htmlObject($data, $type, array $attribs = array(), array $params = array(), $content = null)
+    {
+        // Merge data and type
+        $attribs = array_merge(array('data' => $data,
+                                     'type' => $type), $attribs);
+
+        // Params
+        $paramHtml = array();
+        $closingBracket = $this->getClosingBracket();
+
+        foreach ($params as $param => $options) {
+            if (is_string($options)) {
+                $options = array('value' => $options);
+            }
+
+            $options = array_merge(array('name' => $param), $options);
+
+            $paramHtml[] = '<param' . $this->_htmlAttribs($options) . $closingBracket;
+        }
+
+        // Content
+        if (is_array($content)) {
+            $content = implode(self::EOL, $content);
+        }
+
+        // Object header
+        $xhtml = '<object' . $this->_htmlAttribs($attribs) . '>' . self::EOL
+                 . implode(self::EOL, $paramHtml) . self::EOL
+                 . ($content ? $content . self::EOL : '')
+                 . '</object>';
+
+        return $xhtml;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HtmlPage.php b/lib/zend/Zend/View/Helper/HtmlPage.php
new file mode 100644
index 00000000000..e7b8b0f200c
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HtmlPage.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_HtmlObject
+ */
+require_once 'Zend/View/Helper/HtmlObject.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_HtmlPage extends Zend_View_Helper_HtmlObject
+{
+    /**
+     * Default file type for html
+     *
+     */
+    const TYPE = 'text/html';
+
+    /**
+     * Object classid
+     *
+     */
+    const ATTRIB_CLASSID  = 'clsid:25336920-03F9-11CF-8FD0-00AA00686F13';
+
+    /**
+     * Default attributes
+     *
+     * @var array
+     */
+    protected $_attribs = array('classid' => self::ATTRIB_CLASSID);
+
+    /**
+     * Output a html object tag
+     *
+     * @param string $data The html url
+     * @param array  $attribs Attribs for the object tag
+     * @param array  $params Params for in the object tag
+     * @param string $content Alternative content
+     * @return string
+     */
+    public function htmlPage($data, array $attribs = array(), array $params = array(), $content = null)
+    {
+        // Attrs
+        $attribs = array_merge($this->_attribs, $attribs);
+
+        // Params
+        $params = array_merge(array('data' => $data), $params);
+
+        return $this->htmlObject($data, self::TYPE, $attribs, $params, $content);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/HtmlQuicktime.php b/lib/zend/Zend/View/Helper/HtmlQuicktime.php
new file mode 100644
index 00000000000..6c200dbcecb
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/HtmlQuicktime.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_HtmlObject
+ */
+require_once 'Zend/View/Helper/HtmlObject.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_HtmlQuicktime extends Zend_View_Helper_HtmlObject
+{
+    /**
+     * Default file type for a movie applet
+     *
+     */
+    const TYPE = 'video/quicktime';
+
+    /**
+     * Object classid
+     *
+     */
+    const ATTRIB_CLASSID  = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
+
+    /**
+     * Object Codebase
+     *
+     */
+    const ATTRIB_CODEBASE = 'http://www.apple.com/qtactivex/qtplugin.cab';
+
+    /**
+     * Default attributes
+     *
+     * @var array
+     */
+    protected $_attribs = array('classid'  => self::ATTRIB_CLASSID,
+                                'codebase' => self::ATTRIB_CODEBASE);
+
+    /**
+     * Output a quicktime movie object tag
+     *
+     * @param string $data The quicktime file
+     * @param array  $attribs Attribs for the object tag
+     * @param array  $params Params for in the object tag
+     * @param string $content Alternative content
+     * @return string
+     */
+    public function htmlQuicktime($data, array $attribs = array(), array $params = array(), $content = null)
+    {
+        // Attrs
+        $attribs = array_merge($this->_attribs, $attribs);
+
+        // Params
+        $params = array_merge(array('src' => $data), $params);
+
+        return $this->htmlObject($data, self::TYPE, $attribs, $params, $content);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/InlineScript.php b/lib/zend/Zend/View/Helper/InlineScript.php
new file mode 100644
index 00000000000..978c6b812b5
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/InlineScript.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_HeadScript */
+require_once 'Zend/View/Helper/HeadScript.php';
+
+/**
+ * Helper for setting and retrieving script elements for inclusion in HTML body
+ * section
+ *
+ * @uses       Zend_View_Helper_Head_Script
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_InlineScript extends Zend_View_Helper_HeadScript
+{
+    /**
+     * Registry key for placeholder
+     * @var string
+     */
+    protected $_regKey = 'Zend_View_Helper_InlineScript';
+
+    /**
+     * Return InlineScript object
+     *
+     * Returns InlineScript helper object; optionally, allows specifying a
+     * script or script file to include.
+     *
+     * @param  string $mode Script or file
+     * @param  string $spec Script/url
+     * @param  string $placement Append, prepend, or set
+     * @param  array $attrs Array of script attributes
+     * @param  string $type Script type and/or array of script attributes
+     * @return Zend_View_Helper_InlineScript
+     */
+    public function inlineScript($mode = Zend_View_Helper_HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
+    {
+        return $this->headScript($mode, $spec, $placement, $attrs, $type);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Interface.php b/lib/zend/Zend/View/Helper/Interface.php
new file mode 100644
index 00000000000..c7e761b2a56
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Interface.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_View_Helper_Interface
+{
+    /**
+     * Set the View object
+     *
+     * @param  Zend_View_Interface $view
+     * @return Zend_View_Helper_Interface
+     */
+    public function setView(Zend_View_Interface $view);
+
+    /**
+     * Strategy pattern: helper method to invoke
+     *
+     * @return mixed
+     */
+    public function direct();
+}
diff --git a/lib/zend/Zend/View/Helper/Json.php b/lib/zend/Zend/View/Helper/Json.php
new file mode 100644
index 00000000000..61b21ec93d2
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Json.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Json */
+require_once 'Zend/Json.php';
+
+/** Zend_Controller_Front */
+require_once 'Zend/Controller/Front.php';
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Helper for simplifying JSON responses
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Json extends Zend_View_Helper_Abstract
+{
+    /**
+     * Encode data as JSON, disable layouts, and set response header
+     *
+     * If $keepLayouts is true, does not disable layouts.
+     * If $encodeJson is false, does not JSON-encode $data
+     *
+     * @param  mixed $data
+     * @param  bool $keepLayouts
+     * NOTE:   if boolean, establish $keepLayouts to true|false
+     *         if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false
+     *         this array can contains a 'keepLayout'=>true|false and/or 'encodeData'=>true|false
+     *         that will not be passed to Zend_Json::encode method but will be used here
+     * @param  bool $encodeData
+     * @return string|void
+     */
+    public function json($data, $keepLayouts = false, $encodeData = true)
+    {
+        $options = array();
+        if (is_array($keepLayouts)) {
+            $options = $keepLayouts;
+
+            $keepLayouts = false;
+            if (array_key_exists('keepLayouts', $options)) {
+                $keepLayouts = $options['keepLayouts'];
+                unset($options['keepLayouts']);
+            }
+
+            if (array_key_exists('encodeData', $options)) {
+                $encodeData = $options['encodeData'];
+                unset($options['encodeData']);
+            }
+        }
+
+        if ($encodeData) {
+            $data = Zend_Json::encode($data, null, $options);
+        }
+        if (!$keepLayouts) {
+            require_once 'Zend/Layout.php';
+            $layout = Zend_Layout::getMvcInstance();
+            if ($layout instanceof Zend_Layout) {
+                $layout->disableLayout();
+            }
+        }
+
+        $response = Zend_Controller_Front::getInstance()->getResponse();
+        $response->setHeader('Content-Type', 'application/json', true);
+        return $data;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Layout.php b/lib/zend/Zend/View/Helper/Layout.php
new file mode 100644
index 00000000000..286a9e38e7e
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Layout.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * View helper for retrieving layout object
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Layout extends Zend_View_Helper_Abstract
+{
+    /** @var Zend_Layout */
+    protected $_layout;
+
+    /**
+     * Get layout object
+     *
+     * @return Zend_Layout
+     */
+    public function getLayout()
+    {
+        if (null === $this->_layout) {
+            require_once 'Zend/Layout.php';
+            $this->_layout = Zend_Layout::getMvcInstance();
+            if (null === $this->_layout) {
+                // Implicitly creates layout object
+                $this->_layout = new Zend_Layout();
+            }
+        }
+
+        return $this->_layout;
+    }
+
+    /**
+     * Set layout object
+     *
+     * @param  Zend_Layout $layout
+     * @return Zend_Layout_Controller_Action_Helper_Layout
+     */
+    public function setLayout(Zend_Layout $layout)
+    {
+        $this->_layout = $layout;
+        return $this;
+    }
+
+    /**
+     * Return layout object
+     *
+     * Usage: $this->layout()->setLayout('alternate');
+     *
+     * @return Zend_Layout
+     */
+    public function layout()
+    {
+        return $this->getLayout();
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Navigation.php b/lib/zend/Zend/View/Helper/Navigation.php
new file mode 100644
index 00000000000..2e82ef6a291
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Navigation.php
@@ -0,0 +1,350 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_Navigation_HelperAbstract
+ */
+require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
+
+/**
+ * Proxy helper for retrieving navigational helpers and forwarding calls
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @method Zend_View_Helper_Navigation_Breadcrumbs breadcrumbs
+ * @method Zend_View_Helper_Navigation_Links links
+ * @method Zend_View_Helper_Navigation_Menu menu
+ * @method Zend_View_Helper_Navigation_Sitemap sitemap
+ */
+class Zend_View_Helper_Navigation
+    extends Zend_View_Helper_Navigation_HelperAbstract
+{
+    /**
+     * View helper namespace
+     *
+     * @var string
+     */
+    const NS = 'Zend_View_Helper_Navigation';
+
+    /**
+     * Default proxy to use in {@link render()}
+     *
+     * @var string
+     */
+    protected $_defaultProxy = 'menu';
+
+    /**
+     * Contains references to proxied helpers
+     *
+     * @var array
+     */
+    protected $_helpers = array();
+
+    /**
+     * Whether container should be injected when proxying
+     *
+     * @var bool
+     */
+    protected $_injectContainer = true;
+
+    /**
+     * Whether ACL should be injected when proxying
+     *
+     * @var bool
+     */
+    protected $_injectAcl = true;
+
+    /**
+     * Whether translator should be injected when proxying
+     *
+     * @var bool
+     */
+    protected $_injectTranslator = true;
+
+    /**
+     * Helper entry point
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               operate on
+     * @return Zend_View_Helper_Navigation           fluent interface, returns
+     *                                               self
+     */
+    public function navigation(Zend_Navigation_Container $container = null)
+    {
+        if (null !== $container) {
+            $this->setContainer($container);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Magic overload: Proxy to other navigation helpers or the container
+     *
+     * Examples of usage from a view script or layout:
+     * <code>
+     * // proxy to Menu helper and render container:
+     * echo $this->navigation()->menu();
+     *
+     * // proxy to Breadcrumbs helper and set indentation:
+     * $this->navigation()->breadcrumbs()->setIndent(8);
+     *
+     * // proxy to container and find all pages with 'blog' route:
+     * $blogPages = $this->navigation()->findAllByRoute('blog');
+     * </code>
+     *
+     * @param  string $method             helper name or method name in
+     *                                    container
+     * @param  array  $arguments          [optional] arguments to pass
+     * @return mixed                      returns what the proxied call returns
+     * @throws Zend_View_Exception        if proxying to a helper, and the
+     *                                    helper is not an instance of the
+     *                                    interface specified in
+     *                                    {@link findHelper()}
+     * @throws Zend_Navigation_Exception  if method does not exist in container
+     */
+    public function __call($method, array $arguments = array())
+    {
+        // check if call should proxy to another helper
+        if ($helper = $this->findHelper($method, false)) {
+            return call_user_func_array(array($helper, $method), $arguments);
+        }
+
+        // default behaviour: proxy call to container
+        return parent::__call($method, $arguments);
+    }
+
+    /**
+     * Returns the helper matching $proxy
+     *
+     * The helper must implement the interface
+     * {@link Zend_View_Helper_Navigation_Helper}.
+     *
+     * @param string $proxy                        helper name
+     * @param bool   $strict                       [optional] whether
+     *                                             exceptions should be
+     *                                             thrown if something goes
+     *                                             wrong. Default is true.
+     * @return Zend_View_Helper_Navigation_Helper  helper instance
+     * @throws Zend_Loader_PluginLoader_Exception  if $strict is true and
+     *                                             helper cannot be found
+     * @throws Zend_View_Exception                 if $strict is true and
+     *                                             helper does not implement
+     *                                             the specified interface
+     */
+    public function findHelper($proxy, $strict = true)
+    {
+        if (isset($this->_helpers[$proxy])) {
+            return $this->_helpers[$proxy];
+        }
+
+        if (!$this->view->getPluginLoader('helper')->getPaths(self::NS)) {
+            // Add navigation helper path at the beginning
+            $paths = $this->view->getHelperPaths();
+            $this->view->setHelperPath(null);
+            
+            $this->view->addHelperPath(
+                    str_replace('_', '/', self::NS),
+                    self::NS);
+            
+            foreach ($paths as $ns => $path) {
+                $this->view->addHelperPath($path, $ns);
+            }
+        }
+
+        if ($strict) {
+            $helper = $this->view->getHelper($proxy);
+        } else {
+            try {
+                $helper = $this->view->getHelper($proxy);
+            } catch (Zend_Loader_PluginLoader_Exception $e) {
+                return null;
+            }
+        }
+
+        if (!$helper instanceof Zend_View_Helper_Navigation_Helper) {
+            if ($strict) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception(sprintf(
+                        'Proxy helper "%s" is not an instance of ' .
+                        'Zend_View_Helper_Navigation_Helper',
+                        get_class($helper)));
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            return null;
+        }
+
+        $this->_inject($helper);
+        $this->_helpers[$proxy] = $helper;
+
+        return $helper;
+    }
+
+    /**
+     * Injects container, ACL, and translator to the given $helper if this
+     * helper is configured to do so
+     *
+     * @param  Zend_View_Helper_Navigation_Helper $helper  helper instance
+     * @return void
+     */
+    protected function _inject(Zend_View_Helper_Navigation_Helper $helper)
+    {
+        if ($this->getInjectContainer() && !$helper->hasContainer()) {
+            $helper->setContainer($this->getContainer());
+        }
+
+        if ($this->getInjectAcl()) {
+            if (!$helper->hasAcl()) {
+                $helper->setAcl($this->getAcl());
+            }
+            if (!$helper->hasRole()) {
+                $helper->setRole($this->getRole());
+            }
+        }
+
+        if ($this->getInjectTranslator() && !$helper->hasTranslator()) {
+            $helper->setTranslator($this->getTranslator());
+        }
+    }
+
+    // Accessors:
+
+    /**
+     * Sets the default proxy to use in {@link render()}
+     *
+     * @param  string $proxy                default proxy
+     * @return Zend_View_Helper_Navigation  fluent interface, returns self
+     */
+    public function setDefaultProxy($proxy)
+    {
+        $this->_defaultProxy = (string) $proxy;
+        return $this;
+    }
+
+    /**
+     * Returns the default proxy to use in {@link render()}
+     *
+     * @return string  the default proxy to use in {@link render()}
+     */
+    public function getDefaultProxy()
+    {
+        return $this->_defaultProxy;
+    }
+
+    /**
+     * Sets whether container should be injected when proxying
+     *
+     * @param bool $injectContainer         [optional] whether container should
+     *                                      be injected when proxying. Default
+     *                                      is true.
+     * @return Zend_View_Helper_Navigation  fluent interface, returns self
+     */
+    public function setInjectContainer($injectContainer = true)
+    {
+        $this->_injectContainer = (bool) $injectContainer;
+        return $this;
+    }
+
+    /**
+     * Returns whether container should be injected when proxying
+     *
+     * @return bool  whether container should be injected when proxying
+     */
+    public function getInjectContainer()
+    {
+        return $this->_injectContainer;
+    }
+
+    /**
+     * Sets whether ACL should be injected when proxying
+     *
+     * @param  bool $injectAcl              [optional] whether ACL should be
+     *                                      injected when proxying. Default is
+     *                                      true.
+     * @return Zend_View_Helper_Navigation  fluent interface, returns self
+     */
+    public function setInjectAcl($injectAcl = true)
+    {
+        $this->_injectAcl = (bool) $injectAcl;
+        return $this;
+    }
+
+    /**
+     * Returns whether ACL should be injected when proxying
+     *
+     * @return bool  whether ACL should be injected when proxying
+     */
+    public function getInjectAcl()
+    {
+        return $this->_injectAcl;
+    }
+
+    /**
+     * Sets whether translator should be injected when proxying
+     *
+     * @param  bool $injectTranslator       [optional] whether translator should
+     *                                      be injected when proxying. Default
+     *                                      is true.
+     * @return Zend_View_Helper_Navigation  fluent interface, returns self
+     */
+    public function setInjectTranslator($injectTranslator = true)
+    {
+        $this->_injectTranslator = (bool) $injectTranslator;
+        return $this;
+    }
+
+    /**
+     * Returns whether translator should be injected when proxying
+     *
+     * @return bool  whether translator should be injected when proxying
+     */
+    public function getInjectTranslator()
+    {
+        return $this->_injectTranslator;
+    }
+
+    // Zend_View_Helper_Navigation_Helper:
+
+    /**
+     * Renders helper
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               render. Default is to
+     *                                               render the container
+     *                                               registered in the helper.
+     * @return string                                helper output
+     * @throws Zend_Loader_PluginLoader_Exception    if helper cannot be found
+     * @throws Zend_View_Exception                   if helper doesn't implement
+     *                                               the interface specified in
+     *                                               {@link findHelper()}
+     */
+    public function render(Zend_Navigation_Container $container = null)
+    {
+        $helper = $this->findHelper($this->getDefaultProxy());
+        return $helper->render($container);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Navigation/Breadcrumbs.php b/lib/zend/Zend/View/Helper/Navigation/Breadcrumbs.php
new file mode 100644
index 00000000000..10755c3df49
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Navigation/Breadcrumbs.php
@@ -0,0 +1,331 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_Navigation_HelperAbstract
+ */
+require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
+
+/**
+ * Helper for printing breadcrumbs
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Navigation_Breadcrumbs
+    extends Zend_View_Helper_Navigation_HelperAbstract
+{
+    /**
+     * Breadcrumbs separator string
+     *
+     * @var string
+     */
+    protected $_separator = ' &gt; ';
+
+    /**
+     * The minimum depth a page must have to be included when rendering
+     *
+     * @var int
+     */
+    protected $_minDepth = 1;
+
+    /**
+     * Whether last page in breadcrumb should be hyperlinked
+     *
+     * @var bool
+     */
+    protected $_linkLast = false;
+
+    /**
+     * Partial view script to use for rendering menu
+     *
+     * @var string|array
+     */
+    protected $_partial;
+
+    /**
+     * View helper entry point:
+     * Retrieves helper and optionally sets container to operate on
+     *
+     * @param  Zend_Navigation_Container $container     [optional] container to
+     *                                                  operate on
+     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
+     *                                                  returns self
+     */
+    public function breadcrumbs(Zend_Navigation_Container $container = null)
+    {
+        if (null !== $container) {
+            $this->setContainer($container);
+        }
+
+        return $this;
+    }
+
+    // Accessors:
+
+    /**
+     * Sets breadcrumb separator
+     *
+     * @param  string $separator                        separator string
+     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
+     *                                                  returns self
+     */
+    public function setSeparator($separator)
+    {
+        if (is_string($separator)) {
+            $this->_separator = $separator;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns breadcrumb separator
+     *
+     * @return string  breadcrumb separator
+     */
+    public function getSeparator()
+    {
+        return $this->_separator;
+    }
+
+    /**
+     * Sets whether last page in breadcrumbs should be hyperlinked
+     *
+     * @param  bool $linkLast                           whether last page should
+     *                                                  be hyperlinked
+     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
+     *                                                  returns self
+     */
+    public function setLinkLast($linkLast)
+    {
+        $this->_linkLast = (bool) $linkLast;
+        return $this;
+    }
+
+    /**
+     * Returns whether last page in breadcrumbs should be hyperlinked
+     *
+     * @return bool  whether last page in breadcrumbs should be hyperlinked
+     */
+    public function getLinkLast()
+    {
+        return $this->_linkLast;
+    }
+
+    /**
+     * Sets which partial view script to use for rendering menu
+     *
+     * @param  string|array $partial                    partial view script or
+     *                                                  null. If an array is
+     *                                                  given, it is expected to
+     *                                                  contain two values;
+     *                                                  the partial view script
+     *                                                  to use, and the module
+     *                                                  where the script can be
+     *                                                  found.
+     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
+     *                                                  returns self
+     */
+    public function setPartial($partial)
+    {
+        if (null === $partial || is_string($partial) || is_array($partial)) {
+            $this->_partial = $partial;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns partial view script to use for rendering menu
+     *
+     * @return string|array|null
+     */
+    public function getPartial()
+    {
+        return $this->_partial;
+    }
+
+    // Render methods:
+
+    /**
+     * Renders breadcrumbs by chaining 'a' elements with the separator
+     * registered in the helper
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               render. Default is to
+     *                                               render the container
+     *                                               registered in the helper.
+     * @return string                                helper output
+     */
+    public function renderStraight(Zend_Navigation_Container $container = null)
+    {
+        if (null === $container) {
+            $container = $this->getContainer();
+        }
+
+        // find deepest active
+        if (!$active = $this->findActive($container)) {
+            return '';
+        }
+
+        $active = $active['page'];
+
+        // put the deepest active page last in breadcrumbs
+        if ($this->getLinkLast()) {
+            $html = $this->htmlify($active);
+        } else {
+            $html = $active->getLabel();
+            if ($this->getUseTranslator() && $t = $this->getTranslator()) {
+                $html = $t->translate($html);
+            }
+            $html = $this->view->escape($html);
+        }
+
+        // walk back to root
+        while ($parent = $active->getParent()) {
+            if ($parent instanceof Zend_Navigation_Page) {
+                // prepend crumb to html
+                $html = $this->htmlify($parent)
+                      . $this->getSeparator()
+                      . $html;
+            }
+
+            if ($parent === $container) {
+                // at the root of the given container
+                break;
+            }
+
+            $active = $parent;
+        }
+
+        return strlen($html) ? $this->getIndent() . $html : '';
+    }
+
+    /**
+     * Renders the given $container by invoking the partial view helper
+     *
+     * The container will simply be passed on as a model to the view script,
+     * so in the script it will be available in <code>$this->container</code>.
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               pass to view script.
+     *                                               Default is to use the
+     *                                               container registered in the
+     *                                               helper.
+     * @param  string|array             $partial     [optional] partial view
+     *                                               script to use. Default is
+     *                                               to use the partial
+     *                                               registered in the helper.
+     *                                               If an array is given, it is
+     *                                               expected to contain two
+     *                                               values; the partial view
+     *                                               script to use, and the
+     *                                               module where the script can
+     *                                               be found.
+     * @return string                                helper output
+     */
+    public function renderPartial(Zend_Navigation_Container $container = null,
+                                  $partial = null)
+    {
+        if (null === $container) {
+            $container = $this->getContainer();
+        }
+
+        if (null === $partial) {
+            $partial = $this->getPartial();
+        }
+
+        if (empty($partial)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception(
+                'Unable to render menu: No partial view script provided'
+            );
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        // put breadcrumb pages in model
+        $model = array('pages' => array());
+        if ($active = $this->findActive($container)) {
+            $active = $active['page'];
+            $model['pages'][] = $active;
+            while ($parent = $active->getParent()) {
+                if ($parent instanceof Zend_Navigation_Page) {
+                    $model['pages'][] = $parent;
+                } else {
+                    break;
+                }
+
+                if ($parent === $container) {
+                    // break if at the root of the given container
+                    break;
+                }
+
+                $active = $parent;
+            }
+            $model['pages'] = array_reverse($model['pages']);
+        }
+
+        if (is_array($partial)) {
+            if (count($partial) != 2) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception(
+                    'Unable to render menu: A view partial supplied as '
+                    .  'an array must contain two values: partial view '
+                    .  'script and module where script can be found'
+                );
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            return $this->view->partial($partial[0], $partial[1], $model);
+        }
+
+        return $this->view->partial($partial, null, $model);
+    }
+
+    // Zend_View_Helper_Navigation_Helper:
+
+    /**
+     * Renders helper
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::render()}.
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               render. Default is to
+     *                                               render the container
+     *                                               registered in the helper.
+     * @return string                                helper output
+     */
+    public function render(Zend_Navigation_Container $container = null)
+    {
+        if ($partial = $this->getPartial()) {
+            return $this->renderPartial($container, $partial);
+        } else {
+            return $this->renderStraight($container);
+        }
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Navigation/Helper.php b/lib/zend/Zend/View/Helper/Navigation/Helper.php
new file mode 100644
index 00000000000..e7d5878160c
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Navigation/Helper.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Interface for navigational helpers
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_View_Helper_Navigation_Helper
+{
+    /**
+     * Sets navigation container the helper should operate on by default
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               operate on. Default is
+     *                                               null, which indicates that
+     *                                               the container should be
+     *                                               reset.
+     * @return Zend_View_Helper_Navigation_Helper    fluent interface, returns
+     *                                               self
+     */
+    public function setContainer(Zend_Navigation_Container $container = null);
+
+    /**
+     * Returns the navigation container the helper operates on by default
+     *
+     * @return Zend_Navigation_Container  navigation container
+     */
+    public function getContainer();
+
+    /**
+     * Sets translator to use in helper
+     *
+     * @param  mixed $translator                   [optional] translator.
+     *                                             Expects an object of type
+     *                                             {@link Zend_Translate_Adapter}
+     *                                             or {@link Zend_Translate},
+     *                                             or null. Default is null.
+     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
+     *                                             self
+     */
+    public function setTranslator($translator = null);
+
+    /**
+     * Returns translator used in helper
+     *
+     * @return Zend_Translate_Adapter|null  translator or null
+     */
+    public function getTranslator();
+
+    /**
+     * Sets ACL to use when iterating pages
+     *
+     * @param  Zend_Acl $acl                       [optional] ACL instance
+     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
+     *                                             self
+     */
+    public function setAcl(Zend_Acl $acl = null);
+
+    /**
+     * Returns ACL or null if it isn't set using {@link setAcl()} or
+     * {@link setDefaultAcl()}
+     *
+     * @return Zend_Acl|null  ACL object or null
+     */
+    public function getAcl();
+
+    /**
+     * Sets ACL role to use when iterating pages
+     *
+     * @param  mixed $role                         [optional] role to set.
+     *                                             Expects a string, an
+     *                                             instance of type
+     *                                             {@link Zend_Acl_Role_Interface},
+     *                                             or null. Default is null.
+     * @throws Zend_View_Exception                 if $role is invalid
+     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
+     *                                             self
+     */
+    public function setRole($role = null);
+
+    /**
+     * Returns ACL role to use when iterating pages, or null if it isn't set
+     *
+     * @return string|Zend_Acl_Role_Interface|null  role or null
+     */
+    public function getRole();
+
+    /**
+     * Sets whether ACL should be used
+     *
+     * @param  bool $useAcl                        [optional] whether ACL
+     *                                             should be used. Default is
+     *                                             true.
+     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
+     *                                             self
+     */
+    public function setUseAcl($useAcl = true);
+
+    /**
+     * Returns whether ACL should be used
+     *
+     * @return bool  whether ACL should be used
+     */
+    public function getUseAcl();
+
+    /**
+     * Return renderInvisible flag
+     *
+     * @return bool
+     */
+    public function getRenderInvisible();
+
+    /**
+     * Render invisible items?
+     *
+     * @param  bool $renderInvisible                       [optional] boolean flag
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface
+     *                                                     returns self
+     */
+    public function setRenderInvisible($renderInvisible = true);
+
+    /**
+     * Sets whether translator should be used
+     *
+     * @param  bool $useTranslator                 [optional] whether
+     *                                             translator should be used.
+     *                                             Default is true.
+     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
+     *                                             self
+     */
+    public function setUseTranslator($useTranslator = true);
+
+    /**
+     * Returns whether translator should be used
+     *
+     * @return bool  whether translator should be used
+     */
+    public function getUseTranslator();
+
+    /**
+     * Checks if the helper has a container
+     *
+     * @return bool  whether the helper has a container or not
+     */
+    public function hasContainer();
+
+    /**
+     * Checks if the helper has an ACL instance
+     *
+     * @return bool  whether the helper has a an ACL instance or not
+     */
+    public function hasAcl();
+
+    /**
+     * Checks if the helper has an ACL role
+     *
+     * @return bool  whether the helper has a an ACL role or not
+     */
+    public function hasRole();
+
+    /**
+     * Checks if the helper has a translator
+     *
+     * @return bool  whether the helper has a translator or not
+     */
+    public function hasTranslator();
+
+    /**
+     * Magic overload: Should proxy to {@link render()}.
+     *
+     * @return string
+     */
+    public function __toString();
+
+    /**
+     * Renders helper
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               render. Default is null,
+     *                                               which indicates that the
+     *                                               helper should render the
+     *                                               container returned by
+     *                                               {@link getContainer()}.
+     * @return string                                helper output
+     * @throws Zend_View_Exception                   if unable to render
+     */
+    public function render(Zend_Navigation_Container $container = null);
+}
diff --git a/lib/zend/Zend/View/Helper/Navigation/HelperAbstract.php b/lib/zend/Zend/View/Helper/Navigation/HelperAbstract.php
new file mode 100644
index 00000000000..2e733e4423f
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Navigation/HelperAbstract.php
@@ -0,0 +1,976 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_Navigation_Helper
+ */
+require_once 'Zend/View/Helper/Navigation/Helper.php';
+
+/**
+ * @see Zend_View_Helper_HtmlElement
+ */
+require_once 'Zend/View/Helper/HtmlElement.php';
+
+/**
+ * Base class for navigational helpers
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_View_Helper_Navigation_HelperAbstract
+    extends Zend_View_Helper_HtmlElement
+    implements Zend_View_Helper_Navigation_Helper
+{
+    /**
+     * Container to operate on by default
+     *
+     * @var Zend_Navigation_Container
+     */
+    protected $_container;
+
+    /**
+     * The minimum depth a page must have to be included when rendering
+     *
+     * @var int
+     */
+    protected $_minDepth;
+
+    /**
+     * The maximum depth a page can have to be included when rendering
+     *
+     * @var int
+     */
+    protected $_maxDepth;
+
+    /**
+     * Indentation string
+     *
+     * @var string
+     */
+    protected $_indent = '';
+
+    /**
+     * Whether HTML/XML output should be formatted
+     *
+     * @var bool
+     */
+    protected $_formatOutput = true;
+
+    /**
+     * Prefix for IDs when they are normalized
+     *
+     * @var string|null
+     */
+    protected $_prefixForId = null;
+
+    /**
+     * Skip current prefix for IDs when they are normalized (flag)
+     *
+     * @var bool
+     */
+    protected $_skipPrefixForId = false;
+
+    /**
+     * Translator
+     *
+     * @var Zend_Translate_Adapter
+     */
+    protected $_translator;
+
+    /**
+     * ACL to use when iterating pages
+     *
+     * @var Zend_Acl
+     */
+    protected $_acl;
+
+    /**
+     * Wheter invisible items should be rendered by this helper
+     *
+     * @var bool
+     */
+    protected $_renderInvisible = false;
+
+    /**
+     * ACL role to use when iterating pages
+     *
+     * @var string|Zend_Acl_Role_Interface
+     */
+    protected $_role;
+
+    /**
+     * Whether translator should be used for page labels and titles
+     *
+     * @var bool
+     */
+    protected $_useTranslator = true;
+
+    /**
+     * Whether ACL should be used for filtering out pages
+     *
+     * @var bool
+     */
+    protected $_useAcl = true;
+
+    /**
+     * Default ACL to use when iterating pages if not explicitly set in the
+     * instance by calling {@link setAcl()}
+     *
+     * @var Zend_Acl
+     */
+    protected static $_defaultAcl;
+
+    /**
+     * Default ACL role to use when iterating pages if not explicitly set in the
+     * instance by calling {@link setRole()}
+     *
+     * @var string|Zend_Acl_Role_Interface
+     */
+    protected static $_defaultRole;
+
+    // Accessors:
+
+    /**
+     * Sets navigation container the helper operates on by default
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Interface::setContainer()}.
+     *
+     * @param  Zend_Navigation_Container $container        [optional] container
+     *                                                     to operate on.
+     *                                                     Default is null,
+     *                                                     meaning container
+     *                                                     will be reset.
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setContainer(Zend_Navigation_Container $container = null)
+    {
+        $this->_container = $container;
+        return $this;
+    }
+
+    /**
+     * Returns the navigation container helper operates on by default
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Interface::getContainer()}.
+     *
+     * If a helper is not explicitly set in this helper instance by calling
+     * {@link setContainer()} or by passing it through the helper entry point,
+     * this method will look in {@link Zend_Registry} for a container by using
+     * the key 'Zend_Navigation'.
+     *
+     * If no container is set, and nothing is found in Zend_Registry, a new
+     * container will be instantiated and stored in the helper.
+     *
+     * @return Zend_Navigation_Container  navigation container
+     */
+    public function getContainer()
+    {
+        if (null === $this->_container) {
+            // try to fetch from registry first
+            require_once 'Zend/Registry.php';
+            if (Zend_Registry::isRegistered('Zend_Navigation')) {
+                $nav = Zend_Registry::get('Zend_Navigation');
+                if ($nav instanceof Zend_Navigation_Container) {
+                    return $this->_container = $nav;
+                }
+            }
+
+            // nothing found in registry, create new container
+            require_once 'Zend/Navigation.php';
+            $this->_container = new Zend_Navigation();
+        }
+
+        return $this->_container;
+    }
+
+    /**
+     * Sets the minimum depth a page must have to be included when rendering
+     *
+     * @param  int $minDepth                               [optional] minimum
+     *                                                     depth. Default is
+     *                                                     null, which sets
+     *                                                     no minimum depth.
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setMinDepth($minDepth = null)
+    {
+        if (null === $minDepth || is_int($minDepth)) {
+            $this->_minDepth = $minDepth;
+        } else {
+            $this->_minDepth = (int) $minDepth;
+        }
+        return $this;
+    }
+
+    /**
+     * Returns minimum depth a page must have to be included when rendering
+     *
+     * @return int|null  minimum depth or null
+     */
+    public function getMinDepth()
+    {
+        if (!is_int($this->_minDepth) || $this->_minDepth < 0) {
+            return 0;
+        }
+        return $this->_minDepth;
+    }
+
+    /**
+     * Sets the maximum depth a page can have to be included when rendering
+     *
+     * @param  int $maxDepth                               [optional] maximum
+     *                                                     depth. Default is
+     *                                                     null, which sets no
+     *                                                     maximum depth.
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setMaxDepth($maxDepth = null)
+    {
+        if (null === $maxDepth || is_int($maxDepth)) {
+            $this->_maxDepth = $maxDepth;
+        } else {
+            $this->_maxDepth = (int) $maxDepth;
+        }
+        return $this;
+    }
+
+    /**
+     * Returns maximum depth a page can have to be included when rendering
+     *
+     * @return int|null  maximum depth or null
+     */
+    public function getMaxDepth()
+    {
+        return $this->_maxDepth;
+    }
+
+    /**
+     * Set the indentation string for using in {@link render()}, optionally a
+     * number of spaces to indent with
+     *
+     * @param  string|int $indent                          indentation string or
+     *                                                     number of spaces
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setIndent($indent)
+    {
+        $this->_indent = $this->_getWhitespace($indent);
+        return $this;
+    }
+
+    /**
+     * Returns indentation (format output is respected)
+     *
+     * @return string   indentation string or an empty string
+     */
+    public function getIndent()
+    {
+        if (false === $this->getFormatOutput()) {
+            return '';
+        }
+
+        return $this->_indent;
+    }
+
+    /**
+     * Returns the EOL character (format output is respected)
+     *
+     * @see self::EOL
+     * @see getFormatOutput()
+     *
+     * @return string       standard EOL charater or an empty string
+     */
+    public function getEOL()
+    {
+        if (false === $this->getFormatOutput()) {
+            return '';
+        }
+
+        return self::EOL;
+    }
+
+    /**
+     * Sets whether HTML/XML output should be formatted
+     *
+     * @param  bool $formatOutput                   [optional] whether output
+     *                                              should be formatted. Default
+     *                                              is true.
+     *
+     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
+     *                                              self
+     */
+    public function setFormatOutput($formatOutput = true)
+    {
+        $this->_formatOutput = (bool)$formatOutput;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether HTML/XML output should be formatted
+     *
+     * @return bool  whether HTML/XML output should be formatted
+     */
+    public function getFormatOutput()
+    {
+        return $this->_formatOutput;
+    }
+
+    /**
+     * Sets prefix for IDs when they are normalized
+     *
+     * @param   string $prefix                              Prefix for IDs
+     * @return  Zend_View_Helper_Navigation_HelperAbstract  fluent interface, returns self
+     */
+    public function setPrefixForId($prefix)
+    {
+        if (is_string($prefix)) {
+            $this->_prefixForId = trim($prefix);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns prefix for IDs when they are normalized
+     *
+     * @return string   Prefix for
+     */
+    public function getPrefixForId()
+    {
+        if (null === $this->_prefixForId) {
+            $prefix             = get_class($this);
+            $this->_prefixForId = strtolower(
+                    trim(substr($prefix, strrpos($prefix, '_')), '_')
+                ) . '-';
+        }
+
+        return $this->_prefixForId;
+    }
+
+    /**
+     * Skip the current prefix for IDs when they are normalized
+     *
+     * @param  bool $flag
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface, returns self
+     */
+    public function skipPrefixForId($flag = true)
+    {
+        $this->_skipPrefixForId = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Sets translator to use in helper
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::setTranslator()}.
+     *
+     * @param  mixed $translator                           [optional] translator.
+     *                                                     Expects an object of
+     *                                                     type
+     *                                                     {@link Zend_Translate_Adapter}
+     *                                                     or {@link Zend_Translate},
+     *                                                     or null. Default is
+     *                                                     null, which sets no
+     *                                                     translator.
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setTranslator($translator = null)
+    {
+        if (null == $translator ||
+            $translator instanceof Zend_Translate_Adapter) {
+            $this->_translator = $translator;
+        } elseif ($translator instanceof Zend_Translate) {
+            $this->_translator = $translator->getAdapter();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns translator used in helper
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::getTranslator()}.
+     *
+     * @return Zend_Translate_Adapter|null  translator or null
+     */
+    public function getTranslator()
+    {
+        if (null === $this->_translator) {
+            require_once 'Zend/Registry.php';
+            if (Zend_Registry::isRegistered('Zend_Translate')) {
+                $this->setTranslator(Zend_Registry::get('Zend_Translate'));
+            }
+        }
+
+        return $this->_translator;
+    }
+
+    /**
+     * Sets ACL to use when iterating pages
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::setAcl()}.
+     *
+     * @param  Zend_Acl $acl                               [optional] ACL object.
+     *                                                     Default is null.
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setAcl(Zend_Acl $acl = null)
+    {
+        $this->_acl = $acl;
+        return $this;
+    }
+
+    /**
+     * Returns ACL or null if it isn't set using {@link setAcl()} or
+     * {@link setDefaultAcl()}
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::getAcl()}.
+     *
+     * @return Zend_Acl|null  ACL object or null
+     */
+    public function getAcl()
+    {
+        if ($this->_acl === null && self::$_defaultAcl !== null) {
+            return self::$_defaultAcl;
+        }
+
+        return $this->_acl;
+    }
+
+    /**
+     * Sets ACL role(s) to use when iterating pages
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::setRole()}.
+     *
+     * @param  mixed $role                                 [optional] role to
+     *                                                     set. Expects a string,
+     *                                                     an instance of type
+     *                                                     {@link Zend_Acl_Role_Interface},
+     *                                                     or null. Default is
+     *                                                     null, which will set
+     *                                                     no role.
+     * @throws Zend_View_Exception                         if $role is invalid
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setRole($role = null)
+    {
+        if (null === $role || is_string($role) ||
+            $role instanceof Zend_Acl_Role_Interface) {
+            $this->_role = $role;
+        } else {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception(sprintf(
+                '$role must be a string, null, or an instance of '
+                .  'Zend_Acl_Role_Interface; %s given',
+                gettype($role)
+            ));
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns ACL role to use when iterating pages, or null if it isn't set
+     * using {@link setRole()} or {@link setDefaultRole()}
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::getRole()}.
+     *
+     * @return string|Zend_Acl_Role_Interface|null  role or null
+     */
+    public function getRole()
+    {
+        if ($this->_role === null && self::$_defaultRole !== null) {
+            return self::$_defaultRole;
+        }
+
+        return $this->_role;
+    }
+
+    /**
+     * Sets whether ACL should be used
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::setUseAcl()}.
+     *
+     * @param  bool $useAcl                                [optional] whether ACL
+     *                                                     should be used.
+     *                                                     Default is true.
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setUseAcl($useAcl = true)
+    {
+        $this->_useAcl = (bool) $useAcl;
+        return $this;
+    }
+
+    /**
+     * Returns whether ACL should be used
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::getUseAcl()}.
+     *
+     * @return bool  whether ACL should be used
+     */
+    public function getUseAcl()
+    {
+        return $this->_useAcl;
+    }
+
+    /**
+     * Return renderInvisible flag
+     *
+     * @return bool
+     */
+    public function getRenderInvisible()
+    {
+        return $this->_renderInvisible;
+    }
+
+    /**
+     * Render invisible items?
+     *
+     * @param  bool $renderInvisible                       [optional] boolean flag
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface
+     *                                                     returns self
+     */
+    public function setRenderInvisible($renderInvisible = true)
+    {
+        $this->_renderInvisible = (bool) $renderInvisible;
+        return $this;
+    }
+
+    /**
+     * Sets whether translator should be used
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::setUseTranslator()}.
+     *
+     * @param  bool $useTranslator                         [optional] whether
+     *                                                     translator should be
+     *                                                     used. Default is true.
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setUseTranslator($useTranslator = true)
+    {
+        $this->_useTranslator = (bool) $useTranslator;
+        return $this;
+    }
+
+    /**
+     * Returns whether translator should be used
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::getUseTranslator()}.
+     *
+     * @return bool  whether translator should be used
+     */
+    public function getUseTranslator()
+    {
+        return $this->_useTranslator;
+    }
+
+    // Magic overloads:
+
+    /**
+     * Magic overload: Proxy calls to the navigation container
+     *
+     * @param  string $method             method name in container
+     * @param  array  $arguments          [optional] arguments to pass
+     * @return mixed                      returns what the container returns
+     * @throws Zend_Navigation_Exception  if method does not exist in container
+     */
+    public function __call($method, array $arguments = array())
+    {
+        return call_user_func_array(
+                array($this->getContainer(), $method),
+                $arguments);
+    }
+
+    /**
+     * Magic overload: Proxy to {@link render()}.
+     *
+     * This method will trigger an E_USER_ERROR if rendering the helper causes
+     * an exception to be thrown.
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::__toString()}.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        try {
+            return $this->render();
+        } catch (Exception $e) {
+            $msg = get_class($e) . ': ' . $e->getMessage();
+            trigger_error($msg, E_USER_ERROR);
+            return '';
+        }
+    }
+
+    // Public methods:
+
+    /**
+     * Finds the deepest active page in the given container
+     *
+     * @param  Zend_Navigation_Container $container  container to search
+     * @param  int|null                  $minDepth   [optional] minimum depth
+     *                                               required for page to be
+     *                                               valid. Default is to use
+     *                                               {@link getMinDepth()}. A
+     *                                               null value means no minimum
+     *                                               depth required.
+     * @param  int|null                  $minDepth   [optional] maximum depth
+     *                                               a page can have to be
+     *                                               valid. Default is to use
+     *                                               {@link getMaxDepth()}. A
+     *                                               null value means no maximum
+     *                                               depth required.
+     * @return array                                 an associative array with
+     *                                               the values 'depth' and
+     *                                               'page', or an empty array
+     *                                               if not found
+     */
+    public function findActive(Zend_Navigation_Container $container,
+                               $minDepth = null,
+                               $maxDepth = -1)
+    {
+        if (!is_int($minDepth)) {
+            $minDepth = $this->getMinDepth();
+        }
+        if ((!is_int($maxDepth) || $maxDepth < 0) && null !== $maxDepth) {
+            $maxDepth = $this->getMaxDepth();
+        }
+
+        $found  = null;
+        $foundDepth = -1;
+        $iterator = new RecursiveIteratorIterator($container,
+                RecursiveIteratorIterator::CHILD_FIRST);
+
+        foreach ($iterator as $page) {
+            $currDepth = $iterator->getDepth();
+            if ($currDepth < $minDepth || !$this->accept($page)) {
+                // page is not accepted
+                continue;
+            }
+
+            if ($page->isActive(false) && $currDepth > $foundDepth) {
+                // found an active page at a deeper level than before
+                $found = $page;
+                $foundDepth = $currDepth;
+            }
+        }
+
+        if (is_int($maxDepth) && $foundDepth > $maxDepth) {
+            while ($foundDepth > $maxDepth) {
+                if (--$foundDepth < $minDepth) {
+                    $found = null;
+                    break;
+                }
+
+                $found = $found->getParent();
+                if (!$found instanceof Zend_Navigation_Page) {
+                    $found = null;
+                    break;
+                }
+            }
+        }
+
+        if ($found) {
+            return array('page' => $found, 'depth' => $foundDepth);
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * Checks if the helper has a container
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::hasContainer()}.
+     *
+     * @return bool  whether the helper has a container or not
+     */
+    public function hasContainer()
+    {
+        return null !== $this->_container;
+    }
+
+    /**
+     * Checks if the helper has an ACL instance
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::hasAcl()}.
+     *
+     * @return bool  whether the helper has a an ACL instance or not
+     */
+    public function hasAcl()
+    {
+        return null !== $this->_acl;
+    }
+
+    /**
+     * Checks if the helper has an ACL role
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::hasRole()}.
+     *
+     * @return bool  whether the helper has a an ACL role or not
+     */
+    public function hasRole()
+    {
+        return null !== $this->_role;
+    }
+
+    /**
+     * Checks if the helper has a translator
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::hasTranslator()}.
+     *
+     * @return bool  whether the helper has a translator or not
+     */
+    public function hasTranslator()
+    {
+        return null !== $this->_translator;
+    }
+
+    /**
+     * Returns an HTML string containing an 'a' element for the given page
+     *
+     * @param  Zend_Navigation_Page $page  page to generate HTML for
+     * @return string                      HTML string for the given page
+     */
+    public function htmlify(Zend_Navigation_Page $page)
+    {
+        // get label and title for translating
+        $label = $page->getLabel();
+        $title = $page->getTitle();
+
+        if ($this->getUseTranslator() && $t = $this->getTranslator()) {
+            if (is_string($label) && !empty($label)) {
+                $label = $t->translate($label);
+            }
+            if (is_string($title) && !empty($title)) {
+                $title = $t->translate($title);
+            }
+        }
+
+        // get attribs for anchor element
+        $attribs = array_merge(
+            array(
+                'id'     => $page->getId(),
+                'title'  => $title,
+                'class'  => $page->getClass(),
+                'href'   => $page->getHref(),
+                'target' => $page->getTarget()
+            ),
+            $page->getCustomHtmlAttribs()
+        );
+
+        return '<a' . $this->_htmlAttribs($attribs) . '>'
+             . $this->view->escape($label)
+             . '</a>';
+    }
+
+    // Iterator filter methods:
+
+    /**
+     * Determines whether a page should be accepted when iterating
+     *
+     * Rules:
+     * - If a page is not visible it is not accepted, unless RenderInvisible has
+     *   been set to true.
+     * - If helper has no ACL, page is accepted
+     * - If helper has ACL, but no role, page is not accepted
+     * - If helper has ACL and role:
+     *  - Page is accepted if it has no resource or privilege
+     *  - Page is accepted if ACL allows page's resource or privilege
+     * - If page is accepted by the rules above and $recursive is true, the page
+     *   will not be accepted if it is the descendant of a non-accepted page.
+     *
+     * @param  Zend_Navigation_Page $page      page to check
+     * @param  bool                $recursive  [optional] if true, page will not
+     *                                         be accepted if it is the
+     *                                         descendant of a page that is not
+     *                                         accepted. Default is true.
+     * @return bool                            whether page should be accepted
+     */
+    public function accept(Zend_Navigation_Page $page, $recursive = true)
+    {
+        // accept by default
+        $accept = true;
+
+        if (!$page->isVisible(false) && !$this->getRenderInvisible()) {
+            // don't accept invisible pages
+            $accept = false;
+        } elseif ($this->getUseAcl() && !$this->_acceptAcl($page)) {
+            // acl is not amused
+            $accept = false;
+        }
+
+        if ($accept && $recursive) {
+            $parent = $page->getParent();
+            if ($parent instanceof Zend_Navigation_Page) {
+                $accept = $this->accept($parent, true);
+            }
+        }
+
+        return $accept;
+    }
+
+    /**
+     * Determines whether a page should be accepted by ACL when iterating
+     *
+     * Rules:
+     * - If helper has no ACL, page is accepted
+     * - If page has a resource or privilege defined, page is accepted
+     *   if the ACL allows access to it using the helper's role
+     * - If page has no resource or privilege, page is accepted
+     *
+     * @param  Zend_Navigation_Page $page  page to check
+     * @return bool                        whether page is accepted by ACL
+     */
+    protected function _acceptAcl(Zend_Navigation_Page $page)
+    {
+        if (!$acl = $this->getAcl()) {
+            // no acl registered means don't use acl
+            return true;
+        }
+
+        $role = $this->getRole();
+        $resource = $page->getResource();
+        $privilege = $page->getPrivilege();
+
+        if ($resource || $privilege) {
+            // determine using helper role and page resource/privilege
+            return $acl->isAllowed($role, $resource, $privilege);
+        }
+
+        return true;
+    }
+
+    // Util methods:
+
+    /**
+     * Retrieve whitespace representation of $indent
+     *
+     * @param  int|string $indent
+     * @return string
+     */
+    protected function _getWhitespace($indent)
+    {
+        if (is_int($indent)) {
+            $indent = str_repeat(' ', $indent);
+        }
+
+        return (string) $indent;
+    }
+
+    /**
+     * Converts an associative array to a string of tag attributes.
+     *
+     * Overloads {@link Zend_View_Helper_HtmlElement::_htmlAttribs()}.
+     *
+     * @param  array $attribs  an array where each key-value pair is converted
+     *                         to an attribute name and value
+     * @return string          an attribute string
+     */
+    protected function _htmlAttribs($attribs)
+    {
+        // filter out null values and empty string values
+        foreach ($attribs as $key => $value) {
+            if ($value === null || (is_string($value) && !strlen($value))) {
+                unset($attribs[$key]);
+            }
+        }
+
+        return parent::_htmlAttribs($attribs);
+    }
+
+    /**
+     * Normalize an ID
+     *
+     * Extends {@link Zend_View_Helper_HtmlElement::_normalizeId()}.
+     *
+     * @param  string $value    ID
+     * @return string           Normalized ID
+     */
+    protected function _normalizeId($value)
+    {        
+        if (false === $this->_skipPrefixForId) {
+            $prefix = $this->getPrefixForId();
+
+            if (strlen($prefix)) {
+                return $prefix . $value;
+            }
+        }
+
+        return parent::_normalizeId($value);
+    }
+
+    // Static methods:
+
+    /**
+     * Sets default ACL to use if another ACL is not explicitly set
+     *
+     * @param  Zend_Acl $acl  [optional] ACL object. Default is null, which
+     *                        sets no ACL object.
+     * @return void
+     */
+    public static function setDefaultAcl(Zend_Acl $acl = null)
+    {
+        self::$_defaultAcl = $acl;
+    }
+
+    /**
+     * Sets default ACL role(s) to use when iterating pages if not explicitly
+     * set later with {@link setRole()}
+     *
+     * @param  mixed $role               [optional] role to set. Expects null,
+     *                                   string, or an instance of
+     *                                   {@link Zend_Acl_Role_Interface}.
+     *                                   Default is null, which sets no default
+     *                                   role.
+     * @throws Zend_View_Exception       if role is invalid
+     * @return void
+     */
+    public static function setDefaultRole($role = null)
+    {
+        if (null === $role ||
+            is_string($role) ||
+            $role instanceof Zend_Acl_Role_Interface) {
+            self::$_defaultRole = $role;
+        } else {
+            require_once 'Zend/View/Exception.php';
+            throw new Zend_View_Exception(
+                '$role must be null|string|Zend_Acl_Role_Interface'
+            );
+        }
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Navigation/Links.php b/lib/zend/Zend/View/Helper/Navigation/Links.php
new file mode 100644
index 00000000000..5d05c1008b4
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Navigation/Links.php
@@ -0,0 +1,783 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_Navigation_HelperAbstract
+ */
+require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
+
+/**
+ * Helper for printing <link> elements
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Navigation_Links
+    extends Zend_View_Helper_Navigation_HelperAbstract
+{
+    /**#@+
+     * Constants used for specifying which link types to find and render
+     *
+     * @var int
+     */
+    const RENDER_ALTERNATE  = 0x0001;
+    const RENDER_STYLESHEET = 0x0002;
+    const RENDER_START      = 0x0004;
+    const RENDER_NEXT       = 0x0008;
+    const RENDER_PREV       = 0x0010;
+    const RENDER_CONTENTS   = 0x0020;
+    const RENDER_INDEX      = 0x0040;
+    const RENDER_GLOSSARY   = 0x0080;
+    const RENDER_COPYRIGHT  = 0x0100;
+    const RENDER_CHAPTER    = 0x0200;
+    const RENDER_SECTION    = 0x0400;
+    const RENDER_SUBSECTION = 0x0800;
+    const RENDER_APPENDIX   = 0x1000;
+    const RENDER_HELP       = 0x2000;
+    const RENDER_BOOKMARK   = 0x4000;
+    const RENDER_CUSTOM     = 0x8000;
+    const RENDER_ALL        = 0xffff;
+    /**#@+**/
+
+    /**
+     * Maps render constants to W3C link types
+     *
+     * @var array
+     */
+    protected static $_RELATIONS = array(
+        self::RENDER_ALTERNATE  => 'alternate',
+        self::RENDER_STYLESHEET => 'stylesheet',
+        self::RENDER_START      => 'start',
+        self::RENDER_NEXT       => 'next',
+        self::RENDER_PREV       => 'prev',
+        self::RENDER_CONTENTS   => 'contents',
+        self::RENDER_INDEX      => 'index',
+        self::RENDER_GLOSSARY   => 'glossary',
+        self::RENDER_COPYRIGHT  => 'copyright',
+        self::RENDER_CHAPTER    => 'chapter',
+        self::RENDER_SECTION    => 'section',
+        self::RENDER_SUBSECTION => 'subsection',
+        self::RENDER_APPENDIX   => 'appendix',
+        self::RENDER_HELP       => 'help',
+        self::RENDER_BOOKMARK   => 'bookmark'
+    );
+
+    /**
+     * The helper's render flag
+     *
+     * @see render()
+     * @see setRenderFlag()
+     * @var int
+     */
+    protected $_renderFlag = self::RENDER_ALL;
+
+    /**
+     * Root container
+     *
+     * Used for preventing methods to traverse above the container given to
+     * the {@link render()} method.
+     *
+     * @see _findRoot()
+     *
+     * @var Zend_Navigation_Container
+     */
+    protected $_root;
+
+    /**
+     * View helper entry point:
+     * Retrieves helper and optionally sets container to operate on
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               operate on
+     * @return Zend_View_Helper_Navigation_Links     fluent interface, returns
+     *                                               self
+     */
+    public function links(Zend_Navigation_Container $container = null)
+    {
+        if (null !== $container) {
+            $this->setContainer($container);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Magic overload: Proxy calls to {@link findRelation()} or container
+     *
+     * Examples of finder calls:
+     * <code>
+     * // METHOD                  // SAME AS
+     * $h->findRelNext($page);    // $h->findRelation($page, 'rel', 'next')
+     * $h->findRevSection($page); // $h->findRelation($page, 'rev', 'section');
+     * $h->findRelFoo($page);     // $h->findRelation($page, 'rel', 'foo');
+     * </code>
+     *
+     * @param  string $method             method name
+     * @param  array  $arguments          method arguments
+     * @throws Zend_Navigation_Exception  if method does not exist in container
+     */
+    public function __call($method, array $arguments = array())
+    {
+        if (@preg_match('/find(Rel|Rev)(.+)/', $method, $match)) {
+            return $this->findRelation($arguments[0],
+                                       strtolower($match[1]),
+                                       strtolower($match[2]));
+        }
+
+        return parent::__call($method, $arguments);
+    }
+
+    // Accessors:
+
+    /**
+     * Sets the helper's render flag
+     *
+     * The helper uses the bitwise '&' operator against the hex values of the
+     * render constants. This means that the flag can is "bitwised" value of
+     * the render constants. Examples:
+     * <code>
+     * // render all links except glossary
+     * $flag = Zend_View_Helper_Navigation_Links:RENDER_ALL ^
+     *         Zend_View_Helper_Navigation_Links:RENDER_GLOSSARY;
+     * $helper->setRenderFlag($flag);
+     *
+     * // render only chapters and sections
+     * $flag = Zend_View_Helper_Navigation_Links:RENDER_CHAPTER |
+     *         Zend_View_Helper_Navigation_Links:RENDER_SECTION;
+     * $helper->setRenderFlag($flag);
+     *
+     * // render only relations that are not native W3C relations
+     * $helper->setRenderFlag(Zend_View_Helper_Navigation_Links:RENDER_CUSTOM);
+     *
+     * // render all relations (default)
+     * $helper->setRenderFlag(Zend_View_Helper_Navigation_Links:RENDER_ALL);
+     * </code>
+     *
+     * Note that custom relations can also be rendered directly using the
+     * {@link renderLink()} method.
+     *
+     * @param  int $renderFlag                    render flag
+     * @return Zend_View_Helper_Navigation_Links  fluent interface, returns self
+     */
+    public function setRenderFlag($renderFlag)
+    {
+        $this->_renderFlag = (int) $renderFlag;
+        return $this;
+    }
+
+    /**
+     * Returns the helper's render flag
+     *
+     * @return int  render flag
+     */
+    public function getRenderFlag()
+    {
+        return $this->_renderFlag;
+    }
+
+    // Finder methods:
+
+    /**
+     * Finds all relations (forward and reverse) for the given $page
+     *
+     * The form of the returned array:
+     * <code>
+     * // $page denotes an instance of Zend_Navigation_Page
+     * $returned = array(
+     *     'rel' => array(
+     *         'alternate' => array($page, $page, $page),
+     *         'start'     => array($page),
+     *         'next'      => array($page),
+     *         'prev'      => array($page),
+     *         'canonical' => array($page)
+     *     ),
+     *     'rev' => array(
+     *         'section'   => array($page)
+     *     )
+     * );
+     * </code>
+     *
+     * @param  Zend_Navigation_Page $page  page to find links for
+     * @return array                       related pages
+     */
+    public function findAllRelations(Zend_Navigation_Page $page,
+                                     $flag = null)
+    {
+        if (!is_int($flag)) {
+            $flag = self::RENDER_ALL;
+        }
+
+        $result = array('rel' => array(), 'rev' => array());
+        $native = array_values(self::$_RELATIONS);
+
+        foreach (array_keys($result) as $rel) {
+            $meth = 'getDefined' . ucfirst($rel);
+            $types = array_merge($native, array_diff($page->$meth(), $native));
+
+            foreach ($types as $type) {
+                if (!$relFlag = array_search($type, self::$_RELATIONS)) {
+                    $relFlag = self::RENDER_CUSTOM;
+                }
+                if (!($flag & $relFlag)) {
+                    continue;
+                }
+                if ($found = $this->findRelation($page, $rel, $type)) {
+                    if (!is_array($found)) {
+                        $found = array($found);
+                    }
+                    $result[$rel][$type] = $found;
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Finds relations of the given $rel=$type from $page
+     *
+     * This method will first look for relations in the page instance, then
+     * by searching the root container if nothing was found in the page.
+     *
+     * @param  Zend_Navigation_Page $page       page to find relations for
+     * @param  string              $rel         relation, "rel" or "rev"
+     * @param  string              $type        link type, e.g. 'start', 'next'
+     * @return Zend_Navigaiton_Page|array|null  page(s), or null if not found
+     * @throws Zend_View_Exception              if $rel is not "rel" or "rev"
+     */
+    public function findRelation(Zend_Navigation_Page $page, $rel, $type)
+    {
+        if (!in_array($rel, array('rel', 'rev'))) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception(sprintf(
+                'Invalid argument: $rel must be "rel" or "rev"; "%s" given',
+                $rel));
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        if (!$result = $this->_findFromProperty($page, $rel, $type)) {
+            $result = $this->_findFromSearch($page, $rel, $type);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Finds relations of given $type for $page by checking if the
+     * relation is specified as a property of $page
+     *
+     * @param  Zend_Navigation_Page $page       page to find relations for
+     * @param  string              $rel         relation, 'rel' or 'rev'
+     * @param  string              $type        link type, e.g. 'start', 'next'
+     * @return Zend_Navigation_Page|array|null  page(s), or null if not found
+     */
+    protected function _findFromProperty(Zend_Navigation_Page $page, $rel, $type)
+    {
+        $method = 'get' . ucfirst($rel);
+        if ($result = $page->$method($type)) {
+            if ($result = $this->_convertToPages($result)) {
+                if (!is_array($result)) {
+                    $result = array($result);
+                }
+
+                foreach ($result as $key => $page) {
+                    if (!$this->accept($page)) {
+                        unset($result[$key]);
+                    }
+                }
+
+                return count($result) == 1 ? $result[0] : $result;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Finds relations of given $rel=$type for $page by using the helper to
+     * search for the relation in the root container
+     *
+     * @param  Zend_Navigation_Page $page  page to find relations for
+     * @param  string              $rel    relation, 'rel' or 'rev'
+     * @param  string              $type   link type, e.g. 'start', 'next', etc
+     * @return array|null                  array of pages, or null if not found
+     */
+    protected function _findFromSearch(Zend_Navigation_Page $page, $rel, $type)
+    {
+        $found = null;
+
+        $method = 'search' . ucfirst($rel) . ucfirst($type);
+        if (method_exists($this, $method)) {
+            $found = $this->$method($page);
+        }
+
+        return $found;
+    }
+
+    // Search methods:
+
+    /**
+     * Searches the root container for the forward 'start' relation of the given
+     * $page
+     *
+     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
+     * Refers to the first document in a collection of documents. This link type
+     * tells search engines which document is considered by the author to be the
+     * starting point of the collection.
+     *
+     * @param  Zend_Navigation_Page $page  page to find relation for
+     * @return Zend_Navigation_Page|null   page or null
+     */
+    public function searchRelStart(Zend_Navigation_Page $page)
+    {
+        $found = $this->_findRoot($page);
+        if (!$found instanceof Zend_Navigation_Page) {
+            $found->rewind();
+            $found = $found->current();
+        }
+
+        if ($found === $page || !$this->accept($found)) {
+            $found = null;
+        }
+
+        return $found;
+    }
+
+    /**
+     * Searches the root container for the forward 'next' relation of the given
+     * $page
+     *
+     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
+     * Refers to the next document in a linear sequence of documents. User
+     * agents may choose to preload the "next" document, to reduce the perceived
+     * load time.
+     *
+     * @param  Zend_Navigation_Page $page  page to find relation for
+     * @return Zend_Navigation_Page|null   page(s) or null
+     */
+    public function searchRelNext(Zend_Navigation_Page $page)
+    {
+        $found = null;
+        $break = false;
+        $iterator = new RecursiveIteratorIterator($this->_findRoot($page),
+                RecursiveIteratorIterator::SELF_FIRST);
+        foreach ($iterator as $intermediate) {
+            if ($intermediate === $page) {
+                // current page; break at next accepted page
+                $break = true;
+                continue;
+            }
+
+            if ($break && $this->accept($intermediate)) {
+                $found = $intermediate;
+                break;
+            }
+        }
+
+        return $found;
+    }
+
+    /**
+     * Searches the root container for the forward 'prev' relation of the given
+     * $page
+     *
+     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
+     * Refers to the previous document in an ordered series of documents. Some
+     * user agents also support the synonym "Previous".
+     *
+     * @param  Zend_Navigation_Page $page  page to find relation for
+     * @return Zend_Navigation_Page|null   page or null
+     */
+    public function searchRelPrev(Zend_Navigation_Page $page)
+    {
+        $found = null;
+        $prev = null;
+        $iterator = new RecursiveIteratorIterator(
+                $this->_findRoot($page),
+                RecursiveIteratorIterator::SELF_FIRST);
+        foreach ($iterator as $intermediate) {
+            if (!$this->accept($intermediate)) {
+                continue;
+            }
+            if ($intermediate === $page) {
+                $found = $prev;
+                break;
+            }
+
+            $prev = $intermediate;
+        }
+
+        return $found;
+    }
+
+    /**
+     * Searches the root container for forward 'chapter' relations of the given
+     * $page
+     *
+     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
+     * Refers to a document serving as a chapter in a collection of documents.
+     *
+     * @param  Zend_Navigation_Page $page       page to find relation for
+     * @return Zend_Navigation_Page|array|null  page(s) or null
+     */
+    public function searchRelChapter(Zend_Navigation_Page $page)
+    {
+        $found = array();
+
+        // find first level of pages
+        $root = $this->_findRoot($page);
+
+        // find start page(s)
+        $start = $this->findRelation($page, 'rel', 'start');
+        if (!is_array($start)) {
+            $start = array($start);
+        }
+
+        foreach ($root as $chapter) {
+            // exclude self and start page from chapters
+            if ($chapter !== $page &&
+                !in_array($chapter, $start) &&
+                $this->accept($chapter)) {
+                $found[] = $chapter;
+            }
+        }
+
+        switch (count($found)) {
+            case 0:
+                return null;
+            case 1:
+                return $found[0];
+            default:
+                return $found;
+        }
+    }
+
+    /**
+     * Searches the root container for forward 'section' relations of the given
+     * $page
+     *
+     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
+     * Refers to a document serving as a section in a collection of documents.
+     *
+     * @param  Zend_Navigation_Page $page       page to find relation for
+     * @return Zend_Navigation_Page|array|null  page(s) or null
+     */
+    public function searchRelSection(Zend_Navigation_Page $page)
+    {
+        $found = array();
+
+        // check if given page has pages and is a chapter page
+        if ($page->hasPages() && $this->_findRoot($page)->hasPage($page)) {
+            foreach ($page as $section) {
+                if ($this->accept($section)) {
+                    $found[] = $section;
+                }
+            }
+        }
+
+        switch (count($found)) {
+            case 0:
+                return null;
+            case 1:
+                return $found[0];
+            default:
+                return $found;
+        }
+    }
+
+    /**
+     * Searches the root container for forward 'subsection' relations of the
+     * given $page
+     *
+     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
+     * Refers to a document serving as a subsection in a collection of
+     * documents.
+     *
+     * @param  Zend_Navigation_Page $page       page to find relation for
+     * @return Zend_Navigation_Page|array|null  page(s) or null
+     */
+    public function searchRelSubsection(Zend_Navigation_Page $page)
+    {
+        $found = array();
+
+        if ($page->hasPages()) {
+            // given page has child pages, loop chapters
+            foreach ($this->_findRoot($page) as $chapter) {
+                // is page a section?
+                if ($chapter->hasPage($page)) {
+                    foreach ($page as $subsection) {
+                        if ($this->accept($subsection)) {
+                            $found[] = $subsection;
+                        }
+                    }
+                }
+            }
+        }
+
+        switch (count($found)) {
+            case 0:
+                return null;
+            case 1:
+                return $found[0];
+            default:
+                return $found;
+        }
+    }
+
+    /**
+     * Searches the root container for the reverse 'section' relation of the
+     * given $page
+     *
+     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
+     * Refers to a document serving as a section in a collection of documents.
+     *
+     * @param  Zend_Navigation_Page $page  page to find relation for
+     * @return Zend_Navigation_Page|null   page(s) or null
+     */
+    public function searchRevSection(Zend_Navigation_Page $page)
+    {
+        $found = null;
+
+        if ($parent = $page->getParent()) {
+            if ($parent instanceof Zend_Navigation_Page &&
+                $this->_findRoot($page)->hasPage($parent)) {
+                $found = $parent;
+            }
+        }
+
+        return $found;
+    }
+
+    /**
+     * Searches the root container for the reverse 'section' relation of the
+     * given $page
+     *
+     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
+     * Refers to a document serving as a subsection in a collection of
+     * documents.
+     *
+     * @param  Zend_Navigation_Page $page  page to find relation for
+     * @return Zend_Navigation_Page|null   page(s) or null
+     */
+    public function searchRevSubsection(Zend_Navigation_Page $page)
+    {
+        $found = null;
+
+        if ($parent = $page->getParent()) {
+            if ($parent instanceof Zend_Navigation_Page) {
+                $root = $this->_findRoot($page);
+                foreach ($root as $chapter) {
+                    if ($chapter->hasPage($parent)) {
+                        $found = $parent;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $found;
+    }
+
+    // Util methods:
+
+    /**
+     * Returns the root container of the given page
+     *
+     * When rendering a container, the render method still store the given
+     * container as the root container, and unset it when done rendering. This
+     * makes sure finder methods will not traverse above the container given
+     * to the render method.
+     *
+     * @param  Zend_Navigaiton_Page $page  page to find root for
+     * @return Zend_Navigation_Container   the root container of the given page
+     */
+    protected function _findRoot(Zend_Navigation_Page $page)
+    {
+        if ($this->_root) {
+            return $this->_root;
+        }
+
+        $root = $page;
+
+        while ($parent = $page->getParent()) {
+            $root = $parent;
+            if ($parent instanceof Zend_Navigation_Page) {
+                $page = $parent;
+            } else {
+                break;
+            }
+        }
+
+        return $root;
+    }
+
+    /**
+     * Converts a $mixed value to an array of pages
+     *
+     * @param  mixed $mixed                     mixed value to get page(s) from
+     * @param  bool  $recursive                 whether $value should be looped
+     *                                          if it is an array or a config
+     * @return Zend_Navigation_Page|array|null  empty if unable to convert
+     */
+    protected function _convertToPages($mixed, $recursive = true)
+    {
+        if (is_object($mixed)) {
+            if ($mixed instanceof Zend_Navigation_Page) {
+                // value is a page instance; return directly
+                return $mixed;
+            } elseif ($mixed instanceof Zend_Navigation_Container) {
+                // value is a container; return pages in it
+                $pages = array();
+                foreach ($mixed as $page) {
+                    $pages[] = $page;
+                }
+                return $pages;
+            } elseif ($mixed instanceof Zend_Config) {
+                // convert config object to array and extract
+                return $this->_convertToPages($mixed->toArray(), $recursive);
+            }
+        } elseif (is_string($mixed)) {
+            // value is a string; make an URI page
+            return Zend_Navigation_Page::factory(array(
+                'type' => 'uri',
+                'uri'  => $mixed
+            ));
+        } elseif (is_array($mixed) && !empty($mixed)) {
+            if ($recursive && is_numeric(key($mixed))) {
+                // first key is numeric; assume several pages
+                $pages = array();
+                foreach ($mixed as $value) {
+                    if ($value = $this->_convertToPages($value, false)) {
+                        $pages[] = $value;
+                    }
+                }
+                return $pages;
+            } else {
+                // pass array to factory directly
+                try {
+                    $page = Zend_Navigation_Page::factory($mixed);
+                    return $page;
+                } catch (Exception $e) {
+                }
+            }
+        }
+
+        // nothing found
+        return null;
+    }
+
+    // Render methods:
+
+    /**
+     * Renders the given $page as a link element, with $attrib = $relation
+     *
+     * @param  Zend_Navigation_Page $page      the page to render the link for
+     * @param  string               $attrib    the attribute to use for $type,
+     *                                         either 'rel' or 'rev'
+     * @param  string               $relation  relation type, muse be one of;
+     *                                         alternate, appendix, bookmark,
+     *                                         chapter, contents, copyright,
+     *                                         glossary, help, home, index, next,
+     *                                         prev, section, start, stylesheet,
+     *                                         subsection
+     * @return string                          rendered link element
+     * @throws Zend_View_Exception             if $attrib is invalid
+     */
+    public function renderLink(Zend_Navigation_Page $page, $attrib, $relation)
+    {
+        if (!in_array($attrib, array('rel', 'rev'))) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception(sprintf(
+                    'Invalid relation attribute "%s", must be "rel" or "rev"',
+                    $attrib));
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        if (!$href = $page->getHref()) {
+            return '';
+        }
+
+        // TODO: add more attribs
+        // http://www.w3.org/TR/html401/struct/links.html#h-12.2
+        $attribs = array(
+            $attrib  => $relation,
+            'href'   => $href,
+            'title'  => $page->getLabel()
+        );
+
+        return '<link' .
+               $this->_htmlAttribs($attribs) .
+               $this->getClosingBracket();
+    }
+
+    // Zend_View_Helper_Navigation_Helper:
+
+    /**
+     * Renders helper
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::render()}.
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               render. Default is to
+     *                                               render the container
+     *                                               registered in the helper.
+     * @return string                                helper output
+     */
+    public function render(Zend_Navigation_Container $container = null)
+    {
+        if (null === $container) {
+            $container = $this->getContainer();
+        }
+
+        if ($active = $this->findActive($container)) {
+            $active = $active['page'];
+        } else {
+            // no active page
+            return '';
+        }
+
+        $output = '';
+        $indent = $this->getIndent();
+        $this->_root = $container;
+
+        $result = $this->findAllRelations($active, $this->getRenderFlag());
+        foreach ($result as $attrib => $types) {
+            foreach ($types as $relation => $pages) {
+                foreach ($pages as $page) {
+                    if ($r = $this->renderLink($page, $attrib, $relation)) {
+                        $output .= $indent . $r . $this->getEOL();
+                    }
+                }
+            }
+        }
+
+        $this->_root = null;
+
+        // return output (trim last newline by spec)
+        return strlen($output) ? rtrim($output, self::EOL) : '';
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Navigation/Menu.php b/lib/zend/Zend/View/Helper/Navigation/Menu.php
new file mode 100644
index 00000000000..da3faee84a8
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Navigation/Menu.php
@@ -0,0 +1,1099 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_Navigation_HelperAbstract
+ */
+require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
+
+/**
+ * Helper for rendering menus from navigation containers
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Navigation_Menu
+    extends Zend_View_Helper_Navigation_HelperAbstract
+{
+    /**
+     * CSS class to use for the ul element
+     *
+     * @var string
+     */
+    protected $_ulClass = 'navigation';
+
+    /**
+     * Unique identifier (id) for the ul element
+     *
+     * @var string
+     */
+    protected $_ulId = null;
+
+    /**
+     * CSS class to use for the active elements
+     *
+     * @var string
+     */
+    protected $_activeClass = 'active';
+
+    /**
+     * CSS class to use for the parent li element
+     *
+     * @var string
+     */
+    protected $_parentClass = 'menu-parent';
+
+    /**
+     * Whether parent li elements should be rendered with parent class
+     *
+     * @var bool
+     */
+    protected $_renderParentClass = false;
+
+    /**
+     * Whether only active branch should be rendered
+     *
+     * @var bool
+     */
+    protected $_onlyActiveBranch = false;
+
+    /**
+     * Whether parents should be rendered when only rendering active branch
+     *
+     * @var bool
+     */
+    protected $_renderParents = true;
+
+    /**
+     * Partial view script to use for rendering menu
+     *
+     * @var string|array
+     */
+    protected $_partial = null;
+
+    /**
+     * Expand all sibling nodes of active branch nodes
+     *
+     * @var bool
+     */
+    protected $_expandSiblingNodesOfActiveBranch = false;
+
+    /**
+     * Adds CSS class from page to li element
+     *
+     * @var bool
+     */
+    protected $_addPageClassToLi = false;
+
+    /**
+     * Inner indentation string
+     *
+     * @var string
+     */
+    protected $_innerIndent = '    ';
+    
+    /**
+     * View helper entry point:
+     * Retrieves helper and optionally sets container to operate on
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               operate on
+     * @return Zend_View_Helper_Navigation_Menu      fluent interface,
+     *                                               returns self
+     */
+    public function menu(Zend_Navigation_Container $container = null)
+    {
+        if (null !== $container) {
+            $this->setContainer($container);
+        }
+
+        return $this;
+    }
+
+    // Accessors:
+
+    /**
+     * Sets CSS class to use for the first 'ul' element when rendering
+     *
+     * @param  string $ulClass                   CSS class to set
+     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
+     */
+    public function setUlClass($ulClass)
+    {
+        if (is_string($ulClass)) {
+            $this->_ulClass = $ulClass;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns CSS class to use for the first 'ul' element when rendering
+     *
+     * @return string  CSS class
+     */
+    public function getUlClass()
+    {
+        return $this->_ulClass;
+    }
+
+    /**
+     * Sets unique identifier (id) to use for the first 'ul' element when
+     * rendering
+     *
+     * @param  string|null  $ulId                Unique identifier (id) to set
+     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
+     */
+    public function setUlId($ulId)
+    {
+        if (is_string($ulId)) {
+            $this->_ulId = $ulId;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns unique identifier (id) to use for the first 'ul' element when
+     * rendering
+     *
+     * @return string|null  Unique identifier (id); Default is 'null'
+     */
+    public function getUlId()
+    {
+        return $this->_ulId;
+    }
+
+    /**
+     * Sets CSS class to use for the active elements when rendering
+     *
+     * @param string $activeClass               CSS class to set
+     * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self
+     */
+    public function setActiveClass($activeClass)
+    {
+        if (is_string($activeClass)) {
+            $this->_activeClass = $activeClass;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns CSS class to use for the active elements when rendering
+     *
+     * @return string  CSS class
+     */
+    public function getActiveClass()
+    {
+        return $this->_activeClass;
+    }
+
+    /**
+     * Sets CSS class to use for the parent li elements when rendering
+     *
+     * @param  string $parentClass              CSS class to set to parents
+     * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self
+     */
+    public function setParentClass($parentClass)
+    {
+        if (is_string($parentClass)) {
+            $this->_parentClass = $parentClass;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns CSS class to use for the parent lie elements when rendering
+     *
+     * @return string CSS class
+     */
+    public function getParentClass()
+    {
+        return $this->_parentClass;
+    }
+
+    /**
+     * Enables/disables rendering of parent class to the li element
+     *
+     * @param bool $flag                        [optional] render with parent
+     *                                          class. Default is true.
+     * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self
+     */
+    public function setRenderParentClass($flag = true)
+    {
+        $this->_renderParentClass = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Returns flag indicating whether parent class should be rendered to the li
+     * element
+     *
+     * @return bool  whether parent class should be rendered
+     */
+    public function getRenderParentClass()
+    {
+        return $this->_renderParentClass;
+    }
+
+    /**
+     * Sets a flag indicating whether only active branch should be rendered
+     *
+     * @param  bool $flag                        [optional] render only active
+     *                                           branch. Default is true.
+     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
+     */
+    public function setOnlyActiveBranch($flag = true)
+    {
+        $this->_onlyActiveBranch = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Returns a flag indicating whether only active branch should be rendered
+     *
+     * By default, this value is false, meaning the entire menu will be
+     * be rendered.
+     *
+     * @return bool  whether only active branch should be rendered
+     */
+    public function getOnlyActiveBranch()
+    {
+        return $this->_onlyActiveBranch;
+    }
+    
+    /**
+     * Sets a flag indicating whether to expand all sibling nodes of the active branch
+     * 
+     * @param  bool $flag                        [optional] expand all siblings of
+     *                                           nodes in the active branch. Default is true.
+     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
+     */
+    public function setExpandSiblingNodesOfActiveBranch($flag = true)
+    {
+        $this->_expandSiblingNodesOfActiveBranch = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Returns a flag indicating whether to expand all sibling nodes of the active branch
+     *
+     * By default, this value is false, meaning the entire menu will be
+     * be rendered.
+     *
+     * @return bool  whether siblings of nodes in the active branch should be expanded
+     */
+    public function getExpandSiblingNodesOfActiveBranch()
+    {
+        return $this->_expandSiblingNodesOfActiveBranch;
+    }
+    
+    /**
+     * Enables/disables rendering of parents when only rendering active branch
+     *
+     * See {@link setOnlyActiveBranch()} for more information.
+     *
+     * @param  bool $flag                        [optional] render parents when
+     *                                           rendering active branch.
+     *                                           Default is true.
+     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
+     */
+    public function setRenderParents($flag = true)
+    {
+        $this->_renderParents = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Returns flag indicating whether parents should be rendered when rendering
+     * only the active branch
+     *
+     * By default, this value is true.
+     *
+     * @return bool  whether parents should be rendered
+     */
+    public function getRenderParents()
+    {
+        return $this->_renderParents;
+    }
+
+    /**
+     * Sets which partial view script to use for rendering menu
+     *
+     * @param  string|array $partial             partial view script or null. If
+     *                                           an array is given, it is
+     *                                           expected to contain two values;
+     *                                           the partial view script to use,
+     *                                           and the module where the script
+     *                                           can be found.
+     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
+     */
+    public function setPartial($partial)
+    {
+        if (null === $partial || is_string($partial) || is_array($partial)) {
+            $this->_partial = $partial;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns partial view script to use for rendering menu
+     *
+     * @return string|array|null
+     */
+    public function getPartial()
+    {
+        return $this->_partial;
+    }
+
+    /**
+     * Adds CSS class from page to li element
+     *
+     * Before:
+     * <code>
+     * <li>
+     *     <a href="#" class="foo">Bar</a>
+     * </li>
+     * </code>
+     *
+     * After:
+     * <code>
+     * <li class="foo">
+     *     <a href="#">Bar</a>
+     * </li>
+     * </code>
+     *
+     * @param bool $flag                        [optional] adds CSS class from
+     *                                          page to li element
+     *
+     * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self
+     */
+    public function addPageClassToLi($flag = true)
+    {
+        $this->_addPageClassToLi = (bool) $flag;
+
+        return $this;
+    }
+
+    /**
+     * Returns a flag indicating whether the CSS class from page to be added to
+     * li element
+     *
+     * @return bool
+     */
+    public function getAddPageClassToLi()
+    {
+        return $this->_addPageClassToLi;
+    }
+
+    /**
+     * Set the inner indentation string for using in {@link render()}, optionally
+     * a number of spaces to indent with
+     *
+     * @param  string|int $indent                          indentation string or
+     *                                                     number of spaces
+     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     *                                                     returns self
+     */
+    public function setInnerIndent($indent)
+    {
+        $this->_innerIndent = $this->_getWhitespace($indent);
+
+        return $this;
+    }
+
+    /**
+     * Returns inner indentation (format output is respected)
+     *
+     * @see getFormatOutput()
+     *
+     * @return string       indentation string or an empty string
+     */
+    public function getInnerIndent()
+    {
+        if (false === $this->getFormatOutput()) {
+            return '';
+        }
+
+        return $this->_innerIndent;
+    }
+
+    // Public methods:
+
+    /**
+     * Returns an HTML string containing an 'a' element for the given page if
+     * the page's href is not empty, and a 'span' element if it is empty
+     *
+     * Overrides {@link Zend_View_Helper_Navigation_Abstract::htmlify()}.
+     *
+     * @param  Zend_Navigation_Page $page  page to generate HTML for
+     * @return string                      HTML string for the given page
+     */
+    public function htmlify(Zend_Navigation_Page $page)
+    {
+        // get label and title for translating
+        $label = $page->getLabel();
+        $title = $page->getTitle();
+
+        // translate label and title?
+        if ($this->getUseTranslator() && $t = $this->getTranslator()) {
+            if (is_string($label) && !empty($label)) {
+                $label = $t->translate($label);
+            }
+            if (is_string($title) && !empty($title)) {
+                $title = $t->translate($title);
+            }
+        }
+
+        // get attribs for element
+        $attribs = array(
+            'id'     => $page->getId(),
+            'title'  => $title,
+        );
+
+        if (false === $this->getAddPageClassToLi()) {
+            $attribs['class'] = $page->getClass();
+        }
+
+        // does page have a href?
+        if ($href = $page->getHref()) {
+            $element              = 'a';
+            $attribs['href']      = $href;
+            $attribs['target']    = $page->getTarget();
+            $attribs['accesskey'] = $page->getAccessKey();
+        } else {
+            $element = 'span';
+        }
+
+        // Add custom HTML attributes
+        $attribs = array_merge($attribs, $page->getCustomHtmlAttribs());
+
+        return '<' . $element . $this->_htmlAttribs($attribs) . '>'
+             . $this->view->escape($label)
+             . '</' . $element . '>';
+    }
+
+    /**
+     * Normalizes given render options
+     *
+     * @param  array $options  [optional] options to normalize
+     * @return array           normalized options
+     */
+    protected function _normalizeOptions(array $options = array())
+    {
+        // Ident
+        if (isset($options['indent'])) {
+            $options['indent'] = $this->_getWhitespace($options['indent']);
+        } else {
+            $options['indent'] = $this->getIndent();
+        }
+
+        // Inner ident
+        if (isset($options['innerIndent'])) {
+            $options['innerIndent'] =
+                $this->_getWhitespace($options['innerIndent']);
+        } else {
+            $options['innerIndent'] = $this->getInnerIndent();
+        }
+
+        // UL class
+        if (isset($options['ulClass']) && $options['ulClass'] !== null) {
+            $options['ulClass'] = (string) $options['ulClass'];
+        } else {
+            $options['ulClass'] = $this->getUlClass();
+        }
+
+        // UL id
+        if (isset($options['ulId']) && $options['ulId'] !== null) {
+            $options['ulId'] = (string) $options['ulId'];
+        } else {
+            $options['ulId'] = $this->getUlId();
+        }
+
+        // Active class
+        if (isset($options['activeClass']) && $options['activeClass'] !== null
+        ) {
+            $options['activeClass'] = (string) $options['activeClass'];
+        } else {
+            $options['activeClass'] = $this->getActiveClass();
+        }
+
+        // Parent class
+        if (isset($options['parentClass']) && $options['parentClass'] !== null) {
+            $options['parentClass'] = (string) $options['parentClass'];
+        } else {
+            $options['parentClass'] = $this->getParentClass();
+        }
+
+        // Minimum depth
+        if (array_key_exists('minDepth', $options)) {
+            if (null !== $options['minDepth']) {
+                $options['minDepth'] = (int) $options['minDepth'];
+            }
+        } else {
+            $options['minDepth'] = $this->getMinDepth();
+        }
+
+        if ($options['minDepth'] < 0 || $options['minDepth'] === null) {
+            $options['minDepth'] = 0;
+        }
+
+        // Maximum depth
+        if (array_key_exists('maxDepth', $options)) {
+            if (null !== $options['maxDepth']) {
+                $options['maxDepth'] = (int) $options['maxDepth'];
+            }
+        } else {
+            $options['maxDepth'] = $this->getMaxDepth();
+        }
+
+        // Only active branch
+        if (!isset($options['onlyActiveBranch'])) {
+            $options['onlyActiveBranch'] = $this->getOnlyActiveBranch();
+        }
+
+        // Expand sibling nodes of active branch
+        if (!isset($options['expandSiblingNodesOfActiveBranch'])) {
+            $options['expandSiblingNodesOfActiveBranch'] = $this->getExpandSiblingNodesOfActiveBranch();
+        }
+
+        // Render parents?
+        if (!isset($options['renderParents'])) {
+            $options['renderParents'] = $this->getRenderParents();
+        }
+
+        // Render parent class?
+        if (!isset($options['renderParentClass'])) {
+            $options['renderParentClass'] = $this->getRenderParentClass();
+        }
+
+        // Add page CSS class to LI element
+        if (!isset($options['addPageClassToLi'])) {
+            $options['addPageClassToLi'] = $this->getAddPageClassToLi();
+        }
+
+        return $options;
+    }
+
+    // Render methods:
+
+    /**
+     * Renders the deepest active menu within [$minDepth, $maxDeth], (called
+     * from {@link renderMenu()})
+     *
+     * @param  Zend_Navigation_Container $container     container to render
+     * @param  string                    $ulClass       CSS class for first UL
+     * @param  string                    $indent        initial indentation
+     * @param  string                    $innerIndent   inner indentation
+     * @param  int|null                  $minDepth      minimum depth
+     * @param  int|null                  $maxDepth      maximum depth
+     * @param  string|null               $ulId          unique identifier (id)
+     *                                                  for first UL
+     * @param  bool                      $addPageClassToLi  adds CSS class from
+     *                                                      page to li element
+     * @param  string|null               $activeClass       CSS class for active
+     *                                                      element
+     * @param  string                    $parentClass       CSS class for parent
+     *                                                      li's
+     * @param  bool                      $renderParentClass Render parent class?
+     * @return string                                       rendered menu (HTML)
+     */
+    protected function _renderDeepestMenu(Zend_Navigation_Container $container,
+                                          $ulClass,
+                                          $indent,
+                                          $innerIndent,
+                                          $minDepth,
+                                          $maxDepth,
+                                          $ulId,
+                                          $addPageClassToLi,
+                                          $activeClass,
+                                          $parentClass,
+                                          $renderParentClass)
+    {
+        if (!$active = $this->findActive($container, $minDepth - 1, $maxDepth)) {
+            return '';
+        }
+
+        // special case if active page is one below minDepth
+        if ($active['depth'] < $minDepth) {
+            if (!$active['page']->hasPages()) {
+                return '';
+            }
+        } else if (!$active['page']->hasPages()) {
+            // found pages has no children; render siblings
+            $active['page'] = $active['page']->getParent();
+        } else if (is_int($maxDepth) && $active['depth'] + 1 > $maxDepth) {
+            // children are below max depth; render siblings
+            $active['page'] = $active['page']->getParent();
+        }
+
+        $attribs = array(
+            'class' => $ulClass,
+            'id'    => $ulId,
+        );
+
+        // We don't need a prefix for the menu ID (backup)
+        $skipValue = $this->_skipPrefixForId;
+        $this->skipPrefixForId();
+
+        $html = $indent . '<ul'
+                        . $this->_htmlAttribs($attribs)
+                        . '>'
+                        . $this->getEOL();
+
+        // Reset prefix for IDs
+        $this->_skipPrefixForId = $skipValue;
+
+        foreach ($active['page'] as $subPage) {
+            if (!$this->accept($subPage)) {
+                continue;
+            }
+
+            $liClass = '';
+            if ($subPage->isActive(true) && $addPageClassToLi) {
+                $liClass = $this->_htmlAttribs(
+                    array('class' => $activeClass . ' ' . $subPage->getClass())
+                );
+            } else if ($subPage->isActive(true)) {
+                $liClass = $this->_htmlAttribs(array('class' => $activeClass));
+            } else if ($addPageClassToLi) {
+                $liClass = $this->_htmlAttribs(
+                    array('class' => $subPage->getClass())
+                );
+            }
+            $html .= $indent . $innerIndent . '<li' . $liClass . '>' . $this->getEOL();
+            $html .= $indent . str_repeat($innerIndent, 2) . $this->htmlify($subPage)
+                                                           . $this->getEOL();
+            $html .= $indent . $innerIndent . '</li>' . $this->getEOL();
+        }
+
+        $html .= $indent . '</ul>';
+
+        return $html;
+    }
+
+    /**
+     * Renders a normal menu (called from {@link renderMenu()})
+     *
+     * @param  Zend_Navigation_Container $container     container to render
+     * @param  string                    $ulClass       CSS class for first UL
+     * @param  string                    $indent        initial indentation
+     * @param  string                    $innerIndent   inner indentation
+     * @param  int|null                  $minDepth      minimum depth
+     * @param  int|null                  $maxDepth      maximum depth
+     * @param  bool                      $onlyActive    render only active branch?
+     * @param  bool                      $expandSibs    render siblings of active
+     *                                                  branch nodes?
+     * @param  string|null               $ulId          unique identifier (id)
+     *                                                  for first UL
+     * @param  bool                      $addPageClassToLi  adds CSS class from
+     *                                                      page to li element
+     * @param  string|null               $activeClass       CSS class for active
+     *                                                      element
+     * @param  string                    $parentClass       CSS class for parent
+     *                                                      li's
+     * @param  bool                      $renderParentClass Render parent class?
+     * @return string                                       rendered menu (HTML)
+     */
+    protected function _renderMenu(Zend_Navigation_Container $container,
+                                   $ulClass,
+                                   $indent,
+                                   $innerIndent,
+                                   $minDepth,
+                                   $maxDepth,
+                                   $onlyActive,
+                                   $expandSibs,
+                                   $ulId,
+                                   $addPageClassToLi,
+                                   $activeClass,
+                                   $parentClass,
+                                   $renderParentClass)
+    {
+        $html = '';
+
+        // find deepest active
+        if ($found = $this->findActive($container, $minDepth, $maxDepth)) {
+            $foundPage = $found['page'];
+            $foundDepth = $found['depth'];
+        } else {
+            $foundPage = null;
+        }
+
+        // create iterator
+        $iterator = new RecursiveIteratorIterator($container,
+                            RecursiveIteratorIterator::SELF_FIRST);
+        if (is_int($maxDepth)) {
+            $iterator->setMaxDepth($maxDepth);
+        }
+
+        // iterate container
+        $prevDepth = -1;
+        foreach ($iterator as $page) {
+            $depth = $iterator->getDepth();
+            $isActive = $page->isActive(true);
+            if ($depth < $minDepth || !$this->accept($page)) {
+                // page is below minDepth or not accepted by acl/visibilty
+                continue;
+            } else if ($expandSibs && $depth > $minDepth) {
+                // page is not active itself, but might be in the active branch
+                $accept = false;
+                if ($foundPage) {
+                    if ($foundPage->hasPage($page)) {
+                        // accept if page is a direct child of the active page
+                        $accept = true;
+                    } else if ($page->getParent()->isActive(true)) {
+                        // page is a sibling of the active branch...
+                        $accept = true;
+                    }
+                }
+                if (!$isActive && !$accept) {
+                    continue;
+                }
+            } else if ($onlyActive && !$isActive) {
+                // page is not active itself, but might be in the active branch
+                $accept = false;
+                if ($foundPage) {
+                    if ($foundPage->hasPage($page)) {
+                        // accept if page is a direct child of the active page
+                        $accept = true;
+                    } else if ($foundPage->getParent()->hasPage($page)) {
+                        // page is a sibling of the active page...
+                        if (!$foundPage->hasPages() ||
+                            is_int($maxDepth) && $foundDepth + 1 > $maxDepth) {
+                            // accept if active page has no children, or the
+                            // children are too deep to be rendered
+                            $accept = true;
+                        }
+                    }
+                }
+
+                if (!$accept) {
+                    continue;
+                }
+            }
+
+            // make sure indentation is correct
+            $depth   -= $minDepth;
+            $myIndent = $indent . str_repeat($innerIndent, $depth * 2);
+
+            if ($depth > $prevDepth) {
+                $attribs = array();
+
+                // start new ul tag
+                if (0 == $depth) {
+                    $attribs = array(
+                        'class' => $ulClass,
+                        'id'    => $ulId,
+                    );
+                }
+
+                // We don't need a prefix for the menu ID (backup)
+                $skipValue = $this->_skipPrefixForId;
+                $this->skipPrefixForId();
+
+                $html .= $myIndent . '<ul'
+                                   . $this->_htmlAttribs($attribs)
+                                   . '>'
+                                   . $this->getEOL();
+
+                // Reset prefix for IDs
+                $this->_skipPrefixForId = $skipValue;
+            } else if ($prevDepth > $depth) {
+                // close li/ul tags until we're at current depth
+                for ($i = $prevDepth; $i > $depth; $i--) {
+                    $ind   = $indent . str_repeat($innerIndent, $i * 2);
+                    $html .= $ind . $innerIndent . '</li>' . $this->getEOL();
+                    $html .= $ind . '</ul>' . $this->getEOL();
+                }
+                // close previous li tag
+                $html .= $myIndent . $innerIndent . '</li>' . $this->getEOL();
+            } else {
+                // close previous li tag
+                $html .= $myIndent . $innerIndent . '</li>' . $this->getEOL();
+            }
+
+            // render li tag and page
+            $liClasses = array();
+            // Is page active?
+            if ($isActive) {
+                $liClasses[] = $activeClass;
+            }
+            // Add CSS class from page to LI?
+            if ($addPageClassToLi) {
+                $liClasses[] = $page->getClass();
+            }
+            // Add CSS class for parents to LI?
+            if ($renderParentClass && $page->hasChildren()) {
+                // Check max depth
+                if ((is_int($maxDepth) && ($depth + 1 < $maxDepth))
+                    || !is_int($maxDepth)
+                ) {
+                    $liClasses[] = $parentClass;
+                }
+            }
+
+            $html .= $myIndent . $innerIndent . '<li'
+                   . $this->_htmlAttribs(array('class' => implode(' ', $liClasses)))
+                   . '>' . $this->getEOL()
+                   . $myIndent . str_repeat($innerIndent, 2)
+                   . $this->htmlify($page)
+                   . $this->getEOL();
+
+            // store as previous depth for next iteration
+            $prevDepth = $depth;
+        }
+
+        if ($html) {
+            // done iterating container; close open ul/li tags
+            for ($i = $prevDepth+1; $i > 0; $i--) {
+                $myIndent = $indent . str_repeat($innerIndent . $innerIndent, $i - 1);
+                $html    .= $myIndent . $innerIndent . '</li>' . $this->getEOL()
+                         . $myIndent . '</ul>' . $this->getEOL();
+            }
+            $html = rtrim($html, $this->getEOL());
+        }
+
+        return $html;
+    }
+
+    /**
+     * Renders helper
+     *
+     * Renders a HTML 'ul' for the given $container. If $container is not given,
+     * the container registered in the helper will be used.
+     *
+     * Available $options:
+     *
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               create menu from. Default
+     *                                               is to use the container
+     *                                               retrieved from
+     *                                               {@link getContainer()}.
+     * @param  array                     $options    [optional] options for
+     *                                               controlling rendering
+     * @return string                                rendered menu
+     */
+    public function renderMenu(Zend_Navigation_Container $container = null,
+                               array $options = array())
+    {
+        if (null === $container) {
+            $container = $this->getContainer();
+        }
+
+        $options = $this->_normalizeOptions($options);
+
+        if ($options['onlyActiveBranch'] && !$options['renderParents']) {
+            $html = $this->_renderDeepestMenu(
+                $container,
+                $options['ulClass'],
+                $options['indent'],
+                $options['innerIndent'],
+                $options['minDepth'],
+                $options['maxDepth'],
+                $options['ulId'],
+                $options['addPageClassToLi'],
+                $options['activeClass'],
+                $options['parentClass'],
+                $options['renderParentClass']
+            );
+        } else {
+            $html = $this->_renderMenu(
+                $container,
+                $options['ulClass'],
+                $options['indent'],
+                $options['innerIndent'],
+                $options['minDepth'],
+                $options['maxDepth'],
+                $options['onlyActiveBranch'],
+                $options['expandSiblingNodesOfActiveBranch'],
+                $options['ulId'],
+                $options['addPageClassToLi'],
+                $options['activeClass'],
+                $options['parentClass'],
+                $options['renderParentClass']
+            );
+        }
+
+        return $html;
+    }
+
+    /**
+     * Renders the inner-most sub menu for the active page in the $container
+     *
+     * This is a convenience method which is equivalent to the following call:
+     * <code>
+     * renderMenu($container, array(
+     *     'indent'           => $indent,
+     *     'ulClass'          => $ulClass,
+     *     'minDepth'         => null,
+     *     'maxDepth'         => null,
+     *     'onlyActiveBranch' => true,
+     *     'renderParents'    => false
+     * ));
+     * </code>
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               render. Default is to render
+     *                                               the container registered in
+     *                                               the helper.
+     * @param  string|null               $ulClass    [optional] CSS class to
+     *                                               use for UL element. Default
+     *                                               is to use the value from
+     *                                               {@link getUlClass()}.
+     * @param  string|int                $indent     [optional] indentation as
+     *                                               a string or number of
+     *                                               spaces. Default is to use
+     *                                               the value retrieved from
+     *                                               {@link getIndent()}.
+     * @param  string|null               $ulId       [optional] Unique identifier
+     *                                               (id) use for UL element
+     * @param  bool                      $addPageClassToLi  adds CSS class from
+     *                                                      page to li element
+     * @param  string|int                $innerIndent   [optional] inner
+     *                                                  indentation as a string
+     *                                                  or number of spaces.
+     *                                                  Default is to use the
+     *                                                  {@link getInnerIndent()}.
+     * @return string                                   rendered content
+     */
+    public function renderSubMenu(Zend_Navigation_Container $container = null,
+                                  $ulClass = null,
+                                  $indent = null,
+                                  $ulId   = null,
+                                  $addPageClassToLi = false,
+                                  $innerIndent = null)
+    {
+        return $this->renderMenu($container, array(
+            'indent'           => $indent,
+            'innerIndent'      => $innerIndent,
+            'ulClass'          => $ulClass,
+            'minDepth'         => null,
+            'maxDepth'         => null,
+            'onlyActiveBranch' => true,
+            'renderParents'    => false,
+            'ulId'             => $ulId,
+            'addPageClassToLi' => $addPageClassToLi,
+        ));
+    }
+
+    /**
+     * Renders the given $container by invoking the partial view helper
+     *
+     * The container will simply be passed on as a model to the view script
+     * as-is, and will be available in the partial script as 'container', e.g.
+     * <code>echo 'Number of pages: ', count($this->container);</code>.
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               pass to view script. Default
+     *                                               is to use the container
+     *                                               registered in the helper.
+     * @param  string|array             $partial     [optional] partial view
+     *                                               script to use. Default is to
+     *                                               use the partial registered
+     *                                               in the helper. If an array
+     *                                               is given, it is expected to
+     *                                               contain two values; the
+     *                                               partial view script to use,
+     *                                               and the module where the
+     *                                               script can be found.
+     * @return string                                helper output
+     *
+     * @throws Zend_View_Exception   When no partial script is set
+     */
+    public function renderPartial(Zend_Navigation_Container $container = null,
+                                  $partial = null)
+    {
+        if (null === $container) {
+            $container = $this->getContainer();
+        }
+
+        if (null === $partial) {
+            $partial = $this->getPartial();
+        }
+
+        if (empty($partial)) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception(
+                'Unable to render menu: No partial view script provided'
+            );
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $model = array(
+            'container' => $container
+        );
+
+        if (is_array($partial)) {
+            if (count($partial) != 2) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception(
+                    'Unable to render menu: A view partial supplied as '
+                    .  'an array must contain two values: partial view '
+                    .  'script and module where script can be found'
+                );
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            return $this->view->partial($partial[0], $partial[1], $model);
+        }
+
+        return $this->view->partial($partial, null, $model);
+    }
+
+    // Zend_View_Helper_Navigation_Helper:
+
+    /**
+     * Renders menu
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::render()}.
+     *
+     * If a partial view is registered in the helper, the menu will be rendered
+     * using the given partial script. If no partial is registered, the menu
+     * will be rendered as an 'ul' element by the helper's internal method.
+     *
+     * @see renderPartial()
+     * @see renderMenu()
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               render. Default is to
+     *                                               render the container
+     *                                               registered in the helper.
+     * @return string                                helper output
+     */
+    public function render(Zend_Navigation_Container $container = null)
+    {
+        if ($partial = $this->getPartial()) {
+            return $this->renderPartial($container, $partial);
+        } else {
+            return $this->renderMenu($container);
+        }
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Navigation/Sitemap.php b/lib/zend/Zend/View/Helper/Navigation/Sitemap.php
new file mode 100644
index 00000000000..b93808a2c6b
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Navigation/Sitemap.php
@@ -0,0 +1,444 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @see Zend_View_Helper_Navigation_HelperAbstract
+ */
+require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
+
+/**
+ * Helper for printing sitemaps
+ *
+ * @link http://www.sitemaps.org/protocol.php
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Navigation_Sitemap
+    extends Zend_View_Helper_Navigation_HelperAbstract
+{
+    /**
+     * Namespace for the <urlset> tag
+     *
+     * @var string
+     */
+    const SITEMAP_NS = 'http://www.sitemaps.org/schemas/sitemap/0.9';
+
+    /**
+     * Schema URL
+     *
+     * @var string
+     */
+    const SITEMAP_XSD = 'http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd';
+
+    /**
+     * Whether the XML declaration should be included in XML output
+     *
+     * @var bool
+     */
+    protected $_useXmlDeclaration = true;
+
+    /**
+     * Whether sitemap should be validated using Zend_Validate_Sitemap_*
+     *
+     * @var bool
+     */
+    protected $_useSitemapValidators = true;
+
+    /**
+     * Whether sitemap should be schema validated when generated
+     *
+     * @var bool
+     */
+    protected $_useSchemaValidation = false;
+
+    /**
+     * Server url
+     *
+     * @var string
+     */
+    protected $_serverUrl;
+
+    /**
+     * View helper entry point:
+     * Retrieves helper and optionally sets container to operate on
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               operate on
+     * @return Zend_View_Helper_Navigation_Sitemap   fluent interface, returns
+     *                                               self
+     */
+    public function sitemap(Zend_Navigation_Container $container = null)
+    {
+        if (null !== $container) {
+            $this->setContainer($container);
+        }
+
+        return $this;
+    }
+
+    // Accessors:
+
+    /**
+     * Sets whether the XML declaration should be used in output
+     *
+     * @param  bool $useXmlDecl                     whether XML delcaration
+     *                                              should be rendered
+     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
+     *                                              self
+     */
+    public function setUseXmlDeclaration($useXmlDecl)
+    {
+        $this->_useXmlDeclaration = (bool) $useXmlDecl;
+        return $this;
+    }
+
+    /**
+     * Returns whether the XML declaration should be used in output
+     *
+     * @return bool  whether the XML declaration should be used in output
+     */
+    public function getUseXmlDeclaration()
+    {
+        return $this->_useXmlDeclaration;
+    }
+
+    /**
+     * Sets whether sitemap should be validated using Zend_Validate_Sitemap_*
+     *
+     * @param  bool $useSitemapValidators           whether sitemap validators
+     *                                              should be used
+     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
+     *                                              self
+     */
+    public function setUseSitemapValidators($useSitemapValidators)
+    {
+        $this->_useSitemapValidators = (bool) $useSitemapValidators;
+        return $this;
+    }
+
+    /**
+     * Returns whether sitemap should be validated using Zend_Validate_Sitemap_*
+     *
+     * @return bool  whether sitemap should be validated using validators
+     */
+    public function getUseSitemapValidators()
+    {
+        return $this->_useSitemapValidators;
+    }
+
+    /**
+     * Sets whether sitemap should be schema validated when generated
+     *
+     * @param  bool $schemaValidation               whether sitemap should
+     *                                              validated using XSD Schema
+     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
+     *                                              self
+     */
+    public function setUseSchemaValidation($schemaValidation)
+    {
+        $this->_useSchemaValidation = (bool) $schemaValidation;
+        return $this;
+    }
+
+    /**
+     * Returns true if sitemap should be schema validated when generated
+     *
+     * @return bool
+     */
+    public function getUseSchemaValidation()
+    {
+        return $this->_useSchemaValidation;
+    }
+
+    /**
+     * Sets server url (scheme and host-related stuff without request URI)
+     *
+     * E.g. http://www.example.com
+     *
+     * @param  string $serverUrl                    server URL to set (only
+     *                                              scheme and host)
+     * @throws Zend_Uri_Exception                   if invalid server URL
+     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
+     *                                              self
+     */
+    public function setServerUrl($serverUrl)
+    {
+        require_once 'Zend/Uri.php';
+        $uri = Zend_Uri::factory($serverUrl);
+        $uri->setFragment('');
+        $uri->setPath('');
+        $uri->setQuery('');
+
+        if ($uri->valid()) {
+            $this->_serverUrl = $uri->getUri();
+        } else {
+            require_once 'Zend/Uri/Exception.php';
+            $e = new Zend_Uri_Exception(sprintf(
+                    'Invalid server URL: "%s"',
+                    $serverUrl));
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns server URL
+     *
+     * @return string  server URL
+     */
+    public function getServerUrl()
+    {
+        if (!isset($this->_serverUrl)) {
+            $this->_serverUrl = $this->view->serverUrl();
+        }
+
+        return $this->_serverUrl;
+    }
+
+    // Helper methods:
+
+    /**
+     * Escapes string for XML usage
+     *
+     * @param  string $string  string to escape
+     * @return string          escaped string
+     */
+    protected function _xmlEscape($string)
+    {
+        $enc = 'UTF-8';
+        if ($this->view instanceof Zend_View_Interface
+            && method_exists($this->view, 'getEncoding')
+        ) {
+            $enc = $this->view->getEncoding();
+        }
+
+        // do not encode existing HTML entities
+        return htmlspecialchars($string, ENT_QUOTES, $enc, false);
+    }
+
+    // Public methods:
+
+    /**
+     * Returns an escaped absolute URL for the given page
+     *
+     * @param  Zend_Navigation_Page $page  page to get URL from
+     * @return string
+     */
+    public function url(Zend_Navigation_Page $page)
+    {
+        $href = $page->getHref();
+
+        if (!isset($href{0})) {
+            // no href
+            return '';
+        } elseif ($href{0} == '/') {
+            // href is relative to root; use serverUrl helper
+            $url = $this->getServerUrl() . $href;
+        } elseif (preg_match('/^[a-z]+:/im', (string) $href)) {
+            // scheme is given in href; assume absolute URL already
+            $url = (string) $href;
+        } else {
+            // href is relative to current document; use url helpers
+            $url = $this->getServerUrl()
+                 . rtrim($this->view->url(), '/') . '/'
+                 . $href;
+        }
+
+        return $this->_xmlEscape($url);
+    }
+
+    /**
+     * Returns a DOMDocument containing the Sitemap XML for the given container
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to get
+     *                                               breadcrumbs from, defaults
+     *                                               to what is registered in the
+     *                                               helper
+     * @return DOMDocument                           DOM representation of the
+     *                                               container
+     * @throws Zend_View_Exception                   if schema validation is on
+     *                                               and the sitemap is invalid
+     *                                               according to the sitemap
+     *                                               schema, or if sitemap
+     *                                               validators are used and the
+     *                                               loc element fails validation
+     */
+    public function getDomSitemap(Zend_Navigation_Container $container = null)
+    {
+        if (null === $container) {
+            $container = $this->getContainer();
+        }
+
+        // check if we should validate using our own validators
+        if ($this->getUseSitemapValidators()) {
+            require_once 'Zend/Validate/Sitemap/Changefreq.php';
+            require_once 'Zend/Validate/Sitemap/Lastmod.php';
+            require_once 'Zend/Validate/Sitemap/Loc.php';
+            require_once 'Zend/Validate/Sitemap/Priority.php';
+
+            // create validators
+            $locValidator        = new Zend_Validate_Sitemap_Loc();
+            $lastmodValidator    = new Zend_Validate_Sitemap_Lastmod();
+            $changefreqValidator = new Zend_Validate_Sitemap_Changefreq();
+            $priorityValidator   = new Zend_Validate_Sitemap_Priority();
+        }
+
+        // create document
+        $dom = new DOMDocument('1.0', 'UTF-8');
+        $dom->formatOutput = $this->getFormatOutput();
+
+        // ...and urlset (root) element
+        $urlSet = $dom->createElementNS(self::SITEMAP_NS, 'urlset');
+        $dom->appendChild($urlSet);
+
+        // create iterator
+        $iterator = new RecursiveIteratorIterator($container,
+            RecursiveIteratorIterator::SELF_FIRST);
+
+        $maxDepth = $this->getMaxDepth();
+        if (is_int($maxDepth)) {
+            $iterator->setMaxDepth($maxDepth);
+        }
+        $minDepth = $this->getMinDepth();
+        if (!is_int($minDepth) || $minDepth < 0) {
+            $minDepth = 0;
+        }
+
+        // iterate container
+        foreach ($iterator as $page) {
+            if ($iterator->getDepth() < $minDepth || !$this->accept($page)) {
+                // page should not be included
+                continue;
+            }
+
+            // get absolute url from page
+            if (!$url = $this->url($page)) {
+                // skip page if it has no url (rare case)
+                continue;
+            }
+
+            // create url node for this page
+            $urlNode = $dom->createElementNS(self::SITEMAP_NS, 'url');
+            $urlSet->appendChild($urlNode);
+
+            if ($this->getUseSitemapValidators() &&
+                !$locValidator->isValid($url)) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception(sprintf(
+                        'Encountered an invalid URL for Sitemap XML: "%s"',
+                        $url));
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            // put url in 'loc' element
+            $urlNode->appendChild($dom->createElementNS(self::SITEMAP_NS,
+                                                        'loc', $url));
+
+            // add 'lastmod' element if a valid lastmod is set in page
+            if (isset($page->lastmod)) {
+                $lastmod = strtotime((string) $page->lastmod);
+
+                // prevent 1970-01-01...
+                if ($lastmod !== false) {
+                    $lastmod = date('c', $lastmod);
+                }
+
+                if (!$this->getUseSitemapValidators() ||
+                    $lastmodValidator->isValid($lastmod)) {
+                    $urlNode->appendChild(
+                        $dom->createElementNS(self::SITEMAP_NS, 'lastmod',
+                                              $lastmod)
+                    );
+                }
+            }
+
+            // add 'changefreq' element if a valid changefreq is set in page
+            if (isset($page->changefreq)) {
+                $changefreq = $page->changefreq;
+                if (!$this->getUseSitemapValidators() ||
+                    $changefreqValidator->isValid($changefreq)) {
+                    $urlNode->appendChild(
+                        $dom->createElementNS(self::SITEMAP_NS, 'changefreq',
+                                              $changefreq)
+                    );
+                }
+            }
+
+            // add 'priority' element if a valid priority is set in page
+            if (isset($page->priority)) {
+                $priority = $page->priority;
+                if (!$this->getUseSitemapValidators() ||
+                    $priorityValidator->isValid($priority)) {
+                    $urlNode->appendChild(
+                        $dom->createElementNS(self::SITEMAP_NS, 'priority',
+                                              $priority)
+                    );
+                }
+            }
+        }
+
+        // validate using schema if specified
+        if ($this->getUseSchemaValidation()) {
+            if (!@$dom->schemaValidate(self::SITEMAP_XSD)) {
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception(sprintf(
+                        'Sitemap is invalid according to XML Schema at "%s"',
+                        self::SITEMAP_XSD));
+                $e->setView($this->view);
+                throw $e;
+            }
+        }
+
+        return $dom;
+    }
+
+    // Zend_View_Helper_Navigation_Helper:
+
+    /**
+     * Renders helper
+     *
+     * Implements {@link Zend_View_Helper_Navigation_Helper::render()}.
+     *
+     * @param  Zend_Navigation_Container $container  [optional] container to
+     *                                               render. Default is to
+     *                                               render the container
+     *                                               registered in the helper.
+     * @return string                                helper output
+     */
+    public function render(Zend_Navigation_Container $container = null)
+    {
+        $dom = $this->getDomSitemap($container);
+
+        $xml = $this->getUseXmlDeclaration() ?
+               $dom->saveXML() :
+               $dom->saveXML($dom->documentElement);
+
+        return rtrim($xml, self::EOL);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/PaginationControl.php b/lib/zend/Zend/View/Helper/PaginationControl.php
new file mode 100644
index 00000000000..6f5929a22dd
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/PaginationControl.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_PaginationControl
+{
+    /**
+     * View instance
+     *
+     * @var Zend_View_Instance
+     */
+    public $view = null;
+
+    /**
+     * Default view partial
+     *
+     * @var string|array
+     */
+    protected static $_defaultViewPartial = null;
+
+    /**
+     * Sets the view instance.
+     *
+     * @param  Zend_View_Interface $view View instance
+     * @return Zend_View_Helper_PaginationControl
+     */
+    public function setView(Zend_View_Interface $view)
+    {
+        $this->view = $view;
+        return $this;
+    }
+
+    /**
+     * Sets the default view partial.
+     *
+     * @param string|array $partial View partial
+     */
+    public static function setDefaultViewPartial($partial)
+    {
+        self::$_defaultViewPartial = $partial;
+    }
+
+    /**
+     * Gets the default view partial
+     *
+     * @return string|array
+     */
+    public static function getDefaultViewPartial()
+    {
+        return self::$_defaultViewPartial;
+    }
+
+    /**
+     * Render the provided pages.  This checks if $view->paginator is set and,
+     * if so, uses that.  Also, if no scrolling style or partial are specified,
+     * the defaults will be used (if set).
+     *
+     * @param  Zend_Paginator (Optional) $paginator
+     * @param  string $scrollingStyle (Optional) Scrolling style
+     * @param  string $partial (Optional) View partial
+     * @param  array|string $params (Optional) params to pass to the partial
+     * @return string
+     * @throws Zend_View_Exception
+     */
+    public function paginationControl(Zend_Paginator $paginator = null, $scrollingStyle = null, $partial = null, $params = null)
+    {
+        if ($paginator === null) {
+            if (isset($this->view->paginator) and $this->view->paginator !== null and $this->view->paginator instanceof Zend_Paginator) {
+                $paginator = $this->view->paginator;
+            } else {
+                /**
+                 * @see Zend_View_Exception
+                 */
+                require_once 'Zend/View/Exception.php';
+
+                $e = new Zend_View_Exception('No paginator instance provided or incorrect type');
+                $e->setView($this->view);
+                throw $e;
+            }
+        }
+
+        if ($partial === null) {
+            if (self::$_defaultViewPartial === null) {
+                /**
+                 * @see Zend_View_Exception
+                 */
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception('No view partial provided and no default set');
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            $partial = self::$_defaultViewPartial;
+        }
+
+        $pages = get_object_vars($paginator->getPages($scrollingStyle));
+
+        if ($params !== null) {
+            $pages = array_merge($pages, (array) $params);
+        }
+
+        if (is_array($partial)) {
+            if (count($partial) != 2) {
+                /**
+                 * @see Zend_View_Exception
+                 */
+                require_once 'Zend/View/Exception.php';
+                $e = new Zend_View_Exception('A view partial supplied as an array must contain two values: the filename and its module');
+                $e->setView($this->view);
+                throw $e;
+            }
+
+            if ($partial[1] !== null) {
+                return $this->view->partial($partial[0], $partial[1], $pages);
+            }
+
+            $partial = $partial[0];
+        }
+
+        return $this->view->partial($partial, $pages);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Partial.php b/lib/zend/Zend/View/Helper/Partial.php
new file mode 100644
index 00000000000..733f563b9bb
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Partial.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Helper for rendering a template fragment in its own variable scope.
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Partial extends Zend_View_Helper_Abstract
+{
+    /**
+     * Variable to which object will be assigned
+     * @var string
+     */
+    protected $_objectKey;
+
+    /**
+     * Renders a template fragment within a variable scope distinct from the
+     * calling View object.
+     *
+     * If no arguments are passed, returns the helper instance.
+     *
+     * If the $model is an array, it is passed to the view object's assign()
+     * method.
+     *
+     * If the $model is an object, it first checks to see if the object
+     * implements a 'toArray' method; if so, it passes the result of that
+     * method to to the view object's assign() method. Otherwise, the result of
+     * get_object_vars() is passed.
+     *
+     * @param  string $name Name of view script
+     * @param  string|array $module If $model is empty, and $module is an array,
+     *                              these are the variables to populate in the
+     *                              view. Otherwise, the module in which the
+     *                              partial resides
+     * @param  array $model Variables to populate in the view
+     * @return string|Zend_View_Helper_Partial
+     */
+    public function partial($name = null, $module = null, $model = null)
+    {
+        if (0 == func_num_args()) {
+            return $this;
+        }
+
+        $view = $this->cloneView();
+        if (isset($this->partialCounter)) {
+            $view->partialCounter = $this->partialCounter;
+        }
+        if (isset($this->partialTotalCount)) {
+            $view->partialTotalCount = $this->partialTotalCount;
+        }
+
+        if ((null !== $module) && is_string($module)) {
+            require_once 'Zend/Controller/Front.php';
+            $moduleDir = Zend_Controller_Front::getInstance()->getControllerDirectory($module);
+            if (null === $moduleDir) {
+                require_once 'Zend/View/Helper/Partial/Exception.php';
+                $e = new Zend_View_Helper_Partial_Exception('Cannot render partial; module does not exist');
+                $e->setView($this->view);
+                throw $e;
+            }
+            $viewsDir = dirname($moduleDir) . '/views';
+            $view->addBasePath($viewsDir);
+        } elseif ((null == $model) && (null !== $module)
+            && (is_array($module) || is_object($module)))
+        {
+            $model = $module;
+        }
+
+        if (!empty($model)) {
+            if (is_array($model)) {
+                $view->assign($model);
+            } elseif (is_object($model)) {
+                if (null !== ($objectKey = $this->getObjectKey())) {
+                    $view->assign($objectKey, $model);
+                } elseif (method_exists($model, 'toArray')) {
+                    $view->assign($model->toArray());
+                } else {
+                    $view->assign(get_object_vars($model));
+                }
+            }
+        }
+
+        return $view->render($name);
+    }
+
+    /**
+     * Clone the current View
+     *
+     * @return Zend_View_Interface
+     */
+    public function cloneView()
+    {
+        $view = clone $this->view;
+        $view->clearVars();
+        return $view;
+    }
+
+    /**
+     * Set object key
+     *
+     * @param  string $key
+     * @return Zend_View_Helper_Partial
+     */
+    public function setObjectKey($key)
+    {
+        if (null === $key) {
+            $this->_objectKey = null;
+        } else {
+            $this->_objectKey = (string) $key;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve object key
+     *
+     * The objectKey is the variable to which an object in the iterator will be
+     * assigned.
+     *
+     * @return null|string
+     */
+    public function getObjectKey()
+    {
+        return $this->_objectKey;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Partial/Exception.php b/lib/zend/Zend/View/Helper/Partial/Exception.php
new file mode 100644
index 00000000000..9355fd35240
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Partial/Exception.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+
+/** Zend_View_Exception */
+require_once 'Zend/View/Exception.php';
+
+
+/**
+ * Exception for Zend_View_Helper_Partial class.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Partial_Exception extends Zend_View_Exception
+{
+}
diff --git a/lib/zend/Zend/View/Helper/PartialLoop.php b/lib/zend/Zend/View/Helper/PartialLoop.php
new file mode 100644
index 00000000000..4f90da19186
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/PartialLoop.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Partial */
+require_once 'Zend/View/Helper/Partial.php';
+
+/**
+ * Helper for rendering a template fragment in its own variable scope; iterates
+ * over data provided and renders for each iteration.
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_PartialLoop extends Zend_View_Helper_Partial
+{
+
+    /**
+     * Marker to where the pointer is at in the loop
+     * @var integer
+     */
+    protected $partialCounter = 0;
+
+    /**
+     * Renders a template fragment within a variable scope distinct from the
+     * calling View object.
+     *
+     * If no arguments are provided, returns object instance.
+     *
+     * @param  string $name Name of view script
+     * @param  string|array $module If $model is empty, and $module is an array,
+     *                              these are the variables to populate in the
+     *                              view. Otherwise, the module in which the
+     *                              partial resides
+     * @param  array $model Variables to populate in the view
+     * @return string
+     */
+    public function partialLoop($name = null, $module = null, $model = null)
+    {
+        if (0 == func_num_args()) {
+            return $this;
+        }
+
+        if ((null === $model) && (null !== $module)) {
+            $model  = $module;
+            $module = null;
+        }
+
+        if (!is_array($model)
+            && (!$model instanceof Traversable)
+            && (is_object($model) && !method_exists($model, 'toArray'))
+        ) {
+            require_once 'Zend/View/Helper/Partial/Exception.php';
+            $e = new Zend_View_Helper_Partial_Exception('PartialLoop helper requires iterable data');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        if (is_object($model)
+            && (!$model instanceof Traversable)
+            && method_exists($model, 'toArray')
+        ) {
+            $model = $model->toArray();
+        }
+
+        $content = '';
+        // reset the counter if it's call again
+        $this->partialCounter    = 0;
+        $this->partialTotalCount = count($model);
+
+        foreach ($model as $item) {
+            // increment the counter variable
+            $this->partialCounter++;
+
+            $content .= $this->partial($name, $module, $item);
+        }
+
+        return $content;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Placeholder.php b/lib/zend/Zend/View/Helper/Placeholder.php
new file mode 100644
index 00000000000..c726b401db6
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Placeholder.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Registry */
+require_once 'Zend/View/Helper/Placeholder/Registry.php';
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Helper for passing data between otherwise segregated Views. It's called
+ * Placeholder to make its typical usage obvious, but can be used just as easily
+ * for non-Placeholder things. That said, the support for this is only
+ * guaranteed to effect subsequently rendered templates, and of course Layouts.
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Placeholder extends Zend_View_Helper_Abstract
+{
+    /**
+     * Placeholder items
+     * @var array
+     */
+    protected $_items = array();
+
+    /**
+     * @var Zend_View_Helper_Placeholder_Registry
+     */
+    protected $_registry;
+
+    /**
+     * Constructor
+     *
+     * Retrieve container registry from Zend_Registry, or create new one and register it.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->_registry = Zend_View_Helper_Placeholder_Registry::getRegistry();
+    }
+
+
+    /**
+     * Placeholder helper
+     *
+     * @param  string $name
+     * @return Zend_View_Helper_Placeholder_Container_Abstract
+     */
+    public function placeholder($name)
+    {
+        $name = (string) $name;
+        return $this->_registry->getContainer($name);
+    }
+
+    /**
+     * Retrieve the registry
+     *
+     * @return Zend_View_Helper_Placeholder_Registry
+     */
+    public function getRegistry()
+    {
+        return $this->_registry;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Placeholder/Container.php b/lib/zend/Zend/View/Helper/Placeholder/Container.php
new file mode 100644
index 00000000000..10e706d3b6e
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Placeholder/Container.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Abstract */
+require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php';
+
+/**
+ * Container for placeholder values
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Placeholder_Container extends Zend_View_Helper_Placeholder_Container_Abstract
+{
+}
diff --git a/lib/zend/Zend/View/Helper/Placeholder/Container/Abstract.php b/lib/zend/Zend/View/Helper/Placeholder/Container/Abstract.php
new file mode 100644
index 00000000000..0f9cbab476e
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Placeholder/Container/Abstract.php
@@ -0,0 +1,385 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * Abstract class representing container for placeholder values
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObject
+{
+    /**
+     * Whether or not to override all contents of placeholder
+     * @const string
+     */
+    const SET    = 'SET';
+
+    /**
+     * Whether or not to append contents to placeholder
+     * @const string
+     */
+    const APPEND = 'APPEND';
+
+    /**
+     * Whether or not to prepend contents to placeholder
+     * @const string
+     */
+    const PREPEND = 'PREPEND';
+
+    /**
+     * What text to prefix the placeholder with when rendering
+     * @var string
+     */
+    protected $_prefix    = '';
+
+    /**
+     * What text to append the placeholder with when rendering
+     * @var string
+     */
+    protected $_postfix   = '';
+
+    /**
+     * What string to use between individual items in the placeholder when rendering
+     * @var string
+     */
+    protected $_separator = '';
+
+    /**
+     * What string to use as the indentation of output, this will typically be spaces. Eg: '    '
+     * @var string
+     */
+    protected $_indent = '';
+
+    /**
+     * Whether or not we're already capturing for this given container
+     * @var bool
+     */
+    protected $_captureLock = false;
+
+    /**
+     * What type of capture (overwrite (set), append, prepend) to use
+     * @var string
+     */
+    protected $_captureType;
+
+    /**
+     * Key to which to capture content
+     * @var string
+     */
+    protected $_captureKey;
+
+    /**
+     * Constructor - This is needed so that we can attach a class member as the ArrayObject container
+     *
+     * @return \Zend_View_Helper_Placeholder_Container_Abstract
+     */
+    public function __construct()
+    {
+        parent::__construct(array(), parent::ARRAY_AS_PROPS);
+    }
+
+    /**
+     * Set a single value
+     *
+     * @param  mixed $value
+     * @return void
+     */
+    public function set($value)
+    {
+        $this->exchangeArray(array($value));
+    }
+
+    /**
+     * Prepend a value to the top of the container
+     *
+     * @param  mixed $value
+     * @return void
+     */
+    public function prepend($value)
+    {
+        $values = $this->getArrayCopy();
+        array_unshift($values, $value);
+        $this->exchangeArray($values);
+    }
+
+    /**
+     * Retrieve container value
+     *
+     * If single element registered, returns that element; otherwise,
+     * serializes to array.
+     *
+     * @return mixed
+     */
+    public function getValue()
+    {
+        if (1 == count($this)) {
+            $keys = $this->getKeys();
+            $key  = array_shift($keys);
+            return $this[$key];
+        }
+
+        return $this->getArrayCopy();
+    }
+
+    /**
+     * Set prefix for __toString() serialization
+     *
+     * @param  string $prefix
+     * @return Zend_View_Helper_Placeholder_Container
+     */
+    public function setPrefix($prefix)
+    {
+        $this->_prefix = (string) $prefix;
+        return $this;
+    }
+
+    /**
+     * Retrieve prefix
+     *
+     * @return string
+     */
+    public function getPrefix()
+    {
+        return $this->_prefix;
+    }
+
+    /**
+     * Set postfix for __toString() serialization
+     *
+     * @param  string $postfix
+     * @return Zend_View_Helper_Placeholder_Container
+     */
+    public function setPostfix($postfix)
+    {
+        $this->_postfix = (string) $postfix;
+        return $this;
+    }
+
+    /**
+     * Retrieve postfix
+     *
+     * @return string
+     */
+    public function getPostfix()
+    {
+        return $this->_postfix;
+    }
+
+    /**
+     * Set separator for __toString() serialization
+     *
+     * Used to implode elements in container
+     *
+     * @param  string $separator
+     * @return Zend_View_Helper_Placeholder_Container
+     */
+    public function setSeparator($separator)
+    {
+        $this->_separator = (string) $separator;
+        return $this;
+    }
+
+    /**
+     * Retrieve separator
+     *
+     * @return string
+     */
+    public function getSeparator()
+    {
+        return $this->_separator;
+    }
+
+    /**
+     * Set the indentation string for __toString() serialization,
+     * optionally, if a number is passed, it will be the number of spaces
+     *
+     * @param  string|int $indent
+     * @return Zend_View_Helper_Placeholder_Container_Abstract
+     */
+    public function setIndent($indent)
+    {
+        $this->_indent = $this->getWhitespace($indent);
+        return $this;
+    }
+
+    /**
+     * Retrieve indentation
+     *
+     * @return string
+     */
+    public function getIndent()
+    {
+        return $this->_indent;
+    }
+
+    /**
+     * Retrieve whitespace representation of $indent
+     *
+     * @param  int|string $indent
+     * @return string
+     */
+    public function getWhitespace($indent)
+    {
+        if (is_int($indent)) {
+            $indent = str_repeat(' ', $indent);
+        }
+
+        return (string) $indent;
+    }
+
+    /**
+     * Start capturing content to push into placeholder
+     *
+     * @param int|string $type How to capture content into placeholder; append, prepend, or set
+     * @param null       $key
+     * @throws Zend_View_Helper_Placeholder_Container_Exception
+     * @return void
+     */
+    public function captureStart($type = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $key = null)
+    {
+        if ($this->_captureLock) {
+            require_once 'Zend/View/Helper/Placeholder/Container/Exception.php';
+            $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest placeholder captures for the same placeholder');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $this->_captureLock = true;
+        $this->_captureType = $type;
+        if ((null !== $key) && is_scalar($key)) {
+            $this->_captureKey = (string) $key;
+        }
+        ob_start();
+    }
+
+    /**
+     * End content capture
+     *
+     * @return void
+     */
+    public function captureEnd()
+    {
+        $data               = ob_get_clean();
+        $key                = null;
+        $this->_captureLock = false;
+        if (null !== $this->_captureKey) {
+            $key = $this->_captureKey;
+        }
+        switch ($this->_captureType) {
+            case self::SET:
+                if (null !== $key) {
+                    $this[$key] = $data;
+                } else {
+                    $this->exchangeArray(array($data));
+                }
+                break;
+            case self::PREPEND:
+                if (null !== $key) {
+                    $array  = array($key => $data);
+                    $values = $this->getArrayCopy();
+                    $final  = $array + $values;
+                    $this->exchangeArray($final);
+                } else {
+                    $this->prepend($data);
+                }
+                break;
+            case self::APPEND:
+            default:
+                if (null !== $key) {
+                    if (empty($this[$key])) {
+                        $this[$key] = $data;
+                    } else {
+                        $this[$key] .= $data;
+                    }
+                } else {
+                    $this[$this->nextIndex()] = $data;
+                }
+                break;
+        }
+    }
+
+    /**
+     * Get keys
+     *
+     * @return array
+     */
+    public function getKeys()
+    {
+        $array = $this->getArrayCopy();
+        return array_keys($array);
+    }
+
+    /**
+     * Next Index
+     *
+     * as defined by the PHP manual
+     * @return int
+     */
+    public function nextIndex()
+    {
+        $keys = $this->getKeys();
+        if (0 == count($keys)) {
+            return 0;
+        }
+
+        return $nextIndex = max($keys) + 1;
+    }
+
+    /**
+     * Render the placeholder
+     *
+     * @param null $indent
+     * @return string
+     */
+    public function toString($indent = null)
+    {
+        // Check items
+        if (0 === $this->count()) {
+            return '';
+        }
+
+        $indent = ($indent !== null)
+                ? $this->getWhitespace($indent)
+                : $this->getIndent();
+
+        $items  = $this->getArrayCopy();
+        $return = $indent
+                . $this->getPrefix()
+                . implode($this->getSeparator(), $items)
+                . $this->getPostfix();
+        $return = preg_replace("/(\r\n?|\n)/", '$1' . $indent, $return);
+        return $return;
+    }
+
+    /**
+     * Serialize object to string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Placeholder/Container/Exception.php b/lib/zend/Zend/View/Helper/Placeholder/Container/Exception.php
new file mode 100644
index 00000000000..da15f6e746a
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Placeholder/Container/Exception.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+
+/** Zend_View_Exception */
+require_once 'Zend/View/Exception.php';
+
+
+/**
+ * Exception for Zend_View_Helper_Placeholder_Container class.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Placeholder_Container_Exception extends Zend_View_Exception
+{
+}
diff --git a/lib/zend/Zend/View/Helper/Placeholder/Container/Standalone.php b/lib/zend/Zend/View/Helper/Placeholder/Container/Standalone.php
new file mode 100644
index 00000000000..deeca4de31b
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Placeholder/Container/Standalone.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Registry */
+require_once 'Zend/View/Helper/Placeholder/Registry.php';
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Base class for targetted placeholder helpers
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_View_Helper_Placeholder_Container_Standalone extends Zend_View_Helper_Abstract implements IteratorAggregate, Countable, ArrayAccess
+{
+    /**
+     * @var Zend_View_Helper_Placeholder_Container_Abstract
+     */
+    protected $_container;
+
+    /**
+     * @var Zend_View_Helper_Placeholder_Registry
+     */
+    protected $_registry;
+
+    /**
+     * Registry key under which container registers itself
+     * @var string
+     */
+    protected $_regKey;
+
+    /**
+     * Flag wheter to automatically escape output, must also be
+     * enforced in the child class if __toString/toString is overriden
+     * @var book
+     */
+    protected $_autoEscape = true;
+
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->setRegistry(Zend_View_Helper_Placeholder_Registry::getRegistry());
+        $this->setContainer($this->getRegistry()->getContainer($this->_regKey));
+    }
+
+    /**
+     * Retrieve registry
+     *
+     * @return Zend_View_Helper_Placeholder_Registry
+     */
+    public function getRegistry()
+    {
+        return $this->_registry;
+    }
+
+    /**
+     * Set registry object
+     *
+     * @param  Zend_View_Helper_Placeholder_Registry $registry
+     * @return Zend_View_Helper_Placeholder_Container_Standalone
+     */
+    public function setRegistry(Zend_View_Helper_Placeholder_Registry $registry)
+    {
+        $this->_registry = $registry;
+        return $this;
+    }
+
+    /**
+     * Set whether or not auto escaping should be used
+     *
+     * @param  bool $autoEscape whether or not to auto escape output
+     * @return Zend_View_Helper_Placeholder_Container_Standalone
+     */
+    public function setAutoEscape($autoEscape = true)
+    {
+        $this->_autoEscape = ($autoEscape) ? true : false;
+        return $this;
+    }
+
+    /**
+     * Return whether autoEscaping is enabled or disabled
+     *
+     * return bool
+     */
+    public function getAutoEscape()
+    {
+        return $this->_autoEscape;
+    }
+
+    /**
+     * Escape a string
+     *
+     * @param  string $string
+     * @return string
+     */
+    protected function _escape($string)
+    {
+        $enc = 'UTF-8';
+        if ($this->view instanceof Zend_View_Interface
+            && method_exists($this->view, 'getEncoding')
+        ) {
+            $enc = $this->view->getEncoding();
+        }
+
+        return htmlspecialchars((string) $string, ENT_COMPAT, $enc);
+    }
+
+    /**
+     * Set container on which to operate
+     *
+     * @param  Zend_View_Helper_Placeholder_Container_Abstract $container
+     * @return Zend_View_Helper_Placeholder_Container_Standalone
+     */
+    public function setContainer(Zend_View_Helper_Placeholder_Container_Abstract $container)
+    {
+        $this->_container = $container;
+        return $this;
+    }
+
+    /**
+     * Retrieve placeholder container
+     *
+     * @return Zend_View_Helper_Placeholder_Container_Abstract
+     */
+    public function getContainer()
+    {
+        return $this->_container;
+    }
+
+    /**
+     * Overloading: set property value
+     *
+     * @param  string $key
+     * @param  mixed $value
+     * @return void
+     */
+    public function __set($key, $value)
+    {
+        $container = $this->getContainer();
+        $container[$key] = $value;
+    }
+
+    /**
+     * Overloading: retrieve property
+     *
+     * @param  string $key
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        $container = $this->getContainer();
+        if (isset($container[$key])) {
+            return $container[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Overloading: check if property is set
+     *
+     * @param  string $key
+     * @return bool
+     */
+    public function __isset($key)
+    {
+        $container = $this->getContainer();
+        return isset($container[$key]);
+    }
+
+    /**
+     * Overloading: unset property
+     *
+     * @param  string $key
+     * @return void
+     */
+    public function __unset($key)
+    {
+        $container = $this->getContainer();
+        if (isset($container[$key])) {
+            unset($container[$key]);
+        }
+    }
+
+    /**
+     * Overload
+     *
+     * Proxy to container methods
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return mixed
+     */
+    public function __call($method, $args)
+    {
+        $container = $this->getContainer();
+        if (method_exists($container, $method)) {
+            $return = call_user_func_array(array($container, $method), $args);
+            if ($return === $container) {
+                // If the container is returned, we really want the current object
+                return $this;
+            }
+            return $return;
+        }
+
+        require_once 'Zend/View/Exception.php';
+        $e = new Zend_View_Exception('Method "' . $method . '" does not exist');
+        $e->setView($this->view);
+        throw $e;
+    }
+
+    /**
+     * String representation
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->getContainer()->toString();
+    }
+
+    /**
+     * Cast to string representation
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Countable
+     *
+     * @return int
+     */
+    public function count()
+    {
+        $container = $this->getContainer();
+        return count($container);
+    }
+
+    /**
+     * ArrayAccess: offsetExists
+     *
+     * @param  string|int $offset
+     * @return bool
+     */
+    public function offsetExists($offset)
+    {
+        return $this->getContainer()->offsetExists($offset);
+    }
+
+    /**
+     * ArrayAccess: offsetGet
+     *
+     * @param  string|int $offset
+     * @return mixed
+     */
+    public function offsetGet($offset)
+    {
+        return $this->getContainer()->offsetGet($offset);
+    }
+
+    /**
+     * ArrayAccess: offsetSet
+     *
+     * @param  string|int $offset
+     * @param  mixed $value
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        return $this->getContainer()->offsetSet($offset, $value);
+    }
+
+    /**
+     * ArrayAccess: offsetUnset
+     *
+     * @param  string|int $offset
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        return $this->getContainer()->offsetUnset($offset);
+    }
+
+    /**
+     * IteratorAggregate: get Iterator
+     *
+     * @return Iterator
+     */
+    public function getIterator()
+    {
+        return $this->getContainer()->getIterator();
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Placeholder/Registry.php b/lib/zend/Zend/View/Helper/Placeholder/Registry.php
new file mode 100644
index 00000000000..b4a10c8c8f1
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Placeholder/Registry.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Registry */
+require_once 'Zend/Registry.php';
+
+/** Zend_View_Helper_Placeholder_Container_Abstract */
+require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php';
+
+/** Zend_View_Helper_Placeholder_Container */
+require_once 'Zend/View/Helper/Placeholder/Container.php';
+
+/**
+ * Registry for placeholder containers
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Placeholder_Registry
+{
+    /**
+     * Zend_Registry key under which placeholder registry exists
+     * @const string
+     */
+    const REGISTRY_KEY = 'Zend_View_Helper_Placeholder_Registry';
+
+    /**
+     * Default container class
+     * @var string
+     */
+    protected $_containerClass = 'Zend_View_Helper_Placeholder_Container';
+
+    /**
+     * Placeholder containers
+     * @var array
+     */
+    protected $_items = array();
+
+    /**
+     * Retrieve or create registry instnace
+     *
+     * @return void
+     */
+    public static function getRegistry()
+    {
+        if (Zend_Registry::isRegistered(self::REGISTRY_KEY)) {
+            $registry = Zend_Registry::get(self::REGISTRY_KEY);
+        } else {
+            $registry = new self();
+            Zend_Registry::set(self::REGISTRY_KEY, $registry);
+        }
+
+        return $registry;
+    }
+
+    /**
+     * createContainer
+     *
+     * @param  string $key
+     * @param  array $value
+     * @return Zend_View_Helper_Placeholder_Container_Abstract
+     */
+    public function createContainer($key, array $value = array())
+    {
+        $key = (string) $key;
+
+        $this->_items[$key] = new $this->_containerClass($value);
+        return $this->_items[$key];
+    }
+
+    /**
+     * Retrieve a placeholder container
+     *
+     * @param  string $key
+     * @return Zend_View_Helper_Placeholder_Container_Abstract
+     */
+    public function getContainer($key)
+    {
+        $key = (string) $key;
+        if (isset($this->_items[$key])) {
+            return $this->_items[$key];
+        }
+
+        $container = $this->createContainer($key);
+
+        return $container;
+    }
+
+    /**
+     * Does a particular container exist?
+     *
+     * @param  string $key
+     * @return bool
+     */
+    public function containerExists($key)
+    {
+        $key = (string) $key;
+        $return =  array_key_exists($key, $this->_items);
+        return $return;
+    }
+
+    /**
+     * Set the container for an item in the registry
+     *
+     * @param  string $key
+     * @param  Zend_View_Placeholder_Container_Abstract $container
+     * @return Zend_View_Placeholder_Registry
+     */
+    public function setContainer($key, Zend_View_Helper_Placeholder_Container_Abstract $container)
+    {
+        $key = (string) $key;
+        $this->_items[$key] = $container;
+        return $this;
+    }
+
+    /**
+     * Delete a container
+     *
+     * @param  string $key
+     * @return bool
+     */
+    public function deleteContainer($key)
+    {
+        $key = (string) $key;
+        if (isset($this->_items[$key])) {
+            unset($this->_items[$key]);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Set the container class to use
+     *
+     * @param  string $name
+     * @return Zend_View_Helper_Placeholder_Registry
+     */
+    public function setContainerClass($name)
+    {
+        if (!class_exists($name)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($name);
+        }
+
+        $reflection = new ReflectionClass($name);
+        if (!$reflection->isSubclassOf(new ReflectionClass('Zend_View_Helper_Placeholder_Container_Abstract'))) {
+            require_once 'Zend/View/Helper/Placeholder/Registry/Exception.php';
+            $e = new Zend_View_Helper_Placeholder_Registry_Exception('Invalid Container class specified');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $this->_containerClass = $name;
+        return $this;
+    }
+
+    /**
+     * Retrieve the container class
+     *
+     * @return string
+     */
+    public function getContainerClass()
+    {
+        return $this->_containerClass;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Placeholder/Registry/Exception.php b/lib/zend/Zend/View/Helper/Placeholder/Registry/Exception.php
new file mode 100644
index 00000000000..6bffa198a89
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Placeholder/Registry/Exception.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+
+/** Zend_View_Exception */
+require_once 'Zend/View/Exception.php';
+
+
+/**
+ * Exception for Zend_View_Helper_Placeholder_Registry class.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Placeholder_Registry_Exception extends Zend_View_Exception
+{
+}
diff --git a/lib/zend/Zend/View/Helper/RenderToPlaceholder.php b/lib/zend/Zend/View/Helper/RenderToPlaceholder.php
new file mode 100644
index 00000000000..fd2d3e1ef61
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/RenderToPlaceholder.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Renders a template and stores the rendered output as a placeholder
+ * variable for later use.
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+class Zend_View_Helper_RenderToPlaceholder extends Zend_View_Helper_Abstract
+{
+
+    /**
+     * Renders a template and stores the rendered output as a placeholder
+     * variable for later use.
+     *
+     * @param string $script The template script to render
+     * @param string $placeholder The placeholder variable name in which to store the rendered output
+     * @return void
+     */
+    public function renderToPlaceholder($script, $placeholder)
+    {
+        $this->view->placeholder($placeholder)->captureStart();
+        echo $this->view->render($script);
+        $this->view->placeholder($placeholder)->captureEnd();
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/ServerUrl.php b/lib/zend/Zend/View/Helper/ServerUrl.php
new file mode 100644
index 00000000000..c38ec8bc86a
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/ServerUrl.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Helper for returning the current server URL (optionally with request URI)
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_ServerUrl
+{
+    /**
+     * Scheme
+     *
+     * @var string
+     */
+    protected $_scheme;
+
+    /**
+     * Host (including port)
+     *
+     * @var string
+     */
+    protected $_host;
+
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        switch (true) {
+            case (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] === true)):
+            case (isset($_SERVER['HTTP_SCHEME']) && ($_SERVER['HTTP_SCHEME'] == 'https')):
+            case (isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] == 443)):
+                $scheme = 'https';
+                break;
+            default:
+            $scheme = 'http';
+        }
+        $this->setScheme($scheme);
+
+        if (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) {
+            $this->setHost($_SERVER['HTTP_HOST']);
+        } else if (isset($_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'])) {
+            $name = $_SERVER['SERVER_NAME'];
+            $port = $_SERVER['SERVER_PORT'];
+
+            if (($scheme == 'http' && $port == 80) ||
+                ($scheme == 'https' && $port == 443)) {
+                $this->setHost($name);
+            } else {
+                $this->setHost($name . ':' . $port);
+            }
+        }
+    }
+
+    /**
+     * View helper entry point:
+     * Returns the current host's URL like http://site.com
+     *
+     * @param  string|boolean $requestUri  [optional] if true, the request URI
+     *                                     found in $_SERVER will be appended
+     *                                     as a path. If a string is given, it
+     *                                     will be appended as a path. Default
+     *                                     is to not append any path.
+     * @return string                      server url
+     */
+    public function serverUrl($requestUri = null)
+    {
+        if ($requestUri === true) {
+            $path = $_SERVER['REQUEST_URI'];
+        } else if (is_string($requestUri)) {
+            $path = $requestUri;
+        } else {
+            $path = '';
+        }
+
+        return $this->getScheme() . '://' . $this->getHost() . $path;
+    }
+
+    /**
+     * Returns host
+     *
+     * @return string  host
+     */
+    public function getHost()
+    {
+        return $this->_host;
+    }
+
+    /**
+     * Sets host
+     *
+     * @param  string $host                new host
+     * @return Zend_View_Helper_ServerUrl  fluent interface, returns self
+     */
+    public function setHost($host)
+    {
+        $this->_host = $host;
+        return $this;
+    }
+
+    /**
+     * Returns scheme (typically http or https)
+     *
+     * @return string  scheme (typically http or https)
+     */
+    public function getScheme()
+    {
+        return $this->_scheme;
+    }
+
+    /**
+     * Sets scheme (typically http or https)
+     *
+     * @param  string $scheme              new scheme (typically http or https)
+     * @return Zend_View_Helper_ServerUrl  fluent interface, returns self
+     */
+    public function setScheme($scheme)
+    {
+        $this->_scheme = $scheme;
+        return $this;
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Translate.php b/lib/zend/Zend/View/Helper/Translate.php
new file mode 100644
index 00000000000..f66a560b0d9
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Translate.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/** Zend_Locale */
+require_once 'Zend/Locale.php';
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Translation view helper
+ *
+ * @category  Zend
+ * @package   Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract
+{
+    /**
+     * Translation object
+     *
+     * @var Zend_Translate_Adapter
+     */
+    protected $_translator;
+
+    /**
+     * Constructor for manually handling
+     *
+     * @param Zend_Translate|Zend_Translate_Adapter $translate Instance of Zend_Translate
+     */
+    public function __construct($translate = null)
+    {
+        if ($translate !== null) {
+            $this->setTranslator($translate);
+        }
+    }
+
+    /**
+     * Translate a message
+     * You can give multiple params or an array of params.
+     * If you want to output another locale just set it as last single parameter
+     * Example 1: translate('%1\$s + %2\$s', $value1, $value2, $locale);
+     * Example 2: translate('%1\$s + %2\$s', array($value1, $value2), $locale);
+     *
+     * @param  string $messageid Id of the message to be translated
+     * @return string|Zend_View_Helper_Translate Translated message
+     */
+    public function translate($messageid = null)
+    {
+        if ($messageid === null) {
+            return $this;
+        }
+
+        $translate = $this->getTranslator();
+        $options   = func_get_args();
+
+        array_shift($options);
+        $count  = count($options);
+        $locale = null;
+        if ($count > 0) {
+            if (Zend_Locale::isLocale($options[($count - 1)], null, false) !== false) {
+                $locale = array_pop($options);
+            }
+        }
+
+        if ((count($options) === 1) and (is_array($options[0]) === true)) {
+            $options = $options[0];
+        }
+
+        if ($translate !== null) {
+            $messageid = $translate->translate($messageid, $locale);
+        }
+
+        if (count($options) === 0) {
+            return $messageid;
+        }
+
+        return vsprintf($messageid, $options);
+    }
+
+    /**
+     * Sets a translation Adapter for translation
+     *
+     * @param  Zend_Translate|Zend_Translate_Adapter $translate Instance of Zend_Translate
+     * @throws Zend_View_Exception When no or a false instance was set
+     * @return Zend_View_Helper_Translate
+     */
+    public function setTranslator($translate)
+    {
+        if ($translate instanceof Zend_Translate_Adapter) {
+            $this->_translator = $translate;
+        } else if ($translate instanceof Zend_Translate) {
+            $this->_translator = $translate->getAdapter();
+        } else {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve translation object
+     *
+     * @return Zend_Translate_Adapter|null
+     */
+    public function getTranslator()
+    {
+        if ($this->_translator === null) {
+            require_once 'Zend/Registry.php';
+            if (Zend_Registry::isRegistered('Zend_Translate')) {
+                $this->setTranslator(Zend_Registry::get('Zend_Translate'));
+            }
+        }
+
+        return $this->_translator;
+    }
+
+    /**
+     * Set's an new locale for all further translations
+     *
+     * @param  string|Zend_Locale $locale New locale to set
+     * @throws Zend_View_Exception When no Zend_Translate instance was set
+     * @return Zend_View_Helper_Translate
+     */
+    public function setLocale($locale = null)
+    {
+        $translate = $this->getTranslator();
+        if ($translate === null) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        $translate->setLocale($locale);
+        return $this;
+    }
+
+    /**
+     * Returns the set locale for translations
+     *
+     * @throws Zend_View_Exception When no Zend_Translate instance was set
+     * @return string|Zend_Locale
+     */
+    public function getLocale()
+    {
+        $translate = $this->getTranslator();
+        if ($translate === null) {
+            require_once 'Zend/View/Exception.php';
+            $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter');
+            $e->setView($this->view);
+            throw $e;
+        }
+
+        return $translate->getLocale();
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/Url.php b/lib/zend/Zend/View/Helper/Url.php
new file mode 100644
index 00000000000..fbf7b690e63
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/Url.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Abstract.php */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Helper for making easy links and getting urls that depend on the routes and router
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_Url extends Zend_View_Helper_Abstract
+{
+    /**
+     * Generates an url given the name of a route.
+     *
+     * @access public
+     *
+     * @param  array $urlOptions Options passed to the assemble method of the Route object.
+     * @param  mixed $name The name of a Route to use. If null it will use the current Route
+     * @param  bool $reset Whether or not to reset the route defaults with those provided
+     * @return string Url for the link href attribute.
+     */
+    public function url(array $urlOptions = array(), $name = null, $reset = false, $encode = true)
+    {
+        $router = Zend_Controller_Front::getInstance()->getRouter();
+        return $router->assemble($urlOptions, $name, $reset, $encode);
+    }
+}
diff --git a/lib/zend/Zend/View/Helper/UserAgent.php b/lib/zend/Zend/View/Helper/UserAgent.php
new file mode 100644
index 00000000000..708ccda6513
--- /dev/null
+++ b/lib/zend/Zend/View/Helper/UserAgent.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Abstract */
+require_once 'Zend/View/Helper/Abstract.php';
+
+/**
+ * Helper for interacting with UserAgent instance
+ *
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_UserAgent extends Zend_View_Helper_Abstract
+{
+    /**
+     * UserAgent instance
+     *
+     * @var Zend_Http_UserAgent
+     */
+    protected $_userAgent = null;
+
+    /**
+     * Helper method: retrieve or set UserAgent instance
+     *
+     * @param  null|Zend_Http_UserAgent $userAgent
+     * @return Zend_Http_UserAgent
+     */
+    public function userAgent(Zend_Http_UserAgent $userAgent = null)
+    {
+        if (null !== $userAgent) {
+            $this->setUserAgent($userAgent);
+        }
+        return $this->getUserAgent();
+    }
+
+    /**
+     * Set UserAgent instance
+     *
+     * @param  Zend_Http_UserAgent $userAgent
+     * @return Zend_View_Helper_UserAgent
+     */
+    public function setUserAgent(Zend_Http_UserAgent $userAgent)
+    {
+        $this->_userAgent = $userAgent;
+        return $this;
+    }
+
+    /**
+     * Retrieve UserAgent instance
+     *
+     * If none set, instantiates one using no configuration
+     *
+     * @return Zend_Http_UserAgent
+     */
+    public function getUserAgent()
+    {
+        if (null === $this->_userAgent) {
+            require_once 'Zend/Http/UserAgent.php';
+            $this->setUserAgent(new Zend_Http_UserAgent());
+        }
+        return $this->_userAgent;
+    }
+}
diff --git a/lib/zend/Zend/View/Interface.php b/lib/zend/Zend/View/Interface.php
new file mode 100644
index 00000000000..496ec7108ec
--- /dev/null
+++ b/lib/zend/Zend/View/Interface.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * Interface class for Zend_View compatible template engine implementations
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_View_Interface
+{
+    /**
+     * Return the template engine object, if any
+     *
+     * If using a third-party template engine, such as Smarty, patTemplate,
+     * phplib, etc, return the template engine object. Useful for calling
+     * methods on these objects, such as for setting filters, modifiers, etc.
+     *
+     * @return mixed
+     */
+    public function getEngine();
+
+    /**
+     * Set the path to find the view script used by render()
+     *
+     * @param string|array The directory (-ies) to set as the path. Note that
+     * the concrete view implentation may not necessarily support multiple
+     * directories.
+     * @return void
+     */
+    public function setScriptPath($path);
+
+    /**
+     * Retrieve all view script paths
+     *
+     * @return array
+     */
+    public function getScriptPaths();
+
+    /**
+     * Set a base path to all view resources
+     *
+     * @param  string $path
+     * @param  string $classPrefix
+     * @return void
+     */
+    public function setBasePath($path, $classPrefix = 'Zend_View');
+
+    /**
+     * Add an additional path to view resources
+     *
+     * @param  string $path
+     * @param  string $classPrefix
+     * @return void
+     */
+    public function addBasePath($path, $classPrefix = 'Zend_View');
+
+    /**
+     * Assign a variable to the view
+     *
+     * @param string $key The variable name.
+     * @param mixed $val The variable value.
+     * @return void
+     */
+    public function __set($key, $val);
+
+    /**
+     * Allows testing with empty() and isset() to work
+     *
+     * @param string $key
+     * @return boolean
+     */
+    public function __isset($key);
+
+    /**
+     * Allows unset() on object properties to work
+     *
+     * @param string $key
+     * @return void
+     */
+    public function __unset($key);
+
+    /**
+     * Assign variables to the view script via differing strategies.
+     *
+     * Suggested implementation is to allow setting a specific key to the
+     * specified value, OR passing an array of key => value pairs to set en
+     * masse.
+     *
+     * @see __set()
+     * @param string|array $spec The assignment strategy to use (key or array of key
+     * => value pairs)
+     * @param mixed $value (Optional) If assigning a named variable, use this
+     * as the value.
+     * @return void
+     */
+    public function assign($spec, $value = null);
+
+    /**
+     * Clear all assigned variables
+     *
+     * Clears all variables assigned to Zend_View either via {@link assign()} or
+     * property overloading ({@link __get()}/{@link __set()}).
+     *
+     * @return void
+     */
+    public function clearVars();
+
+    /**
+     * Processes a view script and returns the output.
+     *
+     * @param string $name The script name to process.
+     * @return string The script output.
+     */
+    public function render($name);
+}
diff --git a/lib/zend/Zend/View/Stream.php b/lib/zend/Zend/View/Stream.php
new file mode 100644
index 00000000000..ae8d52419e4
--- /dev/null
+++ b/lib/zend/Zend/View/Stream.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * Stream wrapper to convert markup of mostly-PHP templates into PHP prior to
+ * include().
+ *
+ * Based in large part on the example at
+ * http://www.php.net/manual/en/function.stream-wrapper-register.php
+ *
+ * As well as the example provided at:
+ *     http://mikenaberezny.com/2006/02/19/symphony-templates-ruby-erb/
+ * written by
+ *     Mike Naberezny (@link http://mikenaberezny.com)
+ *     Paul M. Jones  (@link http://paul-m-jones.com)
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Stream
+{
+    /**
+     * Current stream position.
+     *
+     * @var int
+     */
+    protected $_pos = 0;
+
+    /**
+     * Data for streaming.
+     *
+     * @var string
+     */
+    protected $_data;
+
+    /**
+     * Stream stats.
+     *
+     * @var array
+     */
+    protected $_stat;
+
+    /**
+     * Opens the script file and converts markup.
+     */
+    public function stream_open($path, $mode, $options, &$opened_path)
+    {
+        // get the view script source
+        $path        = str_replace('zend.view://', '', $path);
+        $this->_data = file_get_contents($path);
+
+        /**
+         * If reading the file failed, update our local stat store
+         * to reflect the real stat of the file, then return on failure
+         */
+        if ($this->_data === false) {
+            $this->_stat = stat($path);
+            return false;
+        }
+
+        /**
+         * Convert <?= ?> to long-form <?php echo ?> and <? ?> to <?php ?>
+         *
+         */
+        $this->_data = preg_replace('/\<\?\=/',          "<?php echo ",  $this->_data);
+        $this->_data = preg_replace('/<\?(?!xml|php)/s', '<?php ',       $this->_data);
+
+        /**
+         * file_get_contents() won't update PHP's stat cache, so we grab a stat
+         * of the file to prevent additional reads should the script be
+         * requested again, which will make include() happy.
+         */
+        $this->_stat = stat($path);
+
+        return true;
+    }
+
+    /**
+     * Included so that __FILE__ returns the appropriate info
+     *
+     * @return array
+     */
+    public function url_stat()
+    {
+        return $this->_stat;
+    }
+
+    /**
+     * Reads from the stream.
+     */
+    public function stream_read($count)
+    {
+        $ret = substr($this->_data, $this->_pos, $count);
+        $this->_pos += strlen($ret);
+        return $ret;
+    }
+
+
+    /**
+     * Tells the current position in the stream.
+     */
+    public function stream_tell()
+    {
+        return $this->_pos;
+    }
+
+
+    /**
+     * Tells if we are at the end of the stream.
+     */
+    public function stream_eof()
+    {
+        return $this->_pos >= strlen($this->_data);
+    }
+
+
+    /**
+     * Stream statistics.
+     */
+    public function stream_stat()
+    {
+        return $this->_stat;
+    }
+
+
+    /**
+     * Seek to a specific point in the stream.
+     */
+    public function stream_seek($offset, $whence)
+    {
+        switch ($whence) {
+            case SEEK_SET:
+                if ($offset < strlen($this->_data) && $offset >= 0) {
+                $this->_pos = $offset;
+                    return true;
+                } else {
+                    return false;
+                }
+                break;
+
+            case SEEK_CUR:
+                if ($offset >= 0) {
+                    $this->_pos += $offset;
+                    return true;
+                } else {
+                    return false;
+                }
+                break;
+
+            case SEEK_END:
+                if (strlen($this->_data) + $offset >= 0) {
+                    $this->_pos = strlen($this->_data) + $offset;
+                    return true;
+                } else {
+                    return false;
+                }
+                break;
+
+            default:
+                return false;
+        }
+    }
+}
diff --git a/lib/zend/Zend/Xml/Exception.php b/lib/zend/Zend/Xml/Exception.php
new file mode 100644
index 00000000000..b58c249512f
--- /dev/null
+++ b/lib/zend/Zend/Xml/Exception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Xml
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+
+/**
+ * @see Zend_Exception
+ */
+require_once 'Zend/Exception.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Xml
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Xml_Exception extends Zend_Exception
+{}
diff --git a/lib/zend/Zend/Xml/Security.php b/lib/zend/Zend/Xml/Security.php
new file mode 100644
index 00000000000..d95d4f81efc
--- /dev/null
+++ b/lib/zend/Zend/Xml/Security.php
@@ -0,0 +1,488 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Xml
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+ 
+/**
+ * @category   Zend
+ * @package    Zend_Xml_SecurityScan
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Xml_Security
+{
+    const ENTITY_DETECT = 'Detected use of ENTITY in XML, disabled to prevent XXE/XEE attacks';
+
+    /**
+     * Heuristic scan to detect entity in XML
+     *
+     * @param  string $xml
+     * @throws Zend_Xml_Exception If entity expansion or external entity declaration was discovered.
+     */
+    protected static function heuristicScan($xml)
+    {
+        foreach (self::getEntityComparison($xml) as $compare) {
+            if (strpos($xml, $compare) !== false) {
+                throw new Zend_Xml_Exception(self::ENTITY_DETECT);
+            }
+        }
+    }
+
+    /**
+     * @param integer $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param integer $errline
+     * @return bool
+     */
+    public static function loadXmlErrorHandler($errno, $errstr, $errfile, $errline)
+    {
+        if (substr_count($errstr, 'DOMDocument::loadXML()') > 0) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Scan XML string for potential XXE and XEE attacks
+     *
+     * @param   string $xml
+     * @param   DomDocument $dom
+     * @throws  Zend_Xml_Exception
+     * @return  SimpleXMLElement|DomDocument|boolean
+     */
+    public static function scan($xml, DOMDocument $dom = null)
+    {
+        // If running with PHP-FPM we perform an heuristic scan
+        // We cannot use libxml_disable_entity_loader because of this bug
+        // @see https://bugs.php.net/bug.php?id=64938
+        if (self::isPhpFpm()) {
+            self::heuristicScan($xml);
+        }
+
+        if (null === $dom) {
+            $simpleXml = true;
+            $dom = new DOMDocument();
+        }
+
+        if (!self::isPhpFpm()) {
+            $loadEntities = libxml_disable_entity_loader(true);
+            $useInternalXmlErrors = libxml_use_internal_errors(true);
+        }
+
+        // Load XML with network access disabled (LIBXML_NONET)
+        // error disabled with @ for PHP-FPM scenario
+        set_error_handler(array('Zend_Xml_Security', 'loadXmlErrorHandler'), E_WARNING);
+
+        $result = $dom->loadXml($xml, LIBXML_NONET);
+        restore_error_handler();
+
+        if (!$result) {
+            // Entity load to previous setting
+            if (!self::isPhpFpm()) {
+                libxml_disable_entity_loader($loadEntities);
+                libxml_use_internal_errors($useInternalXmlErrors);
+            }
+            return false;
+        }
+
+        // Scan for potential XEE attacks using ENTITY, if not PHP-FPM
+        if (!self::isPhpFpm()) {
+            foreach ($dom->childNodes as $child) {
+                if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
+                    if ($child->entities->length > 0) {
+                        require_once 'Exception.php';
+                        throw new Zend_Xml_Exception(self::ENTITY_DETECT);
+                    }
+                }
+            }
+        }
+
+        // Entity load to previous setting
+        if (!self::isPhpFpm()) {
+            libxml_disable_entity_loader($loadEntities);
+            libxml_use_internal_errors($useInternalXmlErrors);
+        }
+
+        if (isset($simpleXml)) {
+            $result = simplexml_import_dom($dom);
+            if (!$result instanceof SimpleXMLElement) {
+                return false;
+            }
+            return $result;
+        }
+        return $dom;
+    }
+
+    /**
+     * Scan XML file for potential XXE/XEE attacks
+     *
+     * @param  string $file
+     * @param  DOMDocument $dom
+     * @throws Zend_Xml_Exception
+     * @return SimpleXMLElement|DomDocument
+     */
+    public static function scanFile($file, DOMDocument $dom = null)
+    {
+        if (!file_exists($file)) {
+            require_once 'Exception.php';
+            throw new Zend_Xml_Exception(
+                "The file $file specified doesn't exist"
+            );
+        }
+        return self::scan(file_get_contents($file), $dom);
+    }
+
+    /**
+     * Return true if PHP is running with PHP-FPM
+     *
+     * This method is mainly used to determine whether or not heuristic checks
+     * (vs libxml checks) should be made, due to threading issues in libxml;
+     * under php-fpm, threading becomes a concern.
+     *
+     * However, PHP versions 5.5.22+ and 5.6.6+ contain a patch to the
+     * libxml support in PHP that makes the libxml checks viable; in such
+     * versions, this method will return false to enforce those checks, which
+     * are more strict and accurate than the heuristic checks.
+     *
+     * @return boolean
+     */
+    public static function isPhpFpm()
+    {
+        $isVulnerableVersion = (
+            version_compare(PHP_VERSION, '5.5.22', 'lt')
+            || (
+                version_compare(PHP_VERSION, '5.6', 'gte')
+                && version_compare(PHP_VERSION, '5.6.6', 'lt')
+            )
+        );
+
+        if (substr(php_sapi_name(), 0, 3) === 'fpm' && $isVulnerableVersion) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Determine and return the string(s) to use for the <!ENTITY comparison.
+     *
+     * @param string $xml
+     * @return string[]
+     */
+    protected static function getEntityComparison($xml)
+    {
+        $encodingMap = self::getAsciiEncodingMap();
+        return array_map(
+            array(__CLASS__, 'generateEntityComparison'),
+            self::detectXmlEncoding($xml, self::detectStringEncoding($xml))
+        );
+    }
+
+    /**
+     * Determine the string encoding.
+     *
+     * Determines string encoding from either a detected BOM or a
+     * heuristic.
+     *
+     * @param string $xml
+     * @return string File encoding
+     */
+    protected static function detectStringEncoding($xml)
+    {
+        $encoding = self::detectBom($xml);
+        return ($encoding) ? $encoding : self::detectXmlStringEncoding($xml);
+    }
+
+    /**
+     * Attempt to match a known BOM.
+     *
+     * Iterates through the return of getBomMap(), comparing the initial bytes
+     * of the provided string to the BOM of each; if a match is determined,
+     * it returns the encoding.
+     *
+     * @param string $string
+     * @return false|string Returns encoding on success.
+     */
+    protected static function detectBom($string)
+    {
+        foreach (self::getBomMap() as $criteria) {
+            if (0 === strncmp($string, $criteria['bom'], $criteria['length'])) {
+                return $criteria['encoding'];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Attempt to detect the string encoding of an XML string.
+     *
+     * @param string $xml
+     * @return string Encoding
+     */
+    protected static function detectXmlStringEncoding($xml)
+    {
+        foreach (self::getAsciiEncodingMap() as $encoding => $generator) {
+            $prefix = call_user_func($generator, '<' . '?xml');
+            if (0 === strncmp($xml, $prefix, strlen($prefix))) {
+                return $encoding;
+            }
+        }
+
+        // Fallback
+        return 'UTF-8';
+    }
+
+    /**
+     * Attempt to detect the specified XML encoding.
+     *
+     * Using the file's encoding, determines if an "encoding" attribute is
+     * present and well-formed in the XML declaration; if so, it returns a
+     * list with both the ASCII representation of that declaration and the
+     * original file encoding.
+     *
+     * If not, a list containing only the provided file encoding is returned.
+     *
+     * @param string $xml
+     * @param string $fileEncoding
+     * @return string[] Potential XML encodings
+     */
+    protected static function detectXmlEncoding($xml, $fileEncoding)
+    {
+        $encodingMap = self::getAsciiEncodingMap();
+        $generator   = $encodingMap[$fileEncoding];
+        $encAttr     = call_user_func($generator, 'encoding="');
+        $quote       = call_user_func($generator, '"');
+        $close       = call_user_func($generator, '>');
+
+        $closePos    = strpos($xml, $close);
+        if (false === $closePos) {
+            return array($fileEncoding);
+        }
+
+        $encPos = strpos($xml, $encAttr);
+        if (false === $encPos
+            || $encPos > $closePos
+        ) {
+            return array($fileEncoding);
+        }
+
+        $encPos   += strlen($encAttr);
+        $quotePos = strpos($xml, $quote, $encPos);
+        if (false === $quotePos) {
+            return array($fileEncoding);
+        }
+
+        $encoding = self::substr($xml, $encPos, $quotePos);
+        return array(
+            // Following line works because we're only supporting 8-bit safe encodings at this time.
+            str_replace('\0', '', $encoding), // detected encoding
+            $fileEncoding,                    // file encoding
+        );
+    }
+
+    /**
+     * Return a list of BOM maps.
+     *
+     * Returns a list of common encoding -> BOM maps, along with the character
+     * length to compare against.
+     *
+     * @link https://en.wikipedia.org/wiki/Byte_order_mark
+     * @return array
+     */
+    protected static function getBomMap()
+    {
+        return array(
+            array(
+                'encoding' => 'UTF-32BE',
+                'bom'      => pack('CCCC', 0x00, 0x00, 0xfe, 0xff),
+                'length'   => 4,
+            ),
+            array(
+                'encoding' => 'UTF-32LE',
+                'bom'      => pack('CCCC', 0xff, 0xfe, 0x00, 0x00),
+                'length'   => 4,
+            ),
+            array(
+                'encoding' => 'GB-18030',
+                'bom'      => pack('CCCC', 0x84, 0x31, 0x95, 0x33),
+                'length'   => 4,
+            ),
+            array(
+                'encoding' => 'UTF-16BE',
+                'bom'      => pack('CC', 0xfe, 0xff),
+                'length'   => 2,
+            ),
+            array(
+                'encoding' => 'UTF-16LE',
+                'bom'      => pack('CC', 0xff, 0xfe),
+                'length'   => 2,
+            ),
+            array(
+                'encoding' => 'UTF-8',
+                'bom'      => pack('CCC', 0xef, 0xbb, 0xbf),
+                'length'   => 3,
+            ),
+        );
+    }
+
+    /**
+     * Return a map of encoding => generator pairs.
+     *
+     * Returns a map of encoding => generator pairs, where the generator is a
+     * callable that accepts a string and returns the appropriate byte order
+     * sequence of that string for the encoding.
+     *
+     * @return array
+     */
+    protected static function getAsciiEncodingMap()
+    {
+        return array(
+            'UTF-32BE'   => array(__CLASS__, 'encodeToUTF32BE'),
+            'UTF-32LE'   => array(__CLASS__, 'encodeToUTF32LE'),
+            'UTF-32odd1' => array(__CLASS__, 'encodeToUTF32odd1'),
+            'UTF-32odd2' => array(__CLASS__, 'encodeToUTF32odd2'),
+            'UTF-16BE'   => array(__CLASS__, 'encodeToUTF16BE'),
+            'UTF-16LE'   => array(__CLASS__, 'encodeToUTF16LE'),
+            'UTF-8'      => array(__CLASS__, 'encodeToUTF8'),
+            'GB-18030'   => array(__CLASS__, 'encodeToUTF8'),
+        );
+    }
+
+    /**
+     * Binary-safe substr.
+     *
+     * substr() is not binary-safe; this method loops by character to ensure
+     * multi-byte characters are aggregated correctly.
+     *
+     * @param string $string
+     * @param int $start
+     * @param int $end
+     * @return string
+     */
+    protected static function substr($string, $start, $end)
+    {
+        $substr = '';
+        for ($i = $start; $i < $end; $i += 1) {
+            $substr .= $string[$i];
+        }
+        return $substr;
+    }
+
+    /**
+     * Generate an entity comparison based on the given encoding.
+     *
+     * This patch is internal only, and public only so it can be used as a
+     * callable to pass to array_map.
+     *
+     * @internal
+     * @param string $encoding
+     * @return string
+     */
+    public static function generateEntityComparison($encoding)
+    {
+        $encodingMap = self::getAsciiEncodingMap();
+        $generator   = isset($encodingMap[$encoding]) ? $encodingMap[$encoding] : $encodingMap['UTF-8'];
+        return call_user_func($generator, '<!ENTITY');
+    }
+
+    /**
+     * Encode an ASCII string to UTF-32BE
+     *
+     * @internal
+     * @param string $ascii
+     * @return string
+     */
+    public static function encodeToUTF32BE($ascii)
+    {
+        return preg_replace('/(.)/', "\0\0\0\\1", $ascii);
+    }
+
+    /**
+     * Encode an ASCII string to UTF-32LE
+     *
+     * @internal
+     * @param string $ascii
+     * @return string
+     */
+    public static function encodeToUTF32LE($ascii)
+    {
+        return preg_replace('/(.)/', "\\1\0\0\0", $ascii);
+    }
+
+    /**
+     * Encode an ASCII string to UTF-32odd1
+     *
+     * @internal
+     * @param string $ascii
+     * @return string
+     */
+    public static function encodeToUTF32odd1($ascii)
+    {
+        return preg_replace('/(.)/', "\0\\1\0\0", $ascii);
+    }
+
+    /**
+     * Encode an ASCII string to UTF-32odd2
+     *
+     * @internal
+     * @param string $ascii
+     * @return string
+     */
+    public static function encodeToUTF32odd2($ascii)
+    {
+        return preg_replace('/(.)/', "\0\0\\1\0", $ascii);
+    }
+
+    /**
+     * Encode an ASCII string to UTF-16BE
+     *
+     * @internal
+     * @param string $ascii
+     * @return string
+     */
+    public static function encodeToUTF16BE($ascii)
+    {
+        return preg_replace('/(.)/', "\0\\1", $ascii);
+    }
+
+    /**
+     * Encode an ASCII string to UTF-16LE
+     *
+     * @internal
+     * @param string $ascii
+     * @return string
+     */
+    public static function encodeToUTF16LE($ascii)
+    {
+        return preg_replace('/(.)/', "\\1\0", $ascii);
+    }
+
+    /**
+     * Encode an ASCII string to UTF-8
+     *
+     * @internal
+     * @param string $ascii
+     * @return string
+     */
+    public static function encodeToUTF8($ascii)
+    {
+        return $ascii;
+    }
+}
diff --git a/lib/zend/Zend/XmlRpc/Client.php b/lib/zend/Zend/XmlRpc/Client.php
index bc5099a4926..4c298cd71cf 100644
--- a/lib/zend/Zend/XmlRpc/Client.php
+++ b/lib/zend/Zend/XmlRpc/Client.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -71,7 +71,7 @@ require_once 'Zend/XmlRpc/Fault.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Client
@@ -211,7 +211,7 @@ class Zend_XmlRpc_Client
     /**
      * Returns a proxy object for more convenient method calls
      *
-     * @param $namespace  Namespace to proxy or empty string for none
+     * @param string $namespace  Namespace to proxy or empty string for none
      * @return Zend_XmlRpc_Client_ServerProxy
      */
     public function getProxy($namespace = '')
@@ -257,9 +257,15 @@ class Zend_XmlRpc_Client
     {
         $this->_lastRequest = $request;
 
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('output_encoding', 'UTF-8');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
+        if (PHP_VERSION_ID < 50600) {
+            iconv_set_encoding('input_encoding', 'UTF-8');
+            iconv_set_encoding('output_encoding', 'UTF-8');
+            iconv_set_encoding('internal_encoding', 'UTF-8');
+        } else {
+            ini_set('input_encoding', 'UTF-8');
+            ini_set('output_encoding', 'UTF-8');
+            ini_set('default_charset', 'UTF-8');
+        }
 
         $http = $this->getHttpClient();
         if($http->getUri() === null) {
@@ -294,7 +300,7 @@ class Zend_XmlRpc_Client
             $response = new Zend_XmlRpc_Response();
         }
         $this->_lastResponse = $response;
-        $this->_lastResponse->loadXml($httpResponse->getBody());
+        $this->_lastResponse->loadXml(trim($httpResponse->getBody()));
     }
 
     /**
@@ -333,22 +339,33 @@ class Zend_XmlRpc_Client
                 if (!is_array($params)) {
                     $params = array($params);
                 }
-                foreach ($params as $key => $param) {
 
+                foreach ($params as $key => $param)
+                {
                     if ($param instanceof Zend_XmlRpc_Value) {
                         continue;
                     }
 
-                    $type = Zend_XmlRpc_Value::AUTO_DETECT_TYPE;
-                    foreach ($signatures as $signature) {
-                        if (!is_array($signature)) {
-                            continue;
+                    if (count($signatures) > 1) {
+                        $type = Zend_XmlRpc_Value::getXmlRpcTypeByValue($param);
+                        foreach ($signatures as $signature) {
+                            if (!is_array($signature)) {
+                                continue;
+                            }
+                            if (isset($signature['parameters'][$key])) {
+                                if ($signature['parameters'][$key] == $type) {
+                                    break;
+                                }
+                            }
                         }
+                    } elseif (isset($signatures[0]['parameters'][$key])) {
+                        $type = $signatures[0]['parameters'][$key];
+                    } else {
+                        $type = null;
+                    }
 
-                        if (isset($signature['parameters'][$key])) {
-                            $type = $signature['parameters'][$key];
-                            $type = in_array($type, $validTypes) ? $type : Zend_XmlRpc_Value::AUTO_DETECT_TYPE;
-                        }
+                    if (empty($type) || !in_array($type, $validTypes)) {
+                        $type = Zend_XmlRpc_Value::AUTO_DETECT_TYPE;
                     }
 
                     $params[$key] = Zend_XmlRpc_Value::getXmlRpcValue($param, $type);
diff --git a/lib/zend/Zend/XmlRpc/Client/Exception.php b/lib/zend/Zend/XmlRpc/Client/Exception.php
index 0192b5ae12c..d82601da6f0 100644
--- a/lib/zend/Zend/XmlRpc/Client/Exception.php
+++ b/lib/zend/Zend/XmlRpc/Client/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/XmlRpc/Exception.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Client_Exception extends Zend_XmlRpc_Exception
diff --git a/lib/zend/Zend/XmlRpc/Client/FaultException.php b/lib/zend/Zend/XmlRpc/Client/FaultException.php
index bedd26aa805..14ffac3adf1 100644
--- a/lib/zend/Zend/XmlRpc/Client/FaultException.php
+++ b/lib/zend/Zend/XmlRpc/Client/FaultException.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Client/Exception.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Client_FaultException extends Zend_XmlRpc_Client_Exception
diff --git a/lib/zend/Zend/XmlRpc/Client/HttpException.php b/lib/zend/Zend/XmlRpc/Client/HttpException.php
index 2a9ca37fb52..c4186acde7e 100644
--- a/lib/zend/Zend/XmlRpc/Client/HttpException.php
+++ b/lib/zend/Zend/XmlRpc/Client/HttpException.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -34,7 +34,7 @@ require_once 'Zend/XmlRpc/Client/Exception.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Client_HttpException extends Zend_XmlRpc_Client_Exception
diff --git a/lib/zend/Zend/XmlRpc/Client/IntrospectException.php b/lib/zend/Zend/XmlRpc/Client/IntrospectException.php
index 9cf0158a1e1..51fb30e8dbc 100644
--- a/lib/zend/Zend/XmlRpc/Client/IntrospectException.php
+++ b/lib/zend/Zend/XmlRpc/Client/IntrospectException.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/XmlRpc/Client/Exception.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Client_IntrospectException extends Zend_XmlRpc_Client_Exception
diff --git a/lib/zend/Zend/XmlRpc/Client/ServerIntrospection.php b/lib/zend/Zend/XmlRpc/Client/ServerIntrospection.php
index dcfd98e9282..68848d11121 100644
--- a/lib/zend/Zend/XmlRpc/Client/ServerIntrospection.php
+++ b/lib/zend/Zend/XmlRpc/Client/ServerIntrospection.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Client_ServerIntrospection
diff --git a/lib/zend/Zend/XmlRpc/Client/ServerProxy.php b/lib/zend/Zend/XmlRpc/Client/ServerProxy.php
index 3231230c098..516619773b9 100644
--- a/lib/zend/Zend/XmlRpc/Client/ServerProxy.php
+++ b/lib/zend/Zend/XmlRpc/Client/ServerProxy.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Client_ServerProxy
diff --git a/lib/zend/Zend/XmlRpc/Exception.php b/lib/zend/Zend/XmlRpc/Exception.php
index ca688ad6321..d3350515a73 100644
--- a/lib/zend/Zend/XmlRpc/Exception.php
+++ b/lib/zend/Zend/XmlRpc/Exception.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Exception.php';
 /**
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Exception extends Zend_Exception
diff --git a/lib/zend/Zend/XmlRpc/Fault.php b/lib/zend/Zend/XmlRpc/Fault.php
index 265984ade8b..25a5b7d0103 100644
--- a/lib/zend/Zend/XmlRpc/Fault.php
+++ b/lib/zend/Zend/XmlRpc/Fault.php
@@ -14,7 +14,7 @@
  *
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -36,7 +36,7 @@ require_once 'Zend/XmlRpc/Value.php';
  *
  * @category   Zend
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Fault
diff --git a/lib/zend/Zend/XmlRpc/Generator/DomDocument.php b/lib/zend/Zend/XmlRpc/Generator/DomDocument.php
index afcffc88bdd..88bc05fa0cd 100644
--- a/lib/zend/Zend/XmlRpc/Generator/DomDocument.php
+++ b/lib/zend/Zend/XmlRpc/Generator/DomDocument.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -98,4 +98,4 @@ class Zend_XmlRpc_Generator_DomDocument extends Zend_XmlRpc_Generator_GeneratorA
         $this->_dom = new DOMDocument('1.0', $this->_encoding);
         $this->_currentElement = $this->_dom;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/XmlRpc/Generator/GeneratorAbstract.php b/lib/zend/Zend/XmlRpc/Generator/GeneratorAbstract.php
index abfea1ab589..03afcd696f4 100644
--- a/lib/zend/Zend/XmlRpc/Generator/GeneratorAbstract.php
+++ b/lib/zend/Zend/XmlRpc/Generator/GeneratorAbstract.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -47,7 +47,7 @@ abstract class Zend_XmlRpc_Generator_GeneratorAbstract
      * Start XML element
      *
      * Method opens a new XML element with an element name and an optional value
-     * 
+     *
      * @param string $name XML tag name
      * @param string $value Optional value of the XML tag
      * @return Zend_XmlRpc_Generator_Abstract Fluent interface
@@ -86,7 +86,7 @@ abstract class Zend_XmlRpc_Generator_GeneratorAbstract
 
     /**
      * Return encoding
-     * 
+     *
      * @return string
      */
     public function getEncoding()
@@ -143,7 +143,7 @@ abstract class Zend_XmlRpc_Generator_GeneratorAbstract
 
     /**
      * End XML element
-     * 
+     *
      * @param string $name
      */
     abstract protected function _closeElement($name);
diff --git a/lib/zend/Zend/XmlRpc/Generator/XmlWriter.php b/lib/zend/Zend/XmlRpc/Generator/XmlWriter.php
index 51d5d00ee59..a84e11d3bf4 100644
--- a/lib/zend/Zend/XmlRpc/Generator/XmlWriter.php
+++ b/lib/zend/Zend/XmlRpc/Generator/XmlWriter.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Generator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -87,6 +87,7 @@ class Zend_XmlRpc_Generator_XmlWriter extends Zend_XmlRpc_Generator_GeneratorAbs
 
     public function saveXml()
     {
-        return $this->_xmlWriter->flush(false);
+        $xml = $this->_xmlWriter->flush(false);
+        return $xml;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/XmlRpc/Request.php b/lib/zend/Zend/XmlRpc/Request.php
index 2a11a3ac062..73bb9670a33 100644
--- a/lib/zend/Zend/XmlRpc/Request.php
+++ b/lib/zend/Zend/XmlRpc/Request.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,6 +28,12 @@ require_once 'Zend/XmlRpc/Value.php';
  */
 require_once 'Zend/XmlRpc/Fault.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
+/** @see Zend_Xml_Exception */
+require_once 'Zend/Xml/Exception.php';
+
 /**
  * XmlRpc Request object
  *
@@ -41,7 +47,7 @@ require_once 'Zend/XmlRpc/Fault.php';
  *
  * @category Zend
  * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
@@ -303,15 +309,12 @@ class Zend_XmlRpc_Request
             return false;
         }
 
-        // @see ZF-12293 - disable external entities for security purposes
-        $loadEntities = libxml_disable_entity_loader(true);
         try {
-            $xml = new SimpleXMLElement($request);
-        } catch (Exception $e) {
+            $xml = Zend_Xml_Security::scan($request);
+        } catch (Zend_Xml_Exception $e) {
             // Not valid XML
             $this->_fault = new Zend_XmlRpc_Fault(631);
             $this->_fault->setEncoding($this->getEncoding());
-            libxml_disable_entity_loader($loadEntities);
             return false;
         }
 
@@ -320,7 +323,6 @@ class Zend_XmlRpc_Request
             // Missing method name
             $this->_fault = new Zend_XmlRpc_Fault(632);
             $this->_fault->setEncoding($this->getEncoding());
-            libxml_disable_entity_loader($loadEntities);
             return false;
         }
 
@@ -334,7 +336,6 @@ class Zend_XmlRpc_Request
                 if (!isset($param->value)) {
                     $this->_fault = new Zend_XmlRpc_Fault(633);
                     $this->_fault->setEncoding($this->getEncoding());
-                    libxml_disable_entity_loader($loadEntities);
                     return false;
                 }
 
@@ -345,7 +346,6 @@ class Zend_XmlRpc_Request
                 } catch (Exception $e) {
                     $this->_fault = new Zend_XmlRpc_Fault(636);
                     $this->_fault->setEncoding($this->getEncoding());
-                    libxml_disable_entity_loader($loadEntities);
                     return false;
                 }
             }
@@ -354,7 +354,6 @@ class Zend_XmlRpc_Request
             $this->_params = $argv;
         }
 
-        libxml_disable_entity_loader($loadEntities);
         $this->_xml = $request;
 
         return true;
diff --git a/lib/zend/Zend/XmlRpc/Request/Http.php b/lib/zend/Zend/XmlRpc/Request/Http.php
index fd438f67b44..df058a1a84a 100644
--- a/lib/zend/Zend/XmlRpc/Request/Http.php
+++ b/lib/zend/Zend/XmlRpc/Request/Http.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -32,7 +32,7 @@ require_once 'Zend/XmlRpc/Request.php';
  *
  * @category Zend
  * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/XmlRpc/Request/Stdin.php b/lib/zend/Zend/XmlRpc/Request/Stdin.php
index b81005e17e9..d6bb539e199 100644
--- a/lib/zend/Zend/XmlRpc/Request/Stdin.php
+++ b/lib/zend/Zend/XmlRpc/Request/Stdin.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -32,7 +32,7 @@ require_once 'Zend/XmlRpc/Request.php';
  *
  * @category Zend
  * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/XmlRpc/Response.php b/lib/zend/Zend/XmlRpc/Response.php
index 144b7bb6ab9..be5a6cbb4e5 100644
--- a/lib/zend/Zend/XmlRpc/Response.php
+++ b/lib/zend/Zend/XmlRpc/Response.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -28,6 +28,12 @@ require_once 'Zend/XmlRpc/Value.php';
  */
 require_once 'Zend/XmlRpc/Fault.php';
 
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
+/** @see Zend_Xml_Exception */
+require_once 'Zend/Xml/Exception.php';
+
 /**
  * XmlRpc Response
  *
@@ -35,7 +41,7 @@ require_once 'Zend/XmlRpc/Fault.php';
  *
  * @category Zend
  * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
@@ -177,8 +183,8 @@ class Zend_XmlRpc_Response
         }
 
         try {
-            $xml = new SimpleXMLElement($response);
-        } catch (Exception $e) {
+            $xml = Zend_Xml_Security::scan($response);
+        } catch (Zend_Xml_Exception $e) {    
             // Not valid XML
             $this->_fault = new Zend_XmlRpc_Fault(651);
             $this->_fault->setEncoding($this->getEncoding());
@@ -202,6 +208,7 @@ class Zend_XmlRpc_Response
 
         try {
             if (!isset($xml->params) || !isset($xml->params->param) || !isset($xml->params->param->value)) {
+                require_once 'Zend/XmlRpc/Value/Exception.php';
                 throw new Zend_XmlRpc_Value_Exception('Missing XML-RPC value in XML');
             }
             $valueXml = $xml->params->param->value->asXML();
diff --git a/lib/zend/Zend/XmlRpc/Response/Http.php b/lib/zend/Zend/XmlRpc/Response/Http.php
index 751a4dc3189..5bc246ba678 100644
--- a/lib/zend/Zend/XmlRpc/Response/Http.php
+++ b/lib/zend/Zend/XmlRpc/Response/Http.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -29,7 +29,7 @@ require_once 'Zend/XmlRpc/Response.php';
  * @uses Zend_XmlRpc_Response
  * @category Zend
  * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id$
  */
diff --git a/lib/zend/Zend/XmlRpc/Server.php b/lib/zend/Zend/XmlRpc/Server.php
index ed8c354da57..1c747084b0c 100644
--- a/lib/zend/Zend/XmlRpc/Server.php
+++ b/lib/zend/Zend/XmlRpc/Server.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -111,7 +111,7 @@ require_once 'Zend/Server/Reflection/Method.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Server extends Zend_Server_Abstract
@@ -278,13 +278,13 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract
             throw new Zend_XmlRpc_Server_Exception('Invalid method class', 610);
         }
 
-        $argv = null;
+        $args = null;
         if (2 < func_num_args()) {
-            $argv = func_get_args();
-            $argv = array_slice($argv, 2);
+            $args = func_get_args();
+            $args = array_slice($args, 2);
         }
 
-        $dispatchable = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
+        $dispatchable = Zend_Server_Reflection::reflectClass($class, $args, $namespace);
         foreach ($dispatchable->getMethods() as $reflection) {
             $this->_buildSignature($reflection, $class);
         }
diff --git a/lib/zend/Zend/XmlRpc/Server/Cache.php b/lib/zend/Zend/XmlRpc/Server/Cache.php
index 32ee69bd5a3..7c52902b62f 100644
--- a/lib/zend/Zend/XmlRpc/Server/Cache.php
+++ b/lib/zend/Zend/XmlRpc/Server/Cache.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/Server/Cache.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Server_Cache extends Zend_Server_Cache
diff --git a/lib/zend/Zend/XmlRpc/Server/Exception.php b/lib/zend/Zend/XmlRpc/Server/Exception.php
index eb4fe1bed08..36952623b43 100644
--- a/lib/zend/Zend/XmlRpc/Server/Exception.php
+++ b/lib/zend/Zend/XmlRpc/Server/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,7 +33,7 @@ require_once 'Zend/XmlRpc/Exception.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Server_Exception extends Zend_XmlRpc_Exception
diff --git a/lib/zend/Zend/XmlRpc/Server/Fault.php b/lib/zend/Zend/XmlRpc/Server/Fault.php
index 82b851f34ad..8ccb9ba4161 100644
--- a/lib/zend/Zend/XmlRpc/Server/Fault.php
+++ b/lib/zend/Zend/XmlRpc/Server/Fault.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -44,7 +44,7 @@ require_once 'Zend/XmlRpc/Fault.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Server_Fault extends Zend_XmlRpc_Fault
diff --git a/lib/zend/Zend/XmlRpc/Server/System.php b/lib/zend/Zend/XmlRpc/Server/System.php
index d49d0fc3e72..340eb1cd739 100644
--- a/lib/zend/Zend/XmlRpc/Server/System.php
+++ b/lib/zend/Zend/XmlRpc/Server/System.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Server_System
diff --git a/lib/zend/Zend/XmlRpc/Value.php b/lib/zend/Zend/XmlRpc/Value.php
index 4d0fe8c2c94..6b224499649 100644
--- a/lib/zend/Zend/XmlRpc/Value.php
+++ b/lib/zend/Zend/XmlRpc/Value.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@
  * from PHP variables, XML string or by specifing the exact XML-RPC natvie type
  *
  * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_XmlRpc_Value
@@ -252,6 +252,43 @@ abstract class Zend_XmlRpc_Value
         }
     }
 
+    /**
+     * Get XML-RPC type for a PHP native variable
+     *
+     * @static
+     * @param mixed $value
+     * @return string
+     */
+    public static function getXmlRpcTypeByValue($value)
+    {
+        if (is_object($value)) {
+            if ($value instanceof Zend_XmlRpc_Value) {
+                return $value->getType();
+            } elseif (($value instanceof Zend_Date) || ($value instanceof DateTime)) {
+                return self::XMLRPC_TYPE_DATETIME;
+            }
+            return self::getXmlRpcTypeByValue(get_object_vars($value));
+        } elseif (is_array($value)) {
+            if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) {
+                return self::XMLRPC_TYPE_STRUCT;
+            }
+            return self::XMLRPC_TYPE_ARRAY;
+        } elseif (is_int($value)) {
+            return ($value > PHP_INT_MAX) ? self::XMLRPC_TYPE_I8 : self::XMLRPC_TYPE_INTEGER;
+        } elseif (is_double($value)) {
+            return self::XMLRPC_TYPE_DOUBLE;
+        } elseif (is_bool($value)) {
+            return self::XMLRPC_TYPE_BOOLEAN;
+        } elseif (is_null($value)) {
+            return self::XMLRPC_TYPE_NIL;
+        } elseif (is_string($value)) {
+            return self::XMLRPC_TYPE_STRING;
+        }
+        throw new Zend_XmlRpc_Value_Exception(sprintf(
+            'No matching XMLRPC type found for php type %s.',
+            gettype($value)
+        ));
+    }
 
     /**
      * Transform a PHP native variable into a XML-RPC native value
@@ -263,56 +300,52 @@ abstract class Zend_XmlRpc_Value
      */
     protected static function _phpVarToNativeXmlRpc($value)
     {
-        switch (gettype($value)) {
-            case 'object':
-                // Check to see if it's an XmlRpc value
-                if ($value instanceof Zend_XmlRpc_Value) {
-                    return $value;
-                }
+        // @see http://framework.zend.com/issues/browse/ZF-8623
+        if (is_object($value)) {
+            if ($value instanceof Zend_XmlRpc_Value) {
+                return $value;
+            }
+            if ($value instanceof Zend_Crypt_Math_BigInteger) {
+                require_once 'Zend/XmlRpc/Value/Exception.php';
+                throw new Zend_XmlRpc_Value_Exception(
+                    'Using Zend_Crypt_Math_BigInteger to get an ' .
+                    'instance of Zend_XmlRpc_Value_BigInteger is not ' .
+                    'available anymore.'
+                );
+            }
+        }
 
-                if ($value instanceof Zend_Crypt_Math_BigInteger) {
-                    require_once 'Zend/XmlRpc/Value/BigInteger.php';
-                    return new Zend_XmlRpc_Value_BigInteger($value);
-                }
+        switch (self::getXmlRpcTypeByValue($value))
+        {
+            case self::XMLRPC_TYPE_DATETIME:
+                require_once 'Zend/XmlRpc/Value/DateTime.php';
+                return new Zend_XmlRpc_Value_DateTime($value);
 
-                if ($value instanceof Zend_Date or $value instanceof DateTime) {
-                    require_once 'Zend/XmlRpc/Value/DateTime.php';
-                    return new Zend_XmlRpc_Value_DateTime($value);
-                }
-
-                // Otherwise, we convert the object into a struct
-                $value = get_object_vars($value);
-                // Break intentionally omitted
-            case 'array':
-                // Default native type for a PHP array (a simple numeric array) is 'array'
+            case self::XMLRPC_TYPE_ARRAY:
                 require_once 'Zend/XmlRpc/Value/Array.php';
-                $obj = 'Zend_XmlRpc_Value_Array';
+                return new Zend_XmlRpc_Value_Array($value);
 
-                // Determine if this is an associative array
-                if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) {
-                    require_once 'Zend/XmlRpc/Value/Struct.php';
-                    $obj = 'Zend_XmlRpc_Value_Struct';
-                }
-                return new $obj($value);
+            case self::XMLRPC_TYPE_STRUCT:
+                require_once 'Zend/XmlRpc/Value/Struct.php';
+                return new Zend_XmlRpc_Value_Struct($value);
 
-            case 'integer':
+            case self::XMLRPC_TYPE_INTEGER:
                 require_once 'Zend/XmlRpc/Value/Integer.php';
                 return new Zend_XmlRpc_Value_Integer($value);
 
-            case 'double':
+            case self::XMLRPC_TYPE_DOUBLE:
                 require_once 'Zend/XmlRpc/Value/Double.php';
                 return new Zend_XmlRpc_Value_Double($value);
 
-            case 'boolean':
+            case self::XMLRPC_TYPE_BOOLEAN:
                 require_once 'Zend/XmlRpc/Value/Boolean.php';
                 return new Zend_XmlRpc_Value_Boolean($value);
 
-            case 'NULL':
-            case 'null':
+            case self::XMLRPC_TYPE_NIL:
                 require_once 'Zend/XmlRpc/Value/Nil.php';
-                return new Zend_XmlRpc_Value_Nil();
+                return new Zend_XmlRpc_Value_Nil;
 
-            case 'string':
+            case self::XMLRPC_TYPE_STRING:
                 // Fall through to the next case
             default:
                 // If type isn't identified (or identified as string), it treated as string
@@ -467,14 +500,22 @@ abstract class Zend_XmlRpc_Value
             }
         }
 
+        //if there is a child element, try to parse type for it
+        if (!$type && $value instanceof SimpleXMLElement) {
+            self::_extractTypeAndValue($value->children(), $type, $value);
+        }
+
         // If no type was specified, the default is string
         if (!$type) {
             $type = self::XMLRPC_TYPE_STRING;
+            if (preg_match('#^<value>.*</value>$#', $xml->asXML())) {
+                $value = str_replace(array('<value>', '</value>'), '', $xml->asXML());
+            }
         }
     }
 
     /**
-     * @param $xml
+     * @param string $xml
      * @return void
      */
     protected function _setXML($xml)
diff --git a/lib/zend/Zend/XmlRpc/Value/Array.php b/lib/zend/Zend/XmlRpc/Value/Array.php
index 8fed1a39f78..60f68b29628 100644
--- a/lib/zend/Zend/XmlRpc/Value/Array.php
+++ b/lib/zend/Zend/XmlRpc/Value/Array.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Collection.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_Array extends Zend_XmlRpc_Value_Collection
diff --git a/lib/zend/Zend/XmlRpc/Value/Base64.php b/lib/zend/Zend/XmlRpc/Value/Base64.php
index ea1e5d8e887..eee61bae5ca 100644
--- a/lib/zend/Zend/XmlRpc/Value/Base64.php
+++ b/lib/zend/Zend/XmlRpc/Value/Base64.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_Base64 extends Zend_XmlRpc_Value_Scalar
@@ -65,4 +65,4 @@ class Zend_XmlRpc_Value_Base64 extends Zend_XmlRpc_Value_Scalar
     {
         return base64_decode($this->_value);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/XmlRpc/Value/BigInteger.php b/lib/zend/Zend/XmlRpc/Value/BigInteger.php
index 1ce84bb2d3a..b636a5814f9 100644
--- a/lib/zend/Zend/XmlRpc/Value/BigInteger.php
+++ b/lib/zend/Zend/XmlRpc/Value/BigInteger.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Zend Framework
  *
@@ -15,51 +16,43 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
 
-
 /**
  * Zend_XmlRpc_Value_Integer
  */
 require_once 'Zend/XmlRpc/Value/Integer.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_BigInteger extends Zend_XmlRpc_Value_Integer
 {
-    /**
-     * @var Zend_Crypt_Math_BigInteger
-     */
-    protected $_integer;
-
     /**
      * @param mixed $value
      */
     public function __construct($value)
     {
         require_once 'Zend/Crypt/Math/BigInteger.php';
-        $this->_integer = new Zend_Crypt_Math_BigInteger();
-        $this->_value = $this->_integer->init($this->_value);
-
+        $integer = new Zend_Crypt_Math_BigInteger;
+        $this->_value = $integer->init($value);
         $this->_type = self::XMLRPC_TYPE_I8;
     }
 
     /**
-     * Return bigint value object
+     * Return bigint value
      *
-     * @return Zend_Crypt_Math_BigInteger
+     * @return string
      */
     public function getValue()
     {
-        return $this->_integer;
+        return $this->_value;
     }
 }
diff --git a/lib/zend/Zend/XmlRpc/Value/Boolean.php b/lib/zend/Zend/XmlRpc/Value/Boolean.php
index cb25cdd76c6..1a91872ca02 100644
--- a/lib/zend/Zend/XmlRpc/Value/Boolean.php
+++ b/lib/zend/Zend/XmlRpc/Value/Boolean.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_Boolean extends Zend_XmlRpc_Value_Scalar
@@ -60,4 +60,4 @@ class Zend_XmlRpc_Value_Boolean extends Zend_XmlRpc_Value_Scalar
     {
         return (bool)$this->_value;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/XmlRpc/Value/Collection.php b/lib/zend/Zend/XmlRpc/Value/Collection.php
index ad5fbc07d90..2ef9a9a3d50 100644
--- a/lib/zend/Zend/XmlRpc/Value/Collection.php
+++ b/lib/zend/Zend/XmlRpc/Value/Collection.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_XmlRpc_Value_Collection extends Zend_XmlRpc_Value
diff --git a/lib/zend/Zend/XmlRpc/Value/DateTime.php b/lib/zend/Zend/XmlRpc/Value/DateTime.php
index 6386c7e427c..18d9991dc11 100644
--- a/lib/zend/Zend/XmlRpc/Value/DateTime.php
+++ b/lib/zend/Zend/XmlRpc/Value/DateTime.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar
@@ -48,7 +48,7 @@ class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar
      *
      * @var string
      */
-    protected $_isoFormatString = 'YYYYMMddTHH:mm:ss';
+    protected $_isoFormatString = 'yyyyMMddTHH:mm:ss';
 
     /**
      * Set the value of a dateTime.iso8601 native type
@@ -69,13 +69,13 @@ class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar
         } elseif (is_numeric($value)) { // The value is numeric, we make sure it is an integer
             $this->_value = date($this->_phpFormatString, (int)$value);
         } else {
-            $timestamp = strtotime($value);
-            if ($timestamp === false || $timestamp == -1) { // cannot convert the value to a timestamp
+            $timestamp = new DateTime($value);
+            if ($timestamp === false) { // cannot convert the value to a timestamp
                 require_once 'Zend/XmlRpc/Value/Exception.php';
                 throw new Zend_XmlRpc_Value_Exception('Cannot convert given value \''. $value .'\' to a timestamp');
             }
 
-            $this->_value = date($this->_phpFormatString, $timestamp); // Convert the timestamp to iso8601 format
+            $this->_value = $timestamp->format($this->_phpFormatString); // Convert the timestamp to iso8601 format
         }
     }
 
diff --git a/lib/zend/Zend/XmlRpc/Value/Double.php b/lib/zend/Zend/XmlRpc/Value/Double.php
index a4033ed42f6..6251879f069 100644
--- a/lib/zend/Zend/XmlRpc/Value/Double.php
+++ b/lib/zend/Zend/XmlRpc/Value/Double.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_Double extends Zend_XmlRpc_Value_Scalar
diff --git a/lib/zend/Zend/XmlRpc/Value/Exception.php b/lib/zend/Zend/XmlRpc/Value/Exception.php
index 6e79ce4626d..3a18f28e736 100644
--- a/lib/zend/Zend/XmlRpc/Value/Exception.php
+++ b/lib/zend/Zend/XmlRpc/Value/Exception.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Exception.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_Exception extends Zend_XmlRpc_Exception
diff --git a/lib/zend/Zend/XmlRpc/Value/Integer.php b/lib/zend/Zend/XmlRpc/Value/Integer.php
index 5c99387c385..2ad5c840d55 100644
--- a/lib/zend/Zend/XmlRpc/Value/Integer.php
+++ b/lib/zend/Zend/XmlRpc/Value/Integer.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_Integer extends Zend_XmlRpc_Value_Scalar
diff --git a/lib/zend/Zend/XmlRpc/Value/Nil.php b/lib/zend/Zend/XmlRpc/Value/Nil.php
index 760872d7f22..67305d0d8d9 100644
--- a/lib/zend/Zend/XmlRpc/Value/Nil.php
+++ b/lib/zend/Zend/XmlRpc/Value/Nil.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_Nil extends Zend_XmlRpc_Value_Scalar
diff --git a/lib/zend/Zend/XmlRpc/Value/Scalar.php b/lib/zend/Zend/XmlRpc/Value/Scalar.php
index ec1af5443e2..86397d20912 100644
--- a/lib/zend/Zend/XmlRpc/Value/Scalar.php
+++ b/lib/zend/Zend/XmlRpc/Value/Scalar.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_XmlRpc_Value_Scalar extends Zend_XmlRpc_Value
@@ -50,4 +50,4 @@ abstract class Zend_XmlRpc_Value_Scalar extends Zend_XmlRpc_Value
                   ->closeElement($this->_type)
                   ->closeElement('value');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/XmlRpc/Value/String.php b/lib/zend/Zend/XmlRpc/Value/String.php
index 98996157e0b..37ac5b83216 100644
--- a/lib/zend/Zend/XmlRpc/Value/String.php
+++ b/lib/zend/Zend/XmlRpc/Value/String.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -29,7 +29,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php';
 /**
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_String extends Zend_XmlRpc_Value_Scalar
@@ -57,4 +57,4 @@ class Zend_XmlRpc_Value_String extends Zend_XmlRpc_Value_Scalar
     {
         return (string)$this->_value;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/Zend/XmlRpc/Value/Struct.php b/lib/zend/Zend/XmlRpc/Value/Struct.php
index 04baedb7f94..5272eb508db 100644
--- a/lib/zend/Zend/XmlRpc/Value/Struct.php
+++ b/lib/zend/Zend/XmlRpc/Value/Struct.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Collection.php';
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_XmlRpc_Value_Struct extends Zend_XmlRpc_Value_Collection
@@ -72,4 +72,4 @@ class Zend_XmlRpc_Value_Struct extends Zend_XmlRpc_Value_Collection
         $generator->closeElement('struct')
                   ->closeElement('value');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/zend/readme_moodle.txt b/lib/zend/readme_moodle.txt
index 1df8e7647af..2c1d1c8973e 100644
--- a/lib/zend/readme_moodle.txt
+++ b/lib/zend/readme_moodle.txt
@@ -1,12 +1,25 @@
 Description of Zend framework 1.10.6 import into Moodle
-Please note the zend framework is severly crippled - everything not needed in /webservice/* is removed.
+Please note the zend framework is modified - some packages are removed.
+
+Delete all the files from the Moodle lib/zend/Zend folder.
+Copy all the files from the zend/library/Zend folder into the Moodle lib/zend/Zend folder.
+
+Audit the Classes we actually use - and delete libraries that are not used directly or indirectly by any of them.
+
+Libraries I think are safe to remove:
+
+Application/ Tool/ Application.php Barcode/ Barcode.php Captcha/ Form/ Form.php Dojo/ Dojo.php Cloud/
+CodeGenerator/ Console/ Test/ Db.php Db/ Paginator.php Paginator/ Session.php Session/ Feed.php Feed/
+Auth/Adapter/DbTable.php Queue/Adapter/Db/ Queue/Adapter/Db.php Debug.php Dom/ EventManager/ File/ Ldap.php
+Ldap/ Auth/Adapter/Ldap.php Locale/Data Mail.php Mail/ Markup.php Markup/ Measure/ Memory.php Memory/ Pdf.php Pdf/
+Mime.php Mime/ Mobile/ OpenId.php OpenId/ Auth/Adapter/OpenId.php ProgressBar.php ProgressBar Queue.php Queue/
+Search/ Serializer.php Serializer/ Stdlib/ Tag/ Text/ TimeSync.php TimeSync/ Translate.php Translate/
+Log/Writer/Firebug.php Wildfire/ Service/ShortUrl/ Service/WindowsAzure/
+
+
+
 
 Do not use outside of our /webservice/* or mnet !!
 
-
 Changes:
-* lots of files removed
-* small fix to error reporting in reflection (MDL-21460, ZF-8980)
-* SOAP and XMLRPC servers overwrite the fault() functions
-* synced and renamed file to version in ZF 1.10.6 (MDL-30603, ZF-11080)
-* import security patch (MDL-34284, ZF2012-01, ZF-12293)
+* Update to 1.12.16 - this is more or less vanilla now except for the above folders removed.