Merge branch 'master' of https://github.com/zendframework/zf2

src/Client/Adapter/Test.php

@@ -98,10 +98,9 @@ public function setOptions($options = array())
     /**
      * Connect to the remote server
      *
-     * @param string  $host
-     * @param int     $port
-     * @param  bool $secure
-     * @param int     $timeout
+     * @param  string $host
+     * @param  int    $port
+     * @param  bool   $secure
      * @throws Exception\RuntimeException
      */
     public function connect($host, $port = 80, $secure = false)

src/Client/Cookies.php

@@ -328,7 +328,7 @@ protected function _matchPath($domains, $path)
      * of the cookie.
      *
      * @param Response $response HTTP Response object
-     * @param Uri\Uri|string $uri The requested URI
+     * @param Uri\Uri|string $refUri The requested URI
      * @return Cookies
      * @todo Add the $uri functionality.
      */

src/Header/Accept/FieldValuePart/AbstractFieldValuePart.php

@@ -42,7 +42,7 @@ public function __construct($internalValues)
     /**
      * Set a Field Value Part this Field Value Part matched against.
      *
-     * @param AbstractFieldValuePart $matchedPart
+     * @param AbstractFieldValuePart $matchedAgainst
      * @return AbstractFieldValuePart provides fluent interface
      */
     public function setMatchedAgainst(AbstractFieldValuePart $matchedAgainst)

src/Headers.php

@@ -25,7 +25,7 @@
 class Headers implements Countable, Iterator
 {
     /**
-     * @var \Zend\Loader\PluginClassLoader
+     * @var PluginClassLoader
      */
     protected $pluginClassLoader = null;
 

src/Response.php

@@ -508,7 +508,7 @@ protected function decodeDeflate($body)
          * Some servers (IIS ?) send a broken deflate response, without the
          * RFC-required zlib header.
          *
-         * We try to detect the zlib header, and if it does not exsit we
+         * We try to detect the zlib header, and if it does not exist we
          * teat the body is plain DEFLATE content.
          *
          * This method was adapted from PEAR HTTP_Request2 by (c) Alexey Borzov