Merge branch 'hotfix/4421'

Close zendframework/zendframework#4421

Author: weierophinney

src/Client/Adapter/AdapterInterface.php

@@ -10,9 +10,9 @@
 namespace Zend\Http\Client\Adapter;
 
 /**
- * An interface description for Zend_Http_Client_Adapter classes.
+ * An interface description for Zend\Http\Client\Adapter classes.
  *
- * These classes are used as connectors for Zend_Http_Client, performing the
+ * These classes are used as connectors for Zend\Http\Client, performing the
  * tasks of connecting, writing, reading and closing connection to the server.
  */
 interface AdapterInterface

src/Client/Adapter/Proxy.php

@@ -15,11 +15,11 @@
 use Zend\Stdlib\ErrorHandler;
 
 /**
- * HTTP Proxy-supporting Zend_Http_Client adapter class, based on the default
+ * HTTP Proxy-supporting Zend\Http\Client adapter class, based on the default
  * socket based adapter.
  *
  * Should be used if proxy HTTP access is required. If no proxy is set, will
- * fall back to Zend_Http_Client_Adapter_Socket behavior. Just like the
+ * fall back to Zend\Http\Client\Adapter\Socket behavior. Just like the
  * default Socket adapter, this adapter does not require any special extensions
  * installed.
  */

src/Client/Adapter/Socket.php

@@ -106,7 +106,7 @@ public function setOptions($options = array())
         }
         if (!is_array($options)) {
             throw new AdapterException\InvalidArgumentException(
-                'Array or Zend_Config object expected, got ' . gettype($options)
+                'Array or Zend\Config object expected, got ' . gettype($options)
             );
         }
 
@@ -483,7 +483,7 @@ public function read()
             }
 
             // We automatically decode chunked-messages when writing to a stream
-            // this means we have to disallow the Zend_Http_Response to do it again
+            // this means we have to disallow the Zend\Http\Response to do it again
             if ($this->outStream) {
                 $response = str_ireplace("Transfer-Encoding: chunked\r\n", '', $response);
             }

src/Client/Adapter/StreamInterface.php

@@ -10,9 +10,9 @@
 namespace Zend\Http\Client\Adapter;
 
 /**
- * An interface description for Zend_Http_Client_Adapter_Stream classes.
+ * An interface description for Zend\Http\Client\Adapter\Stream classes.
  *
- * This interface describes Zend_Http_Client_Adapter which supports streaming.
+ * This interface describes Zend\Http\Client\Adapter which supports streaming.
  */
 interface StreamInterface
 {

src/Client/Adapter/Test.php

@@ -16,7 +16,7 @@
 /**
  * A testing-purposes adapter.
  *
- * Should be used to test all components that rely on Zend_Http_Client,
+ * Should be used to test all components that rely on Zend\Http\Client,
  * without actually performing an HTTP request. You should instantiate this
  * object manually, and then set it as the client's adapter. Then, you can
  * set the expected response using the setResponse() method.

src/Client/Cookies.php

@@ -18,7 +18,7 @@
 
 /**
  * A Cookies object is designed to contain and maintain HTTP cookies, and should
- * be used along with Zend_Http_Client in order to manage cookies across HTTP requests and
+ * be used along with Zend\Http\Client in order to manage cookies across HTTP requests and
  * responses.
  *
  * The class contains an array of Zend\Http\Header\Cookie objects. Cookies can be added

src/Cookies.php

@@ -16,8 +16,8 @@
 
 
 /**
- * A Zend_Http_CookieJar object is designed to contain and maintain HTTP cookies, and should
- * be used along with Zend_Http_Client in order to manage cookies across HTTP requests and
+ * A Zend\Http\Cookies object is designed to contain and maintain HTTP cookies, and should
+ * be used along with Zend\Http\Client in order to manage cookies across HTTP requests and
  * responses.
  *
  * The class contains an array of Zend\Http\Header\Cookie objects. Cookies can be added
@@ -36,7 +36,7 @@
 class Cookies extends Headers
 {
     /**
-     * Return cookie(s) as a Zend_Http_Cookie object
+     * Return cookie(s) as a Zend\Http\Cookie object
      *
      */
     const COOKIE_OBJECT = 0;