From e9d05c95e924e7980f77e4604b6fea0f8a2ee287 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 10 Jan 2023 22:20:30 +0100
Subject: [PATCH 1/3] Use $this for fluent interface

---
 library/Zend/Acl.php                          |  24 ++--
 library/Zend/Acl/Role/Registry.php            |   6 +-
 library/Zend/Auth.php                         |   4 +-
 library/Zend/Auth/Adapter/DbTable.php         |  12 +-
 library/Zend/Auth/Adapter/Digest.php          |   8 +-
 library/Zend/Auth/Adapter/Http.php            |   8 +-
 .../Zend/Auth/Adapter/Http/Resolver/File.php  |   2 +-
 library/Zend/Auth/Adapter/Ldap.php            |  12 +-
 library/Zend/Auth/Adapter/OpenId.php          |  14 +-
 library/Zend/Console/Getopt.php               |  16 +--
 .../Controller/Action/Helper/Abstract.php     |   2 +-
 .../Controller/Action/Helper/ActionStack.php  |   2 +-
 .../Action/Helper/AutoComplete/Abstract.php   |   2 +-
 .../Action/Helper/ContextSwitch.php           |  60 ++++-----
 .../Action/Helper/FlashMessenger.php          |   8 +-
 .../Controller/Action/Helper/Redirector.php   |  10 +-
 .../Controller/Action/Helper/ViewRenderer.php |  28 ++--
 library/Zend/Controller/Router/Route.php      |   2 +-
 .../Zend/Controller/Router/Route/Chain.php    |   2 +-
 .../Zend/Controller/Router/Route/Hostname.php |   2 +-
 .../Zend/Controller/Router/Route/Module.php   |   2 +-
 .../Zend/Controller/Router/Route/Regex.php    |   2 +-
 .../Zend/Controller/Router/Route/Static.php   |   2 +-
 library/Zend/Currency.php                     |   2 +-
 library/Zend/Date.php                         | 100 +++++++-------
 library/Zend/Date/DateObject.php              |   2 +-
 library/Zend/Db/Adapter/Abstract.php          |   4 +-
 library/Zend/Db/Profiler.php                  |   8 +-
 library/Zend/Db/Profiler/Firebug.php          |   2 +-
 library/Zend/Db/Table/Abstract.php            |  14 +-
 library/Zend/Db/Table/Row/Abstract.php        |   2 +-
 library/Zend/Filter.php                       |   6 +-
 library/Zend/Filter/Alnum.php                 |   2 +-
 library/Zend/Filter/Alpha.php                 |   2 +-
 library/Zend/Filter/HtmlEntities.php          |   6 +-
 library/Zend/Filter/StringToLower.php         |   2 +-
 library/Zend/Filter/StringToUpper.php         |   2 +-
 library/Zend/Filter/StringTrim.php            |   2 +-
 library/Zend/Filter/StripTags.php             |   6 +-
 library/Zend/Form.php                         | 124 +++++++++---------
 library/Zend/Form/Element/File.php            |   2 +-
 library/Zend/Gdata/App.php                    |   2 +-
 library/Zend/Gdata/App/Base.php               |   6 +-
 library/Zend/Gdata/App/BaseMediaSource.php    |   4 +-
 library/Zend/Gdata/App/Entry.php              |  10 +-
 library/Zend/Gdata/App/Extension/Category.php |   6 +-
 library/Zend/Gdata/App/Extension/Content.php  |   2 +-
 library/Zend/Gdata/App/Extension/Control.php  |   2 +-
 .../Zend/Gdata/App/Extension/Generator.php    |   4 +-
 library/Zend/Gdata/App/Extension/Link.php     |  12 +-
 library/Zend/Gdata/App/Extension/Person.php   |   6 +-
 library/Zend/Gdata/App/Extension/Text.php     |   2 +-
 library/Zend/Gdata/App/Feed.php               |   4 +-
 library/Zend/Gdata/App/FeedEntryParent.php    |  22 ++--
 library/Zend/Gdata/App/FeedSourceParent.php   |  12 +-
 library/Zend/Gdata/App/MediaEntry.php         |   2 +-
 library/Zend/Gdata/App/MediaFileSource.php    |   4 +-
 library/Zend/Gdata/App/MediaSource.php        |   4 +-
 .../Gdata/Books/Extension/Embeddability.php   |   2 +-
 library/Zend/Gdata/Books/Extension/Review.php |   4 +-
 .../Gdata/Books/Extension/Viewability.php     |   2 +-
 library/Zend/Gdata/Books/VolumeEntry.php      |  28 ++--
 library/Zend/Gdata/Books/VolumeQuery.php      |   2 +-
 library/Zend/Gdata/Calendar/EventEntry.php    |   4 +-
 library/Zend/Gdata/Calendar/EventQuery.php    |  22 ++--
 .../Zend/Gdata/Calendar/Extension/Link.php    |   2 +-
 library/Zend/Gdata/Calendar/ListEntry.php     |  12 +-
 library/Zend/Gdata/Calendar/ListFeed.php      |   2 +-
 library/Zend/Gdata/Docs/Query.php             |   8 +-
 library/Zend/Gdata/Exif/Entry.php             |   2 +-
 library/Zend/Gdata/Exif/Extension/Tags.php    |  20 +--
 library/Zend/Gdata/Feed.php                   |   6 +-
 library/Zend/Gdata/Gapps/EmailListEntry.php   |   4 +-
 .../Gdata/Gapps/EmailListRecipientEntry.php   |   2 +-
 library/Zend/Gdata/Gapps/Extension/Login.php  |  14 +-
 library/Zend/Gdata/Gapps/Extension/Name.php   |   4 +-
 .../Zend/Gdata/Gapps/Extension/Nickname.php   |   2 +-
 library/Zend/Gdata/Gapps/Extension/Quota.php  |   2 +-
 library/Zend/Gdata/Gapps/GroupEntry.php       |   2 +-
 library/Zend/Gdata/Gapps/MemberEntry.php      |   2 +-
 library/Zend/Gdata/Gapps/NicknameEntry.php    |   4 +-
 library/Zend/Gdata/Gapps/OwnerEntry.php       |   2 +-
 library/Zend/Gdata/Gapps/ServiceException.php |   2 +-
 library/Zend/Gdata/Gapps/UserEntry.php        |   8 +-
 .../Zend/Gdata/Geo/Extension/GeoRssWhere.php  |   2 +-
 library/Zend/Gdata/Geo/Extension/GmlPoint.php |   2 +-
 library/Zend/Gdata/HttpClient.php             |   6 +-
 library/Zend/Gdata/Kind/EventEntry.php        |  22 ++--
 library/Zend/Gdata/Media/Entry.php            |   2 +-
 .../Gdata/Media/Extension/MediaCategory.php   |   4 +-
 .../Gdata/Media/Extension/MediaContent.php    |  28 ++--
 .../Gdata/Media/Extension/MediaCopyright.php  |   2 +-
 .../Gdata/Media/Extension/MediaCredit.php     |   4 +-
 .../Media/Extension/MediaDescription.php      |   2 +-
 .../Zend/Gdata/Media/Extension/MediaGroup.php |   4 +-
 .../Zend/Gdata/Media/Extension/MediaHash.php  |   2 +-
 .../Gdata/Media/Extension/MediaPlayer.php     |   6 +-
 .../Gdata/Media/Extension/MediaRating.php     |   2 +-
 .../Media/Extension/MediaRestriction.php      |   4 +-
 .../Zend/Gdata/Media/Extension/MediaText.php  |   8 +-
 .../Gdata/Media/Extension/MediaThumbnail.php  |   8 +-
 .../Zend/Gdata/Media/Extension/MediaTitle.php |   2 +-
 library/Zend/Gdata/Photos/UserQuery.php       |   4 +-
 library/Zend/Gdata/Query.php                  |  22 ++--
 library/Zend/Gdata/Spreadsheets/CellQuery.php |  22 ++--
 .../Zend/Gdata/Spreadsheets/DocumentQuery.php |  14 +-
 library/Zend/Gdata/Spreadsheets/ListEntry.php |   8 +-
 library/Zend/Gdata/Spreadsheets/ListQuery.php |  16 +--
 library/Zend/Ldap.php                         |  26 ++--
 .../Zend/Ldap/Collection/Iterator/Default.php |   2 +-
 library/Zend/Ldap/Dn.php                      |  10 +-
 library/Zend/Ldap/Node.php                    |  32 ++---
 library/Zend/Ldap/Node/Abstract.php           |   2 +-
 library/Zend/Ldap/Node/Schema.php             |   2 +-
 .../Zend/Ldap/Node/Schema/ActiveDirectory.php |   2 +-
 library/Zend/Ldap/Node/Schema/Item.php        |   2 +-
 library/Zend/Ldap/Node/Schema/OpenLdap.php    |   2 +-
 library/Zend/Mail.php                         |  52 ++++----
 library/Zend/Navigation/Container.php         |   9 +-
 library/Zend/Navigation/Page.php              |  53 ++++----
 library/Zend/Navigation/Page/Mvc.php          |  22 ++--
 library/Zend/Navigation/Page/Uri.php          |   2 +-
 library/Zend/Queue.php                        |   8 +-
 library/Zend/Queue/Message.php                |   2 +-
 library/Zend/Rest/Route.php                   |   2 +-
 library/Zend/Service/Amazon/Query.php         |   2 +-
 library/Zend/Service/Audioscrobbler.php       |   2 +-
 library/Zend/Service/Delicious.php            |  10 +-
 library/Zend/Service/Ebay/Abstract.php        |   4 +-
 library/Zend/Service/Ebay/Finding.php         |   2 +-
 .../Ebay/Finding/Response/Abstract.php        |   4 +-
 library/Zend/Translate/Adapter.php            |   8 +-
 library/Zend/Validate.php                     |   2 +-
 library/Zend/Validate/Abstract.php            |   2 +-
 library/Zend/Validate/Alnum.php               |   2 +-
 library/Zend/Validate/Alpha.php               |   2 +-
 .../Validate/Barcode/AdapterInterface.php     |   2 +-
 library/Zend/Validate/Between.php             |   6 +-
 library/Zend/Validate/Callback.php            |   4 +-
 library/Zend/Validate/CreditCard.php          |   4 +-
 library/Zend/Validate/Date.php                |   4 +-
 library/Zend/Validate/EmailAddress.php        |  10 +-
 library/Zend/Validate/File/Count.php          |   4 +-
 library/Zend/Validate/File/Crc32.php          |   8 +-
 library/Zend/Validate/File/Exists.php         |   4 +-
 library/Zend/Validate/File/Extension.php      |   6 +-
 library/Zend/Validate/File/Hash.php           |   4 +-
 library/Zend/Validate/File/ImageSize.php      |   8 +-
 library/Zend/Validate/File/Md5.php            |   8 +-
 library/Zend/Validate/File/MimeType.php       |  10 +-
 library/Zend/Validate/File/Sha1.php           |   8 +-
 library/Zend/Validate/File/Size.php           |   4 +-
 library/Zend/Validate/File/Upload.php         |   2 +-
 library/Zend/Validate/GreaterThan.php         |   2 +-
 library/Zend/Validate/Hostname.php            |   2 +-
 library/Zend/Validate/Iban.php                |   2 +-
 library/Zend/Validate/InArray.php             |   6 +-
 library/Zend/Validate/Isbn.php                |   4 +-
 library/Zend/Validate/LessThan.php            |   2 +-
 library/Zend/Validate/PostCode.php            |   4 +-
 library/Zend/Validate/Regex.php               |   2 +-
 library/Zend/Validate/StringLength.php        |   4 +-
 library/Zend/View/Abstract.php                |   2 +-
 library/Zend/View/Helper/HeadMeta.php         |   2 +-
 library/Zend/View/Helper/Navigation.php       |  10 +-
 .../View/Helper/Navigation/Breadcrumbs.php    |   8 +-
 .../Zend/View/Helper/Navigation/Helper.php    |  14 +-
 .../View/Helper/Navigation/HelperAbstract.php |  31 ++---
 library/Zend/View/Helper/Navigation/Links.php |   4 +-
 library/Zend/View/Helper/Navigation/Menu.php  |  26 ++--
 .../Zend/View/Helper/Navigation/Sitemap.php   |  10 +-
 library/Zend/View/Helper/ServerUrl.php        |   4 +-
 .../XmlRpc/Generator/GeneratorAbstract.php    |   4 +-
 173 files changed, 741 insertions(+), 750 deletions(-)

diff --git a/library/Zend/Acl.php b/library/Zend/Acl.php
index c409e53eef..828cad8ff3 100644
--- a/library/Zend/Acl.php
+++ b/library/Zend/Acl.php
@@ -143,7 +143,7 @@ class Zend_Acl
      * @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
