Merge branch 'hotfix/4352' into develop

Close zendframework/zendframework#4352

src/Figlet/Figlet.php

@@ -88,7 +88,7 @@ class Figlet
     /**
      * Output width, defaults to 80.
      *
-     * @var integer
+     * @var int
      */
     protected $outputWidth = 80;
 
@@ -102,35 +102,35 @@ class Figlet
     /**
      * Height of the characters
      *
-     * @var integer
+     * @var int
      */
     protected $charHeight;
 
     /**
      * Max length of any character
      *
-     * @var integer
+     * @var int
      */
     protected $maxLength;
 
     /**
      * Smush mode
      *
-     * @var integer
+     * @var int
      */
     protected $smushMode = 0;
 
     /**
      * Smush defined by the font
      *
-     * @var integer
+     * @var int
      */
     protected $fontSmush = 0;
 
     /**
      * Smush defined by the user
      *
-     * @var integer
+     * @var int
      */
     protected $userSmush = 0;
 
@@ -147,7 +147,7 @@ class Figlet
      * For using font default, this parameter should be null, else one of
      * the values of Zend\Text\Figlet::JUSTIFICATION_*
      *
-     * @var integer
+     * @var int
      */
     protected $justification = null;
 
@@ -157,14 +157,14 @@ class Figlet
      * For using font default, this parameter should be null, else one of
      * the values of Zend\Text\Figlet::DIRECTION_*
      *
-     * @var integer
+     * @var int
      */
     protected $rightToLeft = null;
 
     /**
      * Override font file smush layout
      *
-     * @var integer
+     * @var int
      */
     protected $smushOverride = 0;
 
@@ -178,28 +178,28 @@ class Figlet
     /**
      * Previous character width
      *
-     * @var integer
+     * @var int
      */
     protected $previousCharWidth = 0;
 
     /**
      * Current character width
      *
-     * @var integer
+     * @var int
      */
     protected $currentCharWidth = 0;
 
     /**
      * Current outline length
      *
-     * @var integer
+     * @var int
      */
     protected $outlineLength = 0;
 
     /**
      * Maximum outline length
      *
-     * @var integer
+     * @var int
      */
     protected $outlineLengthLimit = 0;
 
@@ -213,14 +213,14 @@ class Figlet
     /**
      * In character line length
      *
-     * @var integer
+     * @var int
      */
     protected $inCharLineLength = 0;
 
     /**
      * Maximum in character line length
      *
-     * @var integer
+     * @var int
      */
     protected $inCharLineLengthLimit = 0;
 
@@ -328,7 +328,7 @@ public function setHandleParagraphs($handleParagraphs)
      * Set the justification. 0 stands for left aligned, 1 for centered and 2
      * for right aligned.
      *
-     * @param  integer $justification Justification of the output text
+     * @param  int $justification Justification of the output text
      * @return Figlet
      */
     public function setJustification($justification)
@@ -340,7 +340,7 @@ public function setJustification($justification)
     /**
      * Set the output width
      *
-     * @param  integer $outputWidth Output with which should be used for word
+     * @param  int $outputWidth Output with which should be used for word
      *                              wrapping and justification
      * @return Figlet
      */
@@ -355,7 +355,7 @@ public function setOutputWidth($outputWidth)
      * Zend\Text\Figlet::DIRECTION_LEFT_TO_RIGHT. For writing from right to left,
      * use Zend\Text\Figlet::DIRECTION_RIGHT_TO_LEFT.
      *
-     * @param  integer $rightToLeft Right-to-left mode
+     * @param  int $rightToLeft Right-to-left mode
      * @return Figlet
      */
     public function setRightToLeft($rightToLeft)
@@ -369,7 +369,7 @@ public function setRightToLeft($rightToLeft)
      *
      * Use one of the constants of Zend\Text\Figlet::SM_*, you may combine them.
      *
-     * @param  integer $smushMode Smush mode to use for generating text
+     * @param  int $smushMode Smush mode to use for generating text
      * @return Figlet
      */
     public function setSmushMode($smushMode)
@@ -710,7 +710,7 @@ protected function _getLetter($char)
      * Returns the maximum amount that the current character can be smushed into
      * the current line.
      *
