Merge branch 'hotfix/4352' into develop

Close zendframework/zendframework#4352

src/BlockCipher.php

@@ -162,20 +162,20 @@ public function getCipher()
     /**
      * Set the number of iterations for Pbkdf2
      *
-     * @param  integer     $num
+     * @param  int     $num
      * @return BlockCipher
      */
     public function setKeyIteration($num)
     {
-        $this->keyIteration = (integer) $num;
+        $this->keyIteration = (int) $num;
 
         return $this;
     }
 
     /**
      * Get the number of iterations for Pbkdf2
      *
-     * @return integer
+     * @return int
      */
     public function getKeyIteration()
     {

src/Hash.php

@@ -44,7 +44,7 @@ public static function compute($hash, $data, $output = self::OUTPUT_STRING)
      *
      * @param  string  $hash
      * @param  bool $output
-     * @return integer
+     * @return int
      */
     public static function getOutputSize($hash, $output = self::OUTPUT_STRING)
     {

src/Hmac.php

@@ -57,7 +57,7 @@ public static function compute($key, $hash, $data, $output = self::OUTPUT_STRING
      *
      * @param  string  $hash
      * @param  bool $output
-     * @return integer
+     * @return int
      */
     public static function getOutputSize($hash, $output = self::OUTPUT_STRING)
     {

src/Key/Derivation/Pbkdf2.php

@@ -22,8 +22,8 @@ class Pbkdf2
      * @param  string  $hash       The hash algorithm to be used by HMAC
      * @param  string  $password   The source password/key
      * @param  string  $salt
-     * @param  integer $iterations The number of iterations
-     * @param  integer $length     The output size
+     * @param  int $iterations The number of iterations
+     * @param  int $length     The output size
      * @throws Exception\InvalidArgumentException
      * @return string
      */

src/Key/Derivation/SaltedS2k.php

@@ -45,7 +45,7 @@ class SaltedS2k
      *
      * @param  string  $hash       The hash algorithm to be used by HMAC
      * @param  string  $password   The source password/key
-     * @param  integer $bytes      The output size in bytes
+     * @param  int $bytes      The output size in bytes
      * @param  string  $salt       The salt of the algorithm
      * @throws Exception\InvalidArgumentException
      * @return string

src/Key/Derivation/Scrypt.php

@@ -24,10 +24,10 @@ abstract class Scrypt
      *
      * @param  string $password
      * @param  string $salt
-     * @param  integer $n CPU cost
-     * @param  integer $r Memory cost
-     * @param  integer $p parallelization cost
-     * @param  integer $length size of the output key
+     * @param  int $n CPU cost
+     * @param  int $r Memory cost
+     * @param  int $p parallelization cost
+     * @param  int $length size of the output key
      * @return string
      */
     public static function calc($password, $salt, $n, $r, $p, $length)
@@ -63,8 +63,8 @@ public static function calc($password, $salt, $n, $r, $p, $length)
     * scryptROMix
     *
     * @param  string $b
-    * @param  integer $n
-    * @param  integer $r
+    * @param  int $n
+    * @param  int $r
     * @return string
     * @see    https://tools.ietf.org/html/draft-josefsson-scrypt-kdf-01#section-4
     */
@@ -88,7 +88,7 @@ protected static function scryptROMix($b, $n, $r)
      * scryptBlockMix
      *
      * @param  string $b
-     * @param  integer $r
+     * @param  int $r
      * @return string
      * @see    https://tools.ietf.org/html/draft-josefsson-scrypt-kdf-01#section-3
      */
@@ -308,7 +308,7 @@ protected static function salsa208Core64($b)
      * Each block B is a string of 64 bytes.
      *
      * @param  string $b
-     * @return integer
+     * @return int
      * @see    https://tools.ietf.org/html/draft-josefsson-scrypt-kdf-01#section-4
      */
     protected static function integerify($b)

src/Password/Bcrypt.php

@@ -118,7 +118,7 @@ public function verify($password, $hash)
     /**
      * Set the cost parameter
      *
-     * @param  integer|string $cost
+     * @param  int|string $cost
      * @throws Exception\InvalidArgumentException
      * @return Bcrypt
      */

src/Symmetric/Mcrypt.php

@@ -209,7 +209,7 @@ public static function setPaddingPluginManager($plugins)
     /**
      * Get the maximum key size for the selected cipher and mode of operation
      *
-     * @return integer
+     * @return int
      */
     public function getKeySize()
     {
@@ -374,7 +374,7 @@ public function decrypt($data)
     /**
      * Get the salt (IV) size
      *
-     * @return integer
+     * @return int
      */
     public function getSaltSize()
     {
@@ -488,7 +488,7 @@ public function getSupportedModes()
     /**
      * Get the block size
      *
-     * @return integer
+     * @return int
      */
     public function getBlockSize()
     {