Merge branch 'feature/arrays-httpclient-addcookie' of https://github.com/juriansluiman/zf2 into hotfix/http-header-cookie_arrays

Author: weierophinney

src/Client.php

@@ -43,21 +43,19 @@
  */
 class Client implements Dispatchable
 {
-    /**#@+
+    /**
      * @const string Supported HTTP Authentication methods
      */
     const AUTH_BASIC  = 'basic';
     const AUTH_DIGEST = 'digest';  // not implemented yet
-    /**#@-*/
 
-    /**#@+
+    /**
      * @const string POST data encoding methods
      */
     const ENC_URLENCODED = 'application/x-www-form-urlencoded';
     const ENC_FORMDATA   = 'multipart/form-data';
-    /**#@-*/
 
-    /**#@+
+    /**
      * @const string DIGEST Authentication
      */
     const DIGEST_REALM  = 'realm';
@@ -66,7 +64,6 @@ class Client implements Dispatchable
     const DIGEST_OPAQUE = 'opaque';
     const DIGEST_NC     = 'nc';
     const DIGEST_CNONCE = 'cnonce';
-    /**#@-*/
 
     /**
      * @var Response
@@ -467,7 +464,7 @@ protected function getCookieId($cookie)
     /**
      * Add a cookie
      *
-     * @param ArrayIterator|SetCookie|string $cookie
+     * @param array|ArrayIterator|SetCookie|string $cookie
      * @param string  $value
      * @param string  $domain
      * @param string  $expire
@@ -478,7 +475,7 @@ protected function getCookieId($cookie)
      */
     public function addCookie($cookie, $value = null, $domain = null, $expire = null, $path = null, $secure = false, $httponly = true)
     {
-        if ($cookie instanceof \ArrayIterator) {
+        if (is_array($cookie) || $cookie instanceof \ArrayIterator) {
             foreach ($cookie as $setCookie) {
                 if ($setCookie instanceof SetCookie) {
                     $this->cookies[$this->getCookieId($setCookie)] = $setCookie;

test/ClientTest.php

@@ -5,7 +5,8 @@
  */
 namespace ZendTest\Http;
 
-use Zend\Http\Client;
+use Zend\Http\Client,
+    Zend\Http\Header\SetCookie;
 
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
@@ -37,4 +38,44 @@ public function testIfNullValueCookiesThrowsException()
         $client = new Client();
         $client->addCookie("test", null);
     } 
+
+    public function testIfCookieHeaderCanBeSet()
+    {
+        $header = new SetCookie('foo');
+
+        $client = new Client();
+        $client->addCookie($header);
+        
+        $cookies = $client->getCookies();
+        $this->assertEquals(1, count($cookies));
+        $this->assertEquals($header, $cookies['foo']);
+    }
+
+    public function testIfArrayOfHeadersCanBeSet()
+    {
+        $headers = array(
+            new SetCookie('foo'),
+            new SetCookie('bar')
+        );
+
+        $client = new Client();
+        $client->addCookie($headers);
+        
+        $cookies = $client->getCookies();
+        $this->assertEquals(2, count($cookies));
+    }
+
+    public function testIfArrayIteratorOfHeadersCanBeSet()
+    {
+        $headers = new \ArrayIterator(array(
+            new SetCookie('foo'),
+            new SetCookie('bar')
+        ));
+        
+        $client = new Client();
+        $client->addCookie($headers);
+        
+        $cookies = $client->getCookies();
+        $this->assertEquals(2, count($cookies));
+    }
 }