Skip to content

Commit 1017d83

Browse files
committed
[HttpFoundation] added some unit tests
1 parent b6a6791 commit 1017d83

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

src/Symfony/Component/HttpFoundation/Response.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -991,10 +991,9 @@ public function getVary()
991991
return array();
992992
}
993993

994-
995994
$ret = array();
996995
foreach ($vary as $item) {
997-
$ret = array_merge($ret, preg_split('/[\s,]+/', $item));
996+
$ret = array_merge($ret, preg_split('/[\s,]+/', $item));
998997
}
999998

1000999
return $ret;

src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,15 @@ public function testGetVary()
285285
$response->headers->set('Vary', 'Accept-Language,User-Agent, X-Foo');
286286
$this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->getVary() parses multiple header name values separated by commas');
287287

288+
$vary = array('Accept-Language', 'User-Agent', 'X-foo');
289+
288290
$response = new Response();
289-
$vary = array(
290-
'Accept-Language',
291-
'User-Agent',
292-
'X-foo',
293-
);
294291
$response->headers->set('Vary', $vary);
295-
$this->assertEquals($response->headers->get('Vary', NULL, FALSE) , $response->getVary(), '->getVary() parses multiple header name values in arrays');
292+
$this->assertEquals($vary, $response->getVary(), '->getVary() parses multiple header name values in arrays');
296293

294+
$response = new Response();
295+
$response->headers->set('Vary', 'Accept-Language, User-Agent, X-foo');
296+
$this->assertEquals($vary, $response->getVary(), '->getVary() parses multiple header name values in arrays');
297297
}
298298

299299
public function testSetVary()
@@ -306,9 +306,7 @@ public function testSetVary()
306306
$this->assertEquals(array('Accept-Language', 'User-Agent'), $response->getVary(), '->setVary() replace the vary header by default');
307307

308308
$response->setVary('X-Foo', false);
309-
$this->assertTrue(in_array('Accept-Language', $response->getVary()), '->setVary() doesn\'t wipe out earlier Vary headers if replace is set to false');
310-
$this->assertTrue(in_array('User-Agent', $response->getVary()), '->setVary() doesn\'t wipe out earlier Vary headers if replace is set to false');
311-
$this->assertTrue(in_array('X-Foo', $response->getVary()), '->setVary() adds new Vary headers when replace is set to false');
309+
$this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->setVary() doesn\'t wipe out earlier Vary headers if replace is set to false');
312310
}
313311

314312
public function testDefaultContentType()

0 commit comments

Comments
 (0)