-     * @return integer
+     * @return int
      */
     protected function _smushAmount()
     {
@@ -1185,7 +1185,7 @@ protected function _loadChar($fp)
      * Unicode compatible ord() method
      *
      * @param  string $c The char to get the value from
-     * @return integer
+     * @return int
      */
     protected function _uniOrd($c)
     {

src/MultiByte.php

@@ -20,7 +20,7 @@ class MultiByte
      * Word wrap
      *
      * @param  string  $string
-     * @param  integer $width
+     * @param  int $width
      * @param  string  $break
      * @param  bool $cut
      * @param  string  $charset
@@ -46,9 +46,9 @@ public static function wordWrap($string, $width = 75, $break = "\n", $cut = fals
      * String padding
      *
      * @param  string  $input
-     * @param  integer $padLength
+     * @param  int $padLength
      * @param  string  $padString
-     * @param  integer $padType
+     * @param  int $padType
      * @param  string  $charset
      * @return string
      * @deprecated Please use Zend\Stdlib\StringUtils instead

src/Table/Column.php

@@ -41,7 +41,7 @@ class Column
     /**
      * Colspan of the column
      *
-     * @var integer
+     * @var int
      */
     protected $colSpan = 1;
 
@@ -57,7 +57,7 @@ class Column
      *
      * @param string  $content  The content of the column
      * @param string  $align    The align of the content
-     * @param integer $colSpan  The colspan of the column
+     * @param int $colSpan  The colspan of the column
      * @param string  $charset  The encoding of the content
      */
     public function __construct($content = null, $align = null, $colSpan = null, $charset = null)
@@ -154,7 +154,7 @@ public function setColSpan($colSpan)
     /**
      * Get the colspan
      *
-     * @return integer
+     * @return int
      */
     public function getColSpan()
     {
@@ -164,8 +164,8 @@ public function getColSpan()
     /**
      * Render the column width the given column width
      *
-     * @param  integer $columnWidth The width of the column
-     * @param  integer $padding     The padding for the column
+     * @param  int $columnWidth The width of the column
+     * @param  int $padding     The padding for the column
      * @throws Exception\InvalidArgumentException When $columnWidth is lower than 1
      * @throws Exception\OutOfBoundsException When padding is greater than columnWidth
      * @return string

src/Table/Decorator/Unicode.php

@@ -129,7 +129,7 @@ public function getHorizontalUp()
     /**
      * Convert am unicode character code to a character
      *
-     * @param  integer $code
+     * @param  int $code
      * @return string|false
      */
     protected function _uniChar($code)

src/Table/Row.php

@@ -72,7 +72,7 @@ public function appendColumn(Column $column)
      *
      * Returns null, when the index is out of range
      *
-     * @param  integer $index
+     * @param  int $index
      * @return Column|null
      */
     public function getColumn($index)
@@ -98,7 +98,7 @@ public function getColumns()
      * Get the widths of all columns, which were rendered last
      *
      * @throws Exception\UnexpectedValueException When no columns were rendered yet
-     * @return integer
+     * @return int
      */
     public function getColumnWidths()
     {
@@ -114,7 +114,7 @@ public function getColumnWidths()
      *
      * @param  array                               $columnWidths Width of all columns
      * @param  Decorator $decorator    Decorator for the row borders
-     * @param  integer                             $padding      Padding for the columns
+     * @param  int                             $padding      Padding for the columns
      * @throws Exception\OverflowException When there are too many columns
      * @return string
      */

src/Table/Table.php

@@ -50,14 +50,14 @@ class Table
     /**
      * Auto separation mode
      *
-     * @var integer
+     * @var int
      */
     protected $autoSeparate = self::AUTO_SEPARATE_ALL;
 
     /**
      * Padding for columns
      *
-     * @var integer
+     * @var int
      */
     protected $padding = 0;
 
@@ -177,7 +177,7 @@ public function setColumnWidths(array $columnWidths)
     /**
      * Set auto separation mode
      *
-     * @param  integer $autoSeparate Auto separation mode
+     * @param  int $autoSeparate Auto separation mode
      * @return Table
      */
     public function setAutoSeparate($autoSeparate)
@@ -206,7 +206,7 @@ public function setDecorator($decorator)
     /**
      * Set the column padding
      *
-     * @param  integer $padding The padding for the columns
+     * @param  int $padding The padding for the columns
      * @return Table
      */
     public function setPadding($padding)
@@ -245,7 +245,7 @@ public function setDecoratorManager(DecoratorManager $decoratorManager)
     /**
      * Set default column align for rows created by appendRow(array $data)
      *
-     * @param  integer $columnNum
+     * @param  int $columnNum
      * @param  string  $align
      * @return Table
      */