Merge branch 'hotfix/3342'

Close zendframework/zendframework#3342

src/AbstractOptions.php

@@ -121,7 +121,7 @@ public function __get($key)
     /**
      * @see ParameterObject::__isset()
      * @param string $key
-     * @return boolean
+     * @return bool
      */
     public function __isset($key)
     {

src/CallbackHandler.php

@@ -39,13 +39,13 @@ class CallbackHandler
 
     /**
      * PHP version is greater as 5.4rc1?
-     * @var boolean
+     * @var bool
      */
     protected static $isPhp54;
 
     /**
      * Is pecl/weakref extension installed?
-     * @var boolean
+     * @var bool
      */
     protected static $hasWeakRefExtension;
 

src/ErrorHandler.php

@@ -24,7 +24,7 @@ abstract class ErrorHandler
     /**
      * Flag to mark started
      *
-     * @var boolean
+     * @var bool
      */
     protected static $started = false;
 
@@ -39,7 +39,7 @@ abstract class ErrorHandler
     /**
      * If the error handler has been started.
      *
-     * @return boolean
+     * @return bool
      */
     public static function started()
     {
@@ -67,7 +67,7 @@ public static function start($errorLevel = \E_WARNING)
     /**
      * Stopping the error handler
      *
-     * @param  boolean $throw Throw the ErrorException if any
+     * @param  bool $throw Throw the ErrorException if any
      * @return null|ErrorException
      * @throws Exception\LogicException If not started before
      * @throws ErrorException If an error has been catched and $throw is true

src/Glob.php

@@ -36,7 +36,7 @@ abstract class Glob
      * @see    http://docs.php.net/glob
      * @param  string  $pattern
      * @param  integer $flags
-     * @param  boolean $forceFallback
+     * @param  bool $forceFallback
      * @return array|false
      */
     public static function glob($pattern, $flags, $forceFallback = false)

src/Hydrator/ClassMethods.php

@@ -21,13 +21,13 @@ class ClassMethods extends AbstractHydrator
 {
     /**
      * Flag defining whether array keys are underscore-separated (true) or camel case (false)
-     * @var boolean
+     * @var bool
      */
     protected $underscoreSeparatedKeys;
 
     /**
      * Define if extract values will use camel case or name with underscore
-     * @param boolean $underscoreSeparatedKeys
+     * @param  bool $underscoreSeparatedKeys
      */
     public function __construct($underscoreSeparatedKeys = true)
     {

src/ParameterObjectInterface.php

@@ -31,7 +31,7 @@ public function __get($key);
 
     /**
      * @param string $key
-     * @return boolean
+     * @return bool
      */
     public function __isset($key);
 

src/PriorityQueue.php

@@ -88,7 +88,7 @@ public function insert($data, $priority = 1)
      * instances.
      *
      * @param  mixed $datum
-     * @return boolean False if the item was not found, true otherwise.
+     * @return bool False if the item was not found, true otherwise.
      */
     public function remove($datum)
     {