Merge branch 'hotfix/4352' into develop

Close zendframework/zendframework#4352

src/AbstractValidator.php

@@ -41,7 +41,7 @@ abstract class AbstractValidator implements
     /**
      * Limits the maximum returned length of a error message
      *
-     * @var Integer
+     * @var int
      */
     protected static $messageLength = -1;
 
@@ -547,7 +547,7 @@ public function isTranslatorEnabled()
     /**
      * Returns the maximum allowed message length
      *
-     * @return integer
+     * @return int
      */
     public static function getMessageLength()
     {
@@ -557,7 +557,7 @@ public static function getMessageLength()
     /**
      * Sets the maximum allowed message length
      *
-     * @param integer $length
+     * @param int $length
      */
     public static function setMessageLength($length = -1)
     {

src/Barcode/AbstractAdapter.php

@@ -124,7 +124,7 @@ public function getLength()
     /**
      * Returns the allowed characters
      *
-     * @return integer|string|array
+     * @return int|string|array
      */
     public function getCharacters()
     {
@@ -183,7 +183,7 @@ protected function setLength($length)
     /**
      * Sets the allowed characters of this barcode
      *
-     * @param integer $characters
+     * @param int $characters
      * @return AbstractAdapter
      */
     protected function setCharacters($characters)

src/Barcode/AdapterInterface.php

@@ -45,7 +45,7 @@ public function getLength();
     /**
      * Returns the allowed characters
      *
-     * @return integer|string|array
+     * @return int|string|array
      */
     public function getCharacters();
 

src/Barcode/Code128.php

@@ -345,7 +345,7 @@ protected function getCodingSet($value)
      *
      * @param string $value
      * @param string $set
-     * @return integer
+     * @return int
      */
     protected function ord128($value, $set)
     {
@@ -406,7 +406,7 @@ protected function ord128($value, $set)
      *  "00" to "99" ==   0 to  99
      *   132 to  138 == 100 to 106
      *
-     * @param integer $value
+     * @param int $value
      * @param string $set
      * @return string
      */

src/Barcode/Identcode.php

@@ -13,7 +13,7 @@ class Identcode extends AbstractAdapter
 {
     /**
      * Allowed barcode lengths
-     * @var integer
+     * @var int
      */
     protected $length = 12;
 

src/DateStep.php

@@ -30,7 +30,7 @@ class DateStep extends Date
     /**
      * Optional base date value
      *
-     * @var string|integer|\DateTime
+     * @var string|int|\DateTime
      */
     protected $baseValue = '1970-01-01T00:00:00Z';
 
@@ -105,7 +105,7 @@ public function __construct($options = array())
     /**
      * Sets the base value from which the step should be computed
      *
-     * @param  string|integer|\DateTime $baseValue
+     * @param  string|int|\DateTime $baseValue
      * @return DateStep
      */
     public function setBaseValue($baseValue)
@@ -117,7 +117,7 @@ public function setBaseValue($baseValue)
     /**
      * Returns the base value from which the step should be computed
      *
-     * @return string|integer|\DateTime
+     * @return string|int|\DateTime
      */
     public function getBaseValue()
     {
@@ -171,7 +171,7 @@ public function setTimezone(DateTimeZone $timezone)
     /**
      * Converts an int or string to a DateTime object
      *
-     * @param  string|integer|\DateTime $param
+     * @param  string|int|\DateTime $param
      * @return \DateTime
      * @throws Exception\InvalidArgumentException
      */
@@ -204,7 +204,7 @@ protected function convertToDateTime($param)
     /**
      * Returns true if a date is within a valid step
      *
-     * @param  string|integer|\DateTime $value
+     * @param  string|int|\DateTime $value
      * @return bool
      * @throws Exception\InvalidArgumentException
      */

src/EmailAddress.php

@@ -157,7 +157,7 @@ public function setHostnameValidator(Hostname $hostnameValidator = null)
     /**
      * Returns the allow option of the attached hostname validator
      *
-     * @return integer
+     * @return int
      */
     public function getAllow()
     {
@@ -167,7 +167,7 @@ public function getAllow()
     /**
      * Sets the allow option of the hostname validator to use
      *
-     * @param integer $allow
+     * @param int $allow
      * @return EmailAddress Provides a fluent interface
      */
     public function setAllow($allow)

src/File/Count.php

@@ -45,7 +45,7 @@ class Count extends AbstractValidator
     /**
      * Actual filecount
      *
-     * @var integer
+     * @var int
      */
     protected $count;
 
@@ -76,7 +76,7 @@ class Count extends AbstractValidator
      * 'min': Minimum filecount
      * 'max': Maximum filecount
      *
-     * @param  integer|array|\Traversable $options Options for the adapter
+     * @param  int|array|\Traversable $options Options for the adapter
      */
     public function __construct($options = null)
     {
@@ -95,7 +95,7 @@ public function __construct($options = null)
     /**
      * Returns the minimum file count
      *
-     * @return integer
+     * @return int
      */
     public function getMin()
     {
@@ -105,7 +105,7 @@ public function getMin()
     /**
      * Sets the minimum file count
      *
-     * @param  integer|array $min The minimum file count
+     * @param  int|array $min The minimum file count
      * @return Count Provides a fluent interface
      * @throws Exception\InvalidArgumentException When min is greater than max
      */
@@ -119,7 +119,7 @@ public function setMin($min)
             throw new Exception\InvalidArgumentException('Invalid options to validator provided');
         }
 
-        $min = (integer) $min;
+        $min = (int) $min;
         if (($this->getMax() !== null) && ($min > $this->getMax())) {
             throw new Exception\InvalidArgumentException("The minimum must be less than or equal to the maximum file count, but $min >"
                                             . " {$this->getMax()}");
@@ -132,7 +132,7 @@ public function setMin($min)
     /**
      * Returns the maximum file count
      *
-     * @return integer
+     * @return int
      */
     public function getMax()
     {
@@ -142,7 +142,7 @@ public function getMax()
     /**
      * Sets the maximum file count
      *
-     * @param  integer|array $max The maximum file count
+     * @param  int|array $max The maximum file count
      * @return Count Provides a fluent interface
      * @throws Exception\InvalidArgumentException When max is smaller than min
      */
@@ -156,7 +156,7 @@ public function setMax($max)
             throw new Exception\InvalidArgumentException('Invalid options to validator provided');
         }
 
-        $max = (integer) $max;
+        $max = (int) $max;
         if (($this->getMin() !== null) && ($max < $this->getMin())) {
             throw new Exception\InvalidArgumentException("The maximum must be greater than or equal to the minimum file count, but "
                                             . "$max < {$this->getMin()}");

src/File/FilesSize.php

@@ -49,7 +49,7 @@ class FilesSize extends Size
      * Min limits the used disk space for all files, when used with max=null it is the maximum file size
      * It also accepts an array with the keys 'min' and 'max'
      *
-     * @param  integer|array|Traversable $options Options for this validator
+     * @param  int|array|Traversable $options Options for this validator
      * @throws \Zend\Validator\Exception\InvalidArgumentException
      */
     public function __construct($options = null)

src/File/ImageSize.php

@@ -55,14 +55,14 @@ class ImageSize extends AbstractValidator
     /**
      * Detected width
      *
-     * @var integer
+     * @var int
      */
     protected $width;
 
     /**
      * Detected height
      *
-     * @var integer
+     * @var int
      */
     protected $height;
 
@@ -113,7 +113,7 @@ public function __construct($options = null)
     /**
      * Returns the minimum allowed width
      *
-     * @return integer
+     * @return int
      */
     public function getMinWidth()
     {
@@ -123,7 +123,7 @@ public function getMinWidth()
     /**
      * Sets the minimum allowed width
      *
-     * @param  integer $minWidth
+     * @param  int $minWidth
      * @return ImageSize Provides a fluid interface
      * @throws Exception\InvalidArgumentException When minwidth is greater than maxwidth
      */
@@ -141,7 +141,7 @@ public function setMinWidth($minWidth)
     /**
      * Returns the maximum allowed width
      *
-     * @return integer
+     * @return int
      */
     public function getMaxWidth()
     {
@@ -151,7 +151,7 @@ public function getMaxWidth()
     /**
      * Sets the maximum allowed width
      *
-     * @param  integer $maxWidth
+     * @param  int $maxWidth
      * @return ImageSize Provides a fluid interface
      * @throws Exception\InvalidArgumentException When maxwidth is less than minwidth
      */
@@ -169,7 +169,7 @@ public function setMaxWidth($maxWidth)
     /**
      * Returns the minimum allowed height
      *
-     * @return integer
+     * @return int
      */
     public function getMinHeight()
     {
@@ -179,7 +179,7 @@ public function getMinHeight()
     /**
      * Sets the minimum allowed height
      *
-     * @param  integer $minHeight
+     * @param  int $minHeight
      * @return ImageSize Provides a fluid interface
      * @throws Exception\InvalidArgumentException When minheight is greater than maxheight
      */
@@ -197,7 +197,7 @@ public function setMinHeight($minHeight)
     /**
      * Returns the maximum allowed height
      *
-     * @return integer
+     * @return int
      */
     public function getMaxHeight()
     {
@@ -207,7 +207,7 @@ public function getMaxHeight()
     /**
      * Sets the maximum allowed height
      *
-     * @param  integer $maxHeight
+     * @param  int $maxHeight
      * @return ImageSize Provides a fluid interface
      * @throws Exception\InvalidArgumentException When maxheight is less than minheight
      */