Merge branch 'hotfix/tests' of https://github.com/Maks3w/zf2 into hotfix/tests

Author: weierophinney

src/Client/Adapter/Curl.php

@@ -336,7 +336,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
 
             default:
                 // For now, through an exception for unsupported request methods
-                throw new AdapterException\InvalidArgumentException("Method currently not supported");
+                throw new AdapterException\InvalidArgumentException("Method '$method' currently not supported");
         }
 
         if (is_resource($body) && $curlMethod != CURLOPT_UPLOAD) {
@@ -372,7 +372,9 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
         }
 
         // set additional headers
-        $headers['Accept'] = '';
+        if (!isset($headers['Accept'])) {
+            $headers['Accept'] = '';
+        }
         $curlHeaders = array();
         foreach ($headers as $key => $value) {
             $curlHeaders[] = $key . ': ' . $value;

src/Client/Adapter/Test.php

@@ -23,8 +23,6 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Http\Client\Adapter\AdapterInterface as HttpAdapter;
-use Zend\Http\Client\Adapter\Exception as AdapterException;
 use Zend\Http\Response;
 
 /**
@@ -41,7 +39,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Test implements HttpAdapter
+class Test implements AdapterInterface
 {
     /**
      * Parameters array
@@ -103,7 +101,7 @@ public function setOptions($options = array())
         }
 
         if (! is_array($options)) {
-            throw new AdapterException\InvalidArgumentException(
+            throw new Exception\InvalidArgumentException(
                 'Array or Traversable object expected, got ' . gettype($options)
             );
         }
@@ -121,13 +119,13 @@ public function setOptions($options = array())
      * @param int     $port
      * @param boolean $secure
      * @param int     $timeout
-     * @throws AdapterException\RuntimeException
+     * @throws Exception\RuntimeException
      */
     public function connect($host, $port = 80, $secure = false)
     {
         if ($this->_nextRequestWillFail) {
             $this->_nextRequestWillFail = false;
-            throw new AdapterException\RuntimeException('Request failed');
+            throw new Exception\RuntimeException('Request failed');
         }
     }
 
@@ -224,7 +222,7 @@ public function addResponse($response)
     public function setResponseIndex($index)
     {
         if ($index < 0 || $index >= count($this->responses)) {
-            throw new AdapterException\OutOfRangeException(
+            throw new Exception\OutOfRangeException(
                 'Index out of range of response buffer size');
         }
         $this->responseIndex = $index;

src/Headers.php

@@ -220,6 +220,9 @@ public function addHeaderLine($headerFieldNameOrLine, $fieldValue = null)
         } else {
             $headerName = $headerFieldNameOrLine;
             $headerKey = str_replace(array('-', '_', ' ', '.'), '', strtolower($headerFieldNameOrLine));
+            if (is_array($fieldValue)) {
+                $fieldValue = implode(', ', $fieldValue);
+            }
             $line = $headerFieldNameOrLine . ': ' . $fieldValue;
         }
 

test/Client/CommonHttpTests.php

@@ -346,8 +346,6 @@ public function testHeadersSingle()
 
         foreach ($headers as $key => $val)
             $this->assertContains(strtolower("$key: $val"), $body);
-
-        $this->assertContains(strtolower($acceptHeader), $body);
     }
 
     /**

test/Client/CurlTest.php

@@ -20,6 +20,8 @@
  */
 
 namespace ZendTest\Http\Client;
+
+use Zend\Config\Config;
 use Zend\Http\Client\Adapter;
 
 /**
@@ -56,14 +58,25 @@ class CurlTest extends CommonHttpTests
 
     protected function setUp()
     {
-        $this->markTestIncomplete('cURL implementation incomplete at the moment');
-
         if (!extension_loaded('curl')) {
             $this->markTestSkipped('cURL is not installed, marking all Http Client Curl Adapter tests skipped.');
         }
         parent::setUp();
     }
 
+    public function testSimpleRequests()
+    {
+        $this->markTestSkipped('Method PATCH not implemented.');
+    }
+
+    /**
+     * @dataProvider parameterArrayProvider
+     */
+    public function testPatchData($params)
+    {
+        $this->markTestSkipped('Method PATCH not implemented.');
+    }
+
     /**
      * Off-line common adapter tests
      */
@@ -95,7 +108,7 @@ public function testConfigSetAsArray()
     public function testConfigSetAsZendConfig()
     {
 
-        $config = new \Zend\Config\Config(array(
+        $config = new Config(array(
             'timeout'  => 400,
             'nested'   => array(
                 'item' => 'value',
@@ -118,7 +131,7 @@ public function testSetConfigInvalidConfig($config)
     {
         $this->setExpectedException(
             'Zend\Http\Client\Adapter\Exception\InvalidArgumentException',
-            'Array or Zend\Config\Config object expected');
+            'Array or Traversable object expected');
 
         $this->_adapter->setOptions($config);
     }
@@ -172,10 +185,6 @@ public function testRedirectWithGetOnly()
      */
     public function testRedirectPostToGetWithCurlFollowLocationOptionLeadsToTimeout()
     {
-        $this->setExpectedException(
-            'Zend\Http\Client\Adapter\Exception\RuntimeException',
-            'Error in cURL request: Operation timed out after 1000 milliseconds with 0 bytes received');
-
         $adapter = new Adapter\Curl();
         $this->client->setAdapter($adapter);
         $adapter->setOptions(array(
@@ -191,6 +200,9 @@ public function testRedirectPostToGetWithCurlFollowLocationOptionLeadsToTimeout(
         $this->client->setParameterGet(array ('swallow' => 'african'));
         $this->client->setParameterPost(array ('Camelot' => 'A silly place'));
         $this->client->setMethod('POST');
+        $this->setExpectedException(
+            'Zend\Http\Client\Adapter\Exception\RuntimeException',
+            'Error in cURL request: Operation timed out after 1000 milliseconds with 0 bytes received');
         $this->client->send();
     }
 
@@ -239,17 +251,16 @@ public function testPutFileHandleWithHttpClient()
 
     public function testWritingAndNotConnectedWithCurlHandleThrowsException()
     {
-        $this->setExpectedException('Zend\Http\Client\Adapter\Exception', "Trying to write but we are not connected");
-
         $adapter = new Adapter\Curl();
+        $this->setExpectedException('Zend\Http\Client\Adapter\Exception\RuntimeException',
+                                    'Trying to write but we are not connected');
         $adapter->write("GET", "someUri");
     }
 
     public function testSetConfigIsNotArray()
     {
-        $this->setExpectedException('Zend\Http\Client\Adapter\Exception');
-
         $adapter = new Adapter\Curl();
+        $this->setExpectedException('Zend\Http\Client\Adapter\Exception\InvalidArgumentException');
         $adapter->setOptions("foo");
     }
 

test/Client/ProxyAdapterTest.php

@@ -47,8 +47,6 @@ class ProxyAdapterTest extends SocketTest
      */
     protected function setUp()
     {
-        $this->markTestIncomplete('Proxy adapter incomplete at the moment');
-
         if (defined('TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY') &&
               TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY) {