Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Method setCookies on Client accepts name=>value pairs or SetCookie instances #188

Merged
merged 2 commits into from
Nov 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
*/
Expand All @@ -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');
Expand Down
28 changes: 28 additions & 0 deletions test/ClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}
}