[HttpFoundation] fixed empty domain= in Cookie::__toString()
This commit is contained in:
parent
c2bc707a4d
commit
495d0e366e
@ -95,7 +95,7 @@ class Cookie
|
|||||||
$str .= '; path='.$this->path;
|
$str .= '; path='.$this->path;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null !== $this->getDomain()) {
|
if ($this->getDomain()) {
|
||||||
$str .= '; domain='.$this->getDomain();
|
$str .= '; domain='.$this->getDomain();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -117,11 +117,12 @@ class CookieTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testToString()
|
public function testToString()
|
||||||
{
|
{
|
||||||
$cookie = new Cookie('foo', 'bar', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);
|
$cookie = new Cookie('foo', 'bar', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);
|
||||||
|
|
||||||
$this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; domain=.myfoodomain.com; secure; httponly', $cookie->__toString(), '->__toString() returns string representation of the cookie');
|
$this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; domain=.myfoodomain.com; secure; httponly', $cookie->__toString(), '->__toString() returns string representation of the cookie');
|
||||||
|
|
||||||
$cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com');
|
$cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com');
|
||||||
|
|
||||||
$this->assertEquals('foo=deleted; expires=' . gmdate("D, d-M-Y H:i:s T", time()-31536001) . '; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL');
|
$this->assertEquals('foo=deleted; expires=' . gmdate("D, d-M-Y H:i:s T", time()-31536001) . '; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL');
|
||||||
|
|
||||||
|
$cookie = new Cookie('foo', 'bar', 0, '/', '');
|
||||||
|
$this->assertEquals('foo=bar; httponly', $cookie->__toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user