more code cleanup

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17459 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Ldap/Attribute.php

@@ -35,10 +35,10 @@ class Zend_Ldap_Attribute
     /**
      * Sets a LDAP attribute.
      *
-     * @param  array $data
-     * @param  string $attribName
-     * @param  mixed $value
-     * @param  boolean $append
+     * @param  array                    $data
+     * @param  string                   $attribName
+     * @param  scalar|array|Traversable $value
+     * @param  boolean                  $append
      * @return void
      */
     public static function setAttribute(array &$data, $attribName, $value, $append = false)
@@ -73,8 +73,8 @@ class Zend_Ldap_Attribute
     /**
      * Gets a LDAP attribute.
      *
-     * @param  array $data
-     * @param  string $attribName
+     * @param  array   $data
+     * @param  string  $attribName
      * @param  integer $index
      * @return array|mixed
      */
@@ -104,8 +104,8 @@ class Zend_Ldap_Attribute
     /**
      * Checks if the given value(s) exist in the attribute
      *
-     * @param array $data
-     * @param string $attribName
+     * @param array       $data
+     * @param string      $attribName
      * @param mixed|array $value
      * @return boolean
      */
@@ -130,7 +130,7 @@ class Zend_Ldap_Attribute
     /**
      * Removes duplicate values from a LDAP attribute
      *
-     * @param array $data
+     * @param array  $data
      * @param string $attribName
      * @return void
      */
@@ -144,8 +144,8 @@ class Zend_Ldap_Attribute
     /**
      * Remove given values from a LDAP attribute
      *
-     * @param array $data
-     * @param string $attribName
+     * @param array       $data
+     * @param string      $attribName
      * @param mixed|array $value
      * @return void
      */
@@ -176,6 +176,10 @@ class Zend_Ldap_Attribute
         $data[$attribName] = $resultArray;
     }
 
+    /**
+     * @param  mixed $value
+     * @return string|null
+     */
     private static function _valueToLdap($value)
     {
         if (is_string($value)) return $value;
@@ -187,6 +191,10 @@ class Zend_Ldap_Attribute
         else return null;
     }
 
