Merge pull request zendframework/zendframework#3827 from micheh/hotfi…

…x/phpdoc-mismatch

Fix mismatches between the PHPDoc and the method signatures

src/ArrayObject.php

@@ -74,6 +74,7 @@ public function __construct($input = array(), $flags = self::STD_PROP_LIST, $ite
     /**
      * Returns whether the requested key exists
      *
+     * @param  mixed $key
      * @return boolean
      */
     public function __isset($key)
@@ -276,6 +277,7 @@ public function natsort()
     /**
      * Returns whether the requested key exists
      *
+     * @param  mixed $key
      * @return boolean
      */
     public function offsetExists($key)
@@ -315,6 +317,7 @@ public function offsetSet($key, $value)
     /**
      * Unsets the value at the specified key
      *
+     * @param  mixed $key
      * @return void
      */
     public function offsetUnset($key)

src/Hydrator/Filter/MethodMatchFilter.php

@@ -23,7 +23,8 @@ class MethodMatchFilter implements FilterInterface
     protected $exclude = null;
 
     /**
-     * @param string $method The method to exclude
+     * @param string $method The method to exclude or include
+     * @param bool $exclude If the method should be excluded
      */
     public function __construct($method, $exclude = true)
     {

src/Hydrator/Strategy/SerializableStrategy.php

@@ -28,6 +28,7 @@ class SerializableStrategy implements StrategyInterface
     /**
      *
      * @param mixed $serializer string or SerializerAdapter
+     * @param mixed $serializerOptions
      */
     public function __construct($serializer, $serializerOptions = null)
     {

src/StringWrapper/AbstractStringWrapper.php

@@ -139,7 +139,7 @@ public function convert($str, $reverse = false)
     /**
      * Wraps a string to a given number of characters
      *
-     * @param  string  $str
+     * @param  string  $string
      * @param  integer $width
      * @param  string  $break
      * @param  boolean $cut

src/StringWrapper/Iconv.php

@@ -225,7 +225,6 @@ public function __construct()
      * Returns the length of the given string
      *
      * @param string $str
-     * @param string $encoding
      * @return int|false
      */
     public function strlen($str)
@@ -239,7 +238,6 @@ public function strlen($str)
      * @param string   $str
      * @param int      $offset
      * @param int|null $length
-     * @param string   $encoding
      * @return string|false
      */
     public function substr($str, $offset = 0, $length = null)
@@ -253,7 +251,6 @@ public function substr($str, $offset = 0, $length = null)
      * @param string $haystack
      * @param string $needle
      * @param int    $offset
-     * @param string $encoding
      * @return int|false
      */
     public function strpos($haystack, $needle, $offset = 0)

src/StringWrapper/Intl.php

@@ -48,7 +48,6 @@ public function __construct()
      * Returns the length of the given string
      *
      * @param string $str
-     * @param string $encoding
      * @return int|false
      */
     public function strlen($str)
@@ -62,7 +61,6 @@ public function strlen($str)
      * @param string   $str
      * @param int      $offset
      * @param int|null $length
-     * @param string   $encoding
      * @return string|false
      */
     public function substr($str, $offset = 0, $length = null)
@@ -76,7 +74,6 @@ public function substr($str, $offset = 0, $length = null)
      * @param string $haystack
      * @param string $needle
      * @param int    $offset
-     * @param string $encoding
      * @return int|false
      */
     public function strpos($haystack, $needle, $offset = 0)

src/StringWrapper/MbString.php

@@ -59,7 +59,6 @@ public function __construct()
      * Returns the length of the given string
      *
      * @param string $str
-     * @param string $encoding
      * @return int|false
      */
     public function strlen($str)
@@ -73,7 +72,6 @@ public function strlen($str)
      * @param string   $str
      * @param int      $offset
      * @param int|null $length
-     * @param string   $encoding
      * @return string|false
      */
     public function substr($str, $offset = 0, $length = null)
@@ -87,7 +85,6 @@ public function substr($str, $offset = 0, $length = null)
      * @param string $haystack
      * @param string $needle
      * @param int    $offset
-     * @param string $encoding
      * @return int|false
      */
     public function strpos($haystack, $needle, $offset = 0)

src/StringWrapper/StringWrapperInterface.php

@@ -64,7 +64,6 @@ public function strlen($str);
      * @param string   $str
      * @param int      $offset
      * @param int|null $length
-     * @param string   $encoding
      * @return string|false
      */
     public function substr($str, $offset = 0, $length = null);
@@ -75,7 +74,6 @@ public function substr($str, $offset = 0, $length = null);
      * @param string $haystack
      * @param string $needle
      * @param int    $offset
-     * @param string $encoding
      * @return int|false
      */
     public function strpos($haystack, $needle, $offset = 0);