Merge branch 'hotfix/3342'

Close zendframework/zendframework#3342
zendframework · Jan 7, 2013 · 86ed85d · 86ed85d
commit 86ed85d
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/src/BlockCipher.php b/src/BlockCipher.php
@@ -57,7 +57,7 @@ class BlockCipher
     /**
      * The output is binary?
      *
-     * @var boolean
+     * @var bool
      */
     protected $binaryOutput = false;
 
@@ -213,19 +213,19 @@ public function getSalt()
     /**
      * Enable/disable the binary output
      *
-     * @param boolean $value
+     * @param  bool $value
      * @return BlockCipher
      */
     public function setBinaryOutput($value)
     {
-        $this->binaryOutput = (boolean)$value;
+        $this->binaryOutput = (bool) $value;
         return $this;
     }
 
     /**
      * Get the value of binary output
      *
-     * @return boolean
+     * @return bool
      */
     public function getBinaryOutput()
     {
@@ -281,7 +281,7 @@ public function setCipherAlgorithm($algo)
     /**
      * Get the cipher algorithm
      *
-     * @return string|boolean
+     * @return string|bool
      */
     public function getCipherAlgorithm()
     {
@@ -383,7 +383,7 @@ public function encrypt($data)
      * Decrypt
      *
      * @param  string $data
-     * @return string|boolean
+     * @return string|bool
      * @throws Exception\InvalidArgumentException
      */
     public function decrypt($data)

diff --git a/src/Hash.php b/src/Hash.php
@@ -29,7 +29,7 @@ class Hash
     /**
      * @param  string  $hash
      * @param  string  $data
-     * @param  boolean $output
+     * @param  bool $output
      * @throws Exception\InvalidArgumentException
      * @return string
      */
@@ -48,7 +48,7 @@ public static function compute($hash, $data, $output = self::OUTPUT_STRING)
      * Get the output size according to the hash algorithm and the output format
      *
      * @param  string  $hash
-     * @param  boolean $output
+     * @param  bool $output
      * @return integer
      */
     public static function getOutputSize($hash, $output = self::OUTPUT_STRING)
@@ -70,7 +70,7 @@ public static function getSupportedAlgorithms()
      * Is the hash algorithm supported?
      *
      * @param  string $algorithm
-     * @return boolean
+     * @return bool
      */
     public static function isSupported($algorithm)
     {

diff --git a/src/Hmac.php b/src/Hmac.php
@@ -36,7 +36,7 @@ class Hmac
      * @param  string  $key
      * @param  string  $hash
      * @param  string  $data
-     * @param  boolean $output
+     * @param  bool $output
      * @throws Exception\InvalidArgumentException
      * @return string
      */
@@ -59,7 +59,7 @@ public static function compute($key, $hash, $data, $output = self::OUTPUT_STRING
      * Get the output size according to the hash algorithm and the output format
      *
      * @param  string  $hash
-     * @param  boolean $output
+     * @param  bool $output
      * @return integer
      */
     public static function getOutputSize($hash, $output = self::OUTPUT_STRING)
@@ -81,7 +81,7 @@ public static function getSupportedAlgorithms()
      * Is the hash algorithm supported?
      *
      * @param  string $algorithm
-     * @return boolean
+     * @return bool
      */
     public static function isSupported($algorithm)
     {

diff --git a/src/Password/Bcrypt.php b/src/Password/Bcrypt.php
@@ -107,7 +107,7 @@ public function create($password)
      *
      * @param  string $password
      * @param  string $hash
-     * @return boolean
+     * @return bool
      */
     public function verify($password, $hash)
     {

diff --git a/src/Password/PasswordInterface.php b/src/Password/PasswordInterface.php
@@ -25,7 +25,7 @@ public function create($password);
      *
      * @param  string $password The password to hash
      * @param  string $hash     The supplied hash to validate
-     * @return boolean Does the password validate against the hash
+     * @return bool Does the password validate against the hash
      */
     public function verify($password, $hash);
 }
diff --git a/src/PublicKey/DiffieHellman.php b/src/PublicKey/DiffieHellman.php
@@ -36,7 +36,7 @@ class DiffieHellman
      * Static flag to select whether to use PHP5.3's openssl extension
      * if available.
      *
-     * @var boolean
+     * @var bool
      */
     public static $useOpenssl = true;
 
@@ -120,7 +120,7 @@ public function __construct($prime, $generator, $privateKey = null, $privateKeyF
      */
     public static function useOpensslExtension($flag = true)
     {
-        static::$useOpenssl = (boolean) $flag;
+        static::$useOpenssl = (bool) $flag;
     }
 
     /**
@@ -378,7 +378,7 @@ public function getPrivateKey($format = self::FORMAT_NUMBER)
     /**
      * Check whether a private key currently exists.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasPrivateKey()
     {

diff --git a/src/PublicKey/RsaOptions.php b/src/PublicKey/RsaOptions.php
@@ -166,19 +166,19 @@ public function getOpensslSignatureAlgorithm()
     /**
      * Enable/disable the binary output
      *
-     * @param  boolean $value
+     * @param  bool $value
      * @return RsaOptions
      */
     public function setBinaryOutput($value)
     {
-        $this->binaryOutput = (boolean)$value;
+        $this->binaryOutput = (bool) $value;
         return $this;
     }
 
     /**
      * Get the value of binary output
      *
-     * @return boolean
+     * @return bool
      */
     public function getBinaryOutput()
     {

diff --git a/src/Utils.php b/src/Utils.php
@@ -28,7 +28,7 @@ class Utils
      *
      * @param  string $expected
      * @param  string $actual
-     * @return boolean
+     * @return bool
      */
     public static function compareStrings($expected, $actual)
     {