Merge branch 'hotfix/3342'

Close zendframework/zendframework#3342

src/AbstractValidator.php

@@ -171,7 +171,7 @@ public function getMessages()
      * Invoke as command
      *
      * @param  mixed $value
-     * @return boolean
+     * @return bool
      */
     public function __invoke($value)
     {
@@ -499,7 +499,7 @@ public static function getDefaultTranslator()
     /**
      * Is there a default translation object set?
      *
-     * @return boolean
+     * @return bool
      */
     public static function hasDefaultTranslator()
     {

src/Barcode.php

@@ -121,8 +121,8 @@ public function getChecksum()
     /**
      * Sets if checksum should be validated, if no value is given the actual setting is returned
      *
-     * @param  boolean $checksum
-     * @return boolean
+     * @param  bool $checksum
+     * @return bool
      */
     public function useChecksum($checksum = null)
     {
@@ -135,7 +135,7 @@ public function useChecksum($checksum = null)
      * Returns true if and only if $value contains a valid barcode
      *
      * @param  string $value
-     * @return boolean
+     * @return bool
      */
     public function isValid($value)
     {

src/Barcode/AbstractAdapter.php

@@ -31,7 +31,7 @@ abstract class AbstractAdapter implements AdapterInterface
      * Checks the length of a barcode
      *
      * @param  string $value The barcode to check for proper length
-     * @return boolean
+     * @return bool
      */
     public function hasValidLength($value)
     {
@@ -71,7 +71,7 @@ public function hasValidLength($value)
      * Checks for allowed characters within the barcode
      *
      * @param  string $value The barcode to check for allowed characters
-     * @return boolean
+     * @return bool
      */
     public function hasValidCharacters($value)
     {
@@ -102,7 +102,7 @@ public function hasValidCharacters($value)
      * Validates the checksum
      *
      * @param  string $value The barcode to check the checksum for
-     * @return boolean
+     * @return bool
      */
     public function hasValidChecksum($value)
     {
@@ -160,16 +160,16 @@ protected function setChecksum($checksum)
     /**
      * Sets the checksum validation, if no value is given, the actual setting is returned
      *
-     * @param  boolean $check
-     * @return AbstractAdapter|boolean
+     * @param  bool $check
+     * @return AbstractAdapter|bool
      */
     public function useChecksum($check = null)
     {
         if ($check === null) {
             return $this->options['useChecksum'];
         }
 
-        $this->options['useChecksum'] = (boolean) $check;
+        $this->options['useChecksum'] = (bool) $check;
         return $this;
     }
 
@@ -202,7 +202,7 @@ protected function setCharacters($characters)
      * GTIN implementation factor 3
      *
      * @param  string $value The barcode to validate
-     * @return boolean
+     * @return bool
      */
     protected function gtin($value)
     {
@@ -232,7 +232,7 @@ protected function gtin($value)
      * IDENTCODE implementation factors 9 and 4
      *
      * @param  string $value The barcode to validate
-     * @return boolean
+     * @return bool
      */
     protected function identcode($value)
     {
@@ -262,7 +262,7 @@ protected function identcode($value)
      * CODE25 implementation factor 3
      *
      * @param  string $value The barcode to validate
-     * @return boolean
+     * @return bool
      */
     protected function code25($value)
     {
@@ -292,7 +292,7 @@ protected function code25($value)
      * POSTNET implementation
      *
      * @param  string $value The barcode to validate
-     * @return boolean
+     * @return bool
      */
     protected function postnet($value)
     {

src/Barcode/AdapterInterface.php

@@ -20,23 +20,23 @@ interface AdapterInterface
      * Checks the length of a barcode
      *
      * @param  string $value  The barcode to check for proper length
-     * @return boolean
+     * @return bool
      */
     public function hasValidLength($value);
 
     /**
      * Checks for allowed characters within the barcode
      *
      * @param  string $value The barcode to check for allowed characters
-     * @return boolean
+     * @return bool
      */
     public function hasValidCharacters($value);
 
     /**
      * Validates the checksum
      *
      * @param string $value The barcode to check the checksum for
-     * @return boolean
+     * @return bool
      */
     public function hasValidChecksum($value);
 
@@ -57,15 +57,15 @@ public function getCharacters();
     /**
      * Returns if barcode uses a checksum
      *
-     * @return boolean
+     * @return bool
      */
     public function getChecksum();
 
     /**
      * Sets the checksum validation, if no value is given, the actual setting is returned
      *
-     * @param  boolean $check
-     * @return AbstractAdapter|boolean
+     * @param  bool $check
+     * @return AbstractAdapter|bool
      */
     public function useChecksum($check = null);
 }

src/Barcode/Code128.php

@@ -76,7 +76,7 @@ public function __construct()
      * Checks for allowed characters within the barcode
      *
      * @param  string $value The barcode to check for allowed characters
-     * @return boolean
+     * @return bool
      */
     public function hasValidCharacters($value)
     {
@@ -164,7 +164,7 @@ public function hasValidCharacters($value)
      * Validates the checksum ()
      *
      * @param  string $value The barcode to validate
-     * @return boolean
+     * @return bool
      */
     protected function code128($value)
     {

src/Barcode/Code39.php

@@ -44,7 +44,7 @@ public function __construct()
      * Validates the checksum (Modulo 43)
      *
      * @param  string $value The barcode to validate
-     * @return boolean
+     * @return bool
      */
     protected function code39($value)
     {

src/Barcode/Code93.php

@@ -45,7 +45,7 @@ public function __construct()
      * Validates the checksum (Modulo CK)
      *
      * @param  string $value The barcode to validate
-     * @return boolean
+     * @return bool
      */
     protected function code93($value)
     {

src/Barcode/Ean8.php

@@ -30,7 +30,7 @@ public function __construct()
      * Overrides parent checkLength
      *
      * @param string $value Value
-     * @return boolean
+     * @return bool
      */
     public function hasValidLength($value)
     {

src/Barcode/Issn.php

@@ -30,7 +30,7 @@ public function __construct()
      * Allows X on length of 8 chars
      *
      * @param  string $value The barcode to check for allowed characters
-     * @return boolean
+     * @return bool
      */
     public function hasValidCharacters($value)
     {
@@ -47,7 +47,7 @@ public function hasValidCharacters($value)
      * Validates the checksum
      *
      * @param  string $value The barcode to check the checksum for
-     * @return boolean
+     * @return bool
      */
     public function hasValidChecksum($value)
     {
@@ -65,7 +65,7 @@ public function hasValidChecksum($value)
      * ISSN implementation (reversed mod11)
      *
      * @param  string $value The barcode to validate
-     * @return boolean
+     * @return bool
      */
     protected function issn($value)
     {

src/Barcode/Royalmail.php

@@ -48,7 +48,7 @@ public function __construct()
      * Validates the checksum ()
      *
      * @param  string $value The barcode to validate
-     * @return boolean
+     * @return bool
      */
     protected function royalmail($value)
     {
@@ -79,7 +79,7 @@ protected function royalmail($value)
      * Allows start and stop tag within checked chars
      *
      * @param  string $value The barcode to check for allowed characters
-     * @return boolean
+     * @return bool
      */
     public function hasValidCharacters($value)
     {

src/Barcode/Upce.php

@@ -30,7 +30,7 @@ public function __construct()
      * Overrides parent checkLength
      *
      * @param string $value Value
-     * @return boolean
+     * @return bool
      */
     public function hasValidLength($value)
     {

src/Between.php

@@ -135,7 +135,7 @@ public function setMax($max)
     /**
      * Returns the inclusive option
      *
-     * @return boolean
+     * @return bool
      */
     public function getInclusive()
     {
@@ -145,7 +145,7 @@ public function getInclusive()
     /**
      * Sets the inclusive option
      *
-     * @param  boolean $inclusive
+     * @param  bool $inclusive
      * @return Between Provides a fluent interface
      */
     public function setInclusive($inclusive)
@@ -159,7 +159,7 @@ public function setInclusive($inclusive)
      * if inclusive option is true.
      *
      * @param  mixed $value
-     * @return boolean
+     * @return bool
      */
     public function isValid($value)
     {

src/Callback.php

@@ -115,7 +115,7 @@ public function setCallbackOptions($options)
      *
      * @param  mixed $value
      * @param  mixed $context Additional context to provide to the callback
-     * @return boolean
+     * @return bool
      * @throws Exception\InvalidArgumentException
      */
     public function isValid($value, $context = null)

src/CreditCard.php

@@ -247,7 +247,7 @@ public function setService($service)
      * Returns true if and only if $value follows the Luhn algorithm (mod-10 checksum)
      *
      * @param  string $value
-     * @return boolean
+     * @return bool
      */
     public function isValid($value)
     {

src/Date.php

@@ -98,7 +98,7 @@ public function setFormat($format = null)
      * according to DateTime
      *
      * @param  string|array|int|DateTime $value
-     * @return boolean
+     * @return bool
      */
     public function isValid($value)
     {

src/Digits.php

@@ -44,7 +44,7 @@ class Digits extends AbstractValidator
      * Returns true if and only if $value only contains digit characters
      *
      * @param  string $value
-     * @return boolean
+     * @return bool
      */
     public function isValid($value)
     {