+     * @return $this
      */
     public function addRole($role, $parents = null)
     {
@@ -217,7 +217,7 @@ public function inheritsRole($role, $inherit, $onlyParents = false)
      *
      * @param  Zend_Acl_Role_Interface|string $role
      * @uses   Zend_Acl_Role_Registry::remove()
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function removeRole($role)
     {
@@ -251,7 +251,7 @@ public function removeRole($role)
      * Removes all Roles from the registry
      *
      * @uses   Zend_Acl_Role_Registry::removeAll()
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function removeRoleAll()
     {
@@ -278,7 +278,7 @@ public function removeRoleAll()
      * @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
+     * @return $this
      */
     public function addResource($resource, $parent = null)
     {
@@ -336,7 +336,7 @@ public function addResource($resource, $parent = null)
      * @param  Zend_Acl_Resource_Interface        $resource
      * @param  Zend_Acl_Resource_Interface|string $parent
      * @throws Zend_Acl_Exception
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function add(Zend_Acl_Resource_Interface $resource, $parent = null)
     {
@@ -440,7 +440,7 @@ public function inherits($resource, $inherit, $onlyParent = false)
      *
      * @param  Zend_Acl_Resource_Interface|string $resource
      * @throws Zend_Acl_Exception
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function remove($resource)
     {
@@ -476,7 +476,7 @@ public function remove($resource)
     /**
      * Removes all Resources
      *
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function removeAll()
     {
@@ -497,7 +497,7 @@ public function removeAll()
      * @param  string|array                             $privileges
      * @param  Zend_Acl_Assert_Interface                $assert
      * @uses   Zend_Acl::setRule()
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function allow($roles = null, $resources = null, $privileges = null, Zend_Acl_Assert_Interface $assert = null)
     {
@@ -512,7 +512,7 @@ public function allow($roles = null, $resources = null, $privileges = null, Zend
      * @param  string|array                             $privileges
      * @param  Zend_Acl_Assert_Interface                $assert
      * @uses   Zend_Acl::setRule()
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function deny($roles = null, $resources = null, $privileges = null, Zend_Acl_Assert_Interface $assert = null)
     {
@@ -526,7 +526,7 @@ public function deny($roles = null, $resources = null, $privileges = null, Zend_
      * @param  Zend_Acl_Resource_Interface|string|array $resources
      * @param  string|array                             $privileges
      * @uses   Zend_Acl::setRule()
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function removeAllow($roles = null, $resources = null, $privileges = null)
     {
@@ -540,7 +540,7 @@ public function removeAllow($roles = null, $resources = null, $privileges = null
      * @param  Zend_Acl_Resource_Interface|string|array $resources
      * @param  string|array                             $privileges
      * @uses   Zend_Acl::setRule()
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function removeDeny($roles = null, $resources = null, $privileges = null)
     {
@@ -597,7 +597,7 @@ public function removeDeny($roles = null, $resources = null, $privileges = null)
      * @throws Zend_Acl_Exception
      * @uses   Zend_Acl_Role_Registry::get()
      * @uses   Zend_Acl::get()
-     * @return Zend_Acl Provides a fluent interface
+     * @return $this
      */
     public function setRule($operation, $type, $roles = null, $resources = null, $privileges = null,
                             Zend_Acl_Assert_Interface $assert = null)
diff --git a/library/Zend/Acl/Role/Registry.php b/library/Zend/Acl/Role/Registry.php
index acea241f87..0b66ad61bf 100644
--- a/library/Zend/Acl/Role/Registry.php
+++ b/library/Zend/Acl/Role/Registry.php
@@ -58,7 +58,7 @@ class Zend_Acl_Role_Registry
      * @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
+     * @return $this
      */
     public function add(Zend_Acl_Role_Interface $role, $parents = null)
     {
@@ -225,7 +225,7 @@ public function inherits($role, $inherit, $onlyParents = false)
      *
      * @param  Zend_Acl_Role_Interface|string $role
      * @throws Zend_Acl_Role_Registry_Exception
-     * @return Zend_Acl_Role_Registry Provides a fluent interface
+     * @return $this
      */
     public function remove($role)
     {
@@ -254,7 +254,7 @@ public function remove($role)
     /**
      * Removes all Roles from the registry
      *
-     * @return Zend_Acl_Role_Registry Provides a fluent interface
+     * @return $this
      */
     public function removeAll()
     {
diff --git a/library/Zend/Auth.php b/library/Zend/Auth.php
index 0b4b00ffb4..84f6e3c49e 100644
--- a/library/Zend/Auth.php
+++ b/library/Zend/Auth.php
@@ -63,7 +63,7 @@ protected function __clone()
      *
      * Singleton pattern implementation
      *
-     * @return Zend_Auth Provides a fluent interface
+     * @return $this
      */
     public static function getInstance()
     {
@@ -98,7 +98,7 @@ public function getStorage()
      * Sets the persistent storage handler
      *
      * @param  Zend_Auth_Storage_Interface $storage
-     * @return Zend_Auth Provides a fluent interface
+     * @return $this
      */
     public function setStorage(Zend_Auth_Storage_Interface $storage)
     {
diff --git a/library/Zend/Auth/Adapter/DbTable.php b/library/Zend/Auth/Adapter/DbTable.php
index f23e0a2bf7..6e04c13b99 100644
--- a/library/Zend/Auth/Adapter/DbTable.php
+++ b/library/Zend/Auth/Adapter/DbTable.php
@@ -185,7 +185,7 @@ protected function _setDbAdapter(Zend_Db_Adapter_Abstract $zendDb = null)
      * setTableName() - set the table name to be used in the select query
      *
      * @param  string $tableName
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
+     * @return $this
      */
     public function setTableName($tableName)
     {
@@ -197,7 +197,7 @@ public function setTableName($tableName)
      * setIdentityColumn() - set the column name to be used as the identity column
      *
      * @param  string $identityColumn
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
+     * @return $this
      */
     public function setIdentityColumn($identityColumn)
     {
@@ -209,7 +209,7 @@ public function setIdentityColumn($identityColumn)
      * setCredentialColumn() - set the column name to be used as the credential column
      *
      * @param  string $credentialColumn
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
+     * @return $this
      */
     public function setCredentialColumn($credentialColumn)
     {
@@ -232,7 +232,7 @@ public function setCredentialColumn($credentialColumn)
      *  'MD5(?)'
      *
      * @param  string $treatment
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
+     * @return $this
      */
     public function setCredentialTreatment($treatment)
     {
@@ -244,7 +244,7 @@ public function setCredentialTreatment($treatment)
      * setIdentity() - set the value to be used as the identity
      *
      * @param  string $value
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
+     * @return $this
      */
     public function setIdentity($value)
     {
@@ -257,7 +257,7 @@ public function setIdentity($value)
      * to be used, should be supplied in parameterized form, such as 'MD5(?)' or 'PASSWORD(?)'
      *
      * @param  string $credential
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
+     * @return $this
      */
     public function setCredential($credential)
     {
diff --git a/library/Zend/Auth/Adapter/Digest.php b/library/Zend/Auth/Adapter/Digest.php
index fbac12c886..6e115fb824 100644
--- a/library/Zend/Auth/Adapter/Digest.php
+++ b/library/Zend/Auth/Adapter/Digest.php
@@ -97,7 +97,7 @@ public function getFilename()
      * Sets the filename option value
      *
      * @param  mixed $filename
-     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
+     * @return $this
      */
     public function setFilename($filename)
     {
@@ -119,7 +119,7 @@ public function getRealm()
      * Sets the realm option value
      *
      * @param  mixed $realm
-     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
+     * @return $this
      */
     public function setRealm($realm)
     {
@@ -141,7 +141,7 @@ public function getUsername()
      * Sets the username option value
      *
      * @param  mixed $username
-     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
+     * @return $this
      */
     public function setUsername($username)
     {
@@ -163,7 +163,7 @@ public function getPassword()
      * Sets the password option value
      *
      * @param  mixed $password
-     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
+     * @return $this
      */
     public function setPassword($password)
     {
diff --git a/library/Zend/Auth/Adapter/Http.php b/library/Zend/Auth/Adapter/Http.php
index 48d3bd5164..d7771c0f43 100644
--- a/library/Zend/Auth/Adapter/Http.php
+++ b/library/Zend/Auth/Adapter/Http.php
@@ -266,7 +266,7 @@ public function __construct(array $config)
      * Setter for the _basicResolver property
      *
      * @param  Zend_Auth_Adapter_Http_Resolver_Interface $resolver
-     * @return Zend_Auth_Adapter_Http Provides a fluent interface
+     * @return $this
      */
     public function setBasicResolver(Zend_Auth_Adapter_Http_Resolver_Interface $resolver)
     {
@@ -289,7 +289,7 @@ public function getBasicResolver()
      * Setter for the _digestResolver property
      *
      * @param  Zend_Auth_Adapter_Http_Resolver_Interface $resolver
-     * @return Zend_Auth_Adapter_Http Provides a fluent interface
+     * @return $this
      */
     public function setDigestResolver(Zend_Auth_Adapter_Http_Resolver_Interface $resolver)
     {
@@ -312,7 +312,7 @@ public function getDigestResolver()
      * Setter for the Request object
      *
      * @param  Zend_Controller_Request_Http $request
-     * @return Zend_Auth_Adapter_Http Provides a fluent interface
+     * @return $this
      */
     public function setRequest(Zend_Controller_Request_Http $request)
     {
@@ -335,7 +335,7 @@ public function getRequest()
      * Setter for the Response object
      *
      * @param  Zend_Controller_Response_Http $response
-     * @return Zend_Auth_Adapter_Http Provides a fluent interface
+     * @return $this
      */
     public function setResponse(Zend_Controller_Response_Http $response)
     {
diff --git a/library/Zend/Auth/Adapter/Http/Resolver/File.php b/library/Zend/Auth/Adapter/Http/Resolver/File.php
index 54473744d7..9f8c83c939 100644
--- a/library/Zend/Auth/Adapter/Http/Resolver/File.php
+++ b/library/Zend/Auth/Adapter/Http/Resolver/File.php
@@ -62,7 +62,7 @@ public function __construct($path = '')
      *
      * @param  string $path
      * @throws Zend_Auth_Adapter_Http_Resolver_Exception
-     * @return Zend_Auth_Adapter_Http_Resolver_File Provides a fluent interface
+     * @return $this
      */
     public function setFile($path)
     {
diff --git a/library/Zend/Auth/Adapter/Ldap.php b/library/Zend/Auth/Adapter/Ldap.php
index 75889cbaf3..9ae8c34627 100644
--- a/library/Zend/Auth/Adapter/Ldap.php
+++ b/library/Zend/Auth/Adapter/Ldap.php
@@ -103,7 +103,7 @@ public function getOptions()
      * this adapter.
      *
      * @param  array $options The array of arrays of Zend_Ldap options
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
+     * @return $this
      */
     public function setOptions($options)
     {
@@ -126,7 +126,7 @@ public function getUsername()
      * Sets the username for binding
      *
      * @param  string $username The username for binding
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
+     * @return $this
      */
     public function setUsername($username)
     {
@@ -149,7 +149,7 @@ public function getPassword()
      * Sets the passwort for the account
      *
      * @param  string $password The password of the account being authenticated
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
+     * @return $this
      */
     public function setPassword($password)
     {
@@ -165,7 +165,7 @@ public function setPassword($password)
      * Closes ZF-6813
      *
      * @param  string $identity
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
+     * @return $this
      */
     public function setIdentity($identity)
     {
@@ -180,7 +180,7 @@ public function setIdentity($identity)
      * Closes ZF-6813
      *
      * @param  string $credential
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
+     * @return $this
      */
     public function setCredential($credential)
     {
@@ -209,7 +209,7 @@ public function getLdap()
      * Set an Ldap connection
      *
      * @param Zend_Ldap $ldap An existing Ldap object
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
+     * @return $this
      */
     public function setLdap(Zend_Ldap $ldap)
     {
diff --git a/library/Zend/Auth/Adapter/OpenId.php b/library/Zend/Auth/Adapter/OpenId.php
index 56f794b137..245184b94d 100644
--- a/library/Zend/Auth/Adapter/OpenId.php
+++ b/library/Zend/Auth/Adapter/OpenId.php
@@ -132,7 +132,7 @@ public function __construct($id = null,
      * Sets the value to be used as the identity
      *
      * @param  string $id the identity value
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
+     * @return $this
      */
     public function setIdentity($id)
     {
@@ -144,7 +144,7 @@ public function setIdentity($id)
      * Sets the storage implementation which will be use by OpenId
      *
      * @param  Zend_OpenId_Consumer_Storage $storage
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
+     * @return $this
      */
     public function setStorage(Zend_OpenId_Consumer_Storage $storage)
     {
@@ -156,7 +156,7 @@ public function setStorage(Zend_OpenId_Consumer_Storage $storage)
      * Sets the HTTP URL to redirect response from server to
      *
      * @param  string $returnTo
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
+     * @return $this
      */
     public function setReturnTo($returnTo)
     {
@@ -168,7 +168,7 @@ public function setReturnTo($returnTo)
      * Sets HTTP URL to identify consumer on server
      *
      * @param  string $root
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
+     * @return $this
      */
     public function setRoot($root)
     {
@@ -180,7 +180,7 @@ public function setRoot($root)
      * Sets OpenID extension(s)
      *
      * @param  mixed $extensions
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
+     * @return $this
      */
     public function setExtensions($extensions)
     {
@@ -192,7 +192,7 @@ public function setExtensions($extensions)
      * Sets an optional response object to perform HTTP or HTML form redirection
      *
      * @param  string $response
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
+     * @return $this
      */
     public function setResponse($response)
     {
@@ -205,7 +205,7 @@ public function setResponse($response)
      * OpenID provider.
      *
      * @param  bool $check_immediate
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
+     * @return $this
      */
     public function setCheckImmediate($check_immediate)
     {
diff --git a/library/Zend/Console/Getopt.php b/library/Zend/Console/Getopt.php
index 7d0ca919bd..7c38d38385 100644
--- a/library/Zend/Console/Getopt.php
+++ b/library/Zend/Console/Getopt.php
@@ -345,7 +345,7 @@ public function __unset($key)
      *
      * @param  array $argv
      * @throws Zend_Console_Getopt_Exception When not given an array as parameter
-     * @return Zend_Console_Getopt Provides a fluent interface
+     * @return $this
      */
     public function addArguments($argv)
     {
@@ -365,7 +365,7 @@ public function addArguments($argv)
      *
      * @param  array $argv
      * @throws Zend_Console_Getopt_Exception When not given an array as parameter
-     * @return Zend_Console_Getopt Provides a fluent interface
+     * @return $this
      */
     public function setArguments($argv)
     {
@@ -385,7 +385,7 @@ public function setArguments($argv)
      * the behavior of Zend_Console_Getopt.
      *
      * @param  array $getoptConfig
-     * @return Zend_Console_Getopt Provides a fluent interface
+     * @return $this
      */
     public function setOptions($getoptConfig)
     {
@@ -404,7 +404,7 @@ public function setOptions($getoptConfig)
      *
      * @param  string $configKey
      * @param  string $configValue
-     * @return Zend_Console_Getopt Provides a fluent interface
+     * @return $this
      */
     public function setOption($configKey, $configValue)
     {
@@ -419,7 +419,7 @@ public function setOption($configKey, $configValue)
      * These are appended to the rules defined when the constructor was called.
      *
      * @param  array $rules
-     * @return Zend_Console_Getopt Provides a fluent interface
+     * @return $this
      */
     public function addRules($rules)
     {
@@ -644,7 +644,7 @@ public function getUsageMessage()
      *
      * @param  array $aliasMap
      * @throws Zend_Console_Getopt_Exception
-     * @return Zend_Console_Getopt Provides a fluent interface
+     * @return $this
      */
     public function setAliases($aliasMap)
     {
@@ -677,7 +677,7 @@ public function setAliases($aliasMap)
      * mapping option name (short or long) to the help string.
      *
      * @param  array $helpMap
-     * @return Zend_Console_Getopt Provides a fluent interface
+     * @return $this
      */
     public function setHelp($helpMap)
     {
@@ -699,7 +699,7 @@ public function setHelp($helpMap)
      * Also find option parameters, and remaining arguments after
      * all options have been parsed.
      *
-     * @return Zend_Console_Getopt|null Provides a fluent interface
+     * @return $this
      */
     public function parse()
     {
diff --git a/library/Zend/Controller/Action/Helper/Abstract.php b/library/Zend/Controller/Action/Helper/Abstract.php
index 2e997062c6..670817a9d0 100644
--- a/library/Zend/Controller/Action/Helper/Abstract.php
+++ b/library/Zend/Controller/Action/Helper/Abstract.php
@@ -50,7 +50,7 @@ abstract class Zend_Controller_Action_Helper_Abstract
      * setActionController()
      *
      * @param  Zend_Controller_Action $actionController
-     * @return Zend_Controller_Action_Helper_Abstract Provides a fluent interface
+     * @return $this
      */
     public function setActionController(Zend_Controller_Action $actionController = null)
     {
diff --git a/library/Zend/Controller/Action/Helper/ActionStack.php b/library/Zend/Controller/Action/Helper/ActionStack.php
index 1b38216366..97adedf2ed 100644
--- a/library/Zend/Controller/Action/Helper/ActionStack.php
+++ b/library/Zend/Controller/Action/Helper/ActionStack.php
@@ -68,7 +68,7 @@ public function __construct()
      * Push onto the stack
      *
      * @param  Zend_Controller_Request_Abstract $next
-     * @return Zend_Controller_Action_Helper_ActionStack Provides a fluent interface
+     * @return $this
      */
     public function pushStack(Zend_Controller_Request_Abstract $next)
     {
diff --git a/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php b/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php
index 707545434b..e29b0bd4f8 100644
--- a/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php
+++ b/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php
@@ -64,7 +64,7 @@ abstract public function prepareAutoCompletion($data, $keepLayouts = false);
     /**
      * Disable layouts and view renderer
      *
-     * @return Zend_Controller_Action_Helper_AutoComplete_Abstract Provides a fluent interface
+     * @return $this
      */
     public function disableLayouts()
     {
diff --git a/library/Zend/Controller/Action/Helper/ContextSwitch.php b/library/Zend/Controller/Action/Helper/ContextSwitch.php
index a58339292c..f82bcf66b4 100644
--- a/library/Zend/Controller/Action/Helper/ContextSwitch.php
+++ b/library/Zend/Controller/Action/Helper/ContextSwitch.php
@@ -175,7 +175,7 @@ public function init()
      * Configure object from array of options
      *
      * @param  array $options
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setOptions(array $options)
     {
@@ -205,7 +205,7 @@ public function setOptions(array $options)
      * Set object state from config object
      *
      * @param  Zend_Config $config
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setConfig(Zend_Config $config)
     {
@@ -215,7 +215,7 @@ public function setConfig(Zend_Config $config)
     /**
      * Strategy pattern: return object
      *
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function direct()
     {
@@ -338,7 +338,7 @@ public function initJsonContext()
      * Should JSON contexts auto-serialize?
      *
      * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setAutoJsonSerialization($flag)
     {
@@ -360,7 +360,7 @@ public function getAutoJsonSerialization()
      * Set suffix from array
      *
      * @param  array $spec
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     protected function _setSuffix(array $spec)
     {
@@ -433,7 +433,7 @@ protected function _setSuffix(array $spec)
      * @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
+     * @return $this
      */
     public function setSuffix($context, $suffix, $prependViewRendererSuffix = true)
     {
@@ -542,7 +542,7 @@ public function hasContext($context, $throwException = false)
      * @param  string $header
      * @param  string $content
      * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function addHeader($context, $header, $content)
     {
@@ -573,7 +573,7 @@ public function addHeader($context, $header, $content)
      * @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
+     * @return $this
      */
     public function setHeader($context, $header, $content)
     {
@@ -591,7 +591,7 @@ public function setHeader($context, $header, $content)
      *
      * @param  string $context
      * @param  array  $headers
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function addHeaders($context, array $headers)
     {
@@ -606,7 +606,7 @@ public function addHeaders($context, array $headers)
      * Set headers from context => headers pairs
      *
      * @param  array $options
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     protected function _setHeaders(array $options)
     {
@@ -625,7 +625,7 @@ protected function _setHeaders(array $options)
      *
      * @param  string $context
      * @param  array  $headers
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setHeaders($context, array $headers)
     {
@@ -697,7 +697,7 @@ public function removeHeader($context, $header)
      * Clear all headers for a given context
      *
      * @param  string $context
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function clearHeaders($context)
     {
@@ -739,7 +739,7 @@ protected function _validateTrigger($trigger)
      * @param  string       $trigger
      * @param  string|array $callback
      * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setCallback($context, $trigger, $callback)
     {
@@ -764,7 +764,7 @@ public function setCallback($context, $trigger, $callback)
      * Set callbacks from array of context => callbacks pairs
      *
      * @param  array $options
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     protected function _setCallbacks(array $options)
     {
@@ -785,7 +785,7 @@ protected function _setCallbacks(array $options)
      *
      * @param  string $context
      * @param  array  $callbacks
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setCallbacks($context, array $callbacks)
     {
@@ -854,7 +854,7 @@ public function removeCallback($context, $trigger)
      * Clear all callbacks for a given context
      *
      * @param  string $context
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function clearCallbacks($context)
     {
@@ -867,7 +867,7 @@ public function clearCallbacks($context)
      * Set name of parameter to use when determining context format
      *
      * @param  string $name
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setContextParam($name)
     {
@@ -890,7 +890,7 @@ public function getContextParam()
      *
      * @param  string $type
      * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setDefaultContext($type)
     {
@@ -920,7 +920,7 @@ public function getDefaultContext()
      * Set flag indicating if layout should be disabled
      *
      * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setAutoDisableLayout($flag)
     {
@@ -944,7 +944,7 @@ public function getAutoDisableLayout()
      * @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
+     * @return $this
      */
     public function addContext($context, array $spec)
     {
@@ -970,7 +970,7 @@ public function addContext($context, array $spec)
      *
      * @param  string $context Context type
      * @param  array  $spec    Context specification
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setContext($context, array $spec)
     {
@@ -982,7 +982,7 @@ public function setContext($context, array $spec)
      * Add multiple contexts
      *
      * @param  array $contexts
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function addContexts(array $contexts)
     {
@@ -996,7 +996,7 @@ public function addContexts(array $contexts)
      * Set multiple contexts, after first removing all
      *
      * @param  array $contexts
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setContexts(array $contexts)
     {
@@ -1049,7 +1049,7 @@ public function removeContext($context)
     /**
      * Remove all contexts
      *
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function clearContexts()
     {
@@ -1132,7 +1132,7 @@ public function postJsonContext()
      *
      * @param  string       $action
      * @param  string|array $context
-     * @return Zend_Controller_Action_Helper_ContextSwitch|void Provides a fluent interface
+     * @return $this
      */
     public function addActionContext($action, $context)
     {
@@ -1172,7 +1172,7 @@ public function addActionContext($action, $context)
      *
      * @param  string       $action
      * @param  string|array $context
-     * @return Zend_Controller_Action_Helper_ContextSwitch|void Provides a fluent interface
+     * @return $this
      */
     public function setActionContext($action, $context)
     {
@@ -1202,7 +1202,7 @@ public function setActionContext($action, $context)
      * Add multiple action/context pairs at once
      *
      * @param  array $contexts
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function addActionContexts(array $contexts)
     {
@@ -1216,7 +1216,7 @@ public function addActionContexts(array $contexts)
      * Overwrite and set multiple action contexts at once
      *
      * @param  array $contexts
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function setActionContexts(array $contexts)
     {
@@ -1353,7 +1353,7 @@ public function removeActionContext($action, $context)
      * Clear all contexts for a given controller action or all actions
      *
      * @param  string $action
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
+     * @return $this
      */
     public function clearActionContexts($action = null)
     {
@@ -1380,7 +1380,7 @@ public function clearActionContexts($action = null)
     /**
      * Retrieve ViewRenderer
      *
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     protected function _getViewRenderer()
     {
diff --git a/library/Zend/Controller/Action/Helper/FlashMessenger.php b/library/Zend/Controller/Action/Helper/FlashMessenger.php
index 97cc74facd..62ef1abc17 100644
--- a/library/Zend/Controller/Action/Helper/FlashMessenger.php
+++ b/library/Zend/Controller/Action/Helper/FlashMessenger.php
@@ -92,7 +92,7 @@ public function __construct()
      * 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
+     * @return $this
      */
     public function postDispatch()
     {
@@ -105,7 +105,7 @@ public function postDispatch()
      * per action controller messaging between requests
      *
      * @param  string $namespace
-     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
+     * @return $this
      */
     public function setNamespace($namespace = 'default')
     {
@@ -126,7 +126,7 @@ public function getNamespace()
     /**
      * resetNamespace() - reset the namespace to the default
      *
-     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
+     * @return $this
      */
     public function resetNamespace()
     {
@@ -138,7 +138,7 @@ public function resetNamespace()
      * addMessage() - Add a message to flash message
      *
      * @param  string|string[] $message
-     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
+     * @return $this
      */
     public function addMessage($message, $namespace = null)
     {
diff --git a/library/Zend/Controller/Action/Helper/Redirector.php b/library/Zend/Controller/Action/Helper/Redirector.php
index e92d3ab3db..b3c9a9b324 100644
--- a/library/Zend/Controller/Action/Helper/Redirector.php
+++ b/library/Zend/Controller/Action/Helper/Redirector.php
@@ -103,7 +103,7 @@ protected function _checkCode($code)
      * Set HTTP status code for {@link _redirect()} behaviour
      *
      * @param  int $code
-     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
+     * @return $this
      */
     public function setCode($code)
     {
@@ -126,7 +126,7 @@ public function getExit()
      * Set exit flag for {@link _redirect()} behaviour
      *
      * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
+     * @return $this
      */
     public function setExit($flag)
     {
@@ -149,7 +149,7 @@ public function getPrependBase()
      * Set 'prepend base' flag for {@link _redirect()} behaviour
      *
      * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
+     * @return $this
      */
     public function setPrependBase($flag)
     {
@@ -172,7 +172,7 @@ public function getCloseSessionOnExit()
      * 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
+     * @return $this
      */
     public function setCloseSessionOnExit($flag)
     {
@@ -194,7 +194,7 @@ public function getUseAbsoluteUri()
      * Set use absolute URI flag
      *
      * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
+     * @return $this
      */
     public function setUseAbsoluteUri($flag = true)
     {
diff --git a/library/Zend/Controller/Action/Helper/ViewRenderer.php b/library/Zend/Controller/Action/Helper/ViewRenderer.php
index ef3cdca1c1..ec1569abcc 100644
--- a/library/Zend/Controller/Action/Helper/ViewRenderer.php
+++ b/library/Zend/Controller/Action/Helper/ViewRenderer.php
@@ -207,7 +207,7 @@ public function __clone()
      * Set the view object
      *
      * @param  Zend_View_Interface $view
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     public function setView(Zend_View_Interface $view)
     {
@@ -294,7 +294,7 @@ public function getInflector()
      *
      * @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
+     * @return $this
      */
     public function setInflector(Zend_Filter_Inflector $inflector, $reference = false)
     {
@@ -396,7 +396,7 @@ protected function _getBasePath()
      * Set options
      *
      * @param  array $options
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     protected function _setOptions(array $options)
     {
@@ -524,7 +524,7 @@ public function init()
      * - :module - name of current module in the request
      *
      * @param  string $path
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     public function setViewBasePathSpec($path)
     {
@@ -552,7 +552,7 @@ public function getViewBasePathSpec()
      * - :module - name of current module in the request
      *
      * @param  string $path
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     public function setViewScriptPathSpec($path)
     {
@@ -582,7 +582,7 @@ public function getViewScriptPathSpec()
      * :controller will likely be ignored in this variant.
      *
      * @param  string $path
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     public function setViewScriptPathNoControllerSpec($path)
     {
@@ -641,7 +641,7 @@ public function getViewScript($action = null, array $vars = [])
      * Set the neverRender flag (i.e., globally dis/enable autorendering)
      *
      * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     public function setNeverRender($flag = true)
     {
@@ -663,7 +663,7 @@ public function getNeverRender()
      * Set the noRender flag (i.e., whether or not to autorender)
      *
      * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     public function setNoRender($flag = true)
     {
@@ -685,7 +685,7 @@ public function getNoRender()
      * Set the view script to use
      *
      * @param  string $name
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     public function setScriptAction($name)
     {
@@ -707,7 +707,7 @@ public function getScriptAction()
      * Set the response segment name
      *
      * @param  string $name
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     public function setResponseSegment($name)
     {
@@ -734,7 +734,7 @@ public function getResponseSegment()
      * 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
+     * @return $this
      */
     public function setNoController($flag = true)
     {
@@ -756,7 +756,7 @@ public function getNoController()
      * 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
+     * @return $this
      */
     public function setNeverController($flag = true)
     {
@@ -778,7 +778,7 @@ public function getNeverController()
      * Set view script suffix
      *
      * @param  string $suffix
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
+     * @return $this
      */
     public function setViewSuffix($suffix)
     {
@@ -802,7 +802,7 @@ public function getViewSuffix()
      * @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
+     * @return $this
      */
     public function setRender($action = null, $name = null, $noController = null)
     {
diff --git a/library/Zend/Controller/Router/Route.php b/library/Zend/Controller/Router/Route.php
index abefd03c21..27e0277ce7 100644
--- a/library/Zend/Controller/Router/Route.php
+++ b/library/Zend/Controller/Router/Route.php
@@ -149,7 +149,7 @@ public function getVersion()
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config Configuration object
-     * @return static
+     * @return $this
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Chain.php b/library/Zend/Controller/Router/Route/Chain.php
index 58de590ed3..d081ad7d11 100644
--- a/library/Zend/Controller/Router/Route/Chain.php
+++ b/library/Zend/Controller/Router/Route/Chain.php
@@ -57,7 +57,7 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
      * Instantiates route based on passed Zend_Config structure
      *
      * @param  Zend_Config $config Configuration object
-     * @return static
+     * @return $this
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Hostname.php b/library/Zend/Controller/Router/Route/Hostname.php
index b232b9b2c1..79837cd0ac 100644
--- a/library/Zend/Controller/Router/Route/Hostname.php
+++ b/library/Zend/Controller/Router/Route/Hostname.php
@@ -145,7 +145,7 @@ public function getRequest()
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config Configuration object
-     * @return static
+     * @return $this
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Module.php b/library/Zend/Controller/Router/Route/Module.php
index 7191a194f4..5176b26778 100644
--- a/library/Zend/Controller/Router/Route/Module.php
+++ b/library/Zend/Controller/Router/Route/Module.php
@@ -95,7 +95,7 @@ public function getVersion()
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config
-     * @return static
+     * @return $this
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Regex.php b/library/Zend/Controller/Router/Route/Regex.php
index 781b4199f6..ea18d97455 100644
--- a/library/Zend/Controller/Router/Route/Regex.php
+++ b/library/Zend/Controller/Router/Route/Regex.php
@@ -73,7 +73,7 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config Configuration object
-     * @return static
+     * @return $this
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Static.php b/library/Zend/Controller/Router/Route/Static.php
index 932c1505de..d8d17136c2 100644
--- a/library/Zend/Controller/Router/Route/Static.php
+++ b/library/Zend/Controller/Router/Route/Static.php
@@ -64,7 +64,7 @@ public function getVersion()
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config Configuration object
-     * @return static
+     * @return $this
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Currency.php b/library/Zend/Currency.php
index f49914cbfe..abe52fc578 100644
--- a/library/Zend/Currency.php
+++ b/library/Zend/Currency.php
@@ -545,7 +545,7 @@ public static function clearCache($tag = null)
      *
      * @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
+     * @return $this
      */
     public function setLocale($locale = null)
     {
diff --git a/library/Zend/Date.php b/library/Zend/Date.php
index b6e6828caa..2e6ab14147 100644
--- a/library/Zend/Date.php
+++ b/library/Zend/Date.php
@@ -354,7 +354,7 @@ private function _timestamp($calc, $stamp)
      * Sets a new timestamp
      *
      * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to set
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setTimestamp($timestamp)
@@ -366,7 +366,7 @@ public function setTimestamp($timestamp)
      * Adds a timestamp
      *
      * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to add
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addTimestamp($timestamp)
@@ -378,7 +378,7 @@ public function addTimestamp($timestamp)
      * Subtracts a timestamp
      *
      * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to sub
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subTimestamp($timestamp)
@@ -987,7 +987,7 @@ public static function getFullYear($value)
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function set($date, $part = null, $locale = null)
@@ -1015,7 +1015,7 @@ public function set($date, $part = null, $locale = null)
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function add($date, $part = self::TIMESTAMP, $locale = null)
@@ -1038,7 +1038,7 @@ public function add($date, $part = self::TIMESTAMP, $locale = null)
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function sub($date, $part = self::TIMESTAMP, $locale = null)
@@ -2684,7 +2684,7 @@ private function _time($calc, $time, $format, $locale)
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setTime($time, $format = null, $locale = null)
@@ -2702,7 +2702,7 @@ public function setTime($time, $format = null, $locale = null)
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addTime($time, $format = null, $locale = null)
@@ -2720,7 +2720,7 @@ public function addTime($time, $format = null, $locale = null)
      * @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 a fluent inteface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subTime($time, $format = null, $locale = null)
@@ -2846,7 +2846,7 @@ private function _date($calc, $date, $format, $locale)
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setDate($date, $format = null, $locale = null)
@@ -2864,7 +2864,7 @@ public function setDate($date, $format = null, $locale = null)
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addDate($date, $format = null, $locale = null)
@@ -2883,7 +2883,7 @@ public function addDate($date, $format = null, $locale = null)
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subDate($date, $format = null, $locale = null)
@@ -2934,7 +2934,7 @@ public function getIso($locale = null)
      *
      * @param  string|integer|Zend_Date  $date    ISO Date to set
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setIso($date, $locale = null)
@@ -2951,7 +2951,7 @@ public function setIso($date, $locale = null)
      *
      * @param  string|integer|Zend_Date  $date    ISO Date to add
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addIso($date, $locale = null)
@@ -2968,7 +2968,7 @@ public function addIso($date, $locale = null)
      *
      * @param  string|integer|Zend_Date  $date    ISO Date to sub
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subIso($date, $locale = null)
@@ -3021,7 +3021,7 @@ public function getArpa($locale = null)
      *
      * @param  string|integer|Zend_Date  $date    RFC 822 to set
      * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setArpa($date, $locale = null)
@@ -3039,7 +3039,7 @@ public function setArpa($date, $locale = null)
      *
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addArpa($date, $locale = null)
@@ -3057,7 +3057,7 @@ public function addArpa($date, $locale = null)
      *
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subArpa($date, $locale = null)
@@ -3404,7 +3404,7 @@ public function getYear($locale = null)
      *
      * @param  string|integer|array|Zend_Date  $year    Year to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setYear($year, $locale = null)
@@ -3423,7 +3423,7 @@ public function setYear($year, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $year    Year to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addYear($year, $locale = null)
@@ -3442,7 +3442,7 @@ public function addYear($year, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $year    Year to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subYear($year, $locale = null)
@@ -3566,7 +3566,7 @@ private function _month($calc, $month, $locale)
      *
      * @param  string|integer|array|Zend_Date  $month   Month to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setMonth($month, $locale = null)
@@ -3585,7 +3585,7 @@ public function setMonth($month, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $month   Month to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addMonth($month, $locale = null)
@@ -3604,7 +3604,7 @@ public function addMonth($month, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $month   Month to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subMonth($month, $locale = null)
@@ -3710,7 +3710,7 @@ private function _day($calc, $day, $locale)
      *
      * @param  string|integer|array|Zend_Date  $day     Day to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setDay($day, $locale = null)
@@ -3728,7 +3728,7 @@ public function setDay($day, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $day     Day to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addDay($day, $locale = null)
@@ -3746,7 +3746,7 @@ public function addDay($day, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $day     Day to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subDay($day, $locale = null)
@@ -3858,7 +3858,7 @@ private function _weekday($calc, $weekday, $locale)
      *
      * @param  string|integer|array|Zend_Date  $weekday Weekday to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setWeekday($weekday, $locale = null)
@@ -3878,7 +3878,7 @@ public function setWeekday($weekday, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $weekday Weekday to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addWeekday($weekday, $locale = null)
@@ -3898,7 +3898,7 @@ public function addWeekday($weekday, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $weekday Weekday to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subWeekday($weekday, $locale = null)
@@ -3950,7 +3950,7 @@ public function getDayOfYear($locale = null)
      *
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setDayOfYear($day, $locale = null)
@@ -3967,7 +3967,7 @@ public function setDayOfYear($day, $locale = null)
      *
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addDayOfYear($day, $locale = null)
@@ -3984,7 +3984,7 @@ public function addDayOfYear($day, $locale = null)
      *
      * @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 a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subDayOfYear($day, $locale = null)
@@ -4030,7 +4030,7 @@ public function getHour($locale = null)
      *
      * @param  string|integer|array|Zend_Date  $hour    Hour to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setHour($hour, $locale = null)
@@ -4047,7 +4047,7 @@ public function setHour($hour, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $hour    Hour to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addHour($hour, $locale = null)
@@ -4064,7 +4064,7 @@ public function addHour($hour, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $hour    Hour to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subHour($hour, $locale = null)
@@ -4116,7 +4116,7 @@ public function getMinute($locale = null)
      *
      * @param  string|integer|array|Zend_Date  $minute  Minute to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setMinute($minute, $locale = null)
@@ -4133,7 +4133,7 @@ public function setMinute($minute, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $minute  Minute to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addMinute($minute, $locale = null)
@@ -4150,7 +4150,7 @@ public function addMinute($minute, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $minute  Minute to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subMinute($minute, $locale = null)
@@ -4202,7 +4202,7 @@ public function getSecond($locale = null)
      *
      * @param  string|integer|array|Zend_Date $second Second to set
      * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setSecond($second, $locale = null)
@@ -4219,7 +4219,7 @@ public function setSecond($second, $locale = null)
      *
      * @param  string|integer|array|Zend_Date $second Second to add
      * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addSecond($second, $locale = null)
@@ -4236,7 +4236,7 @@ public function addSecond($second, $locale = null)
      *
      * @param  string|integer|array|Zend_Date $second Second to sub
      * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subSecond($second, $locale = null)
@@ -4277,7 +4277,7 @@ public function getFractionalPrecision()
      *
      * @param  integer $precision Precision for the fractional datepart 3 = milliseconds
      * @throws Zend_Date_Exception
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      */
     public function setFractionalPrecision($precision)
     {
@@ -4314,7 +4314,7 @@ public function getMilliSecond()
      * @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
      * @throws Zend_Date_Exception
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      */
     public function setMilliSecond($milli = null, $precision = null)
     {
@@ -4347,7 +4347,7 @@ public function setMilliSecond($milli = null, $precision = null)
      * @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
      * @throws Zend_Date_Exception
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      */
     public function addMilliSecond($milli = null, $precision = null)
     {
@@ -4412,7 +4412,7 @@ public function addMilliSecond($milli = null, $precision = null)
      *
      * @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 a fluent interface
+     * @return $this
      */
     public function subMilliSecond($milli = null, $precision = null)
     {
@@ -4494,7 +4494,7 @@ public function getWeek($locale = null)
      *
      * @param  string|integer|array|Zend_Date  $week    Week to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setWeek($week, $locale = null)
@@ -4509,7 +4509,7 @@ public function setWeek($week, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $week    Week to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function addWeek($week, $locale = null)
@@ -4524,7 +4524,7 @@ public function addWeek($week, $locale = null)
      *
      * @param  string|integer|array|Zend_Date  $week    Week to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides a fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function subWeek($week, $locale = null)
@@ -4556,7 +4556,7 @@ public function compareWeek($week, $locale = null)
      *
      * @param  string|Zend_Locale $locale (Optional) Locale for parsing input
      * @throws Zend_Date_Exception When the given locale does not exist
-     * @return Zend_Date Provides fluent interface
+     * @return $this
      */
     public function setLocale($locale = null)
     {
diff --git a/library/Zend/Date/DateObject.php b/library/Zend/Date/DateObject.php
index 94cfc04988..ea86b56545 100644
--- a/library/Zend/Date/DateObject.php
+++ b/library/Zend/Date/DateObject.php
@@ -1024,7 +1024,7 @@ protected function calcSun($location, $horizon, $rise = false)
      * If no timezone can be detected or the given timezone is wrong UTC will be set.
      *
      * @param  string  $zone      OPTIONAL timezone for date calculation; defaults to date_default_timezone_get()
-     * @return Zend_Date_DateObject Provides fluent interface
+     * @return $this
      * @throws Zend_Date_Exception
      */
     public function setTimezone($zone = null)
diff --git a/library/Zend/Db/Adapter/Abstract.php b/library/Zend/Db/Adapter/Abstract.php
index db99d15f41..2ac70e3043 100644
--- a/library/Zend/Db/Adapter/Abstract.php
+++ b/library/Zend/Db/Adapter/Abstract.php
@@ -351,7 +351,7 @@ public function getConfig()
      * 'instance', just as if an associative array had been passed instead.
      *
      * @param  Zend_Db_Profiler|Zend_Config|array|boolean $profiler
-     * @return Zend_Db_Adapter_Abstract Provides a fluent interface
+     * @return $this
      * @throws Zend_Db_Profiler_Exception if the object instance or class specified
      *         is not Zend_Db_Profiler or an extension of that class.
      */
@@ -438,7 +438,7 @@ public function getStatementClass()
     /**
      * Set the default statement class.
      *
-     * @return Zend_Db_Adapter_Abstract Fluent interface
+     * @return $this
      */
     public function setStatementClass($class)
     {
diff --git a/library/Zend/Db/Profiler.php b/library/Zend/Db/Profiler.php
index e7d024c3aa..9bd7cc72a5 100644
--- a/library/Zend/Db/Profiler.php
+++ b/library/Zend/Db/Profiler.php
@@ -131,7 +131,7 @@ public function __construct($enabled = false)
      * is disabled and will not log any queries sent to it.
      *
      * @param  boolean $enable
-     * @return Zend_Db_Profiler Provides a fluent interface
+     * @return $this
      */
     public function setEnabled($enable)
     {
@@ -158,7 +158,7 @@ public function getEnabled()
      * elapsed time, set $minimumSeconds to null.
      *
      * @param  integer $minimumSeconds OPTIONAL
-     * @return Zend_Db_Profiler Provides a fluent interface
+     * @return $this
      */
     public function setFilterElapsedSecs($minimumSeconds = null)
     {
@@ -189,7 +189,7 @@ public function getFilterElapsedSecs()
      * save all queries regardless of type, set $queryType to null.
      *
      * @param  integer $queryTypes OPTIONAL
-     * @return Zend_Db_Profiler Provides a fluent interface
+     * @return $this
      */
     public function setFilterQueryType($queryTypes = null)
     {
@@ -215,7 +215,7 @@ public function getFilterQueryType()
      * and will even clear queries that were started and may not have
      * been marked as ended.
      *
-     * @return Zend_Db_Profiler Provides a fluent interface
+     * @return $this
      */
     public function clear()
     {
diff --git a/library/Zend/Db/Profiler/Firebug.php b/library/Zend/Db/Profiler/Firebug.php
index d037607004..10a60ffe4a 100644
--- a/library/Zend/Db/Profiler/Firebug.php
+++ b/library/Zend/Db/Profiler/Firebug.php
@@ -83,7 +83,7 @@ public function __construct($label = null)
      * is disabled and will not log any queries sent to it.
      *
      * @param  boolean $enable
-     * @return Zend_Db_Profiler Provides a fluent interface
+     * @return $this
      */
     public function setEnabled($enable)
     {
diff --git a/library/Zend/Db/Table/Abstract.php b/library/Zend/Db/Table/Abstract.php
index 2c0aa78a1f..7df24af35e 100644
--- a/library/Zend/Db/Table/Abstract.php
+++ b/library/Zend/Db/Table/Abstract.php
@@ -374,7 +374,7 @@ public function getDefinitionConfigName()
 
     /**
      * @param  string $classname
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
+     * @return $this
      */
     public function setRowClass($classname)
     {
@@ -393,7 +393,7 @@ public function getRowClass()
 
     /**
      * @param  string $classname
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
+     * @return $this
      */
     public function setRowsetClass($classname)
     {
@@ -443,7 +443,7 @@ public function addReference($ruleKey, $columns, $refTableClass, $refColumns,
 
     /**
      * @param array $referenceMap
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
+     * @return $this
      */
     public function setReferences(array $referenceMap)
     {
@@ -487,7 +487,7 @@ public function getReference($tableClassname, $ruleKey = null)
 
     /**
      * @param  array $dependentTables
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
+     * @return $this
      */
     public function setDependentTables(array $dependentTables)
     {
@@ -575,7 +575,7 @@ public static function getDefaultAdapter()
 
     /**
      * @param  mixed $db Either an Adapter object, or a string naming a Registry key
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
+     * @return $this
      */
     protected function _setAdapter($db)
     {
@@ -646,7 +646,7 @@ public static function getDefaultMetadataCache()
      * option for the class constructor upon instantiation.
      *
      * @param  mixed $metadataCache Either a Cache object, or a string naming a Registry key
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
+     * @return $this
      */
     protected function _setMetadataCache($metadataCache)
     {
@@ -719,7 +719,7 @@ protected static function _setupMetadataCache($metadataCache)
      *   Use this for natural keys, for example.
      *
      * @param mixed $sequence
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
+     * @return $this
      */
     protected function _setSequence($sequence)
     {
diff --git a/library/Zend/Db/Table/Row/Abstract.php b/library/Zend/Db/Table/Row/Abstract.php
index 0093cbafb4..2a2c195f65 100644
--- a/library/Zend/Db/Table/Row/Abstract.php
+++ b/library/Zend/Db/Table/Row/Abstract.php
@@ -664,7 +664,7 @@ public function toArray()
      * Sets all data in the row from an array.
      *
      * @param  array $data
-     * @return Zend_Db_Table_Row_Abstract Provides a fluent interface
+     * @return $this
      */
     public function setFromArray(array $data)
     {
diff --git a/library/Zend/Filter.php b/library/Zend/Filter.php
index d0e393d187..35541fb04b 100644
--- a/library/Zend/Filter.php
+++ b/library/Zend/Filter.php
@@ -55,7 +55,7 @@ class Zend_Filter implements Zend_Filter_Interface
      *
      * @param  Zend_Filter_Interface $filter
      * @param  string $placement
-     * @return Zend_Filter Provides a fluent interface
+     * @return $this
      */
     public function addFilter(Zend_Filter_Interface $filter, $placement = self::CHAIN_APPEND)
     {
@@ -71,7 +71,7 @@ public function addFilter(Zend_Filter_Interface $filter, $placement = self::CHAI
      * Add a filter to the end of the chain
      *
      * @param  Zend_Filter_Interface $filter
-     * @return Zend_Filter Provides a fluent interface
+     * @return $this
      */
     public function appendFilter(Zend_Filter_Interface $filter)
     {
@@ -82,7 +82,7 @@ public function appendFilter(Zend_Filter_Interface $filter)
      * Add a filter to the start of the chain
      *
      * @param  Zend_Filter_Interface $filter
-     * @return Zend_Filter Provides a fluent interface
+     * @return $this
      */
     public function prependFilter(Zend_Filter_Interface $filter)
     {
diff --git a/library/Zend/Filter/Alnum.php b/library/Zend/Filter/Alnum.php
index 8528f0c0d8..5a710e0c51 100644
--- a/library/Zend/Filter/Alnum.php
+++ b/library/Zend/Filter/Alnum.php
@@ -111,7 +111,7 @@ public function getAllowWhiteSpace()
      * Sets the allowWhiteSpace option
      *
      * @param boolean $allowWhiteSpace
-     * @return Zend_Filter_Alnum Provides a fluent interface
+     * @return $this
      */
     public function setAllowWhiteSpace($allowWhiteSpace)
     {
diff --git a/library/Zend/Filter/Alpha.php b/library/Zend/Filter/Alpha.php
index acbdc7d93c..7eae0e6842 100644
--- a/library/Zend/Filter/Alpha.php
+++ b/library/Zend/Filter/Alpha.php
@@ -111,7 +111,7 @@ public function getAllowWhiteSpace()
      * Sets the allowWhiteSpace option
      *
      * @param boolean $allowWhiteSpace
-     * @return Zend_Filter_Alpha Provides a fluent interface
+     * @return $this
      */
     public function setAllowWhiteSpace($allowWhiteSpace)
     {
diff --git a/library/Zend/Filter/HtmlEntities.php b/library/Zend/Filter/HtmlEntities.php
index fb3733fc36..e59407f297 100644
--- a/library/Zend/Filter/HtmlEntities.php
+++ b/library/Zend/Filter/HtmlEntities.php
@@ -108,7 +108,7 @@ public function getQuoteStyle()
      * Sets the quoteStyle option
      *
      * @param  integer $quoteStyle
-     * @return Zend_Filter_HtmlEntities Provides a fluent interface
+     * @return $this
      */
     public function setQuoteStyle($quoteStyle)
     {
@@ -157,7 +157,7 @@ public function getCharSet()
      * Proxies to {@link setEncoding()}
      *
      * @param  string $charSet
-     * @return Zend_Filter_HtmlEntities Provides a fluent interface
+     * @return $this
      */
     public function setCharSet($charSet)
     {
@@ -178,7 +178,7 @@ public function getDoubleQuote()
      * Sets the doubleQuote option
      *
      * @param boolean $doubleQuote
-     * @return Zend_Filter_HtmlEntities Provides a fluent interface
+     * @return $this
      */
     public function setDoubleQuote($doubleQuote)
     {
diff --git a/library/Zend/Filter/StringToLower.php b/library/Zend/Filter/StringToLower.php
index 8acf724ca5..125b824674 100644
--- a/library/Zend/Filter/StringToLower.php
+++ b/library/Zend/Filter/StringToLower.php
@@ -80,7 +80,7 @@ public function getEncoding()
      * Set the input encoding for the given string
      *
      * @param  string $encoding
-     * @return Zend_Filter_StringToLower Provides a fluent interface
+     * @return $this
      * @throws Zend_Filter_Exception
      */
     public function setEncoding($encoding = null)
diff --git a/library/Zend/Filter/StringToUpper.php b/library/Zend/Filter/StringToUpper.php
index 864acea961..7ba161f170 100644
--- a/library/Zend/Filter/StringToUpper.php
+++ b/library/Zend/Filter/StringToUpper.php
@@ -80,7 +80,7 @@ public function getEncoding()
      * Set the input encoding for the given string
      *
      * @param  string $encoding
-     * @return Zend_Filter_StringToUpper Provides a fluent interface
+     * @return $this
      * @throws Zend_Filter_Exception
      */
     public function setEncoding($encoding = null)
diff --git a/library/Zend/Filter/StringTrim.php b/library/Zend/Filter/StringTrim.php
index f7923964ac..66261203a3 100644
--- a/library/Zend/Filter/StringTrim.php
+++ b/library/Zend/Filter/StringTrim.php
@@ -77,7 +77,7 @@ public function getCharList()
      * Sets the charList option
      *
      * @param  string|null $charList
-     * @return Zend_Filter_StringTrim Provides a fluent interface
+     * @return $this
      */
     public function setCharList($charList)
     {
diff --git a/library/Zend/Filter/StripTags.php b/library/Zend/Filter/StripTags.php
index 6f181904ac..8e6cdfa0bf 100644
--- a/library/Zend/Filter/StripTags.php
+++ b/library/Zend/Filter/StripTags.php
@@ -132,7 +132,7 @@ public function getCommentsAllowed()
      *
      * @deprecated
      * @param  boolean $commentsAllowed
-     * @return Zend_Filter_StripTags Provides a fluent interface
+     * @return $this
      */
     public function setCommentsAllowed($commentsAllowed)
     {
@@ -154,7 +154,7 @@ public function getTagsAllowed()
      * Sets the tagsAllowed option
      *
      * @param  array|string $tagsAllowed
-     * @return Zend_Filter_StripTags Provides a fluent interface
+     * @return $this
      */
     public function setTagsAllowed($tagsAllowed)
     {
@@ -207,7 +207,7 @@ public function getAttributesAllowed()
      * Sets the attributesAllowed option
      *
      * @param  array|string $attributesAllowed
-     * @return Zend_Filter_StripTags Provides a fluent interface
+     * @return $this
      */
     public function setAttributesAllowed($attributesAllowed)
     {
diff --git a/library/Zend/Form.php b/library/Zend/Form.php
index 4c704a07bb..08dcff9249 100644
--- a/library/Zend/Form.php
+++ b/library/Zend/Form.php
@@ -277,7 +277,7 @@ public function __clone()
     /**
      * Reset values of form
      *
-     * @return static
+     * @return $this
      */
     public function reset()
     {
@@ -306,7 +306,7 @@ public function init()
      * Set form state from options array
      *
      * @param  array $options
-     * @return static
+     * @return $this
      */
     public function setOptions(array $options)
     {
@@ -397,7 +397,7 @@ public function setOptions(array $options)
      * Set form state from config object
      *
      * @param  Zend_Config $config
-     * @return static
+     * @return $this
      */
     public function setConfig(Zend_Config $config)
     {
@@ -412,7 +412,7 @@ public function setConfig(Zend_Config $config)
      *
      * @param  Zend_Loader_PluginLoader_Interface $loader
      * @param  string $type 'decorator' or 'element'
-     * @return static
+     * @return $this
      * @throws Zend_Form_Exception on invalid type
      */
     public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type = null)
@@ -490,7 +490,7 @@ public function getPluginLoader($type = null)
      * @param  string $prefix
      * @param  string $path
      * @param  string $type
-     * @return static
+     * @return $this
      * @throws Zend_Form_Exception for invalid type
      */
     public function addPrefixPath($prefix, $path, $type = null)
@@ -524,7 +524,7 @@ public function addPrefixPath($prefix, $path, $type = null)
      * Add many prefix paths at once
      *
      * @param  array $spec
-     * @return static
+     * @return $this
      */
     public function addPrefixPaths(array $spec)
     {
@@ -556,7 +556,7 @@ public function addPrefixPaths(array $spec)
      * @param  string $prefix
      * @param  string $path
      * @param  string $type
-     * @return static
+     * @return $this
      */
     public function addElementPrefixPath($prefix, $path, $type = null)
     {
@@ -583,7 +583,7 @@ public function addElementPrefixPath($prefix, $path, $type = null)
      * Add prefix paths for all elements
      *
      * @param  array $spec
-     * @return static
+     * @return $this
      */
     public function addElementPrefixPaths(array $spec)
     {
@@ -602,7 +602,7 @@ public function addElementPrefixPaths(array $spec)
      *
      * @param  string $prefix
      * @param  string $path
-     * @return static
+     * @return $this
      */
     public function addDisplayGroupPrefixPath($prefix, $path)
     {
@@ -623,7 +623,7 @@ public function addDisplayGroupPrefixPath($prefix, $path)
      * Add multiple display group prefix paths at once
      *
      * @param  array $spec
-     * @return static
+     * @return $this
      */
     public function addDisplayGroupPrefixPaths(array $spec)
     {
@@ -663,7 +663,7 @@ public function addDisplayGroupPrefixPaths(array $spec)
      *
      * @param  string $key
      * @param  mixed $value
-     * @return static
+     * @return $this
      */
     public function setAttrib($key, $value)
     {
@@ -676,7 +676,7 @@ public function setAttrib($key, $value)
      * Add multiple form attributes at once
      *
      * @param  array $attribs
-     * @return static
+     * @return $this
      */
     public function addAttribs(array $attribs)
     {
@@ -692,7 +692,7 @@ public function addAttribs(array $attribs)
      * Overwrites any previously set attributes.
      *
      * @param  array $attribs
-     * @return static
+     * @return $this
      */
     public function setAttribs(array $attribs)
     {
@@ -745,7 +745,7 @@ public function removeAttrib($key)
     /**
      * Clear all form attributes
      *
-     * @return static
+     * @return $this
      */
     public function clearAttribs()
     {
@@ -757,7 +757,7 @@ public function clearAttribs()
      * Set form action
      *
      * @param  string $action
-     * @return static
+     * @return $this
      */
     public function setAction($action)
     {
@@ -787,7 +787,7 @@ public function getAction()
      * Only values in {@link $_methods()} allowed
      *
      * @param  string $method
-     * @return static
+     * @return $this
      * @throws Zend_Form_Exception
      */
     public function setMethod($method)
@@ -819,7 +819,7 @@ public function getMethod()
      * Set encoding type
      *
      * @param  string $value
-     * @return static
+     * @return $this
      */
     public function setEnctype($value)
     {
@@ -861,7 +861,7 @@ public function filterName($value, $allowBrackets = false)
      * Set form name
      *
      * @param  string $name
-     * @return static
+     * @return $this
      * @throws Zend_Form_Exception
      */
     public function setName($name)
@@ -932,7 +932,7 @@ public function getId()
      * Set form legend
      *
      * @param  string $value
-     * @return static
+     * @return $this
      */
     public function setLegend($value)
     {
@@ -954,7 +954,7 @@ public function getLegend()
      * Set form description
      *
      * @param  string $value
-     * @return static
+     * @return $this
      */
     public function setDescription($value)
     {
@@ -976,7 +976,7 @@ public function getDescription()
      * Set form order
      *
      * @param  int $index
-     * @return static
+     * @return $this
      */
     public function setOrder($index)
     {
@@ -1030,7 +1030,7 @@ protected function _getIsRendered()
      * @param  string $name
      * @param  array|Zend_Config $options
      * @throws Zend_Form_Exception on invalid element
-     * @return static
+     * @return $this
      */
     public function addElement($element, $name = null, $options = null)
     {
@@ -1141,7 +1141,7 @@ public function createElement($type, $name, $options = null)
      * Add multiple elements at once
      *
      * @param  array $elements
-     * @return static
+     * @return $this
      */
     public function addElements(array $elements)
     {
@@ -1197,7 +1197,7 @@ public function addElements(array $elements)
      * Set form elements (overwrites existing elements)
      *
      * @param  array $elements
-     * @return static
+     * @return $this
      */
     public function setElements(array $elements)
     {
@@ -1260,7 +1260,7 @@ public function removeElement($name)
     /**
      * Remove all form elements
      *
-     * @return static
+     * @return $this
      */
     public function clearElements()
     {
@@ -1280,7 +1280,7 @@ public function clearElements()
      * Sets values for all elements specified in the array of $defaults.
      *
      * @param  array $defaults
-     * @return static
+     * @return $this
      */
     public function setDefaults(array $defaults)
     {
@@ -1317,7 +1317,7 @@ public function setDefaults(array $defaults)
      *
      * @param  string $name
      * @param  mixed $value
-     * @return static
+     * @return $this
      */
     public function setDefault($name, $value)
     {
@@ -1511,7 +1511,7 @@ public function getUnfilteredValues()
      * Set all elements' filters
      *
      * @param  array $filters
-     * @return static
+     * @return $this
      */
     public function setElementFilters(array $filters)
     {
@@ -1526,7 +1526,7 @@ public function setElementFilters(array $filters)
      * Set name of array elements belong to
      *
      * @param  string $array
-     * @return static
+     * @return $this
      */
     public function setElementsBelongTo($array)
     {
@@ -1596,7 +1596,7 @@ public function getElementsBelongTo()
      * Set flag indicating elements belong to array
      *
      * @param  bool $flag Value of flag
-     * @return static
+     * @return $this
      */
     public function setIsArray($flag)
     {
@@ -1622,7 +1622,7 @@ public function isArray()
      * @param  Zend_Form $form
      * @param  string $name
      * @param  int $order
-     * @return static
+     * @return $this
      */
     public function addSubForm(Zend_Form $form, $name, $order = null)
     {
@@ -1672,7 +1672,7 @@ public function addSubForm(Zend_Form $form, $name, $order = null)
      * Add multiple form subForms/subforms at once
      *
      * @param  array $subForms
-     * @return static
+     * @return $this
      */
     public function addSubForms(array $subForms)
     {
@@ -1711,7 +1711,7 @@ public function addSubForms(array $subForms)
      * Set multiple form subForms/subforms (overwrites)
      *
      * @param  array $subForms
-     * @return static
+     * @return $this
      */
     public function setSubForms(array $subForms)
     {
@@ -1723,7 +1723,7 @@ public function setSubForms(array $subForms)
      * Retrieve a form subForm/subform
      *
      * @param  string $name
-     * @return static|null
+     * @return $this|null
      */
     public function getSubForm($name)
     {
@@ -1768,7 +1768,7 @@ public function removeSubForm($name)
     /**
      * Remove all form subForms/subforms
      *
-     * @return static
+     * @return $this
      */
     public function clearSubForms()
     {
@@ -1789,7 +1789,7 @@ public function clearSubForms()
      * Set default display group class
      *
      * @param  string $class
-     * @return static
+     * @return $this
      */
     public function setDefaultDisplayGroupClass($class)
     {
@@ -1817,7 +1817,7 @@ public function getDefaultDisplayGroupClass()
      * @param  array $elements
      * @param  string $name
      * @param  array|Zend_Config $options
-     * @return static
+     * @return $this
      * @throws Zend_Form_Exception if no valid elements provided
      */
     public function addDisplayGroup(array $elements, $name, $options = null)
@@ -1892,7 +1892,7 @@ public function addDisplayGroup(array $elements, $name, $options = null)
      * @param  Zend_Form_DisplayGroup $group
      * @param  string|null            $name
      * @throws Zend_Form_Exception
-     * @return static
+     * @return $this
      */
     protected function _addDisplayGroupObject(Zend_Form_DisplayGroup $group, $name = null)
     {
@@ -1920,7 +1920,7 @@ protected function _addDisplayGroupObject(Zend_Form_DisplayGroup $group, $name =
      * Add multiple display groups at once
      *
      * @param  array $groups
-     * @return static
+     * @return $this
      */
     public function addDisplayGroups(array $groups)
     {
@@ -1980,7 +1980,7 @@ public function addDisplayGroups(array $groups)
      * Add multiple display groups (overwrites)
      *
      * @param  array $groups
-     * @return static
+     * @return $this
      */
     public function setDisplayGroups(array $groups)
     {
@@ -2046,7 +2046,7 @@ public function removeDisplayGroup($name)
     /**
      * Remove all display groups
      *
-     * @return static
+     * @return $this
      */
     public function clearDisplayGroups()
     {
@@ -2076,7 +2076,7 @@ public function clearDisplayGroups()
      * Proxies to {@link setDefaults()}
      *
      * @param  array $values
-     * @return static
+     * @return $this
      */
     public function populate(array $values)
     {
@@ -2395,7 +2395,7 @@ public function processAjax(array $data)
      * Add a custom error message to return in the event of failed validation
      *
      * @param  string $message
-     * @return static
+     * @return $this
      */
     public function addErrorMessage($message)
     {
@@ -2407,7 +2407,7 @@ public function addErrorMessage($message)
      * Add multiple custom error messages to return in the event of failed validation
      *
      * @param  array $messages
-     * @return static
+     * @return $this
      */
     public function addErrorMessages(array $messages)
     {
@@ -2421,7 +2421,7 @@ public function addErrorMessages(array $messages)
      * Same as addErrorMessages(), but clears custom error message stack first
      *
      * @param  array $messages
-     * @return static
+     * @return $this
      */
     public function setErrorMessages(array $messages)
     {
@@ -2442,7 +2442,7 @@ public function getErrorMessages()
     /**
      * Clear custom error messages stack
      *
-     * @return static
+     * @return $this
      */
     public function clearErrorMessages()
     {
@@ -2453,7 +2453,7 @@ public function clearErrorMessages()
     /**
      * Mark the element as being in a failed validation state
      *
-     * @return static
+     * @return $this
      */
     public function markAsError()
     {
@@ -2466,7 +2466,7 @@ public function markAsError()
      * Add an error message and mark element as failed validation
      *
      * @param  string $message
-     * @return static
+     * @return $this
      */
     public function addError($message)
     {
@@ -2479,7 +2479,7 @@ public function addError($message)
      * Add multiple error messages and flag element as failed validation
      *
      * @param  array $messages
-     * @return static
+     * @return $this
      */
     public function addErrors(array $messages)
     {
@@ -2493,7 +2493,7 @@ public function addErrors(array $messages)
      * Overwrite any previously set error messages and flag as failed validation
      *
      * @param  array $messages
-     * @return static
+     * @return $this
      */
     public function setErrors(array $messages)
     {
@@ -2672,7 +2672,7 @@ public function getCustomMessages()
      * Set view object
      *
      * @param  Zend_View_Interface $view
-     * @return static
+     * @return $this
      */
     public function setView(Zend_View_Interface $view = null)
     {
@@ -2723,7 +2723,7 @@ protected function _getDecorator($name, $options)
      * @param  string|Zend_Form_Decorator_Interface $decorator
      * @param  array|Zend_Config                    $options Options with which to initialize decorator
      * @throws Zend_Form_Exception
-     * @return static
+     * @return $this
      */
     public function addDecorator($decorator, $options = null)
     {
@@ -2766,7 +2766,7 @@ public function addDecorator($decorator, $options = null)
      *
      * @param  array $decorators
      * @throws Zend_Form_Exception
-     * @return static
+     * @return $this
      */
     public function addDecorators(array $decorators)
     {
@@ -2813,7 +2813,7 @@ public function addDecorators(array $decorators)
      * Overwrite all decorators
      *
      * @param  array $decorators
-     * @return static
+     * @return $this
      */
     public function setDecorators(array $decorators)
     {
@@ -2896,7 +2896,7 @@ public function removeDecorator($name)
     /**
      * Clear all decorators
      *
-     * @return static
+     * @return $this
      */
     public function clearDecorators()
     {
@@ -2910,7 +2910,7 @@ public function clearDecorators()
      * @param  array $decorators
      * @param  array|null $elements Specific elements to decorate or exclude from decoration
      * @param  bool $include Whether $elements is an inclusion or exclusion list
-     * @return static
+     * @return $this
      */
     public function setElementDecorators(array $decorators, array $elements = null, $include = true)
     {
@@ -2948,7 +2948,7 @@ public function setElementDecorators(array $decorators, array $elements = null,
      * Set all display group decorators as specified
      *
      * @param  array $decorators
-     * @return static
+     * @return $this
      */
     public function setDisplayGroupDecorators(array $decorators)
     {
@@ -2964,7 +2964,7 @@ public function setDisplayGroupDecorators(array $decorators)
      * Set all subform decorators as specified
      *
      * @param  array $decorators
-     * @return static
+     * @return $this
      */
     public function setSubFormDecorators(array $decorators)
     {
@@ -3026,7 +3026,7 @@ public function __toString()
      *
      * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
      * @throws Zend_Form_Exception
-     * @return static
+     * @return $this
      */
     public function setTranslator($translator = null)
     {
@@ -3128,7 +3128,7 @@ public static function hasDefaultTranslator()
      * Indicate whether or not translation should be disabled
      *
      * @param  bool $flag
-     * @return static
+     * @return $this
      */
     public function setDisableTranslator($flag)
     {
@@ -3351,7 +3351,7 @@ public function count(): int
      * Set flag to disable loading default decorators
      *
      * @param  bool $flag
-     * @return static
+     * @return $this
      */
     public function setDisableLoadDefaultDecorators($flag)
     {
@@ -3372,7 +3372,7 @@ public function loadDefaultDecoratorsIsDisabled()
     /**
      * Load the default decorators
      *
-     * @return static
+     * @return $this
      */
     public function loadDefaultDecorators()
     {
diff --git a/library/Zend/Form/Element/File.php b/library/Zend/Form/Element/File.php
index c981b05235..e30e4aace1 100644
--- a/library/Zend/Form/Element/File.php
+++ b/library/Zend/Form/Element/File.php
@@ -558,7 +558,7 @@ public function getFileInfo($value = null)
      * Set a multifile element
      *
      * @param integer $count Number of file elements
-     * @return Zend_Form_Element_File Provides fluent interface
+     * @return $this
      */
     public function setMultiFile($count)
     {
diff --git a/library/Zend/Gdata/App.php b/library/Zend/Gdata/App.php
index 370aaff890..6c8970c391 100644
--- a/library/Zend/Gdata/App.php
+++ b/library/Zend/Gdata/App.php
@@ -243,7 +243,7 @@ public function getHttpClient()
      *
      * @param Zend_Http_Client $client The client to use for communication
      * @throws Zend_Gdata_App_HttpException
-     * @return Zend_Gdata_App Provides a fluent interface
+     * @return $this
      */
     public function setHttpClient($client,
         $applicationId = 'MyCompany-MyApp-1.0')
diff --git a/library/Zend/Gdata/App/Base.php b/library/Zend/Gdata/App/Base.php
index 918be10b7f..6fe499c10d 100644
--- a/library/Zend/Gdata/App/Base.php
+++ b/library/Zend/Gdata/App/Base.php
@@ -135,7 +135,7 @@ public function getText($trim = true)
      * This represents any raw text contained within the XML element
      *
      * @param string $value Child text node
-     * @return Zend_Gdata_App_Base Returns an object of the same type as 'this' to provide a fluent interface.
+     * @return $this
      */
     public function setText($value)
     {
@@ -160,7 +160,7 @@ public function getExtensionElements()
      * child XML elements to any data model class.
      *
      * @param array $value All extension elements
-     * @return Zend_Gdata_App_Base Returns an object of the same type as 'this' to provide a fluent interface.
+     * @return $this
      */
     public function setExtensionElements($value)
     {
@@ -189,7 +189,7 @@ public function getExtensionAttributes()
      * This can be used to add arbitrary attributes to any data model element
      *
      * @param array $value All extension attributes
-     * @return Zend_Gdata_App_Base Returns an object of the same type as 'this' to provide a fluent interface.
+     * @return $this
      */
     public function setExtensionAttributes($value)
     {
diff --git a/library/Zend/Gdata/App/BaseMediaSource.php b/library/Zend/Gdata/App/BaseMediaSource.php
index 3e0731131a..91d86a08b7 100644
--- a/library/Zend/Gdata/App/BaseMediaSource.php
+++ b/library/Zend/Gdata/App/BaseMediaSource.php
@@ -68,7 +68,7 @@ public function getContentType()
      * Set the content type for the file attached (example image/png)
      *
      * @param string $value The content type
-     * @return Zend_Gdata_App_MediaFileSource Provides a fluent interface
+     * @return $this
      */
     public function setContentType($value)
     {
@@ -91,7 +91,7 @@ public function getSlug(){
      * title for the uploaded file.  A null value indicates no slug header.
      *
      * @var string The slug value
-     * @return Zend_Gdata_App_MediaSource Provides a fluent interface
+     * @return $this
      */
     public function setSlug($value){
         $this->_slug = $value;
diff --git a/library/Zend/Gdata/App/Entry.php b/library/Zend/Gdata/App/Entry.php
index 5b30ca50d1..d92a8a5053 100644
--- a/library/Zend/Gdata/App/Entry.php
+++ b/library/Zend/Gdata/App/Entry.php
@@ -286,7 +286,7 @@ public function getContent()
      * Sets the value of the atom:content element
      *
      * @param Zend_Gdata_App_Extension_Content $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
+     * @return $this
      */
     public function setContent($value)
     {
@@ -310,7 +310,7 @@ public function getPublished()
      * This represents the publishing date for an entry
      *
      * @param Zend_Gdata_App_Extension_Published $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
+     * @return $this
      */
     public function setPublished($value)
     {
@@ -332,7 +332,7 @@ public function getSource()
      * Sets the value of the atom:source element
      *
      * @param Zend_Gdata_App_Extension_Source $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
+     * @return $this
      */
     public function setSource($value)
     {
@@ -356,7 +356,7 @@ public function getSummary()
      * This represents a textual summary of this entry's content
      *
      * @param Zend_Gdata_App_Extension_Summary $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
+     * @return $this
      */
     public function setSummary($value)
     {
@@ -378,7 +378,7 @@ public function getControl()
      * Sets the value of the app:control element
      *
      * @param Zend_Gdata_App_Extension_Control $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
+     * @return $this
      */
     public function setControl($value)
     {
diff --git a/library/Zend/Gdata/App/Extension/Category.php b/library/Zend/Gdata/App/Extension/Category.php
index 5d60b467c3..aacac4cb0d 100644
--- a/library/Zend/Gdata/App/Extension/Category.php
+++ b/library/Zend/Gdata/App/Extension/Category.php
@@ -93,7 +93,7 @@ public function getTerm()
 
     /**
      * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Category Provides a fluent interface
+     * @return $this
      */
     public function setTerm($value)
     {
@@ -111,7 +111,7 @@ public function getScheme()
 
     /**
      * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Category Provides a fluent interface
+     * @return $this
      */
     public function setScheme($value)
     {
@@ -129,7 +129,7 @@ public function getLabel()
 
     /**
      * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Category Provides a fluent interface
+     * @return $this
      */
     public function setLabel($value)
     {
diff --git a/library/Zend/Gdata/App/Extension/Content.php b/library/Zend/Gdata/App/Extension/Content.php
index 8b0a2be38b..81360a4068 100644
--- a/library/Zend/Gdata/App/Extension/Content.php
+++ b/library/Zend/Gdata/App/Extension/Content.php
@@ -77,7 +77,7 @@ public function getSrc()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_App_Extension_Content Provides a fluent interface
+     * @return $this
      */
     public function setSrc($value)
     {
diff --git a/library/Zend/Gdata/App/Extension/Control.php b/library/Zend/Gdata/App/Extension/Control.php
index 64ac1a4f13..ef7ae4d2f1 100644
--- a/library/Zend/Gdata/App/Extension/Control.php
+++ b/library/Zend/Gdata/App/Extension/Control.php
@@ -87,7 +87,7 @@ public function getDraft()
 
     /**
      * @param Zend_Gdata_App_Extension_Draft $value
-     * @return Zend_Gdata_App_Extension_Control Provides a fluent interface
+     * @return $this
      */
     public function setDraft($value)
     {
diff --git a/library/Zend/Gdata/App/Extension/Generator.php b/library/Zend/Gdata/App/Extension/Generator.php
index 2c4a91ffd6..3731078334 100644
--- a/library/Zend/Gdata/App/Extension/Generator.php
+++ b/library/Zend/Gdata/App/Extension/Generator.php
@@ -86,7 +86,7 @@ public function getUri()
 
     /**
      * @param Zend_Gdata_App_Extension_Uri $value
-     * @return Zend_Gdata_App_Extension_Generator Provides a fluent interface
+     * @return $this
      */
     public function setUri($value)
     {
@@ -104,7 +104,7 @@ public function getVersion()
 
     /**
      * @param Zend_Gdata_App_Extension_Version $value
-     * @return Zend_Gdata_App_Extension_Generator Provides a fluent interface
+     * @return $this
      */
     public function setVersion($value)
     {
diff --git a/library/Zend/Gdata/App/Extension/Link.php b/library/Zend/Gdata/App/Extension/Link.php
index 39cf77db53..3e050e4d15 100644
--- a/library/Zend/Gdata/App/Extension/Link.php
+++ b/library/Zend/Gdata/App/Extension/Link.php
@@ -118,7 +118,7 @@ public function getHref()
 
     /**
      * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Link Provides a fluent interface
+     * @return $this
      */
     public function setHref($value)
     {
@@ -136,7 +136,7 @@ public function getRel()
 
     /**
      * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Link Provides a fluent interface
+     * @return $this
      */
     public function setRel($value)
     {
@@ -154,7 +154,7 @@ public function getType()
 
     /**
      * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Link Provides a fluent interface
+     * @return $this
      */
     public function setType($value)
     {
@@ -172,7 +172,7 @@ public function getHrefLang()
 
     /**
      * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Link Provides a fluent interface
+     * @return $this
      */
     public function setHrefLang($value)
     {
@@ -190,7 +190,7 @@ public function getTitle()
 
     /**
      * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Link Provides a fluent interface
+     * @return $this
      */
     public function setTitle($value)
     {
@@ -208,7 +208,7 @@ public function getLength()
 
     /**
      * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Link Provides a fluent interface
+     * @return $this
      */
     public function setLength($value)
     {
diff --git a/library/Zend/Gdata/App/Extension/Person.php b/library/Zend/Gdata/App/Extension/Person.php
index fc43490e3c..6e98e03090 100644
--- a/library/Zend/Gdata/App/Extension/Person.php
+++ b/library/Zend/Gdata/App/Extension/Person.php
@@ -116,7 +116,7 @@ public function getName()
 
     /**
      * @param Zend_Gdata_App_Extension_Name $value
-     * @return Zend_Gdata_App_Extension_Person Provides a fluent interface
+     * @return $this
      */
     public function setName($value)
     {
@@ -134,7 +134,7 @@ public function getEmail()
 
     /**
      * @param Zend_Gdata_App_Extension_Email $value
-     * @return Zend_Gdata_App_Extension_Person Provides a fluent interface
+     * @return $this
      */
     public function setEmail($value)
     {
@@ -152,7 +152,7 @@ public function getUri()
 
     /**
      * @param Zend_Gdata_App_Extension_Uri $value
-     * @return Zend_Gdata_App_Extension_Person Provides a fluent interface
+     * @return $this
      */
     public function setUri($value)
     {
diff --git a/library/Zend/Gdata/App/Extension/Text.php b/library/Zend/Gdata/App/Extension/Text.php
index 7ddaa2d749..0c264ec313 100644
--- a/library/Zend/Gdata/App/Extension/Text.php
+++ b/library/Zend/Gdata/App/Extension/Text.php
@@ -79,7 +79,7 @@ public function getType()
 
     /*
      * @param string $value
-     * @return Zend_Gdata_App_Extension_Text Provides a fluent interface
+     * @return $this
      */
     public function setType($value)
     {
diff --git a/library/Zend/Gdata/App/Feed.php b/library/Zend/Gdata/App/Feed.php
index 1f2e6f72d2..abc1985ca8 100755
--- a/library/Zend/Gdata/App/Feed.php
+++ b/library/Zend/Gdata/App/Feed.php
@@ -202,7 +202,7 @@ public function getEntry()
      * atom:feed representation
      *
      * @param array $value The array of Zend_Gdata_App_Entry elements
-     * @return Zend_Gdata_App_Feed Provides a fluent interface
+     * @return $this
      */
     public function setEntry($value)
     {
@@ -215,7 +215,7 @@ public function setEntry($value)
      * contained within this feed
      *
      * @param Zend_Gdata_App_Entry An individual entry to add.
-     * @return Zend_Gdata_App_Feed Provides a fluent interface
+     * @return $this
      */
     public function addEntry($value)
     {
diff --git a/library/Zend/Gdata/App/FeedEntryParent.php b/library/Zend/Gdata/App/FeedEntryParent.php
index 216d5b240c..b82f776be7 100755
--- a/library/Zend/Gdata/App/FeedEntryParent.php
+++ b/library/Zend/Gdata/App/FeedEntryParent.php
@@ -148,7 +148,7 @@ public function __construct($element = null)
      * @deprecated Deprecated as of Zend Framework 1.7. Use
      *             setService() instead.
      * @param  Zend_Http_Client $httpClient
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setHttpClient(Zend_Http_Client $httpClient)
     {
@@ -181,7 +181,7 @@ public function getHttpClient()
      * perform network requests, such as when calling save() and delete().
      *
      * @param Zend_Gdata_App $instance The new service instance.
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface.
+     * @return $this
      */
     public function setService($instance)
     {
@@ -294,7 +294,7 @@ public function getAuthor()
      * author is represented by an atom:author element
      *
      * @param array $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setAuthor($value)
     {
@@ -318,7 +318,7 @@ public function getCategory()
      * category is represented in an atom feed by an atom:category element.
      *
      * @param array $value Array of Zend_Gdata_App_Extension_Category
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setCategory($value)
     {
@@ -342,7 +342,7 @@ public function getContributor()
      * is represented in an atom feed by an atom:contributor XML element
      *
      * @param array $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setContributor($value)
     {
@@ -360,7 +360,7 @@ public function getId()
 
     /**
      * @param Zend_Gdata_App_Extension_Id $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setId($value)
     {
@@ -474,7 +474,7 @@ public function getAlternateLink()
 
     /**
      * @param array $value The array of Zend_Gdata_App_Extension_Link elements
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setLink($value)
     {
@@ -492,7 +492,7 @@ public function getRights()
 
     /**
      * @param Zend_Gdata_App_Extension_Rights $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setRights($value)
     {
@@ -534,7 +534,7 @@ public function getTitleValue()
      * an atom:title element in a feed or entry
      *
      * @param Zend_Gdata_App_Extension_Title $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setTitle($value)
     {
@@ -552,7 +552,7 @@ public function getUpdated()
 
     /**
      * @param Zend_Gdata_App_Extension_Updated $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setUpdated($value)
     {
@@ -565,7 +565,7 @@ public function setUpdated($value)
      * unsets the Etag.
      *
      * @param string|null $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
+     * @return $this
      */
     public function setEtag($value) {
         $this->_etag = $value;
diff --git a/library/Zend/Gdata/App/FeedSourceParent.php b/library/Zend/Gdata/App/FeedSourceParent.php
index 99e78c1d22..be2eddb0f4 100644
--- a/library/Zend/Gdata/App/FeedSourceParent.php
+++ b/library/Zend/Gdata/App/FeedSourceParent.php
@@ -90,7 +90,7 @@ abstract class Zend_Gdata_App_FeedSourceParent extends Zend_Gdata_App_FeedEntryP
      * @deprecated Deprecated as of Zend Framework 1.7. Use
      *             setService() instead.
      * @param  Zend_Http_Client $httpClient
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
+     * @return $this
      */
     public function setHttpClient(Zend_Http_Client $httpClient)
     {
@@ -107,7 +107,7 @@ public function setHttpClient(Zend_Http_Client $httpClient)
      * save() and delete().
      *
      * @param Zend_Gdata_App $instance The new service instance.
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface.
+     * @return $this
      */
     public function setService($instance)
     {
@@ -202,7 +202,7 @@ public function getGenerator()
 
     /**
      * @param Zend_Gdata_App_Extension_Generator $value
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
+     * @return $this
      */
     public function setGenerator($value)
     {
@@ -220,7 +220,7 @@ public function getIcon()
 
     /**
      * @param Zend_Gdata_App_Extension_Icon $value
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
+     * @return $this
      */
     public function setIcon($value)
     {
@@ -238,7 +238,7 @@ public function getlogo()
 
     /**
      * @param Zend_Gdata_App_Extension_logo $value
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
+     * @return $this
      */
     public function setlogo($value)
     {
@@ -256,7 +256,7 @@ public function getSubtitle()
 
     /**
      * @param Zend_Gdata_App_Extension_Subtitle $value
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
+     * @return $this
      */
     public function setSubtitle($value)
     {
diff --git a/library/Zend/Gdata/App/MediaEntry.php b/library/Zend/Gdata/App/MediaEntry.php
index 183d3c6386..f4b3c2b566 100644
--- a/library/Zend/Gdata/App/MediaEntry.php
+++ b/library/Zend/Gdata/App/MediaEntry.php
@@ -102,7 +102,7 @@ public function getMediaSource()
      * Set the MediaSource object (file) for this MediaEntry
      *
      * @param Zend_Gdata_App_MediaSource $value The attached MediaSource/file
-     * @return Zend_Gdata_App_MediaEntry Provides a fluent interface
+     * @return $this
      */
     public function setMediaSource($value)
     {
diff --git a/library/Zend/Gdata/App/MediaFileSource.php b/library/Zend/Gdata/App/MediaFileSource.php
index 57f5f219a1..ac05fc1e55 100644
--- a/library/Zend/Gdata/App/MediaFileSource.php
+++ b/library/Zend/Gdata/App/MediaFileSource.php
@@ -103,7 +103,7 @@ public function getFilename()
      * Set the filename which is to be read.
      *
      * @param string $value The desired file handle.
-     * @return Zend_Gdata_App_MediaFileSource Provides a fluent interface.
+     * @return $this
      */
     public function setFilename($value)
     {
@@ -125,7 +125,7 @@ public function getContentType()
      * Set the content type for the file attached (example image/png)
      *
      * @param string $value The content type
-     * @return Zend_Gdata_App_MediaFileSource Provides a fluent interface
+     * @return $this
      */
     public function setContentType($value)
     {
diff --git a/library/Zend/Gdata/App/MediaSource.php b/library/Zend/Gdata/App/MediaSource.php
index 31f509c53b..07ac5ecc72 100644
--- a/library/Zend/Gdata/App/MediaSource.php
+++ b/library/Zend/Gdata/App/MediaSource.php
@@ -43,7 +43,7 @@ public function encode();
      * Set the content type for the file attached (example image/png)
      *
      * @param string $value The content type
-     * @return Zend_Gdata_App_MediaFileSource Provides a fluent interface
+     * @return $this
      */
     public function setContentType($value);
 
@@ -59,7 +59,7 @@ public function getContentType();
      * title for the uploaded file.  A null value indicates no slug header.
      *
      * @var string The slug value
-     * @return Zend_Gdata_App_MediaSource Provides a fluent interface
+     * @return $this
      */
     public function setSlug($value);
 
diff --git a/library/Zend/Gdata/Books/Extension/Embeddability.php b/library/Zend/Gdata/Books/Extension/Embeddability.php
index 573531cde1..04d7801fd5 100644
--- a/library/Zend/Gdata/Books/Extension/Embeddability.php
+++ b/library/Zend/Gdata/Books/Extension/Embeddability.php
@@ -109,7 +109,7 @@ public function getValue()
      *
      * @param string|null $value Programmatic value that describes the
      *        embeddability of a volume in Google Book Search
-     * @return Zend_Gdata_Books_Extension_Embeddability Provides a fluent
+     * @return $this
      *     interface
      */
     public function setValue($value)
diff --git a/library/Zend/Gdata/Books/Extension/Review.php b/library/Zend/Gdata/Books/Extension/Review.php
index a942a1db42..1be15528e8 100644
--- a/library/Zend/Gdata/Books/Extension/Review.php
+++ b/library/Zend/Gdata/Books/Extension/Review.php
@@ -127,7 +127,7 @@ public function getType()
      * Sets the language of link title
      *
      * @param string $lang language of link title
-     * @return Zend_Gdata_Books_Extension_Review Provides a fluent interface
+     * @return $this
      */
     public function setLang($lang)
     {
@@ -139,7 +139,7 @@ public function setLang($lang)
      * Sets the type of text construct (typically 'text', 'html' or 'xhtml')
      *
      * @param string $type type of text construct (typically 'text', 'html' or 'xhtml')
-     * @return Zend_Gdata_Books_Extension_Review Provides a fluent interface
+     * @return $this
      */
     public function setType($type)
     {
diff --git a/library/Zend/Gdata/Books/Extension/Viewability.php b/library/Zend/Gdata/Books/Extension/Viewability.php
index fd83b47d38..ddb1b27f93 100644
--- a/library/Zend/Gdata/Books/Extension/Viewability.php
+++ b/library/Zend/Gdata/Books/Extension/Viewability.php
@@ -109,7 +109,7 @@ public function getValue()
      *
      * @param string $value programmatic value that describes the viewability
      *     of a volume in Googl eBook Search
-     * @return Zend_Gdata_Books_Extension_Viewability Provides a fluent
+     * @return $this
      *     interface
      */
     public function setValue($value)
diff --git a/library/Zend/Gdata/Books/VolumeEntry.php b/library/Zend/Gdata/Books/VolumeEntry.php
index 8675602a22..7bede96c6c 100644
--- a/library/Zend/Gdata/Books/VolumeEntry.php
+++ b/library/Zend/Gdata/Books/VolumeEntry.php
@@ -459,7 +459,7 @@ public function getViewability()
      * Sets the Comments class
      *
      * @param Zend_Gdata_Extension_Comments|null $comments Comments class
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setComments($comments)
     {
@@ -471,7 +471,7 @@ public function setComments($comments)
      * Sets the creators
      *
      * @param array $creators Creators|null
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setCreators($creators)
     {
@@ -483,7 +483,7 @@ public function setCreators($creators)
      * Sets the dates
      *
      * @param array $dates dates
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setDates($dates)
     {
@@ -495,7 +495,7 @@ public function setDates($dates)
      * Sets the descriptions
      *
      * @param array $descriptions descriptions
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setDescriptions($descriptions)
     {
@@ -508,7 +508,7 @@ public function setDescriptions($descriptions)
      *
      * @param Zend_Gdata_Books_Extension_Embeddability|null $embeddability
      *        embeddability
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setEmbeddability($embeddability)
     {
@@ -520,7 +520,7 @@ public function setEmbeddability($embeddability)
      * Sets the formats
      *
      * @param array $formats formats
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setFormats($formats)
     {
@@ -532,7 +532,7 @@ public function setFormats($formats)
      * Sets the identifiers
      *
      * @param array $identifiers identifiers
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setIdentifiers($identifiers)
     {
@@ -544,7 +544,7 @@ public function setIdentifiers($identifiers)
      * Sets the languages
      *
      * @param array $languages languages
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setLanguages($languages)
     {
@@ -556,7 +556,7 @@ public function setLanguages($languages)
      * Sets the publishers
      *
      * @param array $publishers publishers
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setPublishers($publishers)
     {
@@ -568,7 +568,7 @@ public function setPublishers($publishers)
      * Sets the rating
      *
      * @param Zend_Gdata_Extension_Rating|null $rating rating
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setRating($rating)
     {
@@ -580,7 +580,7 @@ public function setRating($rating)
      * Sets the review
      *
      * @param Zend_Gdata_Books_Extension_Review|null $review review
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setReview($review)
     {
@@ -592,7 +592,7 @@ public function setReview($review)
      * Sets the subjects
      *
      * @param array $subjects subjects
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setSubjects($subjects)
     {
@@ -604,7 +604,7 @@ public function setSubjects($subjects)
      * Sets the titles
      *
      * @param array $titles titles
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setTitles($titles)
     {
@@ -617,7 +617,7 @@ public function setTitles($titles)
      *
      * @param Zend_Gdata_Books_Extension_Viewability|null $viewability
      *        viewability
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
+     * @return $this
      */
     public function setViewability($viewability)
     {
diff --git a/library/Zend/Gdata/Books/VolumeQuery.php b/library/Zend/Gdata/Books/VolumeQuery.php
index 37853f37c5..298f413dc8 100755
--- a/library/Zend/Gdata/Books/VolumeQuery.php
+++ b/library/Zend/Gdata/Books/VolumeQuery.php
@@ -58,7 +58,7 @@ public function __construct($url = null)
      * Sets the minimum level of viewability of volumes to return in the search results
      *
      * @param string|null $value The minimum viewability - 'full' or 'partial'
-     * @return Zend_Gdata_Books_VolumeQuery Provides a fluent interface
+     * @return $this
      */
     public function setMinViewability($value = null)
     {
diff --git a/library/Zend/Gdata/Calendar/EventEntry.php b/library/Zend/Gdata/Calendar/EventEntry.php
index cf70cbe0f3..996ba486b9 100644
--- a/library/Zend/Gdata/Calendar/EventEntry.php
+++ b/library/Zend/Gdata/Calendar/EventEntry.php
@@ -138,7 +138,7 @@ public function getTimezone()
 
     /**
      * @param Zend_Gdata_Calendar_Extension_Timezone $value
-     * @return Zend_Gdata_Calendar_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setTimezone($value)
     {
@@ -153,7 +153,7 @@ public function getQuickAdd()
 
     /**
      * @param Zend_Gdata_Calendar_Extension_QuickAdd $value
-     * @return Zend_Gdata_Calendar_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setQuickAdd($value)
     {
diff --git a/library/Zend/Gdata/Calendar/EventQuery.php b/library/Zend/Gdata/Calendar/EventQuery.php
index 92388bd790..755b98b34d 100644
--- a/library/Zend/Gdata/Calendar/EventQuery.php
+++ b/library/Zend/Gdata/Calendar/EventQuery.php
@@ -110,7 +110,7 @@ public function __construct($url = null)
     /**
      * @see $_comments
      * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setComments($value)
     {
@@ -121,7 +121,7 @@ public function setComments($value)
     /**
      * @see $_event
      * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setEvent($value)
     {
@@ -132,7 +132,7 @@ public function setEvent($value)
     /**
      * @see $_projection
      * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setProjection($value)
     {
@@ -143,7 +143,7 @@ public function setProjection($value)
     /**
      * @see $_user
      * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setUser($value)
     {
@@ -154,7 +154,7 @@ public function setUser($value)
     /**
      * @see $_visibility
      * @param bool $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setVisibility($value)
     {
@@ -209,7 +209,7 @@ public function getVisibility()
 
     /**
      * @param int $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setStartMax($value)
     {
@@ -223,7 +223,7 @@ public function setStartMax($value)
 
     /**
      * @param int $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setStartMin($value)
     {
@@ -237,7 +237,7 @@ public function setStartMin($value)
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setOrderBy($value)
     {
@@ -363,7 +363,7 @@ public function setRecurrenceExpansionEnd($value)
 
     /**
      * @param string $value Also accepts bools.
-     * @return bool|null Provides a fluent interface
+     * @return $this
      */
     public function getSingleEvents()
     {
@@ -389,7 +389,7 @@ public function getSingleEvents()
 
     /**
      * @param string $value Also accepts bools. If using a string, must be either "true" or "false".
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setSingleEvents($value)
     {
@@ -438,7 +438,7 @@ public function getFutureEvents()
     /**
      * @param string $value Also accepts bools. If using a string, must be either "true" or "false" or
      *                      an exception will be thrown on retrieval.
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
+     * @return $this
      */
     public function setFutureEvents($value)
     {
diff --git a/library/Zend/Gdata/Calendar/Extension/Link.php b/library/Zend/Gdata/Calendar/Extension/Link.php
index 78cbde14b9..f370c7d87e 100644
--- a/library/Zend/Gdata/Calendar/Extension/Link.php
+++ b/library/Zend/Gdata/Calendar/Extension/Link.php
@@ -112,7 +112,7 @@ public function getWebContent()
      * Set the value for this element's WebContent attribute.
      *
      * @param Zend_Gdata_Calendar_Extension_WebContent $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_Link The element being modified.  Provides a fluent interface.
+     * @return $this
      */
     public function setWebContent($value)
     {
diff --git a/library/Zend/Gdata/Calendar/ListEntry.php b/library/Zend/Gdata/Calendar/ListEntry.php
index 679f62374e..e252f5ea75 100644
--- a/library/Zend/Gdata/Calendar/ListEntry.php
+++ b/library/Zend/Gdata/Calendar/ListEntry.php
@@ -161,7 +161,7 @@ public function getAccessLevel()
 
     /**
      * @param Zend_Gdata_Calendar_Extension_AccessLevel $value
-     * @return Zend_Gdata_Calendar_ListEntry Provides a fluent interface
+     * @return $this
      */
     public function setAccessLevel($value)
     {
@@ -175,7 +175,7 @@ public function getColor()
 
     /**
      * @param Zend_Gdata_Calendar_Extension_Color $value
-     * @return Zend_Gdata_Calendar_ListEntry Provides a fluent interface
+     * @return $this
      */
     public function setColor($value)
     {
@@ -190,7 +190,7 @@ public function getHidden()
 
     /**
      * @param Zend_Gdata_Calendar_Extension_Hidden $value
-     * @return Zend_Gdata_Calendar_ListEntry Provides a fluent interface
+     * @return $this
      */
     public function setHidden($value)
     {
@@ -205,7 +205,7 @@ public function getSelected()
 
     /**
      * @param Zend_Gdata_Calendar_Extension_Selected $value
-     * @return Zend_Gdata_Calendar_ListEntry Provides a fluent interface
+     * @return $this
      */
     public function setSelected($value)
     {
@@ -220,7 +220,7 @@ public function getTimezone()
 
     /**
      * @param Zend_Gdata_Calendar_Extension_Timezone $value
-     * @return Zend_Gdata_Calendar_ListEntry Provides a fluent interface
+     * @return $this
      */
     public function setTimezone($value)
     {
@@ -235,7 +235,7 @@ public function getWhere()
 
     /**
      * @param Zend_Gdata_Extension_Where $value
-     * @return Zend_Gdata_Calendar_ListEntry Provides a fluent interface
+     * @return $this
      */
     public function setWhere($value)
     {
diff --git a/library/Zend/Gdata/Calendar/ListFeed.php b/library/Zend/Gdata/Calendar/ListFeed.php
index 6b33962b78..102f16e943 100644
--- a/library/Zend/Gdata/Calendar/ListFeed.php
+++ b/library/Zend/Gdata/Calendar/ListFeed.php
@@ -95,7 +95,7 @@ public function getTimezone()
 
     /**
      * @param Zend_Gdata_Calendar_Extension_Timezone $value
-     * @return Zend_Gdata_Calendar_ListFeed Provides a fluent interface
+     * @return $this
      */
     public function setTimezone($value)
     {
diff --git a/library/Zend/Gdata/Docs/Query.php b/library/Zend/Gdata/Docs/Query.php
index 8d32d55683..f23b6028b9 100755
--- a/library/Zend/Gdata/Docs/Query.php
+++ b/library/Zend/Gdata/Docs/Query.php
@@ -85,7 +85,7 @@ public function __construct()
      * include 'full'.
      *
      * @param string $value
-     * @return Zend_Gdata_Docs_Query Provides a fluent interface
+     * @return $this
      */
     public function setProjection($value)
     {
@@ -97,7 +97,7 @@ public function setProjection($value)
      * Sets the visibility for this query. Common values for visibility
      * include 'private'.
      *
-     * @return Zend_Gdata_Docs_Query Provides a fluent interface
+     * @return $this
      */
     public function setVisibility($value)
     {
@@ -131,7 +131,7 @@ public function getVisibility()
      * completely match the title.
      *
      * @param string $value
-     * @return Zend_Gdata_Docs_Query Provides a fluent interface
+     * @return $this
      */
     public function setTitle($value)
     {
@@ -164,7 +164,7 @@ public function getTitle()
      * title parameter will be returned.
      *
      * @param boolean $value Use either true or false
-     * @return Zend_Gdata_Docs_Query Provides a fluent interface
+     * @return $this
      */
     public function setTitleExact($value)
     {
diff --git a/library/Zend/Gdata/Exif/Entry.php b/library/Zend/Gdata/Exif/Entry.php
index 62e4c486d9..1a6289f1b1 100755
--- a/library/Zend/Gdata/Exif/Entry.php
+++ b/library/Zend/Gdata/Exif/Entry.php
@@ -134,7 +134,7 @@ public function getTags()
      *
      * @param Zend_Gdata_Exif_Extension_Tags $value The desired value
      *              this element, or null to unset.
-     * @return Zend_Gdata_Exif_Entry Provides a fluent interface
+     * @return $this
      */
     public function setTags($value)
     {
diff --git a/library/Zend/Gdata/Exif/Extension/Tags.php b/library/Zend/Gdata/Exif/Extension/Tags.php
index 23c4ec9742..f16b1fdf6e 100755
--- a/library/Zend/Gdata/Exif/Extension/Tags.php
+++ b/library/Zend/Gdata/Exif/Extension/Tags.php
@@ -332,7 +332,7 @@ public function getDistance()
      * Set the value for this element's distance attribute.
      *
      * @param Zend_Gdata_Exif_Extension_Distance $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setDistance($value)
     {
@@ -355,7 +355,7 @@ public function getExposure()
      * Set the value for this element's exposure attribute.
      *
      * @param Zend_Gdata_Exif_Extension_Exposure $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setExposure($value)
     {
@@ -378,7 +378,7 @@ public function getFlash()
      * Set the value for this element's flash attribute.
      *
      * @param Zend_Gdata_Exif_Extension_Flash $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setFlash($value)
     {
@@ -401,7 +401,7 @@ public function getFocalLength()
      * Set the value for this element's focalLength attribute.
      *
      * @param Zend_Gdata_Exif_Extension_FocalLength $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setFocalLength($value)
     {
@@ -424,7 +424,7 @@ public function getFStop()
      * Set the value for this element's fStop attribute.
      *
      * @param Zend_Gdata_Exif_Extension_FStop $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setFStop($value)
     {
@@ -447,7 +447,7 @@ public function getImageUniqueId()
      * Set the value for this element's imageUniqueId attribute.
      *
      * @param Zend_Gdata_Exif_Extension_ImageUniqueId $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setImageUniqueId($value)
     {
@@ -470,7 +470,7 @@ public function getIso()
      * Set the value for this element's iso attribute.
      *
      * @param Zend_Gdata_Exif_Extension_Iso $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setIso($value)
     {
@@ -492,7 +492,7 @@ public function getMake()
      * Set the value for this element's make attribute.
      *
      * @param Zend_Gdata_Exif_Extension_Make $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setMake($value)
     {
@@ -515,7 +515,7 @@ public function getModel()
      * Set the value for this element's model attribute.
      *
      * @param Zend_Gdata_Exif_Extension_Model $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setModel($value)
     {
@@ -538,7 +538,7 @@ public function getTime()
      * Set the value for this element's time attribute.
      *
      * @param Zend_Gdata_Exif_Extension_Time $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
+     * @return $this
      */
     public function setTime($value)
     {
diff --git a/library/Zend/Gdata/Feed.php b/library/Zend/Gdata/Feed.php
index 5274e4374e..05f1876d73 100644
--- a/library/Zend/Gdata/Feed.php
+++ b/library/Zend/Gdata/Feed.php
@@ -187,7 +187,7 @@ protected function takeAttributeFromDOM($attribute)
      *
      * @param Zend_Gdata_Extension_OpenSearchTotalResults|null $value The
      *        value of the totalResults property. Use null to unset.
-     * @return Zend_Gdata_Feed Provides a fluent interface.
+     * @return $this
      */
     function setTotalResults($value) {
         $this->_totalResults = $value;
@@ -209,7 +209,7 @@ function getTotalResults() {
      *
      * @param Zend_Gdata_Extension_OpenSearchStartIndex|null $value The value
      *        for the startIndex property. Use null to unset.
-     * @return Zend_Gdata_Feed Provides a fluent interface.
+     * @return $this
      */
     function setStartIndex($value) {
         $this->_startIndex = $value;
@@ -231,7 +231,7 @@ function getStartIndex() {
      *
      * @param Zend_Gdata_Extension_OpenSearchItemsPerPage|null $value The
      *        value for the itemsPerPage property. Use nul to unset.
-     * @return Zend_Gdata_Feed Provides a fluent interface.
+     * @return $this
      */
     function setItemsPerPage($value) {
         $this->_itemsPerPage = $value;
diff --git a/library/Zend/Gdata/Gapps/EmailListEntry.php b/library/Zend/Gdata/Gapps/EmailListEntry.php
index ae150cebe7..469031a4a8 100644
--- a/library/Zend/Gdata/Gapps/EmailListEntry.php
+++ b/library/Zend/Gdata/Gapps/EmailListEntry.php
@@ -158,7 +158,7 @@ public function getEmailList()
      *
      * @param Zend_Gdata_Gapps_Extension_EmailList $value The desired value
      *              this element, or null to unset.
-     * @return Zend_Gdata_Gapps_EmailListEntry Provides a fluent interface
+     * @return $this
      */
     public function setEmailList($value)
     {
@@ -203,7 +203,7 @@ public function getFeedLink($rel = null)
      * @param array $value A collection of Zend_Gdata_Gapps_Extension_FeedLink
      *          instances representing all feed links for this entry, or
      *          null to unset.
-     * @return Zend_Gdata_Gapps_EmailListEntry Provides a fluent interface
+     * @return $this
      */
     public function setFeedLink($value)
     {
diff --git a/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php b/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php
index e28177362a..aab9b268d4 100644
--- a/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php
+++ b/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php
@@ -135,7 +135,7 @@ public function getWho()
      *
      * @param Zend_Gdata_Extension_Who $value The desired value for this
      *          instance's who property.
-     * @return Zend_Gdata_Gapps_EmailListRecipientEntry Provides a fluent interface.
+     * @return $this
      */
     public function setWho($value)
     {
diff --git a/library/Zend/Gdata/Gapps/Extension/Login.php b/library/Zend/Gdata/Gapps/Extension/Login.php
index c95a05dec9..f7a44b2426 100644
--- a/library/Zend/Gdata/Gapps/Extension/Login.php
+++ b/library/Zend/Gdata/Gapps/Extension/Login.php
@@ -271,7 +271,7 @@ public function getUsername()
      * to form this user's email address.
      *
      * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
+     * @return $this
      */
     public function setUsername($value)
     {
@@ -297,7 +297,7 @@ public function getPassword()
      * this must be indicated by calling setHashFunctionName().
      *
      * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
+     * @return $this
      */
     public function setPassword($value)
     {
@@ -324,7 +324,7 @@ public function getHashFunctionName()
      * function is 'SHA-1'.
      *
      * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
+     * @return $this
      */
     public function setHashFunctionName($value)
     {
@@ -353,7 +353,7 @@ public function getAdmin()
      * whether this user is an administrator for this domain.
      *
      * @param boolean $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
+     * @return $this
      * @throws Zend_Gdata_App_InvalidArgumentException
      */
     public function setAdmin($value)
@@ -387,7 +387,7 @@ public function getAgreedToTerms()
      * indicates whether this user has agreed to the terms of service.
      *
      * @param boolean $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
+     * @return $this
      * @throws Zend_Gdata_App_InvalidArgumentException
      */
     public function setAgreedToTerms($value)
@@ -421,7 +421,7 @@ public function getSuspended()
      * user will not be able to login to this domain until unsuspended.
      *
      * @param boolean $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
+     * @return $this
      * @throws Zend_Gdata_App_InvalidArgumentException
      */
     public function setSuspended($value)
@@ -456,7 +456,7 @@ public function getChangePasswordAtNextLogin()
      * time they login.
      *
      * @param boolean $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
+     * @return $this
      * @throws Zend_Gdata_App_InvalidArgumentException
      */
     public function setChangePasswordAtNextLogin($value)
diff --git a/library/Zend/Gdata/Gapps/Extension/Name.php b/library/Zend/Gdata/Gapps/Extension/Name.php
index b0589d0dfc..5eefc75f67 100644
--- a/library/Zend/Gdata/Gapps/Extension/Name.php
+++ b/library/Zend/Gdata/Gapps/Extension/Name.php
@@ -137,7 +137,7 @@ public function getFamilyName()
      * represents a user's family name.
      *
      * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Name Provides a fluent interface..
+     * @return $this
      */
     public function setFamilyName($value)
     {
@@ -161,7 +161,7 @@ public function getGivenName()
      * represents a user's given name.
      *
      * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Name Provides a fluent interface.
+     * @return $this
      */
     public function setGivenName($value)
     {
diff --git a/library/Zend/Gdata/Gapps/Extension/Nickname.php b/library/Zend/Gdata/Gapps/Extension/Nickname.php
index dd86fdaa3e..64a3663644 100644
--- a/library/Zend/Gdata/Gapps/Extension/Nickname.php
+++ b/library/Zend/Gdata/Gapps/Extension/Nickname.php
@@ -121,7 +121,7 @@ public function getName()
      * name will be delivered to the user who owns this nickname.
      *
      * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Nickname Provides a fluent
+     * @return $this
      *          interface.
      */
     public function setName($value)
diff --git a/library/Zend/Gdata/Gapps/Extension/Quota.php b/library/Zend/Gdata/Gapps/Extension/Quota.php
index c5243a5c27..5239abaaee 100644
--- a/library/Zend/Gdata/Gapps/Extension/Quota.php
+++ b/library/Zend/Gdata/Gapps/Extension/Quota.php
@@ -122,7 +122,7 @@ public function getLimit()
      * the associated user.
      *
      * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Quota Provides a fluent interface.
+     * @return $this
      */
     public function setLimit($value)
     {
diff --git a/library/Zend/Gdata/Gapps/GroupEntry.php b/library/Zend/Gdata/Gapps/GroupEntry.php
index d5b968a07c..4ca099ed2c 100644
--- a/library/Zend/Gdata/Gapps/GroupEntry.php
+++ b/library/Zend/Gdata/Gapps/GroupEntry.php
@@ -146,7 +146,7 @@ public function getProperty($rel = null)
      *
      * @param array $value A collection of
      *          Zend_Gdata_Gapps_Extension_Property objects.
-     * @return Zend_Gdata_Gapps_GroupEntry Provides a fluent interface.
+     * @return $this
      */
     public function setProperty($value)
     {
diff --git a/library/Zend/Gdata/Gapps/MemberEntry.php b/library/Zend/Gdata/Gapps/MemberEntry.php
index 23a50af9c3..b341f95200 100644
--- a/library/Zend/Gdata/Gapps/MemberEntry.php
+++ b/library/Zend/Gdata/Gapps/MemberEntry.php
@@ -146,7 +146,7 @@ public function getProperty($rel = null)
      *
      * @param array $value A collection of
      *          Zend_Gdata_Gapps_Extension_Property objects.
-     * @return Zend_Gdata_Gapps_MemberEntry Provides a fluent interface.
+     * @return $this
      */
     public function setProperty($value)
     {
diff --git a/library/Zend/Gdata/Gapps/NicknameEntry.php b/library/Zend/Gdata/Gapps/NicknameEntry.php
index deb278ded6..ff8536a889 100644
--- a/library/Zend/Gdata/Gapps/NicknameEntry.php
+++ b/library/Zend/Gdata/Gapps/NicknameEntry.php
@@ -153,7 +153,7 @@ public function getLogin()
      *
      * @param Zend_Gdata_Gapps_Extension_Login $value The desired value for
      *          this instance's login property.
-     * @return Zend_Gdata_Gapps_NicknameEntry Provides a fluent interface.
+     * @return $this
      */
     public function setLogin($value)
     {
@@ -178,7 +178,7 @@ public function getNickname()
      *
      * @param Zend_Gdata_Gapps_Extension_Nickname $value The desired value for
      *          this instance's nickname property.
-     * @return Zend_Gdata_Gapps_NicknameEntry Provides a fluent interface.
+     * @return $this
      */
     public function setNickname($value)
     {
diff --git a/library/Zend/Gdata/Gapps/OwnerEntry.php b/library/Zend/Gdata/Gapps/OwnerEntry.php
index 07f303debc..a26f9b934f 100644
--- a/library/Zend/Gdata/Gapps/OwnerEntry.php
+++ b/library/Zend/Gdata/Gapps/OwnerEntry.php
@@ -146,7 +146,7 @@ public function getProperty($rel = null)
      *
      * @param array $value A collection of
      *          Zend_Gdata_Gapps_Extension_Property objects.
-     * @return Zend_Gdata_Gapps_OwnerEntry Provides a fluent interface.
+     * @return $this
      */
     public function setProperty($value)
     {
diff --git a/library/Zend/Gdata/Gapps/ServiceException.php b/library/Zend/Gdata/Gapps/ServiceException.php
index 081313dd26..6f980598dd 100644
--- a/library/Zend/Gdata/Gapps/ServiceException.php
+++ b/library/Zend/Gdata/Gapps/ServiceException.php
@@ -146,7 +146,7 @@ public function hasError($errorCode) {
      * Import an AppsForYourDomain error from XML.
      *
      * @param string $string The XML data to be imported
-     * @return Zend_Gdata_Gapps_ServiceException Provides a fluent interface.
+     * @return $this
      * @throws Zend_Gdata_App_Exception
      */
     public function importFromString($string) {
diff --git a/library/Zend/Gdata/Gapps/UserEntry.php b/library/Zend/Gdata/Gapps/UserEntry.php
index 8a11fd98f9..837c41086b 100644
--- a/library/Zend/Gdata/Gapps/UserEntry.php
+++ b/library/Zend/Gdata/Gapps/UserEntry.php
@@ -193,7 +193,7 @@ public function getLogin()
      *
      * @param Zend_Gdata_Gapps_Extension_Login $value The desired value for
      *          this instance's login property.
-     * @return Zend_Gdata_Gapps_UserEntry Provides a fluent interface.
+     * @return $this
      */
     public function setLogin($value)
     {
@@ -218,7 +218,7 @@ public function getName()
      *
      * @param Zend_Gdata_Gapps_Extension_Name $value The desired value for
      *          this instance's name property.
-     * @return Zend_Gdata_Gapps_UserEntry Provides a fluent interface.
+     * @return $this
      */
     public function setName($value)
     {
@@ -244,7 +244,7 @@ public function getQuota()
      *
      * @param Zend_Gdata_Gapps_Extension_Quota $value The desired value for
      *          this instance's quota property.
-     * @return Zend_Gdata_Gapps_UserEntry Provides a fluent interface.
+     * @return $this
      */
     public function setQuota($value)
     {
@@ -284,7 +284,7 @@ public function getFeedLink($rel = null)
      *
      * @param array $value A collection of
      *          Zend_Gdata_Gapps_Extension_FeedLink objects.
-     * @return Zend_Gdata_Gapps_UserEntry Provides a fluent interface.
+     * @return $this
      */
     public function setFeedLink($value)
     {
diff --git a/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php b/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php
index dd5e9472d7..1010d77da7 100755
--- a/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php
+++ b/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php
@@ -124,7 +124,7 @@ public function getPoint()
      * Set the value for this element's point attribute.
      *
      * @param Zend_Gdata_Geo_Extension_GmlPoint $value The desired value for this attribute.
-     * @return Zend_Gdata_Geo_Extension_GeoRssWhere Provides a fluent interface
+     * @return $this
      */
     public function setPoint($value)
     {
diff --git a/library/Zend/Gdata/Geo/Extension/GmlPoint.php b/library/Zend/Gdata/Geo/Extension/GmlPoint.php
index c29bb8afd9..67637aa452 100755
--- a/library/Zend/Gdata/Geo/Extension/GmlPoint.php
+++ b/library/Zend/Gdata/Geo/Extension/GmlPoint.php
@@ -124,7 +124,7 @@ public function getPos()
      * Set the value for this element's distance attribute.
      *
      * @param Zend_Gdata_Geo_Extension_GmlPos $value The desired value for this attribute
-     * @return Zend_Gdata_Geo_Extension_GmlPoint Provides a fluent interface
+     * @return $this
      */
     public function setPos($value)
     {
diff --git a/library/Zend/Gdata/HttpClient.php b/library/Zend/Gdata/HttpClient.php
index b67bace2a0..906c1185ec 100644
--- a/library/Zend/Gdata/HttpClient.php
+++ b/library/Zend/Gdata/HttpClient.php
@@ -123,7 +123,7 @@ public function setAuthSubPrivateKeyFile($file, $passphrase = null,
      * @param string $key The private key
      * @param string $passphrase The optional private key passphrase
      * @throws Zend_Gdata_App_InvalidArgumentException
-     * @return Zend_Gdata_HttpClient Provides a fluent interface
+     * @return $this
      */
     public function setAuthSubPrivateKey($key, $passphrase = null) {
         if ($key != null && !function_exists('openssl_pkey_get_private')) {
@@ -159,7 +159,7 @@ public function getAuthSubToken() {
      * Sets the AuthSub token used for authentication
      *
      * @param string $token The token
-     * @return Zend_Gdata_HttpClient Provides a fluent interface
+     * @return $this
      */
     public function setAuthSubToken($token) {
         $this->_authSubToken = $token;
@@ -179,7 +179,7 @@ public function getClientLoginToken() {
      * Sets the ClientLogin token used for authentication
      *
      * @param string $token The token
-     * @return Zend_Gdata_HttpClient Provides a fluent interface
+     * @return $this
      */
     public function setClientLoginToken($token) {
         $this->_clientLoginToken = $token;
diff --git a/library/Zend/Gdata/Kind/EventEntry.php b/library/Zend/Gdata/Kind/EventEntry.php
index cb3b121fde..2e4fe77a4c 100644
--- a/library/Zend/Gdata/Kind/EventEntry.php
+++ b/library/Zend/Gdata/Kind/EventEntry.php
@@ -244,7 +244,7 @@ public function getWhen()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setWhen($value)
     {
@@ -259,7 +259,7 @@ public function getWhere()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setWhere($value)
     {
@@ -274,7 +274,7 @@ public function getWho()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setWho($value)
     {
@@ -289,7 +289,7 @@ public function getRecurrence()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setRecurrence($value)
     {
@@ -304,7 +304,7 @@ public function getEventStatus()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setEventStatus($value)
     {
@@ -319,7 +319,7 @@ public function getComments()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setComments($value)
     {
@@ -334,7 +334,7 @@ public function getTransparency()
 
     /**
      * @param Zend_Gdata_Transparency $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setTransparency($value)
     {
@@ -349,7 +349,7 @@ public function getVisibility()
 
     /**
      * @param Zend_Gdata_Visibility $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setVisibility($value)
     {
@@ -364,7 +364,7 @@ public function getRecurrenceExcption()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setRecurrenceException($value)
     {
@@ -379,7 +379,7 @@ public function getExtendedProperty()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setExtendedProperty($value)
     {
@@ -394,7 +394,7 @@ public function getOriginalEvent()
 
     /**
      * @param Zend_Gdata_Extension_OriginalEvent $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
+     * @return $this
      */
     public function setOriginalEvent($value)
     {
diff --git a/library/Zend/Gdata/Media/Entry.php b/library/Zend/Gdata/Media/Entry.php
index 5fa1225596..b7a105080b 100755
--- a/library/Zend/Gdata/Media/Entry.php
+++ b/library/Zend/Gdata/Media/Entry.php
@@ -122,7 +122,7 @@ public function getMediaGroup()
      * Sets the entry's mediaGroup object.
      *
      * @param Zend_Gdata_Media_Extension_MediaGroup $mediaGroup
-     * @return Zend_Gdata_Media_Entry Provides a fluent interface
+     * @return $this
      */
     public function setMediaGroup($mediaGroup)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaCategory.php b/library/Zend/Gdata/Media/Extension/MediaCategory.php
index e76e5af7e2..eb80f093fe 100755
--- a/library/Zend/Gdata/Media/Extension/MediaCategory.php
+++ b/library/Zend/Gdata/Media/Extension/MediaCategory.php
@@ -119,7 +119,7 @@ public function getScheme()
 
     /**
      * @param string $value     URI that identifies the categorization scheme
-     * @return Zend_Gdata_Media_Extension_MediaCategory Provides a fluent interface
+     * @return $this
      */
     public function setScheme($value)
     {
@@ -137,7 +137,7 @@ public function getLabel()
 
     /**
      * @param string $value     Human-readable label to be displayed in applications
-     * @return Zend_Gdata_Media_Extension_MediaCategory Provides a fluent interface
+     * @return $this
      */
     public function setLabel($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaContent.php b/library/Zend/Gdata/Media/Extension/MediaContent.php
index f3dc0a2ffe..b9d8c53530 100755
--- a/library/Zend/Gdata/Media/Extension/MediaContent.php
+++ b/library/Zend/Gdata/Media/Extension/MediaContent.php
@@ -276,7 +276,7 @@ public function getUrl()
 
     /**
      * @param string $value     The direct URL to the media object
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setUrl($value)
     {
@@ -294,7 +294,7 @@ public function getFileSize()
 
     /**
      * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setFileSize($value)
     {
@@ -312,7 +312,7 @@ public function getType()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setType($value)
     {
@@ -330,7 +330,7 @@ public function getMedium()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setMedium($value)
     {
@@ -348,7 +348,7 @@ public function getIsDefault()
 
     /**
      * @param bool $value
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setIsDefault($value)
     {
@@ -366,7 +366,7 @@ public function getExpression()
 
     /**
      * @param string
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setExpression($value)
     {
@@ -384,7 +384,7 @@ public function getBitrate()
 
     /**
      * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setBitrate($value)
     {
@@ -402,7 +402,7 @@ public function getFramerate()
 
     /**
      * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setFramerate($value)
     {
@@ -420,7 +420,7 @@ public function getSamplingrate()
 
     /**
      * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setSamplingrate($value)
     {
@@ -438,7 +438,7 @@ public function getChannels()
 
     /**
      * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setChannels($value)
     {
@@ -457,7 +457,7 @@ public function getDuration()
     /**
      *
      * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setDuration($value)
     {
@@ -475,7 +475,7 @@ public function getHeight()
 
     /**
      * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setHeight($value)
     {
@@ -493,7 +493,7 @@ public function getWidth()
 
     /**
      * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setWidth($value)
     {
@@ -511,7 +511,7 @@ public function getLang()
 
     /**
      * @param string
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
+     * @return $this
      */
     public function setLang($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaCopyright.php b/library/Zend/Gdata/Media/Extension/MediaCopyright.php
index 0148eebe51..0b0e572731 100755
--- a/library/Zend/Gdata/Media/Extension/MediaCopyright.php
+++ b/library/Zend/Gdata/Media/Extension/MediaCopyright.php
@@ -105,7 +105,7 @@ public function getUrl()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaCopyright Provides a fluent interface
+     * @return $this
      */
     public function setUrl($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaCredit.php b/library/Zend/Gdata/Media/Extension/MediaCredit.php
index e929cc445a..5c709e2e98 100755
--- a/library/Zend/Gdata/Media/Extension/MediaCredit.php
+++ b/library/Zend/Gdata/Media/Extension/MediaCredit.php
@@ -120,7 +120,7 @@ public function getRole()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaCredit Provides a fluent interface
+     * @return $this
      */
     public function setRole($value)
     {
@@ -138,7 +138,7 @@ public function getScheme()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaCredit Provides a fluent interface
+     * @return $this
      */
     public function setScheme($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaDescription.php b/library/Zend/Gdata/Media/Extension/MediaDescription.php
index 7b9c0336d8..d9e08f1d8b 100755
--- a/library/Zend/Gdata/Media/Extension/MediaDescription.php
+++ b/library/Zend/Gdata/Media/Extension/MediaDescription.php
@@ -105,7 +105,7 @@ public function getType()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaDescription Provides a fluent interface
+     * @return $this
      */
     public function setType($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaGroup.php b/library/Zend/Gdata/Media/Extension/MediaGroup.php
index ddbc896397..288e2cc5e9 100755
--- a/library/Zend/Gdata/Media/Extension/MediaGroup.php
+++ b/library/Zend/Gdata/Media/Extension/MediaGroup.php
@@ -339,7 +339,7 @@ public function getContent()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Media_Extension_MediaGroup Provides a fluent interface
+     * @return $this
      */
     public function setContent($value)
     {
@@ -465,7 +465,7 @@ public function getKeywords()
 
     /**
      * @param array $value
-     * @return Zend_Gdata_Media_Extension_MediaGroup Provides a fluent interface
+     * @return $this
      */
     public function setKeywords($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaHash.php b/library/Zend/Gdata/Media/Extension/MediaHash.php
index b891fbc11a..9b4319d563 100755
--- a/library/Zend/Gdata/Media/Extension/MediaHash.php
+++ b/library/Zend/Gdata/Media/Extension/MediaHash.php
@@ -104,7 +104,7 @@ public function getAlgo()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaHash Provides a fluent interface
+     * @return $this
      */
     public function setAlgo($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaPlayer.php b/library/Zend/Gdata/Media/Extension/MediaPlayer.php
index 2602c1b032..1af24a9109 100755
--- a/library/Zend/Gdata/Media/Extension/MediaPlayer.php
+++ b/library/Zend/Gdata/Media/Extension/MediaPlayer.php
@@ -131,7 +131,7 @@ public function getUrl()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaPlayer Provides a fluent interface
+     * @return $this
      */
     public function setUrl($value)
     {
@@ -149,7 +149,7 @@ public function getWidth()
 
     /**
      * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaPlayer Provides a fluent interface
+     * @return $this
      */
     public function setWidth($value)
     {
@@ -167,7 +167,7 @@ public function getHeight()
 
     /**
      * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaPlayer Provides a fluent interface
+     * @return $this
      */
     public function setHeight($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaRating.php b/library/Zend/Gdata/Media/Extension/MediaRating.php
index 877e18033b..99fd3f0643 100755
--- a/library/Zend/Gdata/Media/Extension/MediaRating.php
+++ b/library/Zend/Gdata/Media/Extension/MediaRating.php
@@ -107,7 +107,7 @@ public function getScheme()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaRating Provides a fluent interface
+     * @return $this
      */
     public function setScheme($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaRestriction.php b/library/Zend/Gdata/Media/Extension/MediaRestriction.php
index 27277ce1b9..491bc617d0 100755
--- a/library/Zend/Gdata/Media/Extension/MediaRestriction.php
+++ b/library/Zend/Gdata/Media/Extension/MediaRestriction.php
@@ -120,7 +120,7 @@ public function getRelationship()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaRestriction Provides a fluent interface
+     * @return $this
      */
     public function setRelationship($value)
     {
@@ -138,7 +138,7 @@ public function getType()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaRestriction Provides a fluent interface
+     * @return $this
      */
     public function setType($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaText.php b/library/Zend/Gdata/Media/Extension/MediaText.php
index e58be4c876..dff9a85d4a 100755
--- a/library/Zend/Gdata/Media/Extension/MediaText.php
+++ b/library/Zend/Gdata/Media/Extension/MediaText.php
@@ -147,7 +147,7 @@ public function getType()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaText Provides a fluent interface
+     * @return $this
      */
     public function setType($value)
     {
@@ -165,7 +165,7 @@ public function getLang()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaText Provides a fluent interface
+     * @return $this
      */
     public function setLang($value)
     {
@@ -183,7 +183,7 @@ public function getStart()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaText Provides a fluent interface
+     * @return $this
      */
     public function setStart($value)
     {
@@ -201,7 +201,7 @@ public function getEnd()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaText Provides a fluent interface
+     * @return $this
      */
     public function setEnd($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaThumbnail.php b/library/Zend/Gdata/Media/Extension/MediaThumbnail.php
index 1f7588cd15..aa97770e74 100755
--- a/library/Zend/Gdata/Media/Extension/MediaThumbnail.php
+++ b/library/Zend/Gdata/Media/Extension/MediaThumbnail.php
@@ -145,7 +145,7 @@ public function getUrl()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail Provides a fluent interface
+     * @return $this
      */
     public function setUrl($value)
     {
@@ -163,7 +163,7 @@ public function getWidth()
 
     /**
      * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail Provides a fluent interface
+     * @return $this
      */
     public function setWidth($value)
     {
@@ -181,7 +181,7 @@ public function getHeight()
 
     /**
      * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail Provides a fluent interface
+     * @return $this
      */
     public function setHeight($value)
     {
@@ -199,7 +199,7 @@ public function getTime()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail Provides a fluent interface
+     * @return $this
      */
     public function setTime($value)
     {
diff --git a/library/Zend/Gdata/Media/Extension/MediaTitle.php b/library/Zend/Gdata/Media/Extension/MediaTitle.php
index 79dee0890a..38417aeee4 100755
--- a/library/Zend/Gdata/Media/Extension/MediaTitle.php
+++ b/library/Zend/Gdata/Media/Extension/MediaTitle.php
@@ -107,7 +107,7 @@ public function getType()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaTitle Provides a fluent interface
+     * @return $this
      */
     public function setType($value)
     {
diff --git a/library/Zend/Gdata/Photos/UserQuery.php b/library/Zend/Gdata/Photos/UserQuery.php
index 02cf231a7c..7ce055e484 100755
--- a/library/Zend/Gdata/Photos/UserQuery.php
+++ b/library/Zend/Gdata/Photos/UserQuery.php
@@ -81,7 +81,7 @@ public function __construct()
      * 'api' or 'base'. Normally, 'api' will be desired. Default is 'api'.
      *
      * @param string $value
-     * @return Zend_Gdata_Photos_UserQuery Provides a fluent interface
+     * @return $this
      */
     public function setProjection($value)
     {
@@ -105,7 +105,7 @@ public function getProjection()
      * 'feed' or 'entry'. Normally, 'feed' will be desired. Default is 'feed'.
      *
      * @param string $value
-     * @return Zend_Gdata_Photos_UserQuery Provides a fluent interface
+     * @return $this
      */
     public function setType($value)
     {
diff --git a/library/Zend/Gdata/Query.php b/library/Zend/Gdata/Query.php
index 337f4e8d07..3f7fff7273 100644
--- a/library/Zend/Gdata/Query.php
+++ b/library/Zend/Gdata/Query.php
@@ -124,7 +124,7 @@ public function getQueryUrl()
     /**
      * @param string $name
      * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setParam($name, $value)
     {
@@ -142,7 +142,7 @@ public function getParam($name)
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setAlt($value)
     {
@@ -156,7 +156,7 @@ public function setAlt($value)
 
     /**
      * @param int $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setMaxResults($value)
     {
@@ -170,7 +170,7 @@ public function setMaxResults($value)
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setQuery($value)
     {
@@ -184,7 +184,7 @@ public function setQuery($value)
 
     /**
      * @param int $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setStartIndex($value)
     {
@@ -198,7 +198,7 @@ public function setStartIndex($value)
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setUpdatedMax($value)
     {
@@ -212,7 +212,7 @@ public function setUpdatedMax($value)
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setUpdatedMin($value)
     {
@@ -226,7 +226,7 @@ public function setUpdatedMin($value)
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setPublishedMax($value)
     {
@@ -240,7 +240,7 @@ public function setPublishedMax($value)
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setPublishedMin($value)
     {
@@ -254,7 +254,7 @@ public function setPublishedMin($value)
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setAuthor($value)
     {
@@ -376,7 +376,7 @@ public function getAuthor()
 
     /**
      * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
+     * @return $this
      */
     public function setCategory($value)
     {
diff --git a/library/Zend/Gdata/Spreadsheets/CellQuery.php b/library/Zend/Gdata/Spreadsheets/CellQuery.php
index a94ffb2235..ffd86db14a 100644
--- a/library/Zend/Gdata/Spreadsheets/CellQuery.php
+++ b/library/Zend/Gdata/Spreadsheets/CellQuery.php
@@ -68,7 +68,7 @@ public function __construct($url = null)
      * Sets the spreadsheet key for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setSpreadsheetKey($value)
     {
@@ -90,7 +90,7 @@ public function getSpreadsheetKey()
      * Sets the worksheet id for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setWorksheetId($value)
     {
@@ -112,7 +112,7 @@ public function getWorksheetId()
      * Sets the cell id for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setCellId($value)
     {
@@ -134,7 +134,7 @@ public function getCellId()
      * Sets the projection for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setProjection($value)
     {
@@ -145,7 +145,7 @@ public function setProjection($value)
     /**
      * Sets the visibility for this query.
      *
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setVisibility($value)
     {
@@ -177,7 +177,7 @@ public function getVisibility()
      * Sets the min-row attribute for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setMinRow($value)
     {
@@ -207,7 +207,7 @@ public function getMinRow()
      * Sets the max-row attribute for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setMaxRow($value)
     {
@@ -237,7 +237,7 @@ public function getMaxRow()
      * Sets the min-col attribute for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setMinCol($value)
     {
@@ -267,7 +267,7 @@ public function getMinCol()
      * Sets the max-col attribute for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setMaxCol($value)
     {
@@ -297,7 +297,7 @@ public function getMaxCol()
      * Sets the range attribute for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setRange($value)
     {
@@ -327,7 +327,7 @@ public function getRange()
      * Sets the return-empty attribute for this query.
      *
      * @param mixed $value String or bool value for whether to return empty cells
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
+     * @return $this
      */
     public function setReturnEmpty($value)
     {
diff --git a/library/Zend/Gdata/Spreadsheets/DocumentQuery.php b/library/Zend/Gdata/Spreadsheets/DocumentQuery.php
index 685220e767..f1ea6447ce 100644
--- a/library/Zend/Gdata/Spreadsheets/DocumentQuery.php
+++ b/library/Zend/Gdata/Spreadsheets/DocumentQuery.php
@@ -66,7 +66,7 @@ public function __construct()
      * Sets the spreadsheet key for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
+     * @return $this
      */
     public function setSpreadsheetKey($value)
     {
@@ -88,7 +88,7 @@ public function getSpreadsheetKey()
      * Sets the worksheet id for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
+     * @return $this
      */
     public function setWorksheetId($value)
     {
@@ -109,7 +109,7 @@ public function getWorksheetId()
     /**
      * Sets the document type for this query.
      * @param string $value spreadsheets or worksheets
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
+     * @return $this
      */
     public function setDocumentType($value)
     {
@@ -129,7 +129,7 @@ public function getDocumentType()
     /**
      * Sets the projection for this query.
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
+     * @return $this
      */
     public function setProjection($value)
     {
@@ -139,7 +139,7 @@ public function setProjection($value)
 
     /**
      * Sets the visibility for this query.
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
+     * @return $this
      */
     public function setVisibility($value)
     {
@@ -168,7 +168,7 @@ public function getVisibility()
     /**
      * Sets the title attribute for this query.
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
+     * @return $this
      */
     public function setTitle($value)
     {
@@ -183,7 +183,7 @@ public function setTitle($value)
     /**
      * Sets the title-exact attribute for this query.
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
+     * @return $this
      */
     public function setTitleExact($value)
     {
diff --git a/library/Zend/Gdata/Spreadsheets/ListEntry.php b/library/Zend/Gdata/Spreadsheets/ListEntry.php
index d05a1371d6..ce2684c01c 100644
--- a/library/Zend/Gdata/Spreadsheets/ListEntry.php
+++ b/library/Zend/Gdata/Spreadsheets/ListEntry.php
@@ -132,7 +132,7 @@ public function getCustomByName($name = null)
      * custom row elements were previously stored, they will be overwritten.
      * @param array $custom The custom row elements to be contained in this
      *          list entry.
-     * @return Zend_Gdata_Spreadsheets_ListEntry Provides a fluent interface.
+     * @return $this
      */
     public function setCustom($custom)
     {
@@ -147,7 +147,7 @@ public function setCustom($custom)
      * Add an individual custom row element to this list entry.
      * @param Zend_Gdata_Spreadsheets_Extension_Custom $custom The custom
      *             element to be added.
-     * @return Zend_Gdata_Spreadsheets_ListEntry Provides a fluent interface.
+     * @return $this
      */
     public function addCustom($custom)
     {
@@ -160,7 +160,7 @@ public function addCustom($custom)
      * Remove an individual row element from this list entry by index. This
      * will cause the array to be re-indexed.
      * @param int $index The index of the custom element to be deleted.
-     * @return Zend_Gdata_Spreadsheets_ListEntry Provides a fluent interface.
+     * @return $this
      * @throws Zend_Gdata_App_InvalidArgumentException
      */
     public function removeCustom($index)
@@ -185,7 +185,7 @@ public function removeCustom($index)
     /**
      * Remove an individual row element from this list entry by name.
      * @param string $name The name of the custom element to be deleted.
-     * @return Zend_Gdata_Spreadsheets_ListEntry Provides a fluent interface.
+     * @return $this
      * @throws Zend_Gdata_App_InvalidArgumentException
      */
     public function removeCustomByName($name)
diff --git a/library/Zend/Gdata/Spreadsheets/ListQuery.php b/library/Zend/Gdata/Spreadsheets/ListQuery.php
index 3f7c8a4d41..9ac2ccf14c 100644
--- a/library/Zend/Gdata/Spreadsheets/ListQuery.php
+++ b/library/Zend/Gdata/Spreadsheets/ListQuery.php
@@ -66,7 +66,7 @@ public function __construct()
      * Sets the spreadsheet key for the query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
+     * @return $this
      */
     public function setSpreadsheetKey($value)
     {
@@ -88,7 +88,7 @@ public function getSpreadsheetKey()
      * Sets the worksheet id for the query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
+     * @return $this
      */
     public function setWorksheetId($value)
     {
@@ -109,7 +109,7 @@ public function getWorksheetId()
      * Sets the row id for the query.
      *
      * @param string $value row id
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
+     * @return $this
      */
     public function setRowId($value)
     {
@@ -130,7 +130,7 @@ public function getRowId()
     /**
      * Sets the projection for the query.
      * @param string $value Projection
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
+     * @return $this
      */
     public function setProjection($value)
     {
@@ -141,7 +141,7 @@ public function setProjection($value)
     /**
      * Sets the visibility for this query.
      * @param string $value visibility
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
+     * @return $this
      */
     public function setVisibility($value)
     {
@@ -171,7 +171,7 @@ public function getVisibility()
      * Sets the spreadsheet key for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
+     * @return $this
      */
     public function setSpreadsheetQuery($value)
     {
@@ -200,7 +200,7 @@ public function getSpreadsheetQuery()
      * Sets the orderby attribute for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
+     * @return $this
      */
     public function setOrderBy($value)
     {
@@ -229,7 +229,7 @@ public function getOrderBy()
      * Sets the reverse attribute for this query.
      *
      * @param string $value
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
+     * @return $this
      */
     public function setReverse($value)
     {
diff --git a/library/Zend/Ldap.php b/library/Zend/Ldap.php
index 439234c6ab..acbc6557e3 100644
--- a/library/Zend/Ldap.php
+++ b/library/Zend/Ldap.php
@@ -257,7 +257,7 @@ public function getBoundUser()
      *  tryUsernameSplit
      *
      * @param  array|Zend_Config $options Options used in connecting, binding, etc.
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function setOptions($options)
@@ -703,7 +703,7 @@ protected function _getAccount($acctname, array $attrs = null)
     }
 
     /**
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      */
     public function disconnect()
     {
@@ -726,7 +726,7 @@ public function disconnect()
      * @param  int     $port        The port number of the LDAP server to connect to
      * @param  boolean $useSsl      Use SSL
      * @param  boolean $useStartTls Use STARTTLS
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function connect($host = null, $port = null, $useSsl = null, $useStartTls = null)
@@ -817,7 +817,7 @@ public function connect($host = null, $port = null, $useSsl = null, $useStartTls
     /**
      * @param  string $username The username for authenticating the bind
      * @param  string $password The password for authenticating the bind
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function bind($username = null, $password = null)
@@ -1217,7 +1217,7 @@ public static function prepareLdapEntryArray(array &$entry)
      *
      * @param  string|Zend_Ldap_Dn $dn
      * @param  array               $entry
-     * @return Zend_Ldap                  Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function add($dn, array $entry)
@@ -1265,7 +1265,7 @@ public function add($dn, array $entry)
      *
      * @param  string|Zend_Ldap_Dn $dn
      * @param  array               $entry
-     * @return Zend_Ldap                  Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function update($dn, array $entry)
@@ -1312,7 +1312,7 @@ public function update($dn, array $entry)
      *
      * @param  string|Zend_Ldap_Dn $dn
      * @param  array               $entry
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function save($dn, array $entry)
@@ -1330,7 +1330,7 @@ public function save($dn, array $entry)
      *
      * @param  string|Zend_Ldap_Dn $dn
      * @param  boolean             $recursively
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function delete($dn, $recursively = false)
@@ -1397,7 +1397,7 @@ protected function _getChildrenDns($parentDn)
      * @param  string|Zend_Ldap_Dn $to
      * @param  boolean             $recursively
      * @param  boolean             $alwaysEmulate
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function moveToSubtree($from, $to, $recursively = false, $alwaysEmulate = false)
@@ -1428,7 +1428,7 @@ public function moveToSubtree($from, $to, $recursively = false, $alwaysEmulate =
      * @param  string|Zend_Ldap_Dn $to
      * @param  boolean             $recursively
      * @param  boolean             $alwaysEmulate
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function move($from, $to, $recursively = false, $alwaysEmulate = false)
@@ -1445,7 +1445,7 @@ public function move($from, $to, $recursively = false, $alwaysEmulate = false)
      * @param  string|Zend_Ldap_Dn $to
      * @param  boolean             $recursively
      * @param  boolean             $alwaysEmulate
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function rename($from, $to, $recursively = false, $alwaysEmulate = false)
@@ -1493,7 +1493,7 @@ public function rename($from, $to, $recursively = false, $alwaysEmulate = false)
      * @param  string|Zend_Ldap_Dn $from
      * @param  string|Zend_Ldap_Dn $to
      * @param  boolean             $recursively
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function copyToSubtree($from, $to, $recursively = false)
@@ -1521,7 +1521,7 @@ public function copyToSubtree($from, $to, $recursively = false)
      * @param  string|Zend_Ldap_Dn $from
      * @param  string|Zend_Ldap_Dn $to
      * @param  boolean             $recursively
-     * @return Zend_Ldap Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function copy($from, $to, $recursively = false)
diff --git a/library/Zend/Ldap/Collection/Iterator/Default.php b/library/Zend/Ldap/Collection/Iterator/Default.php
index 9c32f485f6..e59802141d 100644
--- a/library/Zend/Ldap/Collection/Iterator/Default.php
+++ b/library/Zend/Ldap/Collection/Iterator/Default.php
@@ -132,7 +132,7 @@ public function getLdap()
      * argument and returning the new attribute's name.
      *
      * @param  integer|callback $attributeNameTreatment
-     * @return Zend_Ldap_Collection_Iterator_Default Provides a fluent interface
+     * @return $this
      */
     public function setAttributeNameTreatment($attributeNameTreatment)
     {
diff --git a/library/Zend/Ldap/Dn.php b/library/Zend/Ldap/Dn.php
index 62650e1a06..78f2b46bdc 100644
--- a/library/Zend/Ldap/Dn.php
+++ b/library/Zend/Ldap/Dn.php
@@ -198,7 +198,7 @@ public function get($index, $length = 1, $caseFold = null)
      *
      * @param  int   $index
      * @param  array $value
-     * @return Zend_Ldap_Dn Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception if index is illegal
      */
     public function set($index, array $value)
@@ -214,7 +214,7 @@ public function set($index, array $value)
      *
      * @param  int $index
      * @param  int $length
-     * @return Zend_Ldap_Dn Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception if index is illegal
      */
     public function remove($index, $length = 1)
@@ -232,7 +232,7 @@ public function remove($index, $length = 1)
      * Append a DN part
      *
      * @param  array $value
-     * @return Zend_Ldap_Dn Provides a fluent interface
+     * @return $this
      */
     public function append(array $value)
     {
@@ -245,7 +245,7 @@ public function append(array $value)
      * Prepend a DN part
      *
      * @param  array $value
-     * @return Zend_Ldap_Dn Provides a fluent interface
+     * @return $this
      */
     public function prepend(array $value)
     {
@@ -259,7 +259,7 @@ public function prepend(array $value)
      *
      * @param  int   $index
      * @param  array $value
-     * @return Zend_Ldap_Dn Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception if index is illegal
      */
     public function insert($index, array $value)
diff --git a/library/Zend/Ldap/Node.php b/library/Zend/Ldap/Node.php
index 3bc62eed1c..b729b1d0ae 100644
--- a/library/Zend/Ldap/Node.php
+++ b/library/Zend/Ldap/Node.php
@@ -154,7 +154,7 @@ public function getLdap()
      *
      * @uses   Zend_Ldap_Dn::isChildOf()
      * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function attachLdap(Zend_Ldap $ldap)
@@ -185,7 +185,7 @@ public function attachLdap(Zend_Ldap $ldap)
      *
      * This is an offline method.
      *
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      */
     public function detachLdap()
     {
@@ -391,7 +391,7 @@ public function willBeDeleted()
      *
      * Node will be deleted on calling update() if $delete is true.
      *
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      */
     public function delete()
     {
@@ -419,7 +419,7 @@ public function willBeMoved()
      * Sends all pending changes to the LDAP server
      *
      * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function update(Zend_Ldap $ldap = null)
@@ -509,7 +509,7 @@ public function getCurrentDn()
      *
      * @param  Zend_Ldap_Dn|string|array $newDn
      * @throws Zend_Ldap_Exception
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      */
     public function setDn($newDn)
     {
@@ -529,7 +529,7 @@ public function setDn($newDn)
      *
      * @param  Zend_Ldap_Dn|string|array $newDn
      * @throws Zend_Ldap_Exception
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      */
     public function move($newDn)
     {
@@ -543,7 +543,7 @@ public function move($newDn)
      *
      * @param  Zend_Ldap_Dn|string|array $newDn
      * @throws Zend_Ldap_Exception
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      */
     public function rename($newDn)
     {
@@ -556,7 +556,7 @@ public function rename($newDn)
      * This is an offline method.
      *
      * @param  array|string $value
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function setObjectClass($value)
@@ -571,7 +571,7 @@ public function setObjectClass($value)
      * This is an offline method.
      *
      * @param  array|string $value
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function appendObjectClass($value)
@@ -655,7 +655,7 @@ public function getChanges()
      *
      * @param  string $name
      * @param  mixed  $value
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function setAttribute($name, $value)
@@ -671,7 +671,7 @@ public function setAttribute($name, $value)
      *
      * @param  string $name
      * @param  mixed  $value
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function appendToAttribute($name, $value)
@@ -702,7 +702,7 @@ protected function _setAttribute($name, $value, $append)
      * @param  string        $name
      * @param  integer|array $value
      * @param  boolean       $utc
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function setDateTimeAttribute($name, $value, $utc = false)
@@ -719,7 +719,7 @@ public function setDateTimeAttribute($name, $value, $utc = false)
      * @param  string        $name
      * @param  integer|array $value
      * @param  boolean       $utc
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function appendToDateTimeAttribute($name, $value, $utc = false)
@@ -749,7 +749,7 @@ protected function _setDateTimeAttribute($name, $value, $utc, $append)
      * @param  string $password
      * @param  string $hashType
      * @param  string $attribName
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function setPasswordAttribute($password, $hashType = Zend_Ldap_Attribute::PASSWORD_HASH_MD5,
@@ -768,7 +768,7 @@ public function setPasswordAttribute($password, $hashType = Zend_Ldap_Attribute:
      * This is an offline method.
      *
      * @param  string $name
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function deleteAttribute($name)
@@ -926,7 +926,7 @@ public function exists(Zend_Ldap $ldap = null)
      * This is an online method.
      *
      * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function reload(Zend_Ldap $ldap = null)
diff --git a/library/Zend/Ldap/Node/Abstract.php b/library/Zend/Ldap/Node/Abstract.php
index cfc94bd156..a24096bc64 100644
--- a/library/Zend/Ldap/Node/Abstract.php
+++ b/library/Zend/Ldap/Node/Abstract.php
@@ -95,7 +95,7 @@ protected function _loadData(array $data, $fromDataSource)
      * This is an online method.
      *
      * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node_Abstract Provides a fluent interface
+     * @return $this
      * @throws Zend_Ldap_Exception
      */
     public function reload(Zend_Ldap $ldap = null)
diff --git a/library/Zend/Ldap/Node/Schema.php b/library/Zend/Ldap/Node/Schema.php
index 93d4dba8d4..4b7f711ef3 100644
--- a/library/Zend/Ldap/Node/Schema.php
+++ b/library/Zend/Ldap/Node/Schema.php
@@ -91,7 +91,7 @@ protected function __construct(Zend_Ldap_Dn $dn, array $data, Zend_Ldap $ldap)
      *
      * @param  Zend_Ldap_Dn $dn
      * @param  Zend_Ldap    $ldap
-     * @return Zend_Ldap_Node_Schema Provides a fluent interface
+     * @return $this
      */
     protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
     {
diff --git a/library/Zend/Ldap/Node/Schema/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
index 947c9c1208..3a06e4452d 100644
--- a/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
+++ b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
@@ -63,7 +63,7 @@ class Zend_Ldap_Node_Schema_ActiveDirectory extends Zend_Ldap_Node_Schema
      *
      * @param  Zend_Ldap_Dn $dn
      * @param  Zend_Ldap    $ldap
-     * @return Zend_Ldap_Node_Schema Provides a fluent interface
+     * @return $this
      */
     protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
     {
diff --git a/library/Zend/Ldap/Node/Schema/Item.php b/library/Zend/Ldap/Node/Schema/Item.php
index 59cf037d45..ea0e870350 100644
--- a/library/Zend/Ldap/Node/Schema/Item.php
+++ b/library/Zend/Ldap/Node/Schema/Item.php
@@ -53,7 +53,7 @@ public function __construct(array $data)
      * Sets the data
      *
      * @param  array $data
-     * @return Zend_Ldap_Node_Schema_Item Provides a fluent interface
+     * @return $this
      */
     public function setData(array $data)
     {
diff --git a/library/Zend/Ldap/Node/Schema/OpenLdap.php b/library/Zend/Ldap/Node/Schema/OpenLdap.php
index 29ec4de874..80417487b8 100644
--- a/library/Zend/Ldap/Node/Schema/OpenLdap.php
+++ b/library/Zend/Ldap/Node/Schema/OpenLdap.php
@@ -81,7 +81,7 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
      *
      * @param  Zend_Ldap_Dn $dn
      * @param  Zend_Ldap    $ldap
-     * @return Zend_Ldap_Node_Schema Provides a fluent interface
+     * @return $this
      */
     protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
     {
diff --git a/library/Zend/Mail.php b/library/Zend/Mail.php
index f8efcdc3e1..c3c25409a5 100644
--- a/library/Zend/Mail.php
+++ b/library/Zend/Mail.php
@@ -233,7 +233,7 @@ public function getCharset()
      * Should only be used for manually setting multipart content types.
      *
      * @param  string $type Content type
-     * @return Zend_Mail Implements fluent interface
+     * @return $this
      * @throws Zend_Mail_Exception for types not supported by Zend_Mime
      */
     public function setType($type)
@@ -271,7 +271,7 @@ public function getType()
      * If not set, Zend_Mime will generate one.
      *
      * @param  string    $boundary
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function setMimeBoundary($boundary)
     {
@@ -330,7 +330,7 @@ public function setEncodingOfHeaders($encoding)
      *
      * @param  string $encoding Zend_Mime::ENCODING_QUOTEDPRINTABLE or
      *                          Zend_Mime::ENCODING_BASE64
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      * @throws Zend_Mail_Exception
      */
     public function setHeaderEncoding($encoding)
@@ -357,7 +357,7 @@ public function setHeaderEncoding($encoding)
      * @param  string $txt
      * @param  string $charset
      * @param  string $encoding
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
     */
     public function setBodyText($txt, $charset = null, $encoding = Zend_Mime::ENCODING_QUOTEDPRINTABLE)
     {
@@ -399,7 +399,7 @@ public function getBodyText($textOnly = false)
      * @param  string    $html
      * @param  string    $charset
      * @param  string    $encoding
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function setBodyHtml($html, $charset = null, $encoding = Zend_Mime::ENCODING_QUOTEDPRINTABLE)
     {
@@ -438,7 +438,7 @@ public function getBodyHtml($htmlOnly = false)
      * Adds an existing attachment to the mail message
      *
      * @param  Zend_Mime_Part $attachment
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function addAttachment(Zend_Mime_Part $attachment)
     {
@@ -569,7 +569,7 @@ protected function _addRecipientAndHeader($headerName, $email, $name)
      *
      * @param  string|array $email
      * @param  string $name
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function addTo($email, $name='')
     {
@@ -591,7 +591,7 @@ public function addTo($email, $name='')
      *
      * @param  string|array    $email
      * @param  string    $name
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function addCc($email, $name='')
     {
@@ -610,7 +610,7 @@ public function addCc($email, $name='')
      * Adds Bcc recipient, $email can be an array, or a single string address
      *
      * @param  string|array    $email
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function addBcc($email)
     {
@@ -639,7 +639,7 @@ public function getRecipients()
      * Clear header from the message
      *
      * @param string $headerName
-     * @return Zend_Mail Provides fluent inter
+     * @return $this
      */
     public function clearHeader($headerName)
     {
@@ -652,7 +652,7 @@ public function clearHeader($headerName)
     /**
      * Clears list of recipient email addresses
      *
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function clearRecipients()
     {
@@ -671,7 +671,7 @@ public function clearRecipients()
      *
      * @param  string    $email
      * @param  string    $name
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      * @throws Zend_Mail_Exception if called subsequent times
      */
     public function setFrom($email, $name = null)
@@ -741,7 +741,7 @@ public function getReplyTo()
     /**
      * Clears the sender from the mail
      *
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function clearFrom()
     {
@@ -754,7 +754,7 @@ public function clearFrom()
      /**
       * Clears the current Reply-To address from the message
       *
-      * @return Zend_Mail Provides fluent interface
+      * @return $this
       */
     public function clearReplyTo()
     {
@@ -799,7 +799,7 @@ public static function clearDefaultFrom()
     /**
      * Sets From-name and -email based on the defaults
      *
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      * @throws Zend_Mail_Exception
      */
     public function setFromToDefaultFrom() {
@@ -850,7 +850,7 @@ public static function clearDefaultReplyTo()
     /**
      * Sets ReplyTo-name and -email based on the defaults
      *
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      * @throws Zend_Mail_Exception
      */
     public function setReplyToFromDefault() {
@@ -870,7 +870,7 @@ public function setReplyToFromDefault() {
      * Sets the Return-Path header of the message
      *
      * @param  string    $email
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      * @throws Zend_Mail_Exception if set multiple times
      */
     public function setReturnPath($email)
@@ -908,7 +908,7 @@ public function getReturnPath()
     /**
      * Clears the current Return-Path address from the message
      *
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function clearReturnPath()
     {
@@ -922,7 +922,7 @@ public function clearReturnPath()
      * Sets the subject of the message
      *
      * @param   string    $subject
-     * @return  Zend_Mail Provides fluent interface
+     * @return $this
      * @throws  Zend_Mail_Exception
      */
     public function setSubject($subject)
@@ -954,7 +954,7 @@ public function getSubject()
     /**
      * Clears the encoded subject from the message
      *
-     * @return  Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function clearSubject()
     {
@@ -968,7 +968,7 @@ public function clearSubject()
      * Sets Date-header
      *
      * @param  int|string|Zend_Date $date
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      * @throws Zend_Mail_Exception if called subsequent times or wrong date
      *                             format.
      */
@@ -1025,7 +1025,7 @@ public function getDate()
     /**
      * Clears the formatted date from the message
      *
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function clearDate()
     {
@@ -1043,7 +1043,7 @@ public function clearDate()
      * false :No set
      * null  :No set
      * string:Sets given string (Angle brackets is not necessary)
-     * @return  Zend_Mail Provides fluent interface
+     * @return $this
      * @throws  Zend_Mail_Exception
      */
     public function setMessageId($id = true)
@@ -1083,7 +1083,7 @@ public function getMessageId()
     /**
      * Clears the Message-ID from the message
      *
-     * @return Zend_Mail Provides fluent interface
+     * @return $this
      */
     public function clearMessageId()
     {
@@ -1133,7 +1133,7 @@ public function createMessageId() {
      * @param  string              $name
      * @param  string              $value
      * @param  boolean             $append
-     * @return Zend_Mail           Provides fluent interface
+     * @return $this
      * @throws Zend_Mail_Exception on attempts to create standard headers
      */
     public function addHeader($name, $value, $append = false)
@@ -1173,7 +1173,7 @@ public function getHeaders()
      * default transport had been set.
      *
      * @param  Zend_Mail_Transport_Abstract $transport
-     * @return Zend_Mail                    Provides fluent interface
+     * @return $this
      */
     public function send($transport = null)
     {
diff --git a/library/Zend/Navigation/Container.php b/library/Zend/Navigation/Container.php
index cb106dbbaa..f8e3bda94b 100644
--- a/library/Zend/Navigation/Container.php
+++ b/library/Zend/Navigation/Container.php
@@ -100,8 +100,7 @@ public function notifyOrderUpdated()
      * 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
+     * @return $this
      * @throws Zend_Navigation_Exception                     if page is invalid
      */
     public function addPage($page)
@@ -144,7 +143,7 @@ public function addPage($page)
      * Adds several pages at once
      *
      * @param  Zend_Navigation_Page[]|Zend_Config|Zend_Navigation_Container  $pages  pages to add
-     * @return Zend_Navigation_Container                    fluent interface,
+     * @return $this
      *                                                      returns self
      * @throws Zend_Navigation_Exception                    if $pages is not
      *                                                      array, Zend_Config or
@@ -179,7 +178,7 @@ public function addPages($pages)
      * 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
+     * @return $this
      */
     public function setPages(array $pages)
     {
@@ -241,7 +240,7 @@ public function removePage($page, $recursive = false)
     /**
      * Removes all pages in container
      *
-     * @return Zend_Navigation_Container  fluent interface, returns self
+     * @return $this
      */
     public function removePages()
     {
diff --git a/library/Zend/Navigation/Page.php b/library/Zend/Navigation/Page.php
index f3741dfc4b..6faf9caa45 100644
--- a/library/Zend/Navigation/Page.php
+++ b/library/Zend/Navigation/Page.php
@@ -308,7 +308,7 @@ 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
+     * @return $this
      * @throws Zend_Navigation_Exception  if invalid options are given
      */
     public function setConfig(Zend_Config $config)
@@ -325,7 +325,7 @@ public function setConfig(Zend_Config $config)
      * the method setResetParams().
      *
      * @param  array $options             associative array of options to set
-     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if invalid options are given
      */
     public function setOptions(array $options)
@@ -343,7 +343,7 @@ public function setOptions(array $options)
      * Sets page label
      *
      * @param  string $label              new page label
-     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if empty/no string is given
      */
     public function setLabel($label)
@@ -372,7 +372,7 @@ public function getLabel()
      * Sets a fragment identifier
      *
      * @param  string $fragment   new fragment identifier
-     * @return Zend_Navigation_Page         fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception    if empty/no string is given
      */
     public function setFragment($fragment)
@@ -402,7 +402,7 @@ public function getFragment()
      *
      * @param  string|null $id            [optional] id to set. Default is null,
      *                                    which sets no id.
-     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if not given string or null
      */
     public function setId($id = null)
@@ -433,7 +433,7 @@ public function getId()
      *
      * @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
+     * @return $this
      * @throws Zend_Navigation_Exception  if not given string or null
      */
     public function setClass($class = null)
@@ -463,7 +463,7 @@ public function getClass()
      *
      * @param  string $title              [optional] page title. Default is
      *                                    null, which sets no title.
-     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if not given string or null
      */
     public function setTitle($title = null)
@@ -493,7 +493,7 @@ public function getTitle()
      *
      * @param  string|null $target        [optional] target to set. Default is
      *                                    null, which sets no target.
-     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if target is not string or null
      */
     public function setTarget($target = null)
@@ -523,7 +523,7 @@ public function getTarget()
      *
      * @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
+     * @return $this
      * @throws Zend_Navigation_Exception  if access key is not string or null or
      *                                    if the string length not equal to one
      */
@@ -562,7 +562,7 @@ public function getAccesskey()
      *
      * @param  array|Zend_Config $relations  [optional] an associative array of
      *                                       forward links to other pages
-     * @return Zend_Navigation_Page          fluent interface, returns self
+     * @return $this
      */
     public function setRel($relations = null)
     {
@@ -625,7 +625,7 @@ public function getRel($relation = null)
      *
      * @param  array|Zend_Config $relations  [optional] an associative array of
      *                                       reverse links to other pages
-     * @return Zend_Navigation_Page          fluent interface, returns self
+     * @return $this
      */
     public function setRev($relations = null)
     {
@@ -683,7 +683,7 @@ public function getRev($relation = null)
      *
      * @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
+     * @return $this
      * @throws Zend_Navigation_Exception    if name is not string or value is
      *                                      not null or a string
      */
@@ -739,7 +739,7 @@ public function getCustomHtmlAttrib($name)
      * Sets multiple custom HTML attributes at once
      *
      * @param array $attribs        an associative array of html attributes
-     * @return Zend_Navigation_Page fluent interface, returns self
+     * @return $this
      */
     public function setCustomHtmlAttribs(array $attribs)
     {
@@ -763,7 +763,7 @@ public function getCustomHtmlAttribs()
      * Removes a custom HTML attribute from the page
      *
      * @param  string $name          name of the custom HTML attribute
-     * @return void  fluent interface, returns self
+     * @return $this
      */
     public function removeCustomHtmlAttrib($name)
     {
@@ -782,7 +782,7 @@ public function removeCustomHtmlAttrib($name)
     /**
      * Clear all custom HTML attributes
      *
-     * @return Zend_Navigation_Page fluent interface, returns self
+     * @return $this
      */
     public function clearCustomHtmlAttribs()
     {
@@ -797,7 +797,7 @@ public function clearCustomHtmlAttribs()
      * @param  int $order                 [optional] page order in container.
      *                                    Default is null, which sets no
      *                                    specific order.
-     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if order is not integer or null
      */
     public function setOrder($order = null)
@@ -846,8 +846,7 @@ public function getOrder()
      *                                                       resource.
      * @throws Zend_Navigation_Exception                     if $resource if
      *                                                       invalid
-     * @return Zend_Navigation_Page                          fluent interface,
-     *                                                       returns self
+     * @return $this
      */
     public function setResource($resource = null)
     {
@@ -880,7 +879,7 @@ public function getResource()
      * @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
+     * @return $this
      */
     public function setPrivilege($privilege = null)
     {
@@ -903,7 +902,7 @@ public function getPrivilege()
      *
      * @param  bool $active          [optional] whether page should be
      *                               considered active or not. Default is true.
-     * @return Zend_Navigation_Page  fluent interface, returns self
+     * @return $this
      */
     public function setActive($active = true)
     {
@@ -951,7 +950,7 @@ public function getActive($recursive = false)
      *
      * @param  bool $visible         [optional] whether page should be
      *                               considered visible or not. Default is true.
-     * @return Zend_Navigation_Page  fluent interface, returns self
+     * @return $this
      */
     public function setVisible($visible = true)
     {
@@ -1003,7 +1002,7 @@ public function getVisible($recursive = false)
      * @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
+     * @return $this
      */
     public function setParent(Zend_Navigation_Container $parent = null)
     {
@@ -1052,7 +1051,7 @@ public function getParent()
      *
      * @param  string $property           property name
      * @param  mixed  $value              value to set
-     * @return Zend_Navigation_Page       fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if property name is invalid
      */
     public function set($property, $value)
@@ -1202,7 +1201,7 @@ public function __toString()
      * @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
+     * @return $this
      */
     public function addRel($relation, $value)
     {
@@ -1218,7 +1217,7 @@ public function addRel($relation, $value)
      * @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
+     * @return $this
      */
     public function addRev($relation, $value)
     {
@@ -1232,7 +1231,7 @@ public function addRev($relation, $value)
      * Removes a forward relation from the page
      *
      * @param  string $relation      name of relation to remove
-     * @return Zend_Navigation_Page  fluent interface, returns self
+     * @return $this
      */
     public function removeRel($relation)
     {
@@ -1247,7 +1246,7 @@ public function removeRel($relation)
      * Removes a reverse relation from the page
      *
      * @param  string $relation      name of relation to remove
-     * @return Zend_Navigation_Page  fluent interface, returns self
+     * @return $this
      */
     public function removeRev($relation)
     {
diff --git a/library/Zend/Navigation/Page/Mvc.php b/library/Zend/Navigation/Page/Mvc.php
index ee330fb6ae..476a16454d 100644
--- a/library/Zend/Navigation/Page/Mvc.php
+++ b/library/Zend/Navigation/Page/Mvc.php
@@ -285,7 +285,7 @@ public function getHref()
      * @see getHref()
      *
      * @param  string $action             action name
-     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if invalid $action is given
      */
     public function setAction($action)
@@ -321,7 +321,7 @@ public function getAction()
      * @see getHref()
      *
      * @param  string|null $controller    controller name
-     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if invalid controller name is given
      */
     public function setController($controller)
@@ -357,7 +357,7 @@ public function getController()
      * @see getHref()
      *
      * @param  string|null $module        module name
-     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if invalid module name is given
      */
     public function setModule($module)
@@ -398,7 +398,7 @@ public function getModule()
      * @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
+     * @return $this
      */
     public function setParams(array $params = null)
     {
@@ -420,7 +420,7 @@ public function setParams(array $params = null)
      *
      * @param  string $name                 parameter name
      * @param  mixed $value                 parameter value
-     * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+     * @return $this
      */
     public function setParam($name, $value)
     {
@@ -440,7 +440,7 @@ public function setParam($name, $value)
      * @see getHref()
      *
      * @param  array $params                paramters as array ('name' => 'value')
-     * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+     * @return $this
      */
     public function addParams(array $params)
     {
@@ -476,7 +476,7 @@ public function removeParam($name)
      *
      * @see getHref()
      *
-     * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+     * @return $this
      */
     public function clearParams()
     {
@@ -523,7 +523,7 @@ public function getParam($name)
      * @see getHref()
      *
      * @param  string $route              route name to use when assembling URL
-     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if invalid $route is given
      */
     public function setRoute($route)
@@ -560,7 +560,7 @@ public function getRoute()
      *
      * @param  bool $resetParams         whether params should be reset when
      *                                   assembling URL
-     * @return Zend_Navigation_Page_Mvc  fluent interface, returns self
+     * @return $this
      */
     public function setResetParams($resetParams)
     {
@@ -588,7 +588,7 @@ public function getResetParams()
      * @see getHref()
      *
      * @param $encodeUrl
-     * @return Zend_Navigation_Page_Mvc fluent interface, returns self
+     * @return $this
      */
     public function setEncodeUrl($encodeUrl)
     {
@@ -617,7 +617,7 @@ public function getEncodeUrl()
      *
      * @param  string|null $scheme        scheme
      * @throws Zend_Navigation_Exception
-     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+     * @return $this
      */
     public function setScheme($scheme)
     {
diff --git a/library/Zend/Navigation/Page/Uri.php b/library/Zend/Navigation/Page/Uri.php
index 45ec503911..94b279e759 100644
--- a/library/Zend/Navigation/Page/Uri.php
+++ b/library/Zend/Navigation/Page/Uri.php
@@ -47,7 +47,7 @@ class Zend_Navigation_Page_Uri extends Zend_Navigation_Page
      * Sets page URI
      *
      * @param  string $uri                page URI, must a string or null
-     * @return Zend_Navigation_Page_Uri   fluent interface, returns self
+     * @return $this
      * @throws Zend_Navigation_Exception  if $uri is invalid
      */
     public function setUri($uri)
diff --git a/library/Zend/Queue.php b/library/Zend/Queue.php
index c88570b9dc..28e55ea633 100644
--- a/library/Zend/Queue.php
+++ b/library/Zend/Queue.php
@@ -205,7 +205,7 @@ public function getOption($name)
      * Set the adapter for this queue
      *
      * @param  string|Zend_Queue_Adapter_AdapterInterface $adapter
-     * @return Zend_Queue Provides a fluent interface
+     * @return $this
      */
     public function setAdapter($adapter)
     {
@@ -266,7 +266,7 @@ public function getAdapter()
 
     /**
      * @param  string $className
-     * @return Zend_Queue Provides a fluent interface
+     * @return $this
      */
     public function setMessageClass($className)
     {
@@ -284,7 +284,7 @@ public function getMessageClass()
 
     /**
      * @param  string $className
-     * @return Zend_Queue Provides a fluent interface
+     * @return $this
      */
     public function setMessageSetClass($className)
     {
@@ -516,7 +516,7 @@ public function getQueues()
      * This is AN UNSUPPORTED FUNCTION
      *
      * @param  string           $name
-     * @return Zend_Queue|false Provides a fluent interface
+     * @return $this
      */
     protected function _setName($name)
     {
diff --git a/library/Zend/Queue/Message.php b/library/Zend/Queue/Message.php
index 7f8bcc6f95..8565345a78 100644
--- a/library/Zend/Queue/Message.php
+++ b/library/Zend/Queue/Message.php
@@ -217,7 +217,7 @@ public function toArray()
      * Sets all data in the row from an array.
      *
      * @param  array $data
-     * @return Zend_Queue_Message Provides a fluent interface
+     * @return $this
      */
     public function setFromArray(array $data)
     {
diff --git a/library/Zend/Rest/Route.php b/library/Zend/Rest/Route.php
index 3f1454bf26..ee646d47e1 100644
--- a/library/Zend/Rest/Route.php
+++ b/library/Zend/Rest/Route.php
@@ -92,7 +92,7 @@ public function __construct(Zend_Controller_Front $front,
     /**
      * Instantiates route based on passed Zend_Config structure
      *
-     * @return static
+     * @return $this
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Service/Amazon/Query.php b/library/Zend/Service/Amazon/Query.php
index 232675f80c..1aafa16722 100644
--- a/library/Zend/Service/Amazon/Query.php
+++ b/library/Zend/Service/Amazon/Query.php
@@ -57,7 +57,7 @@ class Zend_Service_Amazon_Query extends Zend_Service_Amazon
      * @param  string $method
      * @param  array  $args
      * @throws Zend_Service_Exception
-     * @return Zend_Service_Amazon_Query Provides a fluent interface
+     * @return $this
      */
     public function __call($method, $args)
     {
diff --git a/library/Zend/Service/Audioscrobbler.php b/library/Zend/Service/Audioscrobbler.php
index 09d8da50af..3625634a11 100644
--- a/library/Zend/Service/Audioscrobbler.php
+++ b/library/Zend/Service/Audioscrobbler.php
@@ -135,7 +135,7 @@ public function get($field)
      *
      * @param  string $field name of field to set
      * @param  string $value value to assign to the named field
-     * @return Zend_Service_Audioscrobbler Provides a fluent interface
+     * @return $this
      */
     public function set($field, $value)
     {
diff --git a/library/Zend/Service/Delicious.php b/library/Zend/Service/Delicious.php
index f8a110fd1c..0a36da4065 100644
--- a/library/Zend/Service/Delicious.php
+++ b/library/Zend/Service/Delicious.php
@@ -130,7 +130,7 @@ public function __construct($uname = null, $pass = null)
      *
      * @param  string $uname Client user name
      * @param  string $pass  Client password
-     * @return Zend_Service_Delicious Provides a fluent interface
+     * @return $this
      */
     public function setAuth($uname, $pass)
     {
@@ -182,7 +182,7 @@ public function getTags()
      *
      * @param  string $old Old tag name
      * @param  string $new New tag name
-     * @return Zend_Service_Delicious Provides a fluent interface
+     * @return $this
      */
     public function renameTag($old, $new)
     {
@@ -214,7 +214,7 @@ public function getBundles()
      *
      * @param  string $bundle Name of new bundle
      * @param  array  $tags   Array of tags
-     * @return Zend_Service_Delicious Provides a fluent interface
+     * @return $this
      */
     public function addBundle($bundle, array $tags)
     {
@@ -230,7 +230,7 @@ public function addBundle($bundle, array $tags)
      * Delete a bundle
      *
      * @param  string $bundle Name of bundle to be deleted
-     * @return Zend_Service_Delicious Provides a fluent interface
+     * @return $this
      */
     public function deleteBundle($bundle)
     {
@@ -245,7 +245,7 @@ public function deleteBundle($bundle)
      * Delete a post
      *
      * @param  string $url URL of post to be deleted
-     * @return Zend_Service_Delicious Provides a fluent interface
+     * @return $this
      */
     public function deletePost($url)
     {
diff --git a/library/Zend/Service/Ebay/Abstract.php b/library/Zend/Service/Ebay/Abstract.php
index 8b41a39b90..fa84d62737 100644
--- a/library/Zend/Service/Ebay/Abstract.php
+++ b/library/Zend/Service/Ebay/Abstract.php
@@ -55,7 +55,7 @@ public function __construct($options = null)
     /**
      * @param  string|Zend_Config|array $name
      * @param  mixed                    $value
-     * @return Zend_Service_Ebay_Abstract Provides a fluent interface
+     * @return $this
      */
     public function setOption($name, $value = null)
     {
@@ -96,7 +96,7 @@ public function hasOption($name)
 
     /**
      * @param  mixed $client
-     * @return Zend_Service_Ebay_Abstract Provides a fluent interface
+     * @return $this
      */
     abstract public function setClient($client);
 
diff --git a/library/Zend/Service/Ebay/Finding.php b/library/Zend/Service/Ebay/Finding.php
index 42dd224671..69b6556a0f 100644
--- a/library/Zend/Service/Ebay/Finding.php
+++ b/library/Zend/Service/Ebay/Finding.php
@@ -102,7 +102,7 @@ public function __construct($options)
 
     /**
      * @param  Zend_Rest_Client $client
-     * @return Zend_Service_Ebay_Finding Provides a fluent interface
+     * @return $this
      */
     public function setClient($client)
     {
diff --git a/library/Zend/Service/Ebay/Finding/Response/Abstract.php b/library/Zend/Service/Ebay/Finding/Response/Abstract.php
index 30147376a8..fd8da4bcfd 100644
--- a/library/Zend/Service/Ebay/Finding/Response/Abstract.php
+++ b/library/Zend/Service/Ebay/Finding/Response/Abstract.php
@@ -134,7 +134,7 @@ protected function _init()
 
     /**
      * @param  string $operation
-     * @return Zend_Service_Ebay_Finding_Response_Abstract Provides a fluent interface
+     * @return $this
      */
     public function setOperation($operation)
     {
@@ -153,7 +153,7 @@ public function getOperation()
     /**
      * @param  string|Zend_Config|array $name
      * @param  mixed                    $value
-     * @return Zend_Service_Ebay_Finding_Response_Abstract Provides a fluent interface
+     * @return $this
      */
     public function setOption($name, $value = null)
     {
diff --git a/library/Zend/Translate/Adapter.php b/library/Zend/Translate/Adapter.php
index d051821e5b..5b76c7958f 100644
--- a/library/Zend/Translate/Adapter.php
+++ b/library/Zend/Translate/Adapter.php
@@ -192,7 +192,7 @@ public function __construct($options = [])
      *
      * @param  array|Zend_Config $options Options and translations to be added
      * @throws Zend_Translate_Exception
-     * @return Zend_Translate_Adapter Provides fluent interface
+     * @return $this
      */
     public function addTranslation($options = [])
     {
@@ -341,7 +341,7 @@ public function addTranslation($options = [])
      *
      * @param  array $options Adapter options
      * @throws Zend_Translate_Exception
-     * @return Zend_Translate_Adapter Provides fluent interface
+     * @return $this
      */
     public function setOptions(array $options = [])
     {
@@ -418,7 +418,7 @@ public function getLocale()
      *
      * @param  string|Zend_Locale $locale Locale to set
      * @throws Zend_Translate_Exception
-     * @return Zend_Translate_Adapter Provides fluent interface
+     * @return $this
      */
     public function setLocale($locale)
     {
@@ -580,7 +580,7 @@ abstract protected function _loadTranslationData($data, $locale, array $options
      * @see    Zend_Locale
      * @param  array|Zend_Config $content Translation data to add
      * @throws Zend_Translate_Exception
-     * @return Zend_Translate_Adapter Provides fluent interface
+     * @return $this
      */
     private function _addTranslationData($options = [])
     {
diff --git a/library/Zend/Validate.php b/library/Zend/Validate.php
index 5d3a09ab23..5f79df0a95 100644
--- a/library/Zend/Validate.php
+++ b/library/Zend/Validate.php
@@ -69,7 +69,7 @@ class Zend_Validate implements Zend_Validate_Interface
      *
      * @param  Zend_Validate_Interface $validator
      * @param  boolean                 $breakChainOnFailure
-     * @return Zend_Validate Provides a fluent interface
+     * @return $this
      */
     public function addValidator(Zend_Validate_Interface $validator, $breakChainOnFailure = false)
     {
diff --git a/library/Zend/Validate/Abstract.php b/library/Zend/Validate/Abstract.php
index 3592507824..3b2bbdba14 100644
--- a/library/Zend/Validate/Abstract.php
+++ b/library/Zend/Validate/Abstract.php
@@ -136,7 +136,7 @@ public function getMessageTemplates()
      *
      * @param  string $messageString
      * @param  string $messageKey     OPTIONAL
-     * @return Zend_Validate_Abstract Provides a fluent interface
+     * @return $this
      * @throws Zend_Validate_Exception
      */
     public function setMessage($messageString, $messageKey = null)
diff --git a/library/Zend/Validate/Alnum.php b/library/Zend/Validate/Alnum.php
index c33100475b..e4c4e33271 100644
--- a/library/Zend/Validate/Alnum.php
+++ b/library/Zend/Validate/Alnum.php
@@ -98,7 +98,7 @@ public function getAllowWhiteSpace()
      * Sets the allowWhiteSpace option
      *
      * @param boolean $allowWhiteSpace
-     * @return Zend_Validate_Alnum Provides a fluent interface
+     * @return $this
      */
     public function setAllowWhiteSpace($allowWhiteSpace)
     {
diff --git a/library/Zend/Validate/Alpha.php b/library/Zend/Validate/Alpha.php
index e6dada69d5..ecd7946d22 100644
--- a/library/Zend/Validate/Alpha.php
+++ b/library/Zend/Validate/Alpha.php
@@ -98,7 +98,7 @@ public function getAllowWhiteSpace()
      * Sets the allowWhiteSpace option
      *
      * @param boolean $allowWhiteSpace
-     * @return Zend_Validate_Alpha Provides a fluent interface
+     * @return $this
      */
     public function setAllowWhiteSpace($allowWhiteSpace)
     {
diff --git a/library/Zend/Validate/Barcode/AdapterInterface.php b/library/Zend/Validate/Barcode/AdapterInterface.php
index 8e96effbf4..8550e5a72b 100644
--- a/library/Zend/Validate/Barcode/AdapterInterface.php
+++ b/library/Zend/Validate/Barcode/AdapterInterface.php
@@ -62,7 +62,7 @@ public function getCheck();
      * Sets the checksum validation
      *
      * @param  boolean $check
-     * @return Zend_Validate_Barcode_Adapter Provides a fluent interface
+     * @return $this
      */
     public function setCheck($check);
 }
diff --git a/library/Zend/Validate/Between.php b/library/Zend/Validate/Between.php
index e4a2d08b07..21c7c64123 100644
--- a/library/Zend/Validate/Between.php
+++ b/library/Zend/Validate/Between.php
@@ -142,7 +142,7 @@ public function getMin()
      * Sets the min option
      *
      * @param  mixed $min
-     * @return Zend_Validate_Between Provides a fluent interface
+     * @return $this
      */
     public function setMin($min)
     {
@@ -164,7 +164,7 @@ public function getMax()
      * Sets the max option
      *
      * @param  mixed $max
-     * @return Zend_Validate_Between Provides a fluent interface
+     * @return $this
      */
     public function setMax($max)
     {
@@ -186,7 +186,7 @@ public function getInclusive()
      * Sets the inclusive option
      *
      * @param  boolean $inclusive
-     * @return Zend_Validate_Between Provides a fluent interface
+     * @return $this
      */
     public function setInclusive($inclusive)
     {
diff --git a/library/Zend/Validate/Callback.php b/library/Zend/Validate/Callback.php
index 18895ddad5..aac0e6078c 100644
--- a/library/Zend/Validate/Callback.php
+++ b/library/Zend/Validate/Callback.php
@@ -106,7 +106,7 @@ public function getCallback()
      *
      * @param  string|array $callback
      * @throws Zend_Validate_Exception
-     * @return Zend_Validate_Callback Provides a fluent interface
+     * @return $this
      */
     public function setCallback($callback)
     {
@@ -132,7 +132,7 @@ public function getOptions()
      * Sets options for the callback
      *
      * @param  mixed $options
-     * @return Zend_Validate_Callback Provides a fluent interface
+     * @return $this
      */
     public function setOptions($options)
     {
diff --git a/library/Zend/Validate/CreditCard.php b/library/Zend/Validate/CreditCard.php
index e659a4a2b6..65cf7c4f36 100644
--- a/library/Zend/Validate/CreditCard.php
+++ b/library/Zend/Validate/CreditCard.php
@@ -179,7 +179,7 @@ public function getType()
      * Sets CCIs which are accepted by validation
      *
      * @param string|array $type Type to allow for validation
-     * @return Zend_Validate_CreditCard Provides a fluent interface
+     * @return $this
      */
     public function setType($type)
     {
@@ -191,7 +191,7 @@ public function setType($type)
      * Adds a CCI to be accepted by validation
      *
      * @param string|array $type Type to allow for validation
-     * @return Zend_Validate_CreditCard Provides a fluent interface
+     * @return $this
      */
     public function addType($type)
     {
diff --git a/library/Zend/Validate/Date.php b/library/Zend/Validate/Date.php
index 66ce68a878..2f5fcfd35f 100644
--- a/library/Zend/Validate/Date.php
+++ b/library/Zend/Validate/Date.php
@@ -117,7 +117,7 @@ public function getLocale()
      * Sets the locale option
      *
      * @param  string|Zend_Locale $locale
-     * @return Zend_Validate_Date provides a fluent interface
+     * @return $this
      */
     public function setLocale($locale = null)
     {
@@ -140,7 +140,7 @@ public function getFormat()
      * Sets the format option
      *
      * @param  string $format
-     * @return Zend_Validate_Date provides a fluent interface
+     * @return $this
      */
     public function setFormat($format = null)
     {
diff --git a/library/Zend/Validate/EmailAddress.php b/library/Zend/Validate/EmailAddress.php
index dad5e1f544..283f1208a0 100644
--- a/library/Zend/Validate/EmailAddress.php
+++ b/library/Zend/Validate/EmailAddress.php
@@ -170,7 +170,7 @@ public function getOptions()
      * Set options for the email validator
      *
      * @param array $options
-     * @return Zend_Validate_EmailAddress Provides a fluent inteface
+     * @return $this
      */
     public function setOptions(array $options = [])
     {
@@ -209,7 +209,7 @@ public function setOptions(array $options = [])
      *
      * @param  string $messageString
      * @param  string $messageKey     OPTIONAL
-     * @return Zend_Validate_Abstract Provides a fluent interface
+     * @return $this
      * @throws Zend_Validate_Exception
      */
     public function setMessage($messageString, $messageKey = null)
@@ -283,7 +283,7 @@ public function getValidateMx()
      *
      * @param boolean $mx Set allowed to true to validate for MX records, and false to not validate them
      * @throws Zend_Validate_Exception
-     * @return Zend_Validate_EmailAddress Provides a fluent inteface
+     * @return $this
      */
     public function setValidateMx($mx)
     {
@@ -310,7 +310,7 @@ public function getDeepMxCheck()
      * 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 Provides a fluent inteface
+     * @return $this
      */
     public function setDeepMxCheck($deep)
     {
@@ -333,7 +333,7 @@ public function getDomainCheck()
      * or only the local part of the email address
      *
      * @param boolean $domain
-     * @return Zend_Validate_EmailAddress Provides a fluent inteface
+     * @return $this
      */
     public function setDomainCheck($domain = true)
     {
diff --git a/library/Zend/Validate/File/Count.php b/library/Zend/Validate/File/Count.php
index bf3598cc5a..74c71c86ca 100644
--- a/library/Zend/Validate/File/Count.php
+++ b/library/Zend/Validate/File/Count.php
@@ -142,7 +142,7 @@ public function getMin()
      * Sets the minimum file count
      *
      * @param  integer|array $min The minimum file count
-     * @return Zend_Validate_File_Count Provides a fluent interface
+     * @return $this
      * @throws Zend_Validate_Exception When min is greater than max
      */
     public function setMin($min)
@@ -181,7 +181,7 @@ public function getMax()
      * Sets the maximum file count
      *
      * @param  integer|array $max The maximum file count
-     * @return Zend_Validate_File_Count Provides a fluent interface
+     * @return $this
      * @throws Zend_Validate_Exception When max is smaller than min
      */
     public function setMax($max)
diff --git a/library/Zend/Validate/File/Crc32.php b/library/Zend/Validate/File/Crc32.php
index f9719abdf7..12def1c69a 100644
--- a/library/Zend/Validate/File/Crc32.php
+++ b/library/Zend/Validate/File/Crc32.php
@@ -92,7 +92,7 @@ public function getCrc32()
      * Sets the crc32 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function setHash($options)
     {
@@ -109,7 +109,7 @@ public function setHash($options)
      * Sets the crc32 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function setCrc32($options)
     {
@@ -121,7 +121,7 @@ public function setCrc32($options)
      * Adds the crc32 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function addHash($options)
     {
@@ -138,7 +138,7 @@ public function addHash($options)
      * Adds the crc32 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function addCrc32($options)
     {
diff --git a/library/Zend/Validate/File/Exists.php b/library/Zend/Validate/File/Exists.php
index 4f541ad7bd..ea483c66b5 100644
--- a/library/Zend/Validate/File/Exists.php
+++ b/library/Zend/Validate/File/Exists.php
@@ -100,7 +100,7 @@ public function getDirectory($asArray = false)
      * Sets the file directory which will be checked
      *
      * @param  string|array $directory The directories to validate
-     * @return Zend_Validate_File_Exists Provides a fluent interface
+     * @return $this
      */
     public function setDirectory($directory)
     {
@@ -113,7 +113,7 @@ public function setDirectory($directory)
      * Adds the file directory which will be checked
      *
      * @param  string|array $directory The directory to add for validation
-     * @return Zend_Validate_File_Exists Provides a fluent interface
+     * @return $this
      * @throws Zend_Validate_Exception
      */
     public function addDirectory($directory)
diff --git a/library/Zend/Validate/File/Extension.php b/library/Zend/Validate/File/Extension.php
index 3192200c27..ed66d98a6b 100644
--- a/library/Zend/Validate/File/Extension.php
+++ b/library/Zend/Validate/File/Extension.php
@@ -106,7 +106,7 @@ public function getCase()
      * Sets the case to use
      *
      * @param  boolean $case
-     * @return Zend_Validate_File_Extension Provides a fluent interface
+     * @return $this
      */
     public function setCase($case)
     {
@@ -130,7 +130,7 @@ public function getExtension()
      * Sets the file extensions
      *
      * @param  string|array $extension The extensions to validate
-     * @return Zend_Validate_File_Extension Provides a fluent interface
+     * @return $this
      */
     public function setExtension($extension)
     {
@@ -143,7 +143,7 @@ public function setExtension($extension)
      * Adds the file extensions
      *
      * @param  string|array $extension The extensions to add for validation
-     * @return Zend_Validate_File_Extension Provides a fluent interface
+     * @return $this
      */
     public function addExtension($extension)
     {
diff --git a/library/Zend/Validate/File/Hash.php b/library/Zend/Validate/File/Hash.php
index 168ad11ae8..bef0b85c57 100644
--- a/library/Zend/Validate/File/Hash.php
+++ b/library/Zend/Validate/File/Hash.php
@@ -95,7 +95,7 @@ public function getHash()
      * Sets the hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function setHash($options)
     {
@@ -110,7 +110,7 @@ public function setHash($options)
      *
      * @param  string|array $options
      * @throws Zend_Validate_Exception
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function addHash($options)
     {
diff --git a/library/Zend/Validate/File/ImageSize.php b/library/Zend/Validate/File/ImageSize.php
index 863bcb5cd1..96c155c59c 100644
--- a/library/Zend/Validate/File/ImageSize.php
+++ b/library/Zend/Validate/File/ImageSize.php
@@ -199,7 +199,7 @@ public function getImageHeight()
      * @param  array $options               The minimum image dimensions
      * @throws Zend_Validate_Exception      When minwidth is greater than maxwidth
      * @throws Zend_Validate_Exception      When minheight is greater than maxheight
-     * @return Zend_Validate_File_ImageSize Provides a fluent interface
+     * @return $this
      */
     public function setImageMin($options)
     {
@@ -236,7 +236,7 @@ public function setImageMin($options)
      * @param  array $options          The maximum image dimensions
      * @throws Zend_Validate_Exception When maxwidth is smaller than minwidth
      * @throws Zend_Validate_Exception When maxheight is smaller than minheight
-     * @return Zend_Validate_File_ImageSize Provides a fluent interface
+     * @return $this
      */
     public function setImageMax($options)
     {
@@ -271,7 +271,7 @@ public function setImageMax($options)
      * Sets the mimimum and maximum image width
      *
      * @param  array $options               The image width dimensions
-     * @return Zend_Validate_File_ImageSize Provides a fluent interface
+     * @return $this
      */
     public function setImageWidth($options)
     {
@@ -285,7 +285,7 @@ public function setImageWidth($options)
      * Sets the mimimum and maximum image height
      *
      * @param  array $options               The image height dimensions
-     * @return Zend_Validate_File_ImageSize Provides a fluent interface
+     * @return $this
      */
     public function setImageHeight($options)
     {
diff --git a/library/Zend/Validate/File/Md5.php b/library/Zend/Validate/File/Md5.php
index 7dd4651405..4f49da78d2 100644
--- a/library/Zend/Validate/File/Md5.php
+++ b/library/Zend/Validate/File/Md5.php
@@ -94,7 +94,7 @@ public function getMd5()
      * Sets the md5 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function setHash($options)
     {
@@ -111,7 +111,7 @@ public function setHash($options)
      * Sets the md5 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function setMd5($options)
     {
@@ -123,7 +123,7 @@ public function setMd5($options)
      * Adds the md5 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function addHash($options)
     {
@@ -140,7 +140,7 @@ public function addHash($options)
      * Adds the md5 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function addMd5($options)
     {
diff --git a/library/Zend/Validate/File/MimeType.php b/library/Zend/Validate/File/MimeType.php
index a813bb19c1..841b89586f 100644
--- a/library/Zend/Validate/File/MimeType.php
+++ b/library/Zend/Validate/File/MimeType.php
@@ -170,7 +170,7 @@ public function getMagicFile()
      *
      * @param  string $file
      * @throws Zend_Validate_Exception When finfo can not read the magicfile
-     * @return Zend_Validate_File_MimeType Provides a fluent interface
+     * @return $this
      */
     public function setMagicFile($file)
     {
@@ -209,7 +209,7 @@ public function setMagicFile($file)
      * specified by Zend_Validate_File_MimeType::_magicFiles
      *
      * @param  boolean $flag
-     * @return Zend_Validate_File_MimeType Provides fluent interface
+     * @return $this
      * @see http://framework.zend.com/issues/browse/ZF-11784
      */
     public function setTryCommonMagicFilesFlag($flag = true)
@@ -245,7 +245,7 @@ public function getHeaderCheck()
      * Note that this is unsave and therefor the default value is false
      *
      * @param  boolean $headerCheck
-     * @return Zend_Validate_File_MimeType Provides a fluent interface
+     * @return $this
      */
     public function enableHeaderCheck($headerCheck = true)
     {
@@ -274,7 +274,7 @@ public function getMimeType($asArray = false)
      * Sets the mimetypes
      *
      * @param string|array $mimetype The mimetypes to validate
-     * @return Zend_Validate_File_MimeType Provides a fluent interface
+     * @return $this
      * @throws Zend_Validate_Exception
      */
     public function setMimeType($mimetype)
@@ -288,7 +288,7 @@ public function setMimeType($mimetype)
      * Adds the mimetypes
      *
      * @param  string|array $mimetype The mimetypes to add for validation
-     * @return Zend_Validate_File_MimeType Provides a fluent interface
+     * @return $this
      * @throws Zend_Validate_Exception
      */
     public function addMimeType($mimetype)
diff --git a/library/Zend/Validate/File/Sha1.php b/library/Zend/Validate/File/Sha1.php
index 0b5c75e1db..fff30e80af 100644
--- a/library/Zend/Validate/File/Sha1.php
+++ b/library/Zend/Validate/File/Sha1.php
@@ -94,7 +94,7 @@ public function getSha1()
      * Sets the sha1 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function setHash($options)
     {
@@ -111,7 +111,7 @@ public function setHash($options)
      * Sets the sha1 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function setSha1($options)
     {
@@ -123,7 +123,7 @@ public function setSha1($options)
      * Adds the sha1 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function addHash($options)
     {
@@ -140,7 +140,7 @@ public function addHash($options)
      * Adds the sha1 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
+     * @return $this
      */
     public function addSha1($options)
     {
diff --git a/library/Zend/Validate/File/Size.php b/library/Zend/Validate/File/Size.php
index 4a2e1f4036..e84c1e2092 100644
--- a/library/Zend/Validate/File/Size.php
+++ b/library/Zend/Validate/File/Size.php
@@ -177,7 +177,7 @@ public function getMin($raw = false)
      *
      * @param  integer $min The minimum filesize
      * @throws Zend_Validate_Exception When min is greater than max
-     * @return Zend_Validate_File_Size Provides a fluent interface
+     * @return $this
      */
     public function setMin($min)
     {
@@ -218,7 +218,7 @@ public function getMax($raw = false)
      * Sets the maximum filesize
      *
      * @param  integer $max The maximum filesize
-     * @return Zend_Validate_File_Size Provides a fluent interface
+     * @return $this
      *@throws Zend_Validate_Exception When max is smaller than min
      */
     public function setMax($max)
diff --git a/library/Zend/Validate/File/Upload.php b/library/Zend/Validate/File/Upload.php
index a5cdb4a724..67bc4eef88 100644
--- a/library/Zend/Validate/File/Upload.php
+++ b/library/Zend/Validate/File/Upload.php
@@ -125,7 +125,7 @@ public function getFiles($file = null)
      * Sets the files to be checked
      *
      * @param  array $files The files to check in syntax of Zend_File_Transfer
-     * @return Zend_Validate_File_Upload Provides a fluent interface
+     * @return $this
      */
     public function setFiles($files = [])
     {
diff --git a/library/Zend/Validate/GreaterThan.php b/library/Zend/Validate/GreaterThan.php
index 129c84f9ac..e60353b0aa 100644
--- a/library/Zend/Validate/GreaterThan.php
+++ b/library/Zend/Validate/GreaterThan.php
@@ -94,7 +94,7 @@ public function getMin()
      * Sets the min option
      *
      * @param  mixed $min
-     * @return Zend_Validate_GreaterThan Provides a fluent interface
+     * @return $this
      */
     public function setMin($min)
     {
diff --git a/library/Zend/Validate/Hostname.php b/library/Zend/Validate/Hostname.php
index 93f2582b7f..c587f428cd 100644
--- a/library/Zend/Validate/Hostname.php
+++ b/library/Zend/Validate/Hostname.php
@@ -2046,7 +2046,7 @@ public function getAllow()
      * Sets the allow option
      *
      * @param  integer $allow
-     * @return Zend_Validate_Hostname Provides a fluent interface
+     * @return $this
      */
     public function setAllow($allow)
     {
diff --git a/library/Zend/Validate/Iban.php b/library/Zend/Validate/Iban.php
index ec630d3596..c2a99d6d01 100644
--- a/library/Zend/Validate/Iban.php
+++ b/library/Zend/Validate/Iban.php
@@ -176,7 +176,7 @@ public function getLocale()
      * @param  string|Zend_Locale $locale
      * @throws Zend_Locale_Exception
      * @throws Zend_Validate_Exception
-     * @return Zend_Validate_Iban provides a fluent interface
+     * @return $this
      */
     public function setLocale($locale = null)
     {
diff --git a/library/Zend/Validate/InArray.php b/library/Zend/Validate/InArray.php
index e3cae6a22c..315cd207ab 100644
--- a/library/Zend/Validate/InArray.php
+++ b/library/Zend/Validate/InArray.php
@@ -117,7 +117,7 @@ public function getHaystack()
      * Sets the haystack option
      *
      * @param  mixed $haystack
-     * @return Zend_Validate_InArray Provides a fluent interface
+     * @return $this
      */
     public function setHaystack(array $haystack)
     {
@@ -139,7 +139,7 @@ public function getStrict()
      * Sets the strict option
      *
      * @param  boolean $strict
-     * @return Zend_Validate_InArray Provides a fluent interface
+     * @return $this
      */
     public function setStrict($strict)
     {
@@ -161,7 +161,7 @@ public function getRecursive()
      * Sets the recursive option
      *
      * @param  boolean $recursive
-     * @return Zend_Validate_InArray Provides a fluent interface
+     * @return $this
      */
     public function setRecursive($recursive)
     {
diff --git a/library/Zend/Validate/Isbn.php b/library/Zend/Validate/Isbn.php
index f788e801fa..b7f3c3862e 100644
--- a/library/Zend/Validate/Isbn.php
+++ b/library/Zend/Validate/Isbn.php
@@ -217,7 +217,7 @@ public function isValid($value)
      *
      * @param  string $separator
      * @throws Zend_Validate_Exception When $separator is not valid
-     * @return Zend_Validate_Isbn Provides a fluent interface
+     * @return $this
      */
     public function setSeparator($separator)
     {
@@ -249,7 +249,7 @@ public function getSeparator()
      *
      * @param  string $type
      * @throws Zend_Validate_Exception When $type is not valid
-     * @return Zend_Validate_Isbn Provides a fluent interface
+     * @return $this
      */
     public function setType($type)
     {
diff --git a/library/Zend/Validate/LessThan.php b/library/Zend/Validate/LessThan.php
index b56615c9e6..ba641d6479 100644
--- a/library/Zend/Validate/LessThan.php
+++ b/library/Zend/Validate/LessThan.php
@@ -93,7 +93,7 @@ public function getMax()
      * Sets the max option
      *
      * @param  mixed $max
-     * @return Zend_Validate_LessThan Provides a fluent interface
+     * @return $this
      */
     public function setMax($max)
     {
diff --git a/library/Zend/Validate/PostCode.php b/library/Zend/Validate/PostCode.php
index f636445777..7d2cc24f8c 100644
--- a/library/Zend/Validate/PostCode.php
+++ b/library/Zend/Validate/PostCode.php
@@ -119,7 +119,7 @@ public function getLocale()
      * @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 a fluent interface
+     * @return $this
      */
     public function setLocale($locale = null)
     {
@@ -162,7 +162,7 @@ public function getFormat()
      *
      * @param string $format
      * @throws Zend_Validate_Exception On empty format
-     * @return Zend_Validate_PostCode  Provides a fluent interface
+     * @return $this
      */
     public function setFormat($format)
     {
diff --git a/library/Zend/Validate/Regex.php b/library/Zend/Validate/Regex.php
index 0ccaea0dae..78fcd269c2 100644
--- a/library/Zend/Validate/Regex.php
+++ b/library/Zend/Validate/Regex.php
@@ -98,7 +98,7 @@ public function getPattern()
      *
      * @param  string $pattern
      * @throws Zend_Validate_Exception if there is a fatal error in pattern matching
-     * @return Zend_Validate_Regex Provides a fluent interface
+     * @return $this
      */
     public function setPattern($pattern)
     {
diff --git a/library/Zend/Validate/StringLength.php b/library/Zend/Validate/StringLength.php
index d51e1e2fc2..35caaf4270 100644
--- a/library/Zend/Validate/StringLength.php
+++ b/library/Zend/Validate/StringLength.php
@@ -128,7 +128,7 @@ public function getMin()
      *
      * @param  integer $min
      * @throws Zend_Validate_Exception
-     * @return Zend_Validate_StringLength Provides a fluent interface
+     * @return $this
      */
     public function setMin($min)
     {
@@ -159,7 +159,7 @@ public function getMax()
      *
      * @param  integer|null $max
      * @throws Zend_Validate_Exception
-     * @return Zend_Validate_StringLength Provides a fluent interface
+     * @return $this
      */
     public function setMax($max)
     {
diff --git a/library/Zend/View/Abstract.php b/library/Zend/View/Abstract.php
index cc1c249b3c..e4e9120461 100644
--- a/library/Zend/View/Abstract.php
+++ b/library/Zend/View/Abstract.php
@@ -805,7 +805,7 @@ public function isLfiProtectionOn()
      * @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
+     * @return $this
      * @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
      */
diff --git a/library/Zend/View/Helper/HeadMeta.php b/library/Zend/View/Helper/HeadMeta.php
index 65efd9a89f..8edc071ab2 100644
--- a/library/Zend/View/Helper/HeadMeta.php
+++ b/library/Zend/View/Helper/HeadMeta.php
@@ -186,7 +186,7 @@ public function __call($method, $args)
      * Not valid in a non-HTML5 doctype
      *
      * @param string $charset
-     * @return Zend_View_Helper_HeadMeta Provides a fluent interface
+     * @return $this
      */
     public function setCharset($charset)
     {
diff --git a/library/Zend/View/Helper/Navigation.php b/library/Zend/View/Helper/Navigation.php
index ae82b82743..c2cadcc6ce 100644
--- a/library/Zend/View/Helper/Navigation.php
+++ b/library/Zend/View/Helper/Navigation.php
@@ -88,7 +88,7 @@ class Zend_View_Helper_Navigation
      *
      * @param  Zend_Navigation_Container $container  [optional] container to
      *                                               operate on
-     * @return Zend_View_Helper_Navigation           fluent interface, returns
+     * @return $this
      *                                               self
      */
     public function navigation(Zend_Navigation_Container $container = null)
@@ -237,7 +237,7 @@ protected function _inject(Zend_View_Helper_Navigation_Helper $helper)
      * Sets the default proxy to use in {@link render()}
      *
      * @param  string $proxy                default proxy
-     * @return Zend_View_Helper_Navigation  fluent interface, returns self
+     * @return $this
      */
     public function setDefaultProxy($proxy)
     {
@@ -261,7 +261,7 @@ public function getDefaultProxy()
      * @param bool $injectContainer         [optional] whether container should
      *                                      be injected when proxying. Default
      *                                      is true.
-     * @return Zend_View_Helper_Navigation  fluent interface, returns self
+     * @return $this
      */
     public function setInjectContainer($injectContainer = true)
     {
@@ -285,7 +285,7 @@ public function getInjectContainer()
      * @param  bool $injectAcl              [optional] whether ACL should be
      *                                      injected when proxying. Default is
      *                                      true.
-     * @return Zend_View_Helper_Navigation  fluent interface, returns self
+     * @return $this
      */
     public function setInjectAcl($injectAcl = true)
     {
@@ -309,7 +309,7 @@ public function getInjectAcl()
      * @param  bool $injectTranslator       [optional] whether translator should
      *                                      be injected when proxying. Default
      *                                      is true.
-     * @return Zend_View_Helper_Navigation  fluent interface, returns self
+     * @return $this
      */
     public function setInjectTranslator($injectTranslator = true)
     {
diff --git a/library/Zend/View/Helper/Navigation/Breadcrumbs.php b/library/Zend/View/Helper/Navigation/Breadcrumbs.php
index b88c1ef8d1..46ea735847 100644
--- a/library/Zend/View/Helper/Navigation/Breadcrumbs.php
+++ b/library/Zend/View/Helper/Navigation/Breadcrumbs.php
@@ -71,7 +71,7 @@ class Zend_View_Helper_Navigation_Breadcrumbs
      *
      * @param  Zend_Navigation_Container $container     [optional] container to
      *                                                  operate on
-     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
+     * @return $this
      *                                                  returns self
      */
     public function breadcrumbs(Zend_Navigation_Container $container = null)
@@ -89,7 +89,7 @@ public function breadcrumbs(Zend_Navigation_Container $container = null)
      * Sets breadcrumb separator
      *
      * @param  string $separator                        separator string
-     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
+     * @return $this
      *                                                  returns self
      */
     public function setSeparator($separator)
@@ -116,7 +116,7 @@ public function getSeparator()
      *
      * @param  bool $linkLast                           whether last page should
      *                                                  be hyperlinked
-     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
+     * @return $this
      *                                                  returns self
      */
     public function setLinkLast($linkLast)
@@ -146,7 +146,7 @@ public function getLinkLast()
      *                                                  to use, and the module
      *                                                  where the script can be
      *                                                  found.
-     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
+     * @return $this
      *                                                  returns self
      */
     public function setPartial($partial)
diff --git a/library/Zend/View/Helper/Navigation/Helper.php b/library/Zend/View/Helper/Navigation/Helper.php
index e7d5878160..0d15de719d 100644
--- a/library/Zend/View/Helper/Navigation/Helper.php
+++ b/library/Zend/View/Helper/Navigation/Helper.php
@@ -39,7 +39,7 @@ interface Zend_View_Helper_Navigation_Helper
      *                                               null, which indicates that
      *                                               the container should be
      *                                               reset.
-     * @return Zend_View_Helper_Navigation_Helper    fluent interface, returns
+     * @return $this
      *                                               self
      */
     public function setContainer(Zend_Navigation_Container $container = null);
@@ -59,7 +59,7 @@ public function getContainer();
      *                                             {@link Zend_Translate_Adapter}
      *                                             or {@link Zend_Translate},
      *                                             or null. Default is null.
-     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
+     * @return $this
      *                                             self
      */
     public function setTranslator($translator = null);
@@ -75,7 +75,7 @@ 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
+     * @return $this
      *                                             self
      */
     public function setAcl(Zend_Acl $acl = null);
@@ -97,7 +97,7 @@ public function getAcl();
      *                                             {@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
+     * @return $this
      *                                             self
      */
     public function setRole($role = null);
@@ -115,7 +115,7 @@ public function getRole();
      * @param  bool $useAcl                        [optional] whether ACL
      *                                             should be used. Default is
      *                                             true.
-     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
+     * @return $this
      *                                             self
      */
     public function setUseAcl($useAcl = true);
@@ -138,7 +138,7 @@ public function getRenderInvisible();
      * Render invisible items?
      *
      * @param  bool $renderInvisible                       [optional] boolean flag
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface
+     * @return $this
      *                                                     returns self
      */
     public function setRenderInvisible($renderInvisible = true);
@@ -149,7 +149,7 @@ public function setRenderInvisible($renderInvisible = true);
      * @param  bool $useTranslator                 [optional] whether
      *                                             translator should be used.
      *                                             Default is true.
-     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
+     * @return $this
      *                                             self
      */
     public function setUseTranslator($useTranslator = true);
diff --git a/library/Zend/View/Helper/Navigation/HelperAbstract.php b/library/Zend/View/Helper/Navigation/HelperAbstract.php
index e881acdbb6..55c4d32572 100644
--- a/library/Zend/View/Helper/Navigation/HelperAbstract.php
+++ b/library/Zend/View/Helper/Navigation/HelperAbstract.php
@@ -162,7 +162,7 @@ abstract class Zend_View_Helper_Navigation_HelperAbstract
      *                                                     Default is null,
      *                                                     meaning container
      *                                                     will be reset.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     * @return $this
      *                                                     returns self
      */
     public function setContainer(Zend_Navigation_Container $container = null)
@@ -213,7 +213,7 @@ public function getContainer()
      *                                                     depth. Default is
      *                                                     null, which sets
      *                                                     no minimum depth.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     * @return $this
      *                                                     returns self
      */
     public function setMinDepth($minDepth = null)
@@ -246,7 +246,7 @@ public function getMinDepth()
      *                                                     depth. Default is
      *                                                     null, which sets no
      *                                                     maximum depth.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     * @return $this
      *                                                     returns self
      */
     public function setMaxDepth($maxDepth = null)
@@ -275,7 +275,7 @@ public function getMaxDepth()
      *
      * @param  string|int $indent                          indentation string or
      *                                                     number of spaces
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     * @return $this
      *                                                     returns self
      */
     public function setIndent($indent)
@@ -322,7 +322,7 @@ public function getEOL()
      *                                              should be formatted. Default
      *                                              is true.
      *
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface, returns
+     * @return $this
      *                                              self
      */
     public function setFormatOutput($formatOutput = true)
@@ -346,7 +346,7 @@ public function getFormatOutput()
      * Sets prefix for IDs when they are normalized
      *
      * @param   string $prefix                              Prefix for IDs
-     * @return  Zend_View_Helper_Navigation_HelperAbstract  fluent interface, returns self
+     * @return $this
      */
     public function setPrefixForId($prefix)
     {
@@ -378,7 +378,7 @@ public function getPrefixForId()
      * Skip the current prefix for IDs when they are normalized
      *
      * @param  bool $flag
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface, returns self
+     * @return $this
      */
     public function skipPrefixForId($flag = true)
     {
@@ -399,7 +399,7 @@ public function skipPrefixForId($flag = true)
      *                                                     or null. Default is
      *                                                     null, which sets no
      *                                                     translator.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
+     * @return $this
      *                                                     returns self
      */
     public function setTranslator($translator = null)
@@ -440,8 +440,7 @@ public function getTranslator()
      *
      * @param  Zend_Acl $acl                               [optional] ACL object.
      *                                                     Default is null.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
+     * @return $this
      */
     public function setAcl(Zend_Acl $acl = null)
     {
@@ -479,8 +478,7 @@ public function getAcl()
      *                                                     null, which will set
      *                                                     no role.
      * @throws Zend_View_Exception                         if $role is invalid
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
+     * @return $this
      */
     public function setRole($role = null)
     {
@@ -526,8 +524,7 @@ public function getRole()
      * @param  bool $useAcl                                [optional] whether ACL
      *                                                     should be used.
      *                                                     Default is true.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
+     * @return $this
      */
     public function setUseAcl($useAcl = true)
     {
@@ -561,8 +558,7 @@ public function getRenderInvisible()
      * Render invisible items?
      *
      * @param  bool $renderInvisible                       [optional] boolean flag
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface
-     *                                                     returns self
+     * @return $this
      */
     public function setRenderInvisible($renderInvisible = true)
     {
@@ -578,8 +574,7 @@ public function setRenderInvisible($renderInvisible = true)
      * @param  bool $useTranslator                         [optional] whether
      *                                                     translator should be
      *                                                     used. Default is true.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
+     * @return $this
      */
     public function setUseTranslator($useTranslator = true)
     {
diff --git a/library/Zend/View/Helper/Navigation/Links.php b/library/Zend/View/Helper/Navigation/Links.php
index 8e7d539bec..f189d659e0 100644
--- a/library/Zend/View/Helper/Navigation/Links.php
+++ b/library/Zend/View/Helper/Navigation/Links.php
@@ -111,7 +111,7 @@ class Zend_View_Helper_Navigation_Links
      *
      * @param  Zend_Navigation_Container $container  [optional] container to
      *                                               operate on
-     * @return Zend_View_Helper_Navigation_Links     fluent interface, returns
+     * @return $this
      *                                               self
      */
     public function links(Zend_Navigation_Container $container = null)
@@ -179,7 +179,7 @@ public function __call($method, array $arguments = [])
      * {@link renderLink()} method.
      *
      * @param  int $renderFlag                    render flag
-     * @return Zend_View_Helper_Navigation_Links  fluent interface, returns self
+     * @return $this
      */
     public function setRenderFlag($renderFlag)
     {
diff --git a/library/Zend/View/Helper/Navigation/Menu.php b/library/Zend/View/Helper/Navigation/Menu.php
index 58226be005..f9caa77568 100644
--- a/library/Zend/View/Helper/Navigation/Menu.php
+++ b/library/Zend/View/Helper/Navigation/Menu.php
@@ -120,8 +120,7 @@ class Zend_View_Helper_Navigation_Menu
      *
      * @param  Zend_Navigation_Container $container  [optional] container to
      *                                               operate on
-     * @return Zend_View_Helper_Navigation_Menu      fluent interface,
-     *                                               returns self
+     * @return $this
      */
     public function menu(Zend_Navigation_Container $container = null)
     {
@@ -138,7 +137,7 @@ public function menu(Zend_Navigation_Container $container = null)
      * 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
+     * @return $this
      */
     public function setUlClass($ulClass)
     {
@@ -164,7 +163,7 @@ public function getUlClass()
      * rendering
      *
      * @param  string|null  $ulId                Unique identifier (id) to set
-     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
+     * @return $this
      */
     public function setUlId($ulId)
     {
@@ -190,7 +189,7 @@ public function getUlId()
      * 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
+     * @return $this
      */
     public function setActiveClass($activeClass)
     {
@@ -215,7 +214,7 @@ public function getActiveClass()
      * 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
+     * @return $this
      */
     public function setParentClass($parentClass)
     {
@@ -241,7 +240,7 @@ public function getParentClass()
      *
      * @param bool $flag                        [optional] render with parent
      *                                          class. Default is true.
-     * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self
+     * @return $this
      */
     public function setRenderParentClass($flag = true)
     {
@@ -265,7 +264,7 @@ public function getRenderParentClass()
      *
      * @param  bool $flag                        [optional] render only active
      *                                           branch. Default is true.
-     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
+     * @return $this
      */
     public function setOnlyActiveBranch($flag = true)
     {
@@ -291,7 +290,7 @@ public function getOnlyActiveBranch()
      *
      * @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
+     * @return $this
      */
     public function setExpandSiblingNodesOfActiveBranch($flag = true)
     {
@@ -320,7 +319,7 @@ public function getExpandSiblingNodesOfActiveBranch()
      * @param  bool $flag                        [optional] render parents when
      *                                           rendering active branch.
      *                                           Default is true.
-     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
+     * @return $this
      */
     public function setRenderParents($flag = true)
     {
@@ -350,7 +349,7 @@ public function getRenderParents()
      *                                           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
+     * @return $this
      */
     public function setPartial($partial)
     {
@@ -391,7 +390,7 @@ public function getPartial()
      * @param bool $flag                        [optional] adds CSS class from
      *                                          page to li element
      *
-     * @return Zend_View_Helper_Navigation_Menu fluent interface, returns self
+     * @return $this
      */
     public function addPageClassToLi($flag = true)
     {
@@ -417,8 +416,7 @@ public function getAddPageClassToLi()
      *
      * @param  string|int $indent                          indentation string or
      *                                                     number of spaces
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
+     * @return $this
      */
     public function setInnerIndent($indent)
     {
diff --git a/library/Zend/View/Helper/Navigation/Sitemap.php b/library/Zend/View/Helper/Navigation/Sitemap.php
index 4df6dc38d1..5aa2518243 100644
--- a/library/Zend/View/Helper/Navigation/Sitemap.php
+++ b/library/Zend/View/Helper/Navigation/Sitemap.php
@@ -87,7 +87,7 @@ class Zend_View_Helper_Navigation_Sitemap
      *
      * @param  Zend_Navigation_Container $container  [optional] container to
      *                                               operate on
-     * @return Zend_View_Helper_Navigation_Sitemap   fluent interface, returns
+     * @return $this
      *                                               self
      */
     public function sitemap(Zend_Navigation_Container $container = null)
@@ -106,7 +106,7 @@ public function sitemap(Zend_Navigation_Container $container = null)
      *
      * @param  bool $useXmlDecl                     whether XML delcaration
      *                                              should be rendered
-     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
+     * @return $this
      *                                              self
      */
     public function setUseXmlDeclaration($useXmlDecl)
@@ -130,7 +130,7 @@ public function getUseXmlDeclaration()
      *
      * @param  bool $useSitemapValidators           whether sitemap validators
      *                                              should be used
-     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
+     * @return $this
      *                                              self
      */
     public function setUseSitemapValidators($useSitemapValidators)
@@ -154,7 +154,7 @@ public function getUseSitemapValidators()
      *
      * @param  bool $schemaValidation               whether sitemap should
      *                                              validated using XSD Schema
-     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
+     * @return $this
      *                                              self
      */
     public function setUseSchemaValidation($schemaValidation)
@@ -181,7 +181,7 @@ public function getUseSchemaValidation()
      * @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
+     * @return $this
      *                                              self
      */
     public function setServerUrl($serverUrl)
diff --git a/library/Zend/View/Helper/ServerUrl.php b/library/Zend/View/Helper/ServerUrl.php
index c38ec8bc86..07cca2cff1 100644
--- a/library/Zend/View/Helper/ServerUrl.php
+++ b/library/Zend/View/Helper/ServerUrl.php
@@ -116,7 +116,7 @@ public function getHost()
      * Sets host
      *
      * @param  string $host                new host
-     * @return Zend_View_Helper_ServerUrl  fluent interface, returns self
+     * @return $this
      */
     public function setHost($host)
     {
@@ -138,7 +138,7 @@ public function getScheme()
      * Sets scheme (typically http or https)
      *
      * @param  string $scheme              new scheme (typically http or https)
-     * @return Zend_View_Helper_ServerUrl  fluent interface, returns self
+     * @return $this
      */
     public function setScheme($scheme)
     {
diff --git a/library/Zend/XmlRpc/Generator/GeneratorAbstract.php b/library/Zend/XmlRpc/Generator/GeneratorAbstract.php
index b414b23775..e8dcd388eb 100644
--- a/library/Zend/XmlRpc/Generator/GeneratorAbstract.php
+++ b/library/Zend/XmlRpc/Generator/GeneratorAbstract.php
@@ -50,7 +50,7 @@ public function __construct($encoding = 'UTF-8')
      *
      * @param string $name XML tag name
      * @param string $value Optional value of the XML tag
-     * @return Zend_XmlRpc_Generator_GeneratorAbstract Fluent interface
+     * @return $this
      */
     public function openElement($name, $value = null)
     {
@@ -68,7 +68,7 @@ public function openElement($name, $value = null)
      * Method marks the end of an XML element
      *
      * @param string $name XML tag name
-     * @return Zend_XmlRpc_Generator_GeneratorAbstract Fluent interface
+     * @return $this
      */
     public function closeElement($name)
     {

From 5e1376b53338d5ce7a80cd7748c26c951e561987 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 11 Jan 2023 20:24:35 +0100
Subject: [PATCH 2/3] Use static for static methods (reverted changes)

---
 library/Zend/Auth.php                             | 2 +-
 library/Zend/Controller/Router/Route.php          | 2 +-
 library/Zend/Controller/Router/Route/Chain.php    | 2 +-
 library/Zend/Controller/Router/Route/Hostname.php | 2 +-
 library/Zend/Controller/Router/Route/Module.php   | 2 +-
 library/Zend/Controller/Router/Route/Regex.php    | 2 +-
 library/Zend/Controller/Router/Route/Static.php   | 2 +-
 library/Zend/Queue.php                            | 2 +-
 library/Zend/Rest/Route.php                       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/library/Zend/Auth.php b/library/Zend/Auth.php
index 84f6e3c49e..bad0ac14d3 100644
--- a/library/Zend/Auth.php
+++ b/library/Zend/Auth.php
@@ -63,7 +63,7 @@ protected function __clone()
      *
      * Singleton pattern implementation
      *
-     * @return $this
+     * @return static
      */
     public static function getInstance()
     {
diff --git a/library/Zend/Controller/Router/Route.php b/library/Zend/Controller/Router/Route.php
index 27e0277ce7..abefd03c21 100644
--- a/library/Zend/Controller/Router/Route.php
+++ b/library/Zend/Controller/Router/Route.php
@@ -149,7 +149,7 @@ public function getVersion()
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config Configuration object
-     * @return $this
+     * @return static
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Chain.php b/library/Zend/Controller/Router/Route/Chain.php
index d081ad7d11..58de590ed3 100644
--- a/library/Zend/Controller/Router/Route/Chain.php
+++ b/library/Zend/Controller/Router/Route/Chain.php
@@ -57,7 +57,7 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
      * Instantiates route based on passed Zend_Config structure
      *
      * @param  Zend_Config $config Configuration object
-     * @return $this
+     * @return static
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Hostname.php b/library/Zend/Controller/Router/Route/Hostname.php
index 79837cd0ac..b232b9b2c1 100644
--- a/library/Zend/Controller/Router/Route/Hostname.php
+++ b/library/Zend/Controller/Router/Route/Hostname.php
@@ -145,7 +145,7 @@ public function getRequest()
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config Configuration object
-     * @return $this
+     * @return static
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Module.php b/library/Zend/Controller/Router/Route/Module.php
index 5176b26778..7191a194f4 100644
--- a/library/Zend/Controller/Router/Route/Module.php
+++ b/library/Zend/Controller/Router/Route/Module.php
@@ -95,7 +95,7 @@ public function getVersion()
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config
-     * @return $this
+     * @return static
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Regex.php b/library/Zend/Controller/Router/Route/Regex.php
index ea18d97455..781b4199f6 100644
--- a/library/Zend/Controller/Router/Route/Regex.php
+++ b/library/Zend/Controller/Router/Route/Regex.php
@@ -73,7 +73,7 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config Configuration object
-     * @return $this
+     * @return static
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Controller/Router/Route/Static.php b/library/Zend/Controller/Router/Route/Static.php
index d8d17136c2..932c1505de 100644
--- a/library/Zend/Controller/Router/Route/Static.php
+++ b/library/Zend/Controller/Router/Route/Static.php
@@ -64,7 +64,7 @@ public function getVersion()
      * Instantiates route based on passed Zend_Config structure
      *
      * @param Zend_Config $config Configuration object
-     * @return $this
+     * @return static
      */
     public static function getInstance(Zend_Config $config)
     {
diff --git a/library/Zend/Queue.php b/library/Zend/Queue.php
index b3a92e48cf..dbdea7d365 100644
--- a/library/Zend/Queue.php
+++ b/library/Zend/Queue.php
@@ -516,7 +516,7 @@ public function getQueues()
      * This is AN UNSUPPORTED FUNCTION
      *
      * @param  string           $name
-     * @return $this
+     * @return $this|false
      */
     protected function _setName($name)
     {
diff --git a/library/Zend/Rest/Route.php b/library/Zend/Rest/Route.php
index ee646d47e1..3f1454bf26 100644
--- a/library/Zend/Rest/Route.php
+++ b/library/Zend/Rest/Route.php
@@ -92,7 +92,7 @@ public function __construct(Zend_Controller_Front $front,
     /**
      * Instantiates route based on passed Zend_Config structure
      *
-     * @return $this
+     * @return static
      */
     public static function getInstance(Zend_Config $config)
     {

From b7f0d9f99b0acff8d45ba4020939979801633158 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 11 Jan 2023 20:31:04 +0100
Subject: [PATCH 3/3] Use static for static methods (reverted changes) #2

---
 library/Zend/Auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Zend/Auth.php b/library/Zend/Auth.php
index bad0ac14d3..84f6e3c49e 100644
--- a/library/Zend/Auth.php
+++ b/library/Zend/Auth.php
@@ -63,7 +63,7 @@ protected function __clone()
      *
      * Singleton pattern implementation
      *
-     * @return static
+     * @return $this
      */
     public static function getInstance()
     {