Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/4352' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 32 deletions.
6 changes: 3 additions & 3 deletions src/Translator/Loader/Gettext.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public function load($locale, $filename)
/**
* Read a single integer from the current file.
*
* @return integer
* @return int
*/
protected function readInteger()
{
Expand All @@ -174,8 +174,8 @@ protected function readInteger()
/**
* Read an integer from the current file.
*
* @param integer $num
* @return integer
* @param int $num
* @return int
*/
protected function readIntegerList($num)
{
Expand Down
12 changes: 6 additions & 6 deletions src/Translator/Plural/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Parser
/**
* Current lexer position in the string.
*
* @var integer
* @var int
*/
protected $currentPos;

Expand Down Expand Up @@ -131,7 +131,7 @@ function (Symbol $self) {
* Register a left infix symbol.
*
* @param string $id
* @param integer $leftBindingPower
* @param int $leftBindingPower
* @return void
*/
protected function registerLeftInfixSymbol($id, $leftBindingPower)
Expand All @@ -149,7 +149,7 @@ function (Symbol $self, Symbol $left) use ($leftBindingPower) {
* Register a right infix symbol.
*
* @param string $id
* @param integer $leftBindingPower
* @param int $leftBindingPower
* @return void
*/
protected function registerRightInfixSymbol($id, $leftBindingPower)
Expand All @@ -167,7 +167,7 @@ function (Symbol $self, Symbol $left) use ($leftBindingPower) {
* Register a prefix symbol.
*
* @param string $id
* @param integer $leftBindingPower
* @param int $leftBindingPower
* @return void
*/
protected function registerPrefixSymbol($id, $leftBindingPower)
Expand All @@ -185,7 +185,7 @@ function (Symbol $self) use ($leftBindingPower) {
* Register a symbol.
*
* @param string $id
* @param integer $leftBindingPower
* @param int $leftBindingPower
* @return Symbol
*/
protected function registerSymbol($id, $leftBindingPower = 0)
Expand Down Expand Up @@ -236,7 +236,7 @@ public function parse($string)
/**
* Parse an expression.
*
* @param integer $rightBindingPower
* @param int $rightBindingPower
* @return Symbol
*/
public function expression($rightBindingPower = 0)
Expand Down
14 changes: 7 additions & 7 deletions src/Translator/Plural/Rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ class Rule
/**
* Number of plurals in this rule.
*
* @var integer
* @var int
*/
protected $numPlurals;

/**
* Create a new plural rule.
*
* @param integer $numPlurals
* @param int $numPlurals
* @param array $ast
* @return Rule
*/
Expand All @@ -53,8 +53,8 @@ protected function __construct($numPlurals, array $ast)
/**
* Evaluate a number and return the plural index.
*
* @param integer $number
* @return integer
* @param int $number
* @return int
* @throws Exception\RangeException
*/
public function evaluate($number)
Expand All @@ -74,7 +74,7 @@ public function evaluate($number)
/**
* Get number of possible plural forms.
*
* @return integer
* @return int
*/
public function getNumPlurals()
{
Expand All @@ -85,8 +85,8 @@ public function getNumPlurals()
* Evaluate a part of an ast.
*
* @param array $ast
* @param integer $number
* @return integer
* @param int $number
* @return int
* @throws Exception\ParseException
*/
protected function evaluateAstPart(array $ast, $number)
Expand Down
4 changes: 2 additions & 2 deletions src/Translator/Plural/Symbol.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Symbol
/**
* Left binding power (precedence).
*
* @var integer
* @var int
*/
public $leftBindingPower;

Expand Down Expand Up @@ -90,7 +90,7 @@ class Symbol
*
* @param Parser $parser
* @param string $id
* @param integer $leftBindingPower
* @param int $leftBindingPower
*/
public function __construct(Parser $parser, $id, $leftBindingPower)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Validator/DateTime.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public function __construct($options = array())
/**
* Sets the calendar to be used by the IntlDateFormatter
*
* @param integer|null $calendar
* @param int|null $calendar
* @return DateTime provides fluent interface
*/
public function setCalendar($calendar)
Expand All @@ -119,7 +119,7 @@ public function getCalendar()
/**
* Sets the date format to be used by the IntlDateFormatter
*
* @param integer|null $dateType
* @param int|null $dateType
* @return DateTime provides fluent interface
*/
public function setDateType($dateType)
Expand Down Expand Up @@ -166,7 +166,7 @@ public function getPattern()
/**
* Sets the time format to be used by the IntlDateFormatter
*
* @param integer|null $timeType
* @param int|null $timeType
* @return DateTime provides fluent interface
*/
public function setTimeType($timeType)
Expand Down
2 changes: 1 addition & 1 deletion src/Validator/Int.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function setLocale($locale)
/**
* Returns true if and only if $value is a valid integer
*
* @param string|integer $value
* @param string|int $value
* @return bool
* @throws Exception\InvalidArgumentException
*/
Expand Down
6 changes: 3 additions & 3 deletions src/Validator/PhoneNumber.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class PhoneNumber extends AbstractValidator
/**
* Allow Possible Matches
*
* @var boolean
* @var bool
*/
protected $allowPossible = false;

Expand Down Expand Up @@ -117,8 +117,8 @@ public function allowedTypes(array $types = null)
/**
* Allow Possible
*
* @param boolean|null $possible
* @return self|boolean
* @param bool|null $possible
* @return self|bool
*/
public function allowPossible($possible = null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/View/Helper/DateFormat.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function __construct()
/**
* Format a date
*
* @param DateTime|integer|array $date
* @param DateTime|int|array $date
* @param int $dateType
* @param int $timeType
* @param string $locale
Expand Down
10 changes: 5 additions & 5 deletions src/View/Helper/NumberFormat.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ class NumberFormat extends AbstractHelper
/**
* number of decimals to use.
*
* @var integer
* @var int
*/
protected $decimals;

/**
* NumberFormat style to use
*
* @var integer
* @var int
*/
protected $formatStyle;

/**
* NumberFormat type to use
*
* @var integer
* @var int
*/
protected $formatType;

Expand Down Expand Up @@ -168,7 +168,7 @@ public function getFormatType()
/**
* Set number of decimals to use instead of the default.
*
* @param integer $decimals
* @param int $decimals
* @return NumberFormat
*/
public function setDecimals($decimals)
Expand All @@ -180,7 +180,7 @@ public function setDecimals($decimals)
/**
* Get number of decimals.
*
* @return integer
* @return int
*/
public function getDecimals()
{
Expand Down
2 changes: 1 addition & 1 deletion src/View/Helper/TranslatePlural.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class TranslatePlural extends AbstractTranslatorHelper
*
* @param string $singular
* @param string $plural
* @param integer $number
* @param int $number
* @param string $textDomain
* @param string $locale
* @throws Exception\RuntimeException
Expand Down

0 comments on commit fb94cca

Please sign in to comment.