diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpFoundation][Cookie] Cookie DateTimeInterface fix

Browse Source
This commit is contained in:
Wouter de Wild 2016-01-14 13:21:56 +01:00 committed by Fabien Potencier
parent bbbb0796f4
commit f1f9754bcb
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Symfony/Component/HttpFoundation/Cookie.php
View File

@ -29,13 +29,13 @@ class Cookie
/** /**
* Constructor. * Constructor.
* *
* @param string $name The name of the cookie * @param string $name The name of the cookie
* @param string $value The value of the cookie * @param string $value The value of the cookie
* @param int|string|\DateTime $expire The time the cookie expires * @param int|string|\DateTime|\DateTimeInterface $expire The time the cookie expires
* @param string $path The path on the server in which the cookie will be available on * @param string $path The path on the server in which the cookie will be available on
* @param string $domain The domain that the cookie is available to * @param string $domain The domain that the cookie is available to
* @param bool $secure Whether the cookie should only be transmitted over a secure HTTPS connection from the client * @param bool $secure Whether the cookie should only be transmitted over a secure HTTPS connection from the client
* @param bool $httpOnly Whether the cookie will be made accessible only through the HTTP protocol * @param bool $httpOnly Whether the cookie will be made accessible only through the HTTP protocol
* *
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
@ -51,7 +51,7 @@ class Cookie
} }
// convert expiration time to a Unix timestamp // convert expiration time to a Unix timestamp
if ($expire instanceof \DateTime) { if ($expire instanceof \DateTime || $expire instanceof \DateTimeInterface) {
$expire = $expire->format('U'); $expire = $expire->format('U');
} elseif (!is_numeric($expire)) { } elseif (!is_numeric($expire)) {
$expire = strtotime($expire); $expire = strtotime($expire);

11
src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
View File

@ -85,6 +85,17 @@ class CookieTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expire->format('U'), $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date'); $this->assertEquals($expire->format('U'), $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
} }
/**
* @requires PHP 5.5
*/
public function testConstructorWithDateTimeImmutable()
{
$expire = new \DateTimeImmutable();
$cookie = new Cookie('foo', 'bar', $expire);
$this->assertEquals($expire->format('U'), $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
}
public function testGetExpiresTimeWithStringValue() public function testGetExpiresTimeWithStringValue()
{ {
$value = '+1 day'; $value = '+1 day';