Skip to content

Commit

Permalink
Return null as Expire header if it was set to null
Browse files Browse the repository at this point in the history
  • Loading branch information
danrot authored and nicolas-grekas committed Aug 29, 2019
1 parent c08b42a commit 5e3c7ea
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
10 changes: 9 additions & 1 deletion src/Symfony/Component/HttpFoundation/HeaderBag.php
Expand Up @@ -121,7 +121,15 @@ public function get($key, $default = null, $first = true)
}

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];
Expand Down
10 changes: 10 additions & 0 deletions src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
Expand Up @@ -48,6 +48,13 @@ public function testGetDate()
$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');
Expand Down Expand Up @@ -96,6 +103,9 @@ public function testGet()
$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()
Expand Down
6 changes: 6 additions & 0 deletions src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
Expand Up @@ -369,6 +369,12 @@ public function testExpire()
$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();
Expand Down

0 comments on commit 5e3c7ea

Please sign in to comment.