Merge branch 'hotfix/188' into develop

Forward port #188

Author: michalbundyra

CHANGELOG.md

@@ -48,6 +48,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#187](https://github.com/zendframework/zend-http/pull/187) fixes infinite recursion on invalid header. Now `InvalidArgumentException` exception is thrown. 
 
+- [#188](https://github.com/zendframework/zend-http/pull/188) fixes `Client::setCookies` method to properly handle array of `SetCookie` objects. Per [documentation](https://docs.zendframework.com/zend-http/client/cookies/#usage) it should be allowed. 
+
 ## 2.10.0 - 2019-02-19
 
 ### Added

src/Client.php

@@ -11,6 +11,7 @@
 use Traversable;
 use Zend\Http\Client\Adapter\Curl;
 use Zend\Http\Client\Adapter\Socket;
+use Zend\Http\Header\SetCookie;
 use Zend\Stdlib;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\ErrorHandler;
@@ -603,7 +604,7 @@ public function addCookie(
     /**
      * Set an array of cookies
      *
-     * @param  array $cookies
+     * @param  array|SetCookie[] $cookies Cookies as name=>value pairs or instances of SetCookie.
      * @throws Exception\InvalidArgumentException
      * @return Client
      */
@@ -612,7 +613,11 @@ public function setCookies($cookies)
         if (is_array($cookies)) {
             $this->clearCookies();
             foreach ($cookies as $name => $value) {
-                $this->addCookie($name, $value);
+                if ($value instanceof SetCookie) {
+                    $this->addCookie($value);
+                } else {
+                    $this->addCookie($name, $value);
+                }
             }
         } else {
             throw new Exception\InvalidArgumentException('Invalid cookies passed as parameter, it must be an array');

test/ClientTest.php

@@ -579,4 +579,32 @@ public function testUriPortIsNotSetWhenUriIsRelative()
         $client->send();
         $this->assertNull($client->getUri()->getPort());
     }
+
+    public function cookies()
+    {
+        yield 'name-value' => [['cookie-name' => 'cookie-value']];
+        yield 'SetCookie' => [[new SetCookie('cookie-name', 'cookie-value')]];
+    }
+
+    /**
+     * @dataProvider cookies
+     */
+    public function testSetCookies(array $cookies)
+    {
+        $client = new Client();
+
+        $client->setCookies($cookies);
+
+        self::assertCount(1, $client->getCookies());
+        self::assertContainsOnlyInstancesOf(SetCookie::class, $client->getCookies());
+    }
+
+    public function testSetCookieAcceptOnlyArray()
+    {
+        $client = new Client();
+
+        $this->expectException(HttpException\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid cookies passed as parameter, it must be an array');
+        $client->setCookies(new SetCookie('name', 'value'));
+    }
 }