Merge branch 'hotfix/4352' into develop

Close zendframework/zendframework#4352

src/ArrayUtils.php

@@ -93,11 +93,11 @@ public static function hasNumericKeys($value, $allowEmpty = false)
      *
      * For example:
      * <code>
-     * $list = array( 'a','b','c','d' );
+     * $list = array('a', 'b', 'c', 'd');
      * $list = array(
      *     0 => 'foo',
      *     1 => 'bar',
-     *     2 => array( 'foo' => 'baz' ),
+     *     2 => array('foo' => 'baz'),
      * );
      * </code>
      *

src/ErrorHandler.php

@@ -109,7 +109,7 @@ public static function clean()
      */
     public static function addError($errno, $errstr = '', $errfile = '', $errline = 0)
     {
-        $stack = & static::$stack[ count(static::$stack) - 1 ];
+        $stack = & static::$stack[count(static::$stack) - 1];
         $stack = new ErrorException($errstr, 0, $errno, $errfile, $errline, $stack);
     }
 }

src/Glob.php

@@ -31,7 +31,7 @@ abstract class Glob
      *
      * @see    http://docs.php.net/glob
      * @param  string  $pattern
-     * @param  integer $flags
+     * @param  int $flags
      * @param  bool $forceFallback
      * @return array|false
      */
@@ -48,7 +48,7 @@ public static function glob($pattern, $flags, $forceFallback = false)
      * Use the glob function provided by the system.
      *
      * @param  string  $pattern
-     * @param  integer $flags
+     * @param  int $flags
      * @return array|false
      */
     protected static function systemGlob($pattern, $flags)
@@ -82,7 +82,7 @@ protected static function systemGlob($pattern, $flags)
      * Expand braces manually, then use the system glob.
      *
      * @param  string  $pattern
-     * @param  integer $flags
+     * @param  int $flags
      * @return array|false
      */
     protected static function fallbackGlob($pattern, $flags)
@@ -162,9 +162,9 @@ protected static function fallbackGlob($pattern, $flags)
      * Find the end of the sub-pattern in a brace expression.
      *
      * @param  string  $pattern
-     * @param  integer $begin
-     * @param  integer $flags
-     * @return integer|null
+     * @param  int $begin
+     * @param  int $flags
+     * @return int|null
      */
     protected static function nextBraceSub($pattern, $begin, $flags)
     {

src/Hydrator/ClassMethods.php

@@ -136,7 +136,7 @@ public function extract($object)
             $attribute = $method;
             if (preg_match('/^get/', $method)) {
                 $attribute = substr($method, 3);
-                if(!property_exists($object, $attribute)) {
+                if (!property_exists($object, $attribute)) {
                     $attribute = lcfirst($attribute);
                 }
             }

src/Hydrator/Filter/FilterComposite.php

@@ -96,7 +96,7 @@ function($value, $key) {
      */
     public function addFilter($name, $filter, $condition = self::CONDITION_OR)
     {
-        if ( !is_callable($filter) && !($filter instanceof FilterInterface) ) {
+        if (!is_callable($filter) && !($filter instanceof FilterInterface)) {
             throw new InvalidArgumentException(
                 'The value of ' . $name . ' should be either a callable or ' .
                 'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
@@ -166,13 +166,13 @@ public function filter($property)
         // Check if 1 from the or filters return true
         foreach ($this->orFilter as $filter) {
             if (is_callable($filter)) {
-                if ( $filter($property) === true) {
+                if ($filter($property) === true) {
                     $returnValue = true;
                     break;
                 }
                 continue;
             } else {
-                if ( $filter->filter($property) === true) {
+                if ($filter->filter($property) === true) {
                     $returnValue = true;
                     break;
                 }

src/Hydrator/Filter/NumberOfParameterFilter.php

@@ -39,7 +39,7 @@ public function filter($property)
     {
         try {
             $reflectionMethod = new ReflectionMethod($property);
-        } catch( ReflectionException $exception) {
+        } catch (ReflectionException $exception) {
             throw new InvalidArgumentException(
                 "Method $property doesn't exist"
             );

src/StringWrapper/AbstractStringWrapper.php

@@ -140,7 +140,7 @@ public function convert($str, $reverse = false)
      * Wraps a string to a given number of characters
      *
      * @param  string  $string
-     * @param  integer $width
+     * @param  int $width
      * @param  string  $break
      * @param  bool $cut
      * @return string|false
@@ -221,9 +221,9 @@ public function wordWrap($string, $width = 75, $break = "\n", $cut = false)
      * Pad a string to a certain length with another string
      *
      * @param  string  $input
-     * @param  integer $padLength
+     * @param  int $padLength
      * @param  string  $padString
-     * @param  integer $padType
+     * @param  int $padType
      * @return string
      */
     public function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT)

src/StringWrapper/StringWrapperInterface.php

@@ -91,7 +91,7 @@ public function convert($str, $reverse = false);
      * Wraps a string to a given number of characters
      *
      * @param  string  $str
-     * @param  integer $width
+     * @param  int $width
      * @param  string  $break
      * @param  bool $cut
      * @return string
@@ -102,9 +102,9 @@ public function wordWrap($str, $width = 75, $break = "\n", $cut = false);
      * Pad a string to a certain length with another string
      *
      * @param  string  $input
-     * @param  integer $padLength
+     * @param  int $padLength
      * @param  string  $padString
-     * @param  integer $padType
+     * @param  int $padType
      * @return string
      */
     public function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT);