updated packages
This commit is contained in:
@@ -22,7 +22,7 @@ class ResponseTest extends ResponseTestCase
|
||||
{
|
||||
public function testCreate()
|
||||
{
|
||||
$response = Response::create('foo', 301, array('Foo' => 'bar'));
|
||||
$response = Response::create('foo', 301, ['Foo' => 'bar']);
|
||||
|
||||
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
|
||||
$this->assertEquals(301, $response->getStatusCode());
|
||||
@@ -254,10 +254,10 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function testIsValidateable()
|
||||
{
|
||||
$response = new Response('', 200, array('Last-Modified' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)));
|
||||
$response = new Response('', 200, ['Last-Modified' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)]);
|
||||
$this->assertTrue($response->isValidateable(), '->isValidateable() returns true if Last-Modified is present');
|
||||
|
||||
$response = new Response('', 200, array('ETag' => '"12345"'));
|
||||
$response = new Response('', 200, ['ETag' => '"12345"']);
|
||||
$this->assertTrue($response->isValidateable(), '->isValidateable() returns true if ETag is present');
|
||||
|
||||
$response = new Response();
|
||||
@@ -267,7 +267,7 @@ class ResponseTest extends ResponseTestCase
|
||||
public function testGetDate()
|
||||
{
|
||||
$oneHourAgo = $this->createDateTimeOneHourAgo();
|
||||
$response = new Response('', 200, array('Date' => $oneHourAgo->format(DATE_RFC2822)));
|
||||
$response = new Response('', 200, ['Date' => $oneHourAgo->format(DATE_RFC2822)]);
|
||||
$date = $response->getDate();
|
||||
$this->assertEquals($oneHourAgo->getTimestamp(), $date->getTimestamp(), '->getDate() returns the Date header if present');
|
||||
|
||||
@@ -275,7 +275,7 @@ class ResponseTest extends ResponseTestCase
|
||||
$date = $response->getDate();
|
||||
$this->assertEquals(time(), $date->getTimestamp(), '->getDate() returns the current Date if no Date header present');
|
||||
|
||||
$response = new Response('', 200, array('Date' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)));
|
||||
$response = new Response('', 200, ['Date' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)]);
|
||||
$now = $this->createDateTimeNow();
|
||||
$response->headers->set('Date', $now->format(DATE_RFC2822));
|
||||
$date = $response->getDate();
|
||||
@@ -415,21 +415,21 @@ class ResponseTest extends ResponseTestCase
|
||||
public function testGetVary()
|
||||
{
|
||||
$response = new Response();
|
||||
$this->assertEquals(array(), $response->getVary(), '->getVary() returns an empty array if no Vary header is present');
|
||||
$this->assertEquals([], $response->getVary(), '->getVary() returns an empty array if no Vary header is present');
|
||||
|
||||
$response = new Response();
|
||||
$response->headers->set('Vary', 'Accept-Language');
|
||||
$this->assertEquals(array('Accept-Language'), $response->getVary(), '->getVary() parses a single header name value');
|
||||
$this->assertEquals(['Accept-Language'], $response->getVary(), '->getVary() parses a single header name value');
|
||||
|
||||
$response = new Response();
|
||||
$response->headers->set('Vary', 'Accept-Language User-Agent X-Foo');
|
||||
$this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->getVary() parses multiple header name values separated by spaces');
|
||||
$this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->getVary() parses multiple header name values separated by spaces');
|
||||
|
||||
$response = new Response();
|
||||
$response->headers->set('Vary', 'Accept-Language,User-Agent, X-Foo');
|
||||
$this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->getVary() parses multiple header name values separated by commas');
|
||||
$this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->getVary() parses multiple header name values separated by commas');
|
||||
|
||||
$vary = array('Accept-Language', 'User-Agent', 'X-foo');
|
||||
$vary = ['Accept-Language', 'User-Agent', 'X-foo'];
|
||||
|
||||
$response = new Response();
|
||||
$response->headers->set('Vary', $vary);
|
||||
@@ -444,18 +444,18 @@ class ResponseTest extends ResponseTestCase
|
||||
{
|
||||
$response = new Response();
|
||||
$response->setVary('Accept-Language');
|
||||
$this->assertEquals(array('Accept-Language'), $response->getVary());
|
||||
$this->assertEquals(['Accept-Language'], $response->getVary());
|
||||
|
||||
$response->setVary('Accept-Language, User-Agent');
|
||||
$this->assertEquals(array('Accept-Language', 'User-Agent'), $response->getVary(), '->setVary() replace the vary header by default');
|
||||
$this->assertEquals(['Accept-Language', 'User-Agent'], $response->getVary(), '->setVary() replace the vary header by default');
|
||||
|
||||
$response->setVary('X-Foo', false);
|
||||
$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');
|
||||
$this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->setVary() doesn\'t wipe out earlier Vary headers if replace is set to false');
|
||||
}
|
||||
|
||||
public function testDefaultContentType()
|
||||
{
|
||||
$headerMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\ResponseHeaderBag')->setMethods(array('set'))->getMock();
|
||||
$headerMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\ResponseHeaderBag')->setMethods(['set'])->getMock();
|
||||
$headerMock->expects($this->at(0))
|
||||
->method('set')
|
||||
->with('Content-Type', 'text/html');
|
||||
@@ -595,55 +595,55 @@ class ResponseTest extends ResponseTestCase
|
||||
public function testSetCache()
|
||||
{
|
||||
$response = new Response();
|
||||
//array('etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public')
|
||||
// ['etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public']
|
||||
try {
|
||||
$response->setCache(array('wrong option' => 'value'));
|
||||
$response->setCache(['wrong option' => 'value']);
|
||||
$this->fail('->setCache() throws an InvalidArgumentException if an option is not supported');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('InvalidArgumentException', $e, '->setCache() throws an InvalidArgumentException if an option is not supported');
|
||||
$this->assertContains('"wrong option"', $e->getMessage());
|
||||
}
|
||||
|
||||
$options = array('etag' => '"whatever"');
|
||||
$options = ['etag' => '"whatever"'];
|
||||
$response->setCache($options);
|
||||
$this->assertEquals($response->getEtag(), '"whatever"');
|
||||
|
||||
$now = $this->createDateTimeNow();
|
||||
$options = array('last_modified' => $now);
|
||||
$options = ['last_modified' => $now];
|
||||
$response->setCache($options);
|
||||
$this->assertEquals($response->getLastModified()->getTimestamp(), $now->getTimestamp());
|
||||
|
||||
$options = array('max_age' => 100);
|
||||
$options = ['max_age' => 100];
|
||||
$response->setCache($options);
|
||||
$this->assertEquals($response->getMaxAge(), 100);
|
||||
|
||||
$options = array('s_maxage' => 200);
|
||||
$options = ['s_maxage' => 200];
|
||||
$response->setCache($options);
|
||||
$this->assertEquals($response->getMaxAge(), 200);
|
||||
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('public' => true));
|
||||
$response->setCache(['public' => true]);
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('public' => false));
|
||||
$response->setCache(['public' => false]);
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('private' => true));
|
||||
$response->setCache(['private' => true]);
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('private' => false));
|
||||
$response->setCache(['private' => false]);
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('immutable' => true));
|
||||
$response->setCache(['immutable' => true]);
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('immutable'));
|
||||
|
||||
$response->setCache(array('immutable' => false));
|
||||
$response->setCache(['immutable' => false]);
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('immutable'));
|
||||
}
|
||||
|
||||
@@ -780,14 +780,14 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function getStatusCodeFixtures()
|
||||
{
|
||||
return array(
|
||||
array('200', null, 'OK'),
|
||||
array('200', false, ''),
|
||||
array('200', 'foo', 'foo'),
|
||||
array('199', null, 'unknown status'),
|
||||
array('199', false, ''),
|
||||
array('199', 'foo', 'foo'),
|
||||
);
|
||||
return [
|
||||
['200', null, 'OK'],
|
||||
['200', false, ''],
|
||||
['200', 'foo', 'foo'],
|
||||
['199', null, 'unknown status'],
|
||||
['199', false, ''],
|
||||
['199', 'foo', 'foo'],
|
||||
];
|
||||
}
|
||||
|
||||
public function testIsInformational()
|
||||
@@ -801,7 +801,7 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function testIsRedirectRedirection()
|
||||
{
|
||||
foreach (array(301, 302, 303, 307) as $code) {
|
||||
foreach ([301, 302, 303, 307] as $code) {
|
||||
$response = new Response('', $code);
|
||||
$this->assertTrue($response->isRedirection());
|
||||
$this->assertTrue($response->isRedirect());
|
||||
@@ -819,7 +819,7 @@ class ResponseTest extends ResponseTestCase
|
||||
$this->assertFalse($response->isRedirection());
|
||||
$this->assertFalse($response->isRedirect());
|
||||
|
||||
$response = new Response('', 301, array('Location' => '/good-uri'));
|
||||
$response = new Response('', 301, ['Location' => '/good-uri']);
|
||||
$this->assertFalse($response->isRedirect('/bad-uri'));
|
||||
$this->assertTrue($response->isRedirect('/good-uri'));
|
||||
}
|
||||
@@ -835,7 +835,7 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function testIsEmpty()
|
||||
{
|
||||
foreach (array(204, 304) as $code) {
|
||||
foreach ([204, 304] as $code) {
|
||||
$response = new Response('', $code);
|
||||
$this->assertTrue($response->isEmpty());
|
||||
}
|
||||
@@ -884,7 +884,7 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function testSetEtag()
|
||||
{
|
||||
$response = new Response('', 200, array('ETag' => '"12345"'));
|
||||
$response = new Response('', 200, ['ETag' => '"12345"']);
|
||||
$response->setEtag();
|
||||
|
||||
$this->assertNull($response->headers->get('Etag'), '->setEtag() removes Etags when call with null');
|
||||
@@ -914,7 +914,7 @@ class ResponseTest extends ResponseTestCase
|
||||
{
|
||||
$response = new Response();
|
||||
|
||||
$setters = array(
|
||||
$setters = [
|
||||
'setProtocolVersion' => '1.0',
|
||||
'setCharset' => 'UTF-8',
|
||||
'setPublic' => null,
|
||||
@@ -925,7 +925,7 @@ class ResponseTest extends ResponseTestCase
|
||||
'setSharedMaxAge' => 1,
|
||||
'setTtl' => 1,
|
||||
'setClientTtl' => 1,
|
||||
);
|
||||
];
|
||||
|
||||
foreach ($setters as $setter => $arg) {
|
||||
$this->assertEquals($response, $response->{$setter}($arg));
|
||||
@@ -944,20 +944,20 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function validContentProvider()
|
||||
{
|
||||
return array(
|
||||
'obj' => array(new StringableObject()),
|
||||
'string' => array('Foo'),
|
||||
'int' => array(2),
|
||||
);
|
||||
return [
|
||||
'obj' => [new StringableObject()],
|
||||
'string' => ['Foo'],
|
||||
'int' => [2],
|
||||
];
|
||||
}
|
||||
|
||||
public function invalidContentProvider()
|
||||
{
|
||||
return array(
|
||||
'obj' => array(new \stdClass()),
|
||||
'array' => array(array()),
|
||||
'bool' => array(true, '1'),
|
||||
);
|
||||
return [
|
||||
'obj' => [new \stdClass()],
|
||||
'array' => [[]],
|
||||
'bool' => [true, '1'],
|
||||
];
|
||||
}
|
||||
|
||||
protected function createDateTimeOneHourAgo()
|
||||
@@ -1004,19 +1004,20 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
$ianaHttpStatusCodes = new \DOMDocument();
|
||||
|
||||
libxml_set_streams_context(stream_context_create(array(
|
||||
'http' => array(
|
||||
$context = stream_context_create([
|
||||
'http' => [
|
||||
'method' => 'GET',
|
||||
'timeout' => 30,
|
||||
),
|
||||
)));
|
||||
'user_agent' => __METHOD__,
|
||||
],
|
||||
]);
|
||||
|
||||
$ianaHttpStatusCodes->load('https://www.iana.org/assignments/http-status-codes/http-status-codes.xml');
|
||||
$ianaHttpStatusCodes->loadXML(file_get_contents('https://www.iana.org/assignments/http-status-codes/http-status-codes.xml', false, $context));
|
||||
if (!$ianaHttpStatusCodes->relaxNGValidate(__DIR__.'/schema/http-status-codes.rng')) {
|
||||
self::fail('Invalid IANA\'s HTTP status code list.');
|
||||
}
|
||||
|
||||
$ianaCodesReasonPhrases = array();
|
||||
$ianaCodesReasonPhrases = [];
|
||||
|
||||
$xpath = new \DOMXPath($ianaHttpStatusCodes);
|
||||
$xpath->registerNamespace('ns', 'http://www.iana.org/assignments');
|
||||
@@ -1026,16 +1027,16 @@ class ResponseTest extends ResponseTestCase
|
||||
$value = $xpath->query('.//ns:value', $record)->item(0)->nodeValue;
|
||||
$description = $xpath->query('.//ns:description', $record)->item(0)->nodeValue;
|
||||
|
||||
if (\in_array($description, array('Unassigned', '(Unused)'), true)) {
|
||||
if (\in_array($description, ['Unassigned', '(Unused)'], true)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (preg_match('/^([0-9]+)\s*\-\s*([0-9]+)$/', $value, $matches)) {
|
||||
for ($value = $matches[1]; $value <= $matches[2]; ++$value) {
|
||||
$ianaCodesReasonPhrases[] = array($value, $description);
|
||||
$ianaCodesReasonPhrases[] = [$value, $description];
|
||||
}
|
||||
} else {
|
||||
$ianaCodesReasonPhrases[] = array($value, $description);
|
||||
$ianaCodesReasonPhrases[] = [$value, $description];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user