Merge branch 'hotfix/4352' into develop

Close zendframework/zendframework#4352
zendframework · Apr 29, 2013 · 9cc3538 · 9cc3538
commit 9cc3538
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 35 deletions.
diff --git a/src/Attribute.php b/src/Attribute.php
@@ -64,7 +64,7 @@ public static function setAttribute(array &$data, $attribName, $value, $append =
      *
      * @param  array   $data
      * @param  string  $attribName
-     * @param  integer $index
+     * @param  int $index
      * @return array|mixed
      */
     public static function getAttribute(array $data, $attribName, $index = null)
@@ -283,7 +283,7 @@ public static function createPassword($password, $hashType = self::PASSWORD_HASH
      *
      * @param  array                      $data
      * @param  string                     $attribName
-     * @param  integer|array|\Traversable $value
+     * @param  int|array|\Traversable $value
      * @param  bool                    $utc
      * @param  bool                    $append
      */
@@ -310,7 +310,7 @@ public static function setDateTimeAttribute(
     }
 
     /**
-     * @param  integer $value
+     * @param  int $value
      * @param  bool $utc
      * @return string|null
      */
@@ -328,8 +328,8 @@ private static function valueToLdapDateTime($value, $utc)
      *
      * @param  array   $data
      * @param  string  $attribName
-     * @param  integer $index
-     * @return array|integer
+     * @param  int $index
+     * @return array|int
      */
     public static function getDateTimeAttribute(array $data, $attribName, $index = null)
     {
@@ -353,7 +353,7 @@ public static function getDateTimeAttribute(array $data, $attribName, $index = n
 
     /**
      * @param  string|DateTime $value
-     * @return integer|null
+     * @return int|null
      */
     private static function valueFromLdapDateTime($value)
     {

diff --git a/src/Collection.php b/src/Collection.php
@@ -24,7 +24,7 @@ class Collection implements \Iterator, \Countable
     /**
      * Current item number
      *
-     * @var integer
+     * @var int
      */
     protected $current = -1;
 

diff --git a/src/Collection/DefaultIterator.php b/src/Collection/DefaultIterator.php
@@ -47,7 +47,7 @@ class DefaultIterator implements \Iterator, \Countable
     /**
      * Number of items in query result
      *
-     * @var integer
+     * @var int
      */
     protected $itemCount = -1;
 
@@ -124,7 +124,7 @@ public function getLDAP()
      * or a valid callback accepting the attribute's name as it's only
      * argument and returning the new attribute's name.
      *
-     * @param  integer|callable $attributeNameTreatment
+     * @param  int|callable $attributeNameTreatment
      * @return DefaultIterator Provides a fluent interface
      */
     public function setAttributeNameTreatment($attributeNameTreatment)
@@ -159,7 +159,7 @@ public function setAttributeNameTreatment($attributeNameTreatment)
     /**
      * Returns the currently set attribute name treatment
      *
-     * @return integer|callable
+     * @return int|callable
      */
     public function getAttributeNameTreatment()
     {

diff --git a/src/Converter/Converter.php b/src/Converter/Converter.php
@@ -123,7 +123,7 @@ public static function toLdap($value, $type = self::STANDARD)
      * The date-entity <var>$date</var> can be either a timestamp, a
      * DateTime Object, a string that is parseable by strtotime().
      *
-     * @param integer|string|DateTime $date  The date-entity
+     * @param int|string|DateTime $date  The date-entity
      * @param  bool                 $asUtc Whether to return the LDAP-compatible date-string as UTC or as local value
      * @return string
      * @throws Exception\InvalidArgumentException
@@ -158,7 +158,7 @@ public static function toLdapDateTime($date, $asUtc = true)
      * case-insensitive string 'true' to an LDAP-compatible 'TRUE'. All other
      * other values are converted to an LDAP-compatible 'FALSE'.
      *
-     * @param  bool|integer|string $value The boolean value to encode
+     * @param  bool|int|string $value The boolean value to encode
      * @return string
      */
     public static function toLdapBoolean($value)

diff --git a/src/Ldap.php b/src/Ldap.php
@@ -347,7 +347,7 @@ public function getBaseDn()
     }
 
     /**
-     * @return integer Either ACCTNAME_FORM_BACKSLASH, ACCTNAME_FORM_PRINCIPAL or
+     * @return int Either ACCTNAME_FORM_BACKSLASH, ACCTNAME_FORM_PRINCIPAL or
      * ACCTNAME_FORM_USERNAME indicating the form usernames should be canonicalized to.
      */
     protected function getAccountCanonicalForm()
@@ -852,12 +852,12 @@ public function bind($username = null, $password = null)
      *
      * @param  string|Filter\AbstractFilter|array $filter
      * @param  string|Dn|null                     $basedn
-     * @param  integer                            $scope
+     * @param  int                            $scope
      * @param  array                              $attributes
      * @param  string|null                        $sort
      * @param  string|null                        $collectionClass
-     * @param  integer                            $sizelimit
-     * @param  integer                            $timelimit
+     * @param  int                            $sizelimit
+     * @param  int                            $timelimit
      * @return Collection
      * @throws Exception\LdapException
      */
@@ -966,8 +966,8 @@ protected function createCollection(Collection\DefaultIterator $iterator, $colle
      *
      * @param  string|Filter\AbstractFilter $filter
      * @param  string|Dn|null               $basedn
-     * @param  integer                      $scope
-     * @return integer
+     * @param  int                      $scope
+     * @return int
      * @throws Exception\LdapException
      */
     public function count($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB)
@@ -988,7 +988,7 @@ public function count($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB)
      * Count children for a given DN.
      *
      * @param  string|Dn $dn
-     * @return integer
+     * @return int
      * @throws Exception\LdapException
      */
     public function countChildren($dn)
@@ -1024,12 +1024,12 @@ public function exists($dn)
      *
      * @param  string|Filter\AbstractFilter|array $filter
      * @param  string|Dn|null                     $basedn
-     * @param  integer                            $scope
+     * @param  int                            $scope
      * @param  array                              $attributes
      * @param  string|null                        $sort
      * @param  bool                            $reverseSort
-     * @param  integer                            $sizelimit
-     * @param  integer                            $timelimit
+     * @param  int                            $sizelimit
+     * @param  int                            $timelimit
      * @return array
      * @throws Exception\LdapException
      */

diff --git a/src/Node.php b/src/Node.php
@@ -691,7 +691,7 @@ protected function _setAttribute($name, $value, $append)
      * This is an offline method.
      *
      * @param  string        $name
-     * @param  integer|array $value
+     * @param  int|array $value
      * @param  bool       $utc
      * @return Node Provides a fluid interface
      * @throws Exception\LdapException
@@ -708,7 +708,7 @@ public function setDateTimeAttribute($name, $value, $utc = false)
      * This is an offline method.
      *
      * @param  string        $name
-     * @param  integer|array $value
+     * @param  int|array $value
      * @param  bool       $utc
      * @return Node Provides a fluid interface
      * @throws Exception\LdapException
@@ -724,7 +724,7 @@ public function appendToDateTimeAttribute($name, $value, $utc = false)
      * Checks if the attribute can be set and sets it accordingly.
      *
      * @param  string        $name
-     * @param  integer|array $value
+     * @param  int|array $value
      * @param  bool       $utc
      * @param  bool       $append
      * @throws Exception\LdapException
@@ -920,7 +920,7 @@ public function reload(Ldap $ldap = null)
      * This is an online method.
      *
      * @param  string|Filter\AbstractFilter $filter
-     * @param  integer                      $scope
+     * @param  int                      $scope
      * @param  string                       $sort
      * @return Node\Collection
      * @throws Exception\LdapException
@@ -939,8 +939,8 @@ public function searchSubtree($filter, $scope = Ldap::SEARCH_SCOPE_SUB, $sort =
      * This is an online method.
      *
      * @param  string|Filter\AbstractFilter $filter
-     * @param  integer                      $scope
-     * @return integer
+     * @param  int                      $scope
+     * @return int
      * @throws Exception\LdapException
      */
     public function countSubtree($filter, $scope = Ldap::SEARCH_SCOPE_SUB)
@@ -953,7 +953,7 @@ public function countSubtree($filter, $scope = Ldap::SEARCH_SCOPE_SUB)
      *
      * This is an online method.
      *
-     * @return integer
+     * @return int
      * @throws Exception\LdapException
      */
     public function countChildren()

diff --git a/src/Node/AbstractNode.php b/src/Node/AbstractNode.php
@@ -304,7 +304,7 @@ public function attributeHasValue($attribName, $value)
      * This is an offline method.
      *
      * @param  string  $name
-     * @param  integer $index
+     * @param  int $index
      * @return mixed
      * @throws \Zend\Ldap\Exception\LdapException
      */
@@ -323,8 +323,8 @@ public function getAttribute($name, $index = null)
      * This is an offline method.
      *
      * @param  string  $name
-     * @param  integer $index
-     * @return array|integer
+     * @param  int $index
+     * @return array|int
      * @throws \Zend\Ldap\Exception\LdapException
      */
     public function getDateTimeAttribute($name, $index = null)

diff --git a/src/Node/Schema/ObjectClass/ActiveDirectory.php b/src/Node/Schema/ObjectClass/ActiveDirectory.php
@@ -70,7 +70,7 @@ public function getDescription()
     /**
      * Gets the objectClass type
      *
-     * @return integer
+     * @return int
      */
     public function getType()
     {

diff --git a/src/Node/Schema/ObjectClass/ObjectClassInterface.php b/src/Node/Schema/ObjectClass/ObjectClassInterface.php
@@ -52,7 +52,7 @@ public function getDescription();
     /**
      * Gets the objectClass type
      *
-     * @return integer
+     * @return int
      */
     public function getType();
 

diff --git a/src/Node/Schema/ObjectClass/OpenLdap.php b/src/Node/Schema/ObjectClass/OpenLdap.php
@@ -113,7 +113,7 @@ public function getDescription()
     /**
      * Gets the objectClass type
      *
-     * @return integer
+     * @return int
      */
     public function getType()
     {