Return null as Expire header if it was set to null
This commit is contained in:
parent
c08b42aacb
commit
5e3c7ea452
|
@ -121,7 +121,15 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
|||
}
|
||||
|
||||
if ($first) {
|
||||
return \count($headers[$key]) ? (string) $headers[$key][0] : $default;
|
||||
if (!$headers[$key]) {
|
||||
return $default;
|
||||
}
|
||||
|
||||
if (null === $headers[$key][0]) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (string) $headers[$key][0];
|
||||
}
|
||||
|
||||
return $headers[$key];
|
||||
|
|
|
@ -48,6 +48,13 @@ class HeaderBagTest extends TestCase
|
|||
$this->assertInstanceOf('DateTime', $headerDate);
|
||||
}
|
||||
|
||||
public function testGetDateNull()
|
||||
{
|
||||
$bag = new HeaderBag(['foo' => null]);
|
||||
$headerDate = $bag->getDate('foo');
|
||||
$this->assertNull($headerDate);
|
||||
}
|
||||
|
||||
public function testGetDateException()
|
||||
{
|
||||
$this->expectException('RuntimeException');
|
||||
|
@ -96,6 +103,9 @@ class HeaderBagTest extends TestCase
|
|||
$bag->set('foo', 'bor', false);
|
||||
$this->assertEquals('bar', $bag->get('foo'), '->get return first value');
|
||||
$this->assertEquals(['bar', 'bor'], $bag->get('foo', 'nope', false), '->get return all values as array');
|
||||
|
||||
$bag->set('baz', null);
|
||||
$this->assertNull($bag->get('baz', 'nope'), '->get return null although different default value is given');
|
||||
}
|
||||
|
||||
public function testSetAssociativeArray()
|
||||
|
|
|
@ -369,6 +369,12 @@ class ResponseTest extends ResponseTestCase
|
|||
$this->assertNull($response->headers->get('Expires'), '->expire() removes the Expires header when the response is fresh');
|
||||
}
|
||||
|
||||
public function testNullExpireHeader()
|
||||
{
|
||||
$response = new Response(null, 200, ['Expires' => null]);
|
||||
$this->assertNull($response->getExpires());
|
||||
}
|
||||
|
||||
public function testGetTtl()
|
||||
{
|
||||
$response = new Response();
|
||||
|
|
Reference in New Issue