Merge pull request zendframework/zendframework#5523 in master

zendframework · Feb 23, 2014 · e231336 · e231336
commit e231336
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/test/Client/SocketTest.php b/test/Client/SocketTest.php
@@ -86,7 +86,7 @@ public function testConnectingViaSslEnforcesDefaultSslOptionsOnContext()
     }
 
     /**
-     * Test that a Zend_Config object can be used to set configuration
+     * Test that a Zend\Config object can be used to set configuration
      *
      * @link http://framework.zend.com/issues/browse/ZF-5577
      */
@@ -116,7 +116,7 @@ public function testSetConfigInvalidConfig($config)
     {
         $this->setExpectedException(
             'Zend\Http\Client\Adapter\Exception\InvalidArgumentException',
-            'Array or Zend_Config object expected');
+            'Array or Zend\Config object expected');
 
         $this->_adapter->setOptions($config);
     }

diff --git a/test/Client/StaticTest.php b/test/Client/StaticTest.php
@@ -350,7 +350,7 @@ public function testSocketErrorException()
         }
         $this->setExpectedException(
             'Zend\Http\Client\Adapter\Exception\RuntimeException',
-            'Unable to Connect to tcp://255.255.255.255:80');
+            'Unable to connect to 255.255.255.255:80');
 
         // Try to connect to an invalid host
         $this->_client->setUri('http://255.255.255.255');

diff --git a/test/Client/_files/ZF7038-multipartarrayrequest.txt b/test/Client/_files/ZF7038-multipartarrayrequest.txt
@@ -1,7 +1,7 @@
 POST \/ HTTP\/1\.1
 Host: example\.com
 Connection: close
-Accept-encoding: gzip, deflate
+Accept-Encoding: gzip, deflate
 User-Agent: Zend_Http_Client
 Content-Type: multipart\/form-data; boundary=---ZENDHTTPCLIENT-\w+
 Content-Length: \d+