Skip to content

Commit

Permalink
Merge branch '7.5' into 7.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@GrahamCampbell
GrahamCampbell committed May 14, 2023
2 parents a8154fc + 4019c94 commit 3d12c4b
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 72 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.

## 7.5.2 - 2023-05-14

### Fixed

- Fixed set cookie constructor validation
- Fixed handling of files with `'0'` body

### Changed

- Corrected docs and default connect timeout value to 300 seconds

## 7.5.1 - 2023-04-17

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion docs/request-options.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ connect_timeout
---------------

:Summary: Float describing the number of seconds to wait while trying to connect
to a server. Use ``0`` to wait indefinitely (the default behavior).
to a server. Use ``0`` to wait 300 seconds (the default behavior).
:Types: float
:Default: ``0``
:Constant: ``GuzzleHttp\RequestOptions::CONNECT_TIMEOUT``
Expand Down
46 changes: 41 additions & 5 deletions src/Cookie/SetCookie.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,49 @@ public static function fromString(string $cookie): self
*/
public function __construct(array $data = [])
{
/** @var array|null $replaced will be null in case of replace error */
$replaced = \array_replace(self::$defaults, $data);
if ($replaced === null) {
throw new \InvalidArgumentException('Unable to replace the default values for the Cookie.');
$this->data = self::$defaults;

if (isset($data['Name'])) {
$this->setName($data['Name']);
}

if (isset($data['Value'])) {
$this->setValue($data['Value']);
}

if (isset($data['Domain'])) {
$this->setDomain($data['Domain']);
}

if (isset($data['Path'])) {
$this->setPath($data['Path']);
}

if (isset($data['Max-Age'])) {
$this->setMaxAge($data['Max-Age']);
}

if (isset($data['Expires'])) {
$this->setExpires($data['Expires']);
}

if (isset($data['Secure'])) {
$this->setSecure($data['Secure']);
}

if (isset($data['Discard'])) {
$this->setDiscard($data['Discard']);
}

if (isset($data['HttpOnly'])) {
$this->setHttpOnly($data['HttpOnly']);
}

// Set the remaining values that don't have extra validation logic
foreach (array_diff(array_keys($data), array_keys(self::$defaults)) as $key) {
$this->data[$key] = $data[$key];
}

$this->data = $replaced;
// Extract the Expires value and turn it into a UNIX timestamp if needed
if (!$this->getExpires() && $this->getMaxAge()) {
// Calculate the Expires date
Expand Down
2 changes: 1 addition & 1 deletion src/Handler/CurlFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ private function getDefaultConf(EasyHandle $easy): array
\CURLOPT_URL => (string) $easy->request->getUri()->withFragment(''),
\CURLOPT_RETURNTRANSFER => false,
\CURLOPT_HEADER => false,
\CURLOPT_CONNECTTIMEOUT => 150,
\CURLOPT_CONNECTTIMEOUT => 300,
];

if (\defined('CURLOPT_PROTOCOLS')) {
Expand Down
2 changes: 1 addition & 1 deletion src/Handler/StreamHandler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ private function getDefaultContext(RequestInterface $request): array

$body = (string) $request->getBody();

if (!empty($body)) {
if ('' !== $body) {
$context['http']['content'] = $body;
// Prevent the HTTP handler from adding a Content-Type header.
if (!$request->hasHeader('Content-Type')) {
Expand Down
2 changes: 1 addition & 1 deletion src/RequestOptions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ final class RequestOptions
/**
* connect_timeout: (float, default=0) Float describing the number of
* seconds to wait while trying to connect to a server. Use 0 to wait
* indefinitely (the default behavior).
* 300 seconds (the default behavior).
*/
public const CONNECT_TIMEOUT = 'connect_timeout';

Expand Down
141 changes: 99 additions & 42 deletions tests/Cookie/CookieJarTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,55 +128,112 @@ public function testRemovesSelectively()
self::assertCount(0, $this->jar);
}

public function testDoesNotAddIncompleteCookies()
public static function providesIncompleteCookies(): array
{
self::assertFalse($this->jar->setCookie(new SetCookie()));
self::assertFalse($this->jar->setCookie(new SetCookie([
'Name' => 'foo'
])));
self::assertFalse($this->jar->setCookie(new SetCookie([
'Name' => false
])));
self::assertFalse($this->jar->setCookie(new SetCookie([
'Name' => true
])));
self::assertFalse($this->jar->setCookie(new SetCookie([
'Name' => 'foo',
'Domain' => 'foo.com'
])));
return [
[
[],
],
[
[
'Name' => 'foo',
],
],
[
[
'Name' => false,
],
],
[
[
'Name' => true,
],
],
[
[
'Name' => 'foo',
'Domain' => 'foo.com',
],
],
];
}

public function testDoesNotAddEmptyCookies()
/**
* @dataProvider providesIncompleteCookies
*/
public function testDoesNotAddIncompleteCookies(array $cookie)
{
self::assertFalse($this->jar->setCookie(new SetCookie([
'Name' => '',
'Domain' => 'foo.com',
'Value' => 0
])));
self::assertFalse($this->jar->setCookie(new SetCookie($cookie)));
}

public function testDoesAddValidCookies()
public static function providesEmptyCookies(): array
{
return [
[
[
'Name' => '',
'Domain' => 'foo.com',
'Value' => 0,
],
],
[
[
'Name' => null,
'Domain' => 'foo.com',
'Value' => 0,
],
],
];
}

/**
* @dataProvider providesEmptyCookies
*/
public function testDoesNotAddEmptyCookies(array $cookie)
{
self::assertFalse($this->jar->setCookie(new SetCookie($cookie)));
}

public static function providesValidCookies(): array
{
return [
[
[
'Name' => '0',
'Domain' => 'foo.com',
'Value' => 0,
],
],
[
[
'Name' => 'foo',
'Domain' => 'foo.com',
'Value' => 0,
],
],
[
[
'Name' => 'foo',
'Domain' => 'foo.com',
'Value' => 0.0,
],
],
[
[
'Name' => 'foo',
'Domain' => 'foo.com',
'Value' => '0',
],
],
];
}

/**
* @dataProvider providesValidCookies
*/
public function testDoesAddValidCookies(array $cookie)
{
self::assertTrue($this->jar->setCookie(new SetCookie([
'Name' => '0',
'Domain' => 'foo.com',
'Value' => 0
])));
self::assertTrue($this->jar->setCookie(new SetCookie([
'Name' => 'foo',
'Domain' => 'foo.com',
'Value' => 0
])));
self::assertTrue($this->jar->setCookie(new SetCookie([
'Name' => 'foo',
'Domain' => 'foo.com',
'Value' => 0.0
])));
self::assertTrue($this->jar->setCookie(new SetCookie([
'Name' => 'foo',
'Domain' => 'foo.com',
'Value' => '0'
])));
self::assertTrue($this->jar->setCookie(new SetCookie($cookie)));
}

public function testOverwritesCookiesThatAreOlderOrDiscardable()
Expand Down
55 changes: 35 additions & 20 deletions tests/Cookie/SetCookieTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ public function cookieParserDataProvider()
'Discard' => null,
'Name' => 'ASIHTTPRequestTestCookie',
'Value' => 'This+is+the+value',
'HttpOnly' => false
]
'HttpOnly' => false,
],
],
['', []],
['foo', []],
Expand All @@ -241,8 +241,8 @@ public function cookieParserDataProvider()
'Max-Age' => null,
'Path' => '/',
'Secure' => null,
'HttpOnly' => false
]
'HttpOnly' => false,
],
],
// Test setting a blank value for a cookie
[[
Expand All @@ -256,8 +256,8 @@ public function cookieParserDataProvider()
'Max-Age' => null,
'Path' => '/',
'Secure' => null,
'HttpOnly' => false
]
'HttpOnly' => false,
],
],
// Test setting a value and removing quotes
[[
Expand All @@ -271,8 +271,8 @@ public function cookieParserDataProvider()
'Max-Age' => null,
'Path' => '/',
'Secure' => null,
'HttpOnly' => false
]
'HttpOnly' => false,
],
],
// Some of the following tests are based on https://github.com/zendframework/zf1/blob/master/tests/Zend/Http/CookieTest.php
[
Expand All @@ -286,8 +286,8 @@ public function cookieParserDataProvider()
'Max-Age' => null,
'Path' => '/',
'Secure' => null,
'HttpOnly' => false
]
'HttpOnly' => false,
],
],
[
'expires=tomorrow; secure; path=/Space Out/; expires=Tue, 21-Nov-2006 08:33:44 GMT; domain=.example.com',
Expand All @@ -300,8 +300,8 @@ public function cookieParserDataProvider()
'Discard' => null,
'Secure' => true,
'Max-Age' => null,
'HttpOnly' => false
]
'HttpOnly' => false,
],
],
[
'domain=unittests; expires=Tue, 21-Nov-2006 08:33:44 GMT; domain=example.com; path=/some value/',
Expand All @@ -314,8 +314,8 @@ public function cookieParserDataProvider()
'Secure' => false,
'Discard' => null,
'Max-Age' => null,
'HttpOnly' => false
]
'HttpOnly' => false,
],
],
[
'path=indexAction; path=/; domain=.foo.com; expires=Tue, 21-Nov-2006 08:33:44 GMT',
Expand All @@ -328,8 +328,8 @@ public function cookieParserDataProvider()
'Secure' => false,
'Discard' => null,
'Max-Age' => null,
'HttpOnly' => false
]
'HttpOnly' => false,
],
],
[
'secure=sha1; secure; SECURE; domain=some.really.deep.domain.com; version=1; Max-Age=86400',
Expand All @@ -343,8 +343,8 @@ public function cookieParserDataProvider()
'Expires' => \time() + 86400,
'Max-Age' => 86400,
'HttpOnly' => false,
'version' => '1'
]
'version' => '1',
],
],
[
'PHPSESSID=123456789+abcd%2Cef; secure; discard; domain=.localdomain; path=/foo/baz; expires=Tue, 21-Nov-2006 08:33:44 GMT;',
Expand All @@ -357,8 +357,23 @@ public function cookieParserDataProvider()
'Secure' => true,
'Discard' => true,
'Max-Age' => null,
'HttpOnly' => false
]
'HttpOnly' => false,
],
],
[
'fr=synced; Max-Age=604800 Expires=Mon, 12 Dec 2022 13:27:50 GMT; Domain=.example.com; Path=/; SameSite=None; Secure; HttpOnly',
[
'Name' => 'fr',
'Value' => 'synced',
'Domain' => '.example.com',
'Path' => '/',
'Expires' => \time() + 604800,
'Secure' => true,
'Discard' => false,
'Max-Age' => 604800,
'HttpOnly' => true,
'SameSite' => 'None',
],
],
];
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Handler/CurlFactoryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function testCreatesCurlHandle()
self::assertSame('testing', $_SERVER['_curl'][\CURLOPT_POSTFIELDS]);
self::assertEquals(0, $_SERVER['_curl'][\CURLOPT_RETURNTRANSFER]);
self::assertEquals(0, $_SERVER['_curl'][\CURLOPT_HEADER]);
self::assertSame(150, $_SERVER['_curl'][\CURLOPT_CONNECTTIMEOUT]);
self::assertSame(300, $_SERVER['_curl'][\CURLOPT_CONNECTTIMEOUT]);
self::assertInstanceOf('Closure', $_SERVER['_curl'][\CURLOPT_HEADERFUNCTION]);
if (\defined('CURLOPT_PROTOCOLS')) {
self::assertSame(
Expand Down

0 comments on commit 3d12c4b

Please sign in to comment.