+    /**
+     * @param  string $value
+     * @return string|boolean
+     */
     private static function _valueFromLdap($value)
     {
         $value = (string)$value;
@@ -198,7 +206,7 @@ class Zend_Ldap_Attribute
     /**
      * Converts a PHP data type into its LDAP representation
      *
-     * @param mixed $value
+     * @param  mixed $value
      * @return string|null - null if the PHP data type cannot be converted.
      */
     public static function convertToLdapValue($value)
@@ -209,7 +217,7 @@ class Zend_Ldap_Attribute
     /**
      * Converts an LDAP value into its PHP data type
      *
-     * @param string $value
+     * @param  string $value
      * @return mixed
      */
     public static function convertFromLdapValue($value)
@@ -220,8 +228,8 @@ class Zend_Ldap_Attribute
     /**
      * Converts a timestamp into its LDAP date/time representation
      *
-     * @param integer $value
-     * @param boolean $utc
+     * @param  integer $value
+     * @param  boolean $utc
      * @return string|null - null if the value cannot be converted.
      */
     public static function convertToLdapDateTimeValue($value, $utc = false)
@@ -232,7 +240,7 @@ class Zend_Ldap_Attribute
     /**
      * Converts LDAP date/time representation into a timestamp
      *
-     * @param string $value
+     * @param  string $value
      * @return integer|null - null if the value cannot be converted.
      */
     public static function convertFromLdapDateTimeValue($value)
@@ -243,7 +251,7 @@ class Zend_Ldap_Attribute
     /**
      * Sets a LDAP password.
      *
-     * @param  array $data
+     * @param  array  $data
      * @param  string $password
      * @param  string $hashType
      * @param  string $attribName
@@ -282,11 +290,11 @@ class Zend_Ldap_Attribute
     /**
      * Sets a LDAP date/time attribute.
      *
-     * @param  array $data
-     * @param  string $attribName
-     * @param  integer|array $value
-     * @param  boolean $utc
-     * @param  boolean $append
+     * @param  array                     $data
+     * @param  string                    $attribName
+     * @param  integer|array|Traversable $value
+     * @param  boolean                   $utc
+     * @param  boolean                   $append
      * @return null
      */
     public static function setDateTimeAttribute(array &$data, $attribName, $value, $utc = false,
@@ -307,6 +315,11 @@ class Zend_Ldap_Attribute
         self::setAttribute($data, $attribName, $convertedValues, $append);
     }
 
+    /**
+     * @param  integer $value
+     * @param  boolean $utc
+     * @return string|null
+     */
     private static function _valueToLdapDateTime($value, $utc)
     {
         if (is_int($value)) {
@@ -319,8 +332,8 @@ class Zend_Ldap_Attribute
     /**
      * Gets a LDAP date/time attribute.
      *
-     * @param  array $data
-     * @param  string $attribName
+     * @param  array   $data
+     * @param  string  $attribName
      * @param  integer $index
      * @return array|integer
      */
@@ -337,6 +350,10 @@ class Zend_Ldap_Attribute
         return $values;
     }
 
+    /**
+     * @param  string $value
+     * @return integer|null
+     */
     private static function _valueFromLdapDateTime($value)
     {
         $matches = array();

library/Zend/Ldap/Collection.php

@@ -53,9 +53,7 @@ class Zend_Ldap_Collection implements Iterator, Countable
     /**
      * Constructor.
      *
-     * @param Zend_Ldap $ldap
      * @param Zend_Ldap_Collection_Iterator_Interface $iterator
-     * @return void
      */
     public function __construct(Zend_Ldap_Collection_Iterator_Interface $iterator)
     {
@@ -136,7 +134,7 @@ class Zend_Ldap_Collection implements Iterator, Countable
     /**
      * Creates the data structure for the given entry data
      *
-     * @param array $data
+     * @param  array $data
      * @return array
      */
     protected function _createEntry(array $data)

library/Zend/Ldap/Collection/Iterator/Default.php

@@ -73,8 +73,8 @@ class Zend_Ldap_Collection_Iterator_Default implements Zend_Ldap_Collection_Iter
     /**
      * Constructor.
      *
-     * @param Zend_Ldap $ldap
-     * @param resource $resultId
+     * @param  Zend_Ldap $ldap
+     * @param  resource  $resultId
      * @return void
      */
     public function __construct(Zend_Ldap $ldap, $resultId)

library/Zend/Ldap/Dn.php

@@ -150,7 +150,7 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Get the parent DN $levelUp levels up the tree
      *
-     * @param int $levelUp
+     * @param  int $levelUp
      * @return Zend_Ldap_Dn
      */
     public function getParentDn($levelUp = 1)
@@ -170,9 +170,9 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Get a DN part
      *
-     * @param int $index
-     * @param int $length
-     * @param string $caseFold
+     * @param  int    $index
+     * @param  int    $length
+     * @param  string $caseFold
      * @return array
      * @throws Zend_Ldap_Exception if index is illegal
      */
@@ -195,8 +195,8 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Set a DN part
      *
-     * @param int $index
-     * @param array $value
+     * @param  int   $index
+     * @param  array $value
      * @return Zend_Ldap_Dn Provides a fluent interface
      * @throws Zend_Ldap_Exception if index is illegal
      */
@@ -211,8 +211,8 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Remove a DN part
      *
-     * @param int $index
-     * @param int $length
+     * @param  int $index
+     * @param  int $length
      * @return Zend_Ldap_Dn Provides a fluent interface
      * @throws Zend_Ldap_Exception if index is illegal
      */
@@ -230,7 +230,7 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Append a DN part
      *
-     * @param array $value
+     * @param  array $value
      * @return Zend_Ldap_Dn Provides a fluent interface
      */
     public function append(array $value)
@@ -243,7 +243,7 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Prepend a DN part
      *
-     * @param array $value
+     * @param  array $value
      * @return Zend_Ldap_Dn Provides a fluent interface
      */
     public function prepend(array $value)
@@ -256,8 +256,8 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Insert a DN part
      *
-     * @param int index
-     * @param array $value
+     * @param  int   $index
+     * @param  array $value
      * @return Zend_Ldap_Dn Provides a fluent interface
      * @throws Zend_Ldap_Exception if index is illegal
      */
@@ -274,7 +274,7 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Assert index is correct and usable
      *
-     * @param mixed $index
+     * @param  mixed $index
      * @return boolean
      * @throws Zend_Ldap_Exception
      */
@@ -300,7 +300,7 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Assert if value is in a correct RDN format
      *
-     * @param array $value
+     * @param  array $value
      * @return boolean
      * @throws Zend_Ldap_Exception
      */
@@ -338,7 +338,7 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Return DN as a string
      *
-     * @param string $caseFold
+     * @param  string $caseFold
      * @return string
      * @throws Zend_Ldap_Exception
      */
@@ -351,7 +351,7 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Return DN as an array
      *
-     * @param string $caseFold
+     * @param  string $caseFold
      * @return array
      */
     public function toArray($caseFold = null)
@@ -368,8 +368,8 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Do a case folding on a RDN
      *
-     * @param array $part
-     * @param string $caseFold
+     * @param  array  $part
+     * @param  string $caseFold
      * @return array
      */
     protected static function _caseFoldRdn(array $part, $caseFold)
@@ -388,8 +388,8 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Do a case folding on a DN ort part of it
      *
-     * @param array $dn
-     * @param string $caseFold
+     * @param  array  $dn
+     * @param  string $caseFold
      * @return array
      */
     protected static function _caseFoldDn(array $dn, $caseFold)
@@ -414,7 +414,7 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Required by the ArrayAccess implementation
      *
-     * @param int $offset
+     * @param  int $offset
      * @return boolean
      */
     public function offsetExists($offset)
@@ -431,7 +431,7 @@ class Zend_Ldap_Dn implements ArrayAccess
      * Proxy to {@see get()}
      * Required by the ArrayAccess implementation
      *
-     * @param int $offset
+     * @param  int $offset
      * @return array
      */
      public function offsetGet($offset)
@@ -443,7 +443,7 @@ class Zend_Ldap_Dn implements ArrayAccess
       * Proxy to {@see set()}
       * Required by the ArrayAccess implementation
       *
-      * @param int $offset
+      * @param int   $offset
       * @param array $value
       */
      public function offsetSet($offset, $value)
@@ -475,7 +475,7 @@ class Zend_Ldap_Dn implements ArrayAccess
     /**
      * Sanitizes the case fold
      *
-     * @param string $caseFold
+     * @param  string $caseFold
      * @return string
      */
     protected static function _sanitizeCaseFold($caseFold, $default)
@@ -578,8 +578,8 @@ class Zend_Ldap_Dn implements ArrayAccess
      * for a DN of cn=name1+uid=user,cn=name2,dc=example,dc=org.
      *
      * @param  string $dn
-     * @param  array  $keys An optional array to receive DN keys (e.g. CN, OU, DC, ...)
-     * @param  array  $vals An optional array to receive DN values
+     * @param  array  $keys     An optional array to receive DN keys (e.g. CN, OU, DC, ...)
+     * @param  array  $vals     An optional array to receive DN values
      * @param  string $caseFold
      * @return array
      * @throws Zend_Ldap_Exception
@@ -616,9 +616,9 @@ class Zend_Ldap_Dn implements ArrayAccess
     }
 
     /**
-     * @param  string $dn   The DN to parse
-     * @param  array  $keys An optional array to receive DN keys (e.g. CN, OU, DC, ...)
-     * @param  array  $vals An optional array to receive DN values
+     * @param  string $dn       The DN to parse
+     * @param  array  $keys     An optional array to receive DN keys (e.g. CN, OU, DC, ...)
+     * @param  array  $vals     An optional array to receive DN values
      * @param  string $caseFold
      * @return boolean True if the DN was successfully parsed or false if the string is not a valid DN.
      */
@@ -711,7 +711,7 @@ class Zend_Ldap_Dn implements ArrayAccess
      * This method supports the creation of multi-valued RDNs
      * $part must contain an even number of elemets.
      *
-     * @param  array $attribute
+     * @param  array  $attribute
      * @param  string $caseFold
      * @return string
      * @throws Zend_Ldap_Exception
@@ -742,7 +742,7 @@ class Zend_Ldap_Dn implements ArrayAccess
      *      array("dc" => "org")
      * )
      *
-     * @param  array $dnArray
+     * @param  array  $dnArray
      * @param  string $caseFold
      * @param  string $separator
      * @return string

library/Zend/Ldap/Exception.php

@@ -118,8 +118,8 @@ class Zend_Ldap_Exception extends Zend_Exception
 
     /**
      * @param Zend_Ldap $ldap A Zend_Ldap object
-     * @param string $str An informtive exception message
-     * @param int $code An LDAP error code
+     * @param string    $str  An informtive exception message
+     * @param int       $code An LDAP error code
      */
     public function __construct(Zend_Ldap $ldap = null, $str = null, $code = 0)
     {

library/Zend/Ldap/Filter.php

@@ -36,12 +36,12 @@ require_once 'Zend/Ldap/Filter/String.php';
  */
 class Zend_Ldap_Filter extends Zend_Ldap_Filter_String
 {
-    const TYPE_EQUALS = '=';
-    const TYPE_GREATER = '>';
+    const TYPE_EQUALS         = '=';
+    const TYPE_GREATER        = '>';
     const TYPE_GREATEROREQUAL = '>=';
-    const TYPE_LESS = '<';
-    const TYPE_LESSOREQUAL = '<=';
-    const TYPE_APPROX = '~=';
+    const TYPE_LESS           = '<';
+    const TYPE_LESSOREQUAL    = '<=';
+    const TYPE_APPROX         = '~=';
 
     /**
      * Creates an 'equals' filter.

library/Zend/Ldap/Filter/Logical.php

@@ -41,7 +41,7 @@ require_once 'Zend/Ldap/Filter/String.php';
 abstract class Zend_Ldap_Filter_Logical extends Zend_Ldap_Filter_Abstract
 {
     const TYPE_AND = '&';
-    const TYPE_OR = '|';
+    const TYPE_OR  = '|';
 
     /**
      * All the sub-filters for this grouping filter.
@@ -60,7 +60,7 @@ abstract class Zend_Ldap_Filter_Logical extends Zend_Ldap_Filter_Abstract
     /**
      * Creates a new grouping filter.
      *
-     * @param array $subfilters
+     * @param array  $subfilters
      * @param string $symbol
      */
     protected function __construct(array $subfilters, $symbol)
@@ -82,7 +82,7 @@ abstract class Zend_Ldap_Filter_Logical extends Zend_Ldap_Filter_Abstract
     /**
      * Adds a filter to this grouping filter.
      *
-     * @param Zend_Ldap_Filter_Abstract $filter
+     * @param  Zend_Ldap_Filter_Abstract $filter
      * @return Zend_Ldap_Filter_Logical
      */
     public function addFilter(Zend_Ldap_Filter_Abstract $filter)

library/Zend/Ldap/Ldif/Encoder.php

@@ -42,12 +42,15 @@ class Zend_Ldap_Ldif_Encoder
         'wrap'    => 78
     );
 
+    /**
+     * @var boolean
+     */
     protected $_versionWritten = false;
 
     /**
      * Constructor.
      *
-     * @param array $options Additional options used during encoding
+     * @param  array $options Additional options used during encoding
      * @return void
      */
     protected function __construct(array $options = array())
@@ -58,7 +61,7 @@ class Zend_Ldap_Ldif_Encoder
     /**
      * Decodes the string $string into an array of LDIF items
      *
-     * @param string $string
+     * @param  string $string
      * @return array
      */
     public static function decode($string)
@@ -70,7 +73,7 @@ class Zend_Ldap_Ldif_Encoder
     /**
      * Decodes the string $string into an array of LDIF items
      *
-     * @param string $string
+     * @param  string $string
      * @return array
      */
     protected function _decode($string)
@@ -137,8 +140,8 @@ class Zend_Ldap_Ldif_Encoder
     /**
      * Encode $value into a LDIF representation
      *
-     * @param mixed $value The value to be encoded
-     * @param array $options Additional options used during encoding
+     * @param  mixed $value   The value to be encoded
+     * @param  array $options Additional options used during encoding
      * @return string The encoded value
      */
     public static function encode($value, array $options = array())
@@ -151,7 +154,7 @@ class Zend_Ldap_Ldif_Encoder
      * Recursive driver which determines the type of value to be encoded
      * and then dispatches to the appropriate method.
      *
-     * @param $value mixed The value to be encoded
+     * @param  mixed $value The value to be encoded
      * @return string Encoded value
      */
     protected function _encode($value)
@@ -171,8 +174,8 @@ class Zend_Ldap_Ldif_Encoder
      *
      * @link http://www.faqs.org/rfcs/rfc2849.html
      *
-     * @param string $string
-     * @param boolen $base64
+     * @param  string $string
+     * @param  boolen $base64
      * @return string
      */
     protected function _encodeString($string, &$base64 = null)
@@ -229,8 +232,8 @@ class Zend_Ldap_Ldif_Encoder
      *
      * @link http://www.faqs.org/rfcs/rfc2849.html
      *
-     * @param string $name
-     * @param array|string $value
+     * @param  string       $name
+     * @param  array|string $value
      * @return string
      */
     protected function _encodeAttribute($name, $value)
@@ -267,7 +270,7 @@ class Zend_Ldap_Ldif_Encoder
      *
      * @link http://www.faqs.org/rfcs/rfc2849.html
      *
-     * @param array $attributes
+     * @param  array $attributes
      * @return string
      */
     protected function _encodeAttributes(array $attributes)

library/Zend/Ldap/Node.php

@@ -91,9 +91,9 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * Constructor is protected to enforce the use of factory methods.
      *
      * @param  Zend_Ldap_Dn $dn
-     * @param  array $data
-     * @param  boolean $fromDataSource
-     * @param  Zend_Ldap $ldap
+     * @param  array        $data
+     * @param  boolean      $fromDataSource
+     * @param  Zend_Ldap    $ldap
      * @throws Zend_Ldap_Exception
      */
     protected function __construct(Zend_Ldap_Dn $dn, array $data, $fromDataSource, Zend_Ldap $ldap = null)
@@ -153,7 +153,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * @uses   Zend_Ldap_Dn::isChildOf()
      * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function attachLdap(Zend_Ldap $ldap)
@@ -183,7 +183,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * This is an offline method.
      *
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      */
     public function detachLdap()
     {
@@ -209,7 +209,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
     }
 
     /**
-     * @param  array $data
+     * @param  array   $data
      * @param  boolean $fromDataSource
      * @throws Zend_Ldap_Exception
      */
@@ -230,7 +230,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * Factory method to create a new detached Zend_Ldap_Node for a given DN.
      *
      * @param  string|array|Zend_Ldap_Dn $dn
-     * @param  array $objectClass
+     * @param  array                     $objectClass
      * @return Zend_Ldap_Node
      * @throws Zend_Ldap_Exception
      */
@@ -257,7 +257,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * Factory method to create an attached Zend_Ldap_Node for a given DN.
      *
      * @param  string|array|Zend_Ldap_Dn $dn
-     * @param  Zend_Ldap $ldap
+     * @param  Zend_Ldap                 $ldap
      * @return Zend_Ldap_Node
      * @throws Zend_Ldap_Exception
      */
@@ -282,7 +282,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
     /**
      * Factory method to create a detached Zend_Ldap_Node from array data.
      *
-     * @param  array $data
+     * @param  array   $data
      * @param  boolean $fromDataSource
      * @return Zend_Ldap_Node
      * @throws Zend_Ldap_Exception
@@ -378,7 +378,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * Node will be deleted on calling update() if $delete is true.
      *
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      */
     public function delete()
     {
@@ -405,8 +405,8 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
     /**
      * Sends all pending changes to the LDAP server
      *
-     * @param Zend_Ldap $ldap
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @param  Zend_Ldap $ldap
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function update(Zend_Ldap $ldap = null)
@@ -487,9 +487,9 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * This is an offline method.
      *
-     * @param Zend_Ldap_Dn|string|array $newDn
+     * @param  Zend_Ldap_Dn|string|array $newDn
      * @throws Zend_Ldap_Exception
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      */
     public function setDn($newDn)
     {
@@ -507,9 +507,9 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * This is an offline method.
      *
-     * @param Zend_Ldap_Dn|string|array $newDn
+     * @param  Zend_Ldap_Dn|string|array $newDn
      * @throws Zend_Ldap_Exception
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      */
     public function move($newDn)
     {
@@ -521,9 +521,9 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * This is an offline method.
      *
-     * @param Zend_Ldap_Dn|string|array $newDn
+     * @param  Zend_Ldap_Dn|string|array $newDn
      * @throws Zend_Ldap_Exception
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      */
     public function rename($newDn)
     {
@@ -536,7 +536,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * This is an offline method.
      *
      * @param  array|string $value
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function setObjectClass($value)
@@ -551,7 +551,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * This is an offline method.
      *
      * @param  array|string $value
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function appendObjectClass($value)
@@ -563,7 +563,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
     /**
      * Returns a LDIF representation of the current node
      *
-     * @param array $options Additional options used during encoding
+     * @param  array $options Additional options used during encoding
      * @return string
      */
     public function toLdif(array $options = array())
@@ -634,8 +634,8 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * This is an offline method.
      *
      * @param  string $name
-     * @param  mixed $value
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @param  mixed  $value
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function setAttribute($name, $value)
@@ -650,8 +650,8 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * This is an offline method.
      *
      * @param  string $name
-     * @param  mixed $value
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @param  mixed  $value
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function appendToAttribute($name, $value)
@@ -663,8 +663,8 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
     /**
      * Checks if the attribute can be set and sets it accordingly.
      *
-     * @param  string $name
-     * @param  mixed $value
+     * @param  string  $name
+     * @param  mixed   $value
      * @param  boolean $append
      * @throws Zend_Ldap_Exception
      */
@@ -679,10 +679,10 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * This is an offline method.
      *
-     * @param  string $name
+     * @param  string        $name
      * @param  integer|array $value
-     * @param  boolean $utc
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @param  boolean       $utc
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function setDateTimeAttribute($name, $value, $utc = false)
@@ -696,10 +696,10 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * This is an offline method.
      *
-     * @param  string $name
+     * @param  string        $name
      * @param  integer|array $value
-     * @param  boolean $utc
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @param  boolean       $utc
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function appendToDateTimeAttribute($name, $value, $utc = false)
@@ -711,10 +711,10 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
     /**
      * Checks if the attribute can be set and sets it accordingly.
      *
-     * @param  string $name
+     * @param  string        $name
      * @param  integer|array $value
-     * @param  boolean $utc
-     * @param  boolean $append
+     * @param  boolean       $utc
+     * @param  boolean       $append
      * @throws Zend_Ldap_Exception
      */
     protected function _setDateTimeAttribute($name, $value, $utc, $append)
@@ -729,7 +729,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * @param  string $password
      * @param  string $hashType
      * @param  string $attribName
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function setPasswordAttribute($password, $hashType = Zend_Ldap_Attribute::PASSWORD_HASH_MD5,
@@ -748,7 +748,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * This is an offline method.
      *
      * @param  string $name
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function deleteAttribute($name)
@@ -762,7 +762,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
     /**
      * Removes duplicate values from a LDAP attribute
      *
-     * @param string $attribName
+     * @param  string $attribName
      * @return void
      */
     public function removeDuplicatesFromAttribute($attribName)
@@ -773,8 +773,8 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
     /**
      * Remove given values from a LDAP attribute
      *
-     * @param string $attribName
-     * @param mixed|array $value
+     * @param  string      $attribName
+     * @param  mixed|array $value
      * @return void
      */
     public function removeFromAttribute($attribName, $value)
@@ -820,7 +820,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * This is an offline method.
      *
      * @param  string $name
-     * @param  mixed $value
+     * @param  mixed  $value
      * @return null
      * @throws Zend_Ldap_Exception
      */
@@ -852,7 +852,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * This is an offline method.
      *
      * @param  string $name
-     * @param  mixed $value
+     * @param  mixed  $value
      * @return null
      * @throws Zend_Ldap_Exception
      */
@@ -883,7 +883,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * This is an online method.
      *
-     * @param Zend_Ldap $ldap
+     * @param  Zend_Ldap $ldap
      * @return boolean
      * @throws Zend_Ldap_Exception
      */
@@ -902,7 +902,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * This is an online method.
      *
      * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node *Provides a fluid interface*
+     * @return Zend_Ldap_Node Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function reload(Zend_Ldap $ldap = null)
@@ -920,9 +920,9 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * This is an online method.
      *
-     * @param string|Zend_Ldap_Filter_Abstract $filter
-     * @param integer $scope
-     * @param string $sort
+     * @param  string|Zend_Ldap_Filter_Abstract $filter
+     * @param  integer                          $scope
+     * @param  string                           $sort
      * @return Zend_Ldap_Node_Collection
      * @throws Zend_Ldap_Exception
      */
@@ -941,8 +941,8 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      *
      * This is an online method.
      *
-     * @param string|Zend_Ldap_Filter_Abstract $filter
-     * @param integer $scope
+     * @param  string|Zend_Ldap_Filter_Abstract $filter
+     * @param  integer                          $scope
      * @return integer
      * @throws Zend_Ldap_Exception
      */
@@ -970,7 +970,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      * This is an online method.
      *
      * @param  string|Zend_Ldap_Filter_Abstract $filter
-     * @param  string $sort
+     * @param  string                           $sort
      * @return Zend_Ldap_Node_Collection
      * @throws Zend_Ldap_Exception
      */

library/Zend/Ldap/Node/Abstract.php

@@ -66,8 +66,8 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
      * Constructor is protected to enforce the use of factory methods.
      *
      * @param  Zend_Ldap_Dn $dn
-     * @param  array $data
-     * @param  boolean $fromDataSource
+     * @param  array        $data
+     * @param  boolean      $fromDataSource
      */
     protected function __construct(Zend_Ldap_Dn $dn, array $data, $fromDataSource)
     {
@@ -76,7 +76,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
     }
 
     /**
-     * @param  array $data
+     * @param  array   $data
      * @param  boolean $fromDataSource
      * @throws Zend_Ldap_Exception
      */
@@ -95,7 +95,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
      * This is an online method.
      *
      * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node_Abstract *Provides a fluid interface*
+     * @return Zend_Ldap_Node_Abstract Provides a fluid interface
      * @throws Zend_Ldap_Exception
      */
     public function reload(Zend_Ldap $ldap = null)
@@ -202,7 +202,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
      *
      * This is an offline method.
      *
-     * @param boolean $includeSystemAttributes
+     * @param  boolean $includeSystemAttributes
      * @return array
      */
     public function getAttributes($includeSystemAttributes = true)
@@ -237,7 +237,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
     /**
      * Returns an array representation of the current node
      *
-     * @param boolean $includeSystemAttributes
+     * @param  boolean $includeSystemAttributes
      * @return array
      */
     public function toArray($includeSystemAttributes = true)
@@ -249,7 +249,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
     /**
      * Returns a JSON representation of the current node
      *
-     * @param boolean $includeSystemAttributes
+     * @param  boolean $includeSystemAttributes
      * @return string
      */
     public function toJson($includeSystemAttributes = true)
@@ -264,7 +264,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
      *
      * This is an offline method.
      *
-     * @param boolean $includeSystemAttributes
+     * @param  boolean $includeSystemAttributes
      * @return array
      */
     public function getData($includeSystemAttributes = true)
@@ -291,7 +291,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
      * true. In this case method returns false only if the attribute name is
      * missing in the key-collection.
      *
-     * @param  string $name
+     * @param  string  $name
      * @param  boolean $emptyExists
      * @return boolean
      */
@@ -308,8 +308,8 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
     /**
      * Checks if the given value(s) exist in the attribute
      *
-     * @param string $attribName
-     * @param mixed|array $value
+     * @param  string      $attribName
+     * @param  mixed|array $value
      * @return boolean
      */
     public function attributeHasValue($attribName, $value)
@@ -322,7 +322,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
      *
      * This is an offline method.
      *
-     * @param  string $name
+     * @param  string  $name
      * @param  integer $index
      * @return mixed
      * @throws Zend_Ldap_Exception
@@ -342,7 +342,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
      *
      * This is an offline method.
      *
-     * @param  string $name
+     * @param  string  $name
      * @param  integer $index
      * @return array|integer
      * @throws Zend_Ldap_Exception
@@ -358,7 +358,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
      * This is an offline method.
      *
      * @param  string $name
-     * @param  mixed $value
+     * @param  mixed  $value
      * @return null
      * @throws BadMethodCallException
      */
@@ -417,7 +417,7 @@ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
      * This is an offline method.
      *
      * @param  string $name
-     * @param  mixed $value
+     * @param  mixed  $value
      * @return null
      * @throws BadMethodCallException
      */

library/Zend/Ldap/Node/ChildrenIterator.php

@@ -46,7 +46,7 @@ class Zend_Ldap_Node_ChildrenIterator implements Iterator, Countable, RecursiveI
     /**
      * Constructor.
      *
-     * @param array $data
+     * @param  array $data
      * @return void
      */
     public function __construct(array $data)

library/Zend/Ldap/Node/Collection.php

@@ -40,7 +40,7 @@ class Zend_Ldap_Node_Collection extends Zend_Ldap_Collection
     /**
      * Creates the data structure for the given entry data
      *
-     * @param array $data
+     * @param  array $data
      * @return Zend_Ldap_Node
      */
     protected function _createEntry(array $data)

library/Zend/Ldap/Node/RootDse.php

@@ -82,7 +82,7 @@ class Zend_Ldap_Node_RootDse extends Zend_Ldap_Node_Abstract
      * Constructor is protected to enforce the use of factory methods.
      *
      * @param  Zend_Ldap_Dn $dn
-     * @param  array $data
+     * @param  array        $data
      */
     protected function __construct(Zend_Ldap_Dn $dn, array $data)
     {
@@ -112,7 +112,7 @@ class Zend_Ldap_Node_RootDse extends Zend_Ldap_Node_Abstract
     /**
      * Determines if the version is supported
      *
-     * @param string|int|array $versions version(s) to check
+     * @param  string|int|array $versions version(s) to check
      * @return boolean
      */
     public function supportsVersion($versions)
@@ -123,7 +123,7 @@ class Zend_Ldap_Node_RootDse extends Zend_Ldap_Node_Abstract
     /**
      * Determines if the sasl mechanism is supported
      *
-     * @param string|array $mechlist SASL mechanisms to check
+     * @param  string|array $mechlist SASL mechanisms to check
      * @return boolean
      */
     public function supportsSaslMechanism($mechlist)

library/Zend/Ldap/Node/RootDse/OpenLdap.php

@@ -60,7 +60,7 @@ class Zend_Ldap_Node_RootDse_OpenLdap extends Zend_Ldap_Node_RootDse
     /**
      * Determines if the control is supported
      *
-     * @param string|array $oids control oid(s) to check
+     * @param  string|array $oids control oid(s) to check
      * @return boolean
      */
     public function supportsControl($oids)
@@ -71,7 +71,7 @@ class Zend_Ldap_Node_RootDse_OpenLdap extends Zend_Ldap_Node_RootDse
     /**
      * Determines if the extension is supported
      *
-     * @param string|array $oids oid(s) to check
+     * @param  string|array $oids oid(s) to check
      * @return boolean
      */
     public function supportsExtension($oids)
@@ -82,7 +82,7 @@ class Zend_Ldap_Node_RootDse_OpenLdap extends Zend_Ldap_Node_RootDse
     /**
      * Determines if the feature is supported
      *
-     * @param string|array $oids feature oid(s) to check
+     * @param  string|array $oids feature oid(s) to check
      * @return boolean
      */
     public function supportsFeature($oids)

library/Zend/Ldap/Node/RootDse/eDirectory.php

@@ -40,7 +40,7 @@ class Zend_Ldap_Node_RootDse_eDirectory extends Zend_Ldap_Node_RootDse
     /**
      * Determines if the extension is supported
      *
-     * @param string|array $oids oid(s) to check
+     * @param  string|array $oids oid(s) to check
      * @return boolean
      */
     public function supportsExtension($oids)

library/Zend/Ldap/Node/Schema.php

@@ -77,8 +77,8 @@ class Zend_Ldap_Node_Schema extends Zend_Ldap_Node_Abstract
      * Constructor is protected to enforce the use of factory methods.
      *
      * @param  Zend_Ldap_Dn $dn
-     * @param  array $data
-     * @param  Zend_Ldap $ldap
+     * @param  array        $data
+     * @param  Zend_Ldap    $ldap
      */
     protected function __construct(Zend_Ldap_Dn $dn, array $data, Zend_Ldap $ldap)
     {
@@ -90,8 +90,8 @@ class Zend_Ldap_Node_Schema extends Zend_Ldap_Node_Abstract
      * Parses the schema
      *
      * @param  Zend_Ldap_Dn $dn
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node_Schema *Provides a fluid interface*
+     * @param  Zend_Ldap    $ldap
+     * @return Zend_Ldap_Node_Schema Provides a fluid interface
      */
     protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
     {

library/Zend/Ldap/Node/Schema/ActiveDirectory.php

@@ -62,8 +62,8 @@ class Zend_Ldap_Node_Schema_ActiveDirectory extends Zend_Ldap_Node_Schema
      * Parses the schema
      *
      * @param  Zend_Ldap_Dn $dn
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node_Schema *Provides a fluid interface*
+     * @param  Zend_Ldap    $ldap
+     * @return Zend_Ldap_Node_Schema Provides a fluid interface
      */
     protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
     {

library/Zend/Ldap/Node/Schema/Item.php

@@ -52,8 +52,8 @@ abstract class Zend_Ldap_Node_Schema_Item implements ArrayAccess, Countable
     /**
      * Sets the data
      *
-     * @param array $data
-     * @return Zend_Ldap_Node_Schema_Item *Provides a fluid interface*
+     * @param  array $data
+     * @return Zend_Ldap_Node_Schema_Item Provides a fluid interface
      */
     public function setData(array $data)
     {

library/Zend/Ldap/Node/Schema/OpenLdap.php

@@ -80,8 +80,8 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
      * Parses the schema
      *
      * @param  Zend_Ldap_Dn $dn
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node_Schema *Provides a fluid interface*
+     * @param  Zend_Ldap    $ldap
+     * @return Zend_Ldap_Node_Schema Provides a fluid interface
      */
     protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
     {
@@ -172,7 +172,7 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
     /**
      * Parses an attributeType value
      *
-     * @param string $value
+     * @param  string $value
      * @return array
      */
     protected function _parseAttributeType($value)
@@ -271,7 +271,7 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
      * Resolves inheritance in objectClasses and attributes
      *
      * @param Zend_Ldap_Node_Schema_Item $node
-     * @param array $repository
+     * @param array                      $repository
      */
     protected function _resolveInheritance(Zend_Ldap_Node_Schema_Item $node, array $repository)
     {
@@ -306,7 +306,7 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
     /**
      * Parses an ldapSyntaxes value
      *
-     * @param string $value
+     * @param  string $value
      * @return array
      */
     protected function _parseLdapSyntax($value)
@@ -341,7 +341,7 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
     /**
      * Parses an matchingRules value
      *
-     * @param string $value
+     * @param  string $value
      * @return array
      */
     protected function _parseMatchingRule($value)
@@ -381,7 +381,7 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
     /**
      * Parses an matchingRuleUse value
      *
-     * @param string $value
+     * @param  string $value
      * @return array
      */
     protected function _parseMatchingRuleUse($value)
@@ -427,8 +427,8 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
     /**
      * Parse the given tokens into a data structure
      *
-     * @param array $data
-     * @param array $tokens
+     * @param  array $data
+     * @param  array $tokens
      * @return void
      */
     protected function _parseLdapSchemaSyntax(array &$data, array $tokens)
@@ -475,7 +475,7 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
     /**
     * Tokenizes the given value into an array
     *
-    * @param string $value string
+    * @param  string $value
     * @return array tokens
     */
     protected function _tokenizeString($value)