Update composer dependencies

This commit is contained in:
Chris
2019-06-11 12:29:32 +01:00
parent 7d6df3843b
commit 1f608b1c21
1835 changed files with 74500 additions and 27482 deletions

View File

@@ -39,7 +39,7 @@ class HttpCacheTest extends HttpCacheTestCase
// implements TerminableInterface
$kernelMock = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Kernel')
->disableOriginalConstructor()
->setMethods(array('terminate', 'registerBundles', 'registerContainerConfiguration'))
->setMethods(['terminate', 'registerBundles', 'registerContainerConfiguration'])
->getMock();
$kernelMock->expects($this->once())
@@ -61,7 +61,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testInvalidatesOnPostPutDeleteRequests()
{
foreach (array('post', 'put', 'delete') as $method) {
foreach (['post', 'put', 'delete'] as $method) {
$this->setNextResponse(200);
$this->request($method, '/');
@@ -74,8 +74,8 @@ class HttpCacheTest extends HttpCacheTestCase
public function testDoesNotCacheWithAuthorizationRequestHeaderAndNonPublicResponse()
{
$this->setNextResponse(200, array('ETag' => '"Foo"'));
$this->request('GET', '/', array('HTTP_AUTHORIZATION' => 'basic foobarbaz'));
$this->setNextResponse(200, ['ETag' => '"Foo"']);
$this->request('GET', '/', ['HTTP_AUTHORIZATION' => 'basic foobarbaz']);
$this->assertHttpKernelIsCalled();
$this->assertResponseOk();
@@ -88,8 +88,8 @@ class HttpCacheTest extends HttpCacheTestCase
public function testDoesCacheWithAuthorizationRequestHeaderAndPublicResponse()
{
$this->setNextResponse(200, array('Cache-Control' => 'public', 'ETag' => '"Foo"'));
$this->request('GET', '/', array('HTTP_AUTHORIZATION' => 'basic foobarbaz'));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'ETag' => '"Foo"']);
$this->request('GET', '/', ['HTTP_AUTHORIZATION' => 'basic foobarbaz']);
$this->assertHttpKernelIsCalled();
$this->assertResponseOk();
@@ -101,8 +101,8 @@ class HttpCacheTest extends HttpCacheTestCase
public function testDoesNotCacheWithCookieHeaderAndNonPublicResponse()
{
$this->setNextResponse(200, array('ETag' => '"Foo"'));
$this->request('GET', '/', array(), array('foo' => 'bar'));
$this->setNextResponse(200, ['ETag' => '"Foo"']);
$this->request('GET', '/', [], ['foo' => 'bar']);
$this->assertHttpKernelIsCalled();
$this->assertResponseOk();
@@ -115,7 +115,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testDoesNotCacheRequestsWithACookieHeader()
{
$this->setNextResponse(200);
$this->request('GET', '/', array(), array('foo' => 'bar'));
$this->request('GET', '/', [], ['foo' => 'bar']);
$this->assertHttpKernelIsCalled();
$this->assertResponseOk();
@@ -129,8 +129,8 @@ class HttpCacheTest extends HttpCacheTestCase
{
$time = \DateTime::createFromFormat('U', time());
$this->setNextResponse(200, array('Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822), 'Content-Type' => 'text/plain'), 'Hello World');
$this->request('GET', '/', array('HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822), 'Content-Type' => 'text/plain'], 'Hello World');
$this->request('GET', '/', ['HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
$this->assertHttpKernelIsCalled();
$this->assertEquals(304, $this->response->getStatusCode());
@@ -142,8 +142,8 @@ class HttpCacheTest extends HttpCacheTestCase
public function testRespondsWith304WhenIfNoneMatchMatchesETag()
{
$this->setNextResponse(200, array('Cache-Control' => 'public', 'ETag' => '12345', 'Content-Type' => 'text/plain'), 'Hello World');
$this->request('GET', '/', array('HTTP_IF_NONE_MATCH' => '12345'));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'ETag' => '12345', 'Content-Type' => 'text/plain'], 'Hello World');
$this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345']);
$this->assertHttpKernelIsCalled();
$this->assertEquals(304, $this->response->getStatusCode());
@@ -158,7 +158,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
$time = \DateTime::createFromFormat('U', time());
$this->setNextResponse(200, array(), '', function ($request, $response) use ($time) {
$this->setNextResponse(200, [], '', function ($request, $response) use ($time) {
$response->setStatusCode(200);
$response->headers->set('ETag', '12345');
$response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
@@ -168,17 +168,17 @@ class HttpCacheTest extends HttpCacheTestCase
// only ETag matches
$t = \DateTime::createFromFormat('U', time() - 3600);
$this->request('GET', '/', array('HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $t->format(DATE_RFC2822)));
$this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $t->format(DATE_RFC2822)]);
$this->assertHttpKernelIsCalled();
$this->assertEquals(200, $this->response->getStatusCode());
// only Last-Modified matches
$this->request('GET', '/', array('HTTP_IF_NONE_MATCH' => '1234', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)));
$this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '1234', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
$this->assertHttpKernelIsCalled();
$this->assertEquals(200, $this->response->getStatusCode());
// Both matches
$this->request('GET', '/', array('HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)));
$this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
$this->assertHttpKernelIsCalled();
$this->assertEquals(304, $this->response->getStatusCode());
}
@@ -187,10 +187,10 @@ class HttpCacheTest extends HttpCacheTestCase
{
$this->setNextResponse(
200,
array(
[
'ETag' => '1234',
'Cache-Control' => 'public, s-maxage=60',
)
]
);
$this->request('GET', '/');
@@ -210,7 +210,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testValidatesPrivateResponsesCachedOnTheClient()
{
$this->setNextResponse(200, array(), '', function ($request, $response) {
$this->setNextResponse(200, [], '', function ($request, $response) {
$etags = preg_split('/\s*,\s*/', $request->headers->get('IF_NONE_MATCH'));
if ($request->cookies->has('authenticated')) {
$response->headers->set('Cache-Control', 'private, no-store');
@@ -243,7 +243,7 @@ class HttpCacheTest extends HttpCacheTestCase
$this->assertTraceContains('miss');
$this->assertTraceContains('store');
$this->request('GET', '/', array(), array('authenticated' => ''));
$this->request('GET', '/', [], ['authenticated' => '']);
$this->assertHttpKernelIsCalled();
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('"private tag"', $this->response->headers->get('ETag'));
@@ -257,8 +257,8 @@ class HttpCacheTest extends HttpCacheTestCase
{
$time = \DateTime::createFromFormat('U', time() + 5);
$this->setNextResponse(200, array('Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)));
$this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'no-cache'));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
$this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
$this->assertHttpKernelIsCalled();
$this->assertTraceContains('store');
@@ -269,7 +269,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
$count = 0;
$this->setNextResponse(200, array('Cache-Control' => 'public, max-age=10000'), '', function ($request, $response) use (&$count) {
$this->setNextResponse(200, ['Cache-Control' => 'public, max-age=10000'], '', function ($request, $response) use (&$count) {
++$count;
$response->setContent(1 == $count ? 'Hello World' : 'Goodbye World');
});
@@ -285,7 +285,7 @@ class HttpCacheTest extends HttpCacheTestCase
$this->assertTraceContains('fresh');
$this->cacheConfig['allow_reload'] = true;
$this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'no-cache'));
$this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('Goodbye World', $this->response->getContent());
$this->assertTraceContains('reload');
@@ -296,7 +296,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
$count = 0;
$this->setNextResponse(200, array('Cache-Control' => 'public, max-age=10000'), '', function ($request, $response) use (&$count) {
$this->setNextResponse(200, ['Cache-Control' => 'public, max-age=10000'], '', function ($request, $response) use (&$count) {
++$count;
$response->setContent(1 == $count ? 'Hello World' : 'Goodbye World');
});
@@ -312,12 +312,12 @@ class HttpCacheTest extends HttpCacheTestCase
$this->assertTraceContains('fresh');
$this->cacheConfig['allow_reload'] = false;
$this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'no-cache'));
$this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('Hello World', $this->response->getContent());
$this->assertTraceNotContains('reload');
$this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'no-cache'));
$this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('Hello World', $this->response->getContent());
$this->assertTraceNotContains('reload');
@@ -327,7 +327,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
$count = 0;
$this->setNextResponse(200, array(), '', function ($request, $response) use (&$count) {
$this->setNextResponse(200, [], '', function ($request, $response) use (&$count) {
++$count;
$response->headers->set('Cache-Control', 'public, max-age=10000');
$response->setETag($count);
@@ -345,7 +345,7 @@ class HttpCacheTest extends HttpCacheTestCase
$this->assertTraceContains('fresh');
$this->cacheConfig['allow_revalidate'] = true;
$this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'max-age=0'));
$this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'max-age=0']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('Goodbye World', $this->response->getContent());
$this->assertTraceContains('stale');
@@ -357,7 +357,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
$count = 0;
$this->setNextResponse(200, array(), '', function ($request, $response) use (&$count) {
$this->setNextResponse(200, [], '', function ($request, $response) use (&$count) {
++$count;
$response->headers->set('Cache-Control', 'public, max-age=10000');
$response->setETag($count);
@@ -375,14 +375,14 @@ class HttpCacheTest extends HttpCacheTestCase
$this->assertTraceContains('fresh');
$this->cacheConfig['allow_revalidate'] = false;
$this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'max-age=0'));
$this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'max-age=0']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('Hello World', $this->response->getContent());
$this->assertTraceNotContains('stale');
$this->assertTraceNotContains('invalid');
$this->assertTraceContains('fresh');
$this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'max-age=0'));
$this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'max-age=0']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('Hello World', $this->response->getContent());
$this->assertTraceNotContains('stale');
@@ -393,7 +393,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testFetchesResponseFromBackendWhenCacheMisses()
{
$time = \DateTime::createFromFormat('U', time() + 5);
$this->setNextResponse(200, array('Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
$this->request('GET', '/');
$this->assertEquals(200, $this->response->getStatusCode());
@@ -405,7 +405,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
foreach (array_merge(range(201, 202), range(204, 206), range(303, 305), range(400, 403), range(405, 409), range(411, 417), range(500, 505)) as $code) {
$time = \DateTime::createFromFormat('U', time() + 5);
$this->setNextResponse($code, array('Expires' => $time->format(DATE_RFC2822)));
$this->setNextResponse($code, ['Expires' => $time->format(DATE_RFC2822)]);
$this->request('GET', '/');
$this->assertEquals($code, $this->response->getStatusCode());
@@ -417,7 +417,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testDoesNotCacheResponsesWithExplicitNoStoreDirective()
{
$time = \DateTime::createFromFormat('U', time() + 5);
$this->setNextResponse(200, array('Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'no-store'));
$this->setNextResponse(200, ['Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'no-store']);
$this->request('GET', '/');
$this->assertTraceNotContains('store');
@@ -436,7 +436,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testCachesResponsesWithExplicitNoCacheDirective()
{
$time = \DateTime::createFromFormat('U', time() + 5);
$this->setNextResponse(200, array('Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, no-cache'));
$this->setNextResponse(200, ['Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, no-cache']);
$this->request('GET', '/');
$this->assertTraceContains('store');
@@ -446,7 +446,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testCachesResponsesWithAnExpirationHeader()
{
$time = \DateTime::createFromFormat('U', time() + 5);
$this->setNextResponse(200, array('Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
$this->request('GET', '/');
$this->assertEquals(200, $this->response->getStatusCode());
@@ -462,7 +462,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testCachesResponsesWithAMaxAgeDirective()
{
$this->setNextResponse(200, array('Cache-Control' => 'public, max-age=5'));
$this->setNextResponse(200, ['Cache-Control' => 'public, max-age=5']);
$this->request('GET', '/');
$this->assertEquals(200, $this->response->getStatusCode());
@@ -478,7 +478,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testCachesResponsesWithASMaxAgeDirective()
{
$this->setNextResponse(200, array('Cache-Control' => 's-maxage=5'));
$this->setNextResponse(200, ['Cache-Control' => 's-maxage=5']);
$this->request('GET', '/');
$this->assertEquals(200, $this->response->getStatusCode());
@@ -495,7 +495,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testCachesResponsesWithALastModifiedValidatorButNoFreshnessInformation()
{
$time = \DateTime::createFromFormat('U', time());
$this->setNextResponse(200, array('Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822)));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822)]);
$this->request('GET', '/');
$this->assertEquals(200, $this->response->getStatusCode());
@@ -506,7 +506,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testCachesResponsesWithAnETagValidatorButNoFreshnessInformation()
{
$this->setNextResponse(200, array('Cache-Control' => 'public', 'ETag' => '"123456"'));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'ETag' => '"123456"']);
$this->request('GET', '/');
$this->assertEquals(200, $this->response->getStatusCode());
@@ -519,7 +519,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
$time1 = \DateTime::createFromFormat('U', time() - 5);
$time2 = \DateTime::createFromFormat('U', time() + 5);
$this->setNextResponse(200, array('Cache-Control' => 'public', 'Date' => $time1->format(DATE_RFC2822), 'Expires' => $time2->format(DATE_RFC2822)));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'Date' => $time1->format(DATE_RFC2822), 'Expires' => $time2->format(DATE_RFC2822)]);
$this->request('GET', '/');
$this->assertHttpKernelIsCalled();
@@ -543,7 +543,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testHitsCachedResponseWithMaxAgeDirective()
{
$time = \DateTime::createFromFormat('U', time() - 5);
$this->setNextResponse(200, array('Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, max-age=10'));
$this->setNextResponse(200, ['Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, max-age=10']);
$this->request('GET', '/');
$this->assertHttpKernelIsCalled();
@@ -573,7 +573,7 @@ class HttpCacheTest extends HttpCacheTestCase
$this->cacheConfig['stale_while_revalidate'] = 10;
// The prescence of Last-Modified makes this cacheable (because Response::isValidateable() then).
$this->setNextResponse(200, array('Cache-Control' => 'public, s-maxage=5', 'Last-Modified' => 'some while ago'), 'Old response');
$this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=5', 'Last-Modified' => 'some while ago'], 'Old response');
$this->request('GET', '/'); // warm the cache
// Now, lock the cache
@@ -607,7 +607,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testHitsCachedResponseWithSMaxAgeDirective()
{
$time = \DateTime::createFromFormat('U', time() - 5);
$this->setNextResponse(200, array('Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 's-maxage=10, max-age=0'));
$this->setNextResponse(200, ['Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 's-maxage=10, max-age=0']);
$this->request('GET', '/');
$this->assertHttpKernelIsCalled();
@@ -752,7 +752,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testDoesNotAssignDefaultTtlWhenResponseHasMustRevalidateDirective()
{
$this->setNextResponse(200, array('Cache-Control' => 'must-revalidate'));
$this->setNextResponse(200, ['Cache-Control' => 'must-revalidate']);
$this->cacheConfig['default_ttl'] = 10;
$this->request('GET', '/');
@@ -767,7 +767,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testFetchesFullResponseWhenCacheStaleAndNoValidatorsPresent()
{
$time = \DateTime::createFromFormat('U', time() + 5);
$this->setNextResponse(200, array('Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)));
$this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
// build initial request
$this->request('GET', '/');
@@ -807,7 +807,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testValidatesCachedResponsesWithLastModifiedAndNoFreshnessInformation()
{
$time = \DateTime::createFromFormat('U', time());
$this->setNextResponse(200, array(), 'Hello World', function ($request, $response) use ($time) {
$this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($time) {
$response->headers->set('Cache-Control', 'public');
$response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
if ($time->format(DATE_RFC2822) == $request->headers->get('IF_MODIFIED_SINCE')) {
@@ -845,7 +845,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
$test = $this;
$this->setNextResponse(200, array(), 'Hello World', function ($request, $response) use ($test) {
$this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($test) {
$test->assertSame('OPTIONS', $request->getMethod());
});
@@ -858,7 +858,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testValidatesCachedResponsesWithETagAndNoFreshnessInformation()
{
$this->setNextResponse(200, array(), 'Hello World', function ($request, $response) {
$this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
$response->headers->set('Cache-Control', 'public');
$response->headers->set('ETag', '"12345"');
if ($response->getETag() == $request->headers->get('IF_NONE_MATCH')) {
@@ -895,7 +895,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
$time = \DateTime::createFromFormat('U', time());
$this->setNextResponse(200, array(), 'Hello World', function (Request $request, Response $response) use ($time) {
$this->setNextResponse(200, [], 'Hello World', function (Request $request, Response $response) use ($time) {
$response->setSharedMaxAge(10);
$response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
});
@@ -913,7 +913,7 @@ class HttpCacheTest extends HttpCacheTestCase
sleep(15); // expire the cache
$this->setNextResponse(304, array(), '', function (Request $request, Response $response) use ($time) {
$this->setNextResponse(304, [], '', function (Request $request, Response $response) use ($time) {
$this->assertEquals($time->format(DATE_RFC2822), $request->headers->get('IF_MODIFIED_SINCE'));
});
@@ -929,7 +929,7 @@ class HttpCacheTest extends HttpCacheTestCase
{
$time = \DateTime::createFromFormat('U', time());
$count = 0;
$this->setNextResponse(200, array(), 'Hello World', function ($request, $response) use ($time, &$count) {
$this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($time, &$count) {
$response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
$response->headers->set('Cache-Control', 'public');
switch (++$count) {
@@ -966,20 +966,20 @@ class HttpCacheTest extends HttpCacheTestCase
public function testPassesHeadRequestsThroughDirectlyOnPass()
{
$this->setNextResponse(200, array(), 'Hello World', function ($request, $response) {
$this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
$response->setContent('');
$response->setStatusCode(200);
$this->assertEquals('HEAD', $request->getMethod());
});
$this->request('HEAD', '/', array('HTTP_EXPECT' => 'something ...'));
$this->request('HEAD', '/', ['HTTP_EXPECT' => 'something ...']);
$this->assertHttpKernelIsCalled();
$this->assertEquals('', $this->response->getContent());
}
public function testUsesCacheToRespondToHeadRequestsWhenFresh()
{
$this->setNextResponse(200, array(), 'Hello World', function ($request, $response) {
$this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
$response->headers->set('Cache-Control', 'public, max-age=10');
$response->setContent('Hello World');
$response->setStatusCode(200);
@@ -1000,7 +1000,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testSendsNoContentWhenFresh()
{
$time = \DateTime::createFromFormat('U', time());
$this->setNextResponse(200, array(), 'Hello World', function ($request, $response) use ($time) {
$this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($time) {
$response->headers->set('Cache-Control', 'public, max-age=10');
$response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
});
@@ -1009,7 +1009,7 @@ class HttpCacheTest extends HttpCacheTestCase
$this->assertHttpKernelIsCalled();
$this->assertEquals('Hello World', $this->response->getContent());
$this->request('GET', '/', array('HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)));
$this->request('GET', '/', ['HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
$this->assertHttpKernelIsNotCalled();
$this->assertEquals(304, $this->response->getStatusCode());
$this->assertEquals('', $this->response->getContent());
@@ -1017,7 +1017,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testInvalidatesCachedResponsesOnPost()
{
$this->setNextResponse(200, array(), 'Hello World', function ($request, $response) {
$this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
if ('GET' == $request->getMethod()) {
$response->setStatusCode(200);
$response->headers->set('Cache-Control', 'public, max-age=500');
@@ -1066,20 +1066,20 @@ class HttpCacheTest extends HttpCacheTestCase
public function testServesFromCacheWhenHeadersMatch()
{
$count = 0;
$this->setNextResponse(200, array('Cache-Control' => 'max-age=10000'), '', function ($request, $response) use (&$count) {
$this->setNextResponse(200, ['Cache-Control' => 'max-age=10000'], '', function ($request, $response) use (&$count) {
$response->headers->set('Vary', 'Accept User-Agent Foo');
$response->headers->set('Cache-Control', 'public, max-age=10');
$response->headers->set('X-Response-Count', ++$count);
$response->setContent($request->headers->get('USER_AGENT'));
});
$this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0'));
$this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('Bob/1.0', $this->response->getContent());
$this->assertTraceContains('miss');
$this->assertTraceContains('store');
$this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0'));
$this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('Bob/1.0', $this->response->getContent());
$this->assertTraceContains('fresh');
@@ -1090,36 +1090,36 @@ class HttpCacheTest extends HttpCacheTestCase
public function testStoresMultipleResponsesWhenHeadersDiffer()
{
$count = 0;
$this->setNextResponse(200, array('Cache-Control' => 'max-age=10000'), '', function ($request, $response) use (&$count) {
$this->setNextResponse(200, ['Cache-Control' => 'max-age=10000'], '', function ($request, $response) use (&$count) {
$response->headers->set('Vary', 'Accept User-Agent Foo');
$response->headers->set('Cache-Control', 'public, max-age=10');
$response->headers->set('X-Response-Count', ++$count);
$response->setContent($request->headers->get('USER_AGENT'));
});
$this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0'));
$this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertEquals('Bob/1.0', $this->response->getContent());
$this->assertEquals(1, $this->response->headers->get('X-Response-Count'));
$this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0'));
$this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0']);
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertTraceContains('miss');
$this->assertTraceContains('store');
$this->assertEquals('Bob/2.0', $this->response->getContent());
$this->assertEquals(2, $this->response->headers->get('X-Response-Count'));
$this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0'));
$this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
$this->assertTraceContains('fresh');
$this->assertEquals('Bob/1.0', $this->response->getContent());
$this->assertEquals(1, $this->response->headers->get('X-Response-Count'));
$this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0'));
$this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0']);
$this->assertTraceContains('fresh');
$this->assertEquals('Bob/2.0', $this->response->getContent());
$this->assertEquals(2, $this->response->headers->get('X-Response-Count'));
$this->request('GET', '/', array('HTTP_USER_AGENT' => 'Bob/2.0'));
$this->request('GET', '/', ['HTTP_USER_AGENT' => 'Bob/2.0']);
$this->assertTraceContains('miss');
$this->assertEquals('Bob/2.0', $this->response->getContent());
$this->assertEquals(3, $this->response->headers->get('X-Response-Count'));
@@ -1141,7 +1141,7 @@ class HttpCacheTest extends HttpCacheTestCase
$this->setNextResponse();
$this->cacheConfig['allow_reload'] = true;
$this->request('GET', '/', array(), array(), false, array('Pragma' => 'no-cache'));
$this->request('GET', '/', [], [], false, ['Pragma' => 'no-cache']);
$this->assertExceptionsAreCaught();
}
@@ -1158,30 +1158,30 @@ class HttpCacheTest extends HttpCacheTestCase
public function testEsiCacheSendsTheLowestTtl()
{
$responses = array(
array(
$responses = [
[
'status' => 200,
'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
'headers' => array(
'headers' => [
'Cache-Control' => 's-maxage=300',
'Surrogate-Control' => 'content="ESI/1.0"',
),
),
array(
],
],
[
'status' => 200,
'body' => 'Hello World!',
'headers' => array('Cache-Control' => 's-maxage=200'),
),
array(
'headers' => ['Cache-Control' => 's-maxage=200'],
],
[
'status' => 200,
'body' => 'My name is Bobby.',
'headers' => array('Cache-Control' => 's-maxage=100'),
),
);
'headers' => ['Cache-Control' => 's-maxage=100'],
],
];
$this->setNextResponses($responses);
$this->request('GET', '/', array(), array(), true);
$this->request('GET', '/', [], [], true);
$this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
$this->assertEquals(100, $this->response->getTtl());
@@ -1189,25 +1189,25 @@ class HttpCacheTest extends HttpCacheTestCase
public function testEsiCacheSendsTheLowestTtlForHeadRequests()
{
$responses = array(
array(
$responses = [
[
'status' => 200,
'body' => 'I am a long-lived master response, but I embed a short-lived resource: <esi:include src="/foo" />',
'headers' => array(
'headers' => [
'Cache-Control' => 's-maxage=300',
'Surrogate-Control' => 'content="ESI/1.0"',
),
),
array(
],
],
[
'status' => 200,
'body' => 'I am a short-lived resource',
'headers' => array('Cache-Control' => 's-maxage=100'),
),
);
'headers' => ['Cache-Control' => 's-maxage=100'],
],
];
$this->setNextResponses($responses);
$this->request('HEAD', '/', array(), array(), true);
$this->request('HEAD', '/', [], [], true);
$this->assertEmpty($this->response->getContent());
$this->assertEquals(100, $this->response->getTtl());
@@ -1215,30 +1215,30 @@ class HttpCacheTest extends HttpCacheTestCase
public function testEsiCacheForceValidation()
{
$responses = array(
array(
$responses = [
[
'status' => 200,
'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
'headers' => array(
'headers' => [
'Cache-Control' => 's-maxage=300',
'Surrogate-Control' => 'content="ESI/1.0"',
),
),
array(
],
],
[
'status' => 200,
'body' => 'Hello World!',
'headers' => array('ETag' => 'foobar'),
),
array(
'headers' => ['ETag' => 'foobar'],
],
[
'status' => 200,
'body' => 'My name is Bobby.',
'headers' => array('Cache-Control' => 's-maxage=100'),
),
);
'headers' => ['Cache-Control' => 's-maxage=100'],
],
];
$this->setNextResponses($responses);
$this->request('GET', '/', array(), array(), true);
$this->request('GET', '/', [], [], true);
$this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
$this->assertNull($this->response->getTtl());
$this->assertTrue($this->response->mustRevalidate());
@@ -1248,25 +1248,25 @@ class HttpCacheTest extends HttpCacheTestCase
public function testEsiCacheForceValidationForHeadRequests()
{
$responses = array(
array(
$responses = [
[
'status' => 200,
'body' => 'I am the master response and use expiration caching, but I embed another resource: <esi:include src="/foo" />',
'headers' => array(
'headers' => [
'Cache-Control' => 's-maxage=300',
'Surrogate-Control' => 'content="ESI/1.0"',
),
),
array(
],
],
[
'status' => 200,
'body' => 'I am the embedded resource and use validation caching',
'headers' => array('ETag' => 'foobar'),
),
);
'headers' => ['ETag' => 'foobar'],
],
];
$this->setNextResponses($responses);
$this->request('HEAD', '/', array(), array(), true);
$this->request('HEAD', '/', [], [], true);
// The response has been assembled from expiration and validation based resources
// This can neither be cached nor revalidated, so it should be private/no cache
@@ -1279,50 +1279,50 @@ class HttpCacheTest extends HttpCacheTestCase
public function testEsiRecalculateContentLengthHeader()
{
$responses = array(
array(
$responses = [
[
'status' => 200,
'body' => '<esi:include src="/foo" />',
'headers' => array(
'headers' => [
'Content-Length' => 26,
'Surrogate-Control' => 'content="ESI/1.0"',
),
),
array(
],
],
[
'status' => 200,
'body' => 'Hello World!',
'headers' => array(),
),
);
'headers' => [],
],
];
$this->setNextResponses($responses);
$this->request('GET', '/', array(), array(), true);
$this->request('GET', '/', [], [], true);
$this->assertEquals('Hello World!', $this->response->getContent());
$this->assertEquals(12, $this->response->headers->get('Content-Length'));
}
public function testEsiRecalculateContentLengthHeaderForHeadRequest()
{
$responses = array(
array(
$responses = [
[
'status' => 200,
'body' => '<esi:include src="/foo" />',
'headers' => array(
'headers' => [
'Content-Length' => 26,
'Surrogate-Control' => 'content="ESI/1.0"',
),
),
array(
],
],
[
'status' => 200,
'body' => 'Hello World!',
'headers' => array(),
),
);
'headers' => [],
],
];
$this->setNextResponses($responses);
$this->request('HEAD', '/', array(), array(), true);
$this->request('HEAD', '/', [], [], true);
// https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13
// "The Content-Length entity-header field indicates the size of the entity-body,
@@ -1336,7 +1336,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testClientIpIsAlwaysLocalhostForForwardedRequests()
{
$this->setNextResponse();
$this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));
$this->request('GET', '/', ['REMOTE_ADDR' => '10.0.0.1']);
$this->kernel->assert(function ($backendRequest) {
$this->assertSame('127.0.0.1', $backendRequest->server->get('REMOTE_ADDR'));
@@ -1351,25 +1351,25 @@ class HttpCacheTest extends HttpCacheTestCase
Request::setTrustedProxies($existing, Request::HEADER_X_FORWARDED_ALL);
$this->setNextResponse();
$this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));
$this->request('GET', '/', ['REMOTE_ADDR' => '10.0.0.1']);
$this->assertSame($existing, Request::getTrustedProxies());
$existing = array_unique(array_merge($existing, array('127.0.0.1')));
$existing = array_unique(array_merge($existing, ['127.0.0.1']));
$this->kernel->assert(function ($backendRequest) use ($existing) {
$this->assertSame($existing, Request::getTrustedProxies());
$this->assertsame('10.0.0.1', $backendRequest->getClientIp());
});
Request::setTrustedProxies(array(), -1);
Request::setTrustedProxies([], -1);
}
public function getTrustedProxyData()
{
return array(
array(array()),
array(array('10.0.0.2')),
array(array('10.0.0.2', '127.0.0.1')),
);
return [
[[]],
[['10.0.0.2']],
[['10.0.0.2', '127.0.0.1']],
];
}
/**
@@ -1378,7 +1378,7 @@ class HttpCacheTest extends HttpCacheTestCase
public function testForwarderHeaderForForwardedRequests($forwarded, $expected)
{
$this->setNextResponse();
$server = array('REMOTE_ADDR' => '10.0.0.1');
$server = ['REMOTE_ADDR' => '10.0.0.1'];
if (null !== $forwarded) {
Request::setTrustedProxies($server, -1);
$server['HTTP_FORWARDED'] = $forwarded;
@@ -1389,42 +1389,42 @@ class HttpCacheTest extends HttpCacheTestCase
$this->assertSame($expected, $backendRequest->headers->get('Forwarded'));
});
Request::setTrustedProxies(array(), -1);
Request::setTrustedProxies([], -1);
}
public function getForwardedData()
{
return array(
array(null, 'for="10.0.0.1";host="localhost";proto=http'),
array('for=10.0.0.2', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.1"'),
array('for=10.0.0.2, for=10.0.0.3', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.3", for="10.0.0.1"'),
);
return [
[null, 'for="10.0.0.1";host="localhost";proto=http'],
['for=10.0.0.2', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.1"'],
['for=10.0.0.2, for=10.0.0.3', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.3", for="10.0.0.1"'],
];
}
public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
{
$time = \DateTime::createFromFormat('U', time());
$responses = array(
array(
$responses = [
[
'status' => 200,
'body' => '<esi:include src="/hey" />',
'headers' => array(
'headers' => [
'Surrogate-Control' => 'content="ESI/1.0"',
'ETag' => 'hey',
'Last-Modified' => $time->format(DATE_RFC2822),
),
),
array(
],
],
[
'status' => 200,
'body' => 'Hey!',
'headers' => array(),
),
);
'headers' => [],
],
];
$this->setNextResponses($responses);
$this->request('GET', '/', array(), array(), true);
$this->request('GET', '/', [], [], true);
$this->assertNull($this->response->getETag());
$this->assertNull($this->response->getLastModified());
}
@@ -1433,26 +1433,26 @@ class HttpCacheTest extends HttpCacheTestCase
{
$time = \DateTime::createFromFormat('U', time());
$responses = array(
array(
$responses = [
[
'status' => 200,
'body' => '<esi:include src="/hey" />',
'headers' => array(
'headers' => [
'Surrogate-Control' => 'content="ESI/1.0"',
'ETag' => 'hey',
'Last-Modified' => $time->format(DATE_RFC2822),
),
),
array(
],
],
[
'status' => 200,
'body' => 'Hey!',
'headers' => array(),
),
);
'headers' => [],
],
];
$this->setNextResponses($responses);
$this->request('HEAD', '/', array(), array(), true);
$this->request('HEAD', '/', [], [], true);
$this->assertEmpty($this->response->getContent());
$this->assertNull($this->response->getETag());
$this->assertNull($this->response->getLastModified());
@@ -1460,11 +1460,11 @@ class HttpCacheTest extends HttpCacheTestCase
public function testDoesNotCacheOptionsRequest()
{
$this->setNextResponse(200, array('Cache-Control' => 'public, s-maxage=60'), 'get');
$this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=60'], 'get');
$this->request('GET', '/');
$this->assertHttpKernelIsCalled();
$this->setNextResponse(200, array('Cache-Control' => 'public, s-maxage=60'), 'options');
$this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=60'], 'options');
$this->request('OPTIONS', '/');
$this->assertHttpKernelIsCalled();
@@ -1508,6 +1508,44 @@ class HttpCacheTest extends HttpCacheTestCase
// Surrogate request
$cache->handle($request, HttpKernelInterface::SUB_REQUEST);
}
public function testTraceHeaderNameCanBeChanged()
{
$this->cacheConfig['trace_header'] = 'X-My-Header';
$this->setNextResponse();
$this->request('GET', '/');
$this->assertTrue($this->response->headers->has('X-My-Header'));
}
public function testTraceLevelDefaultsToFullIfDebug()
{
$this->setNextResponse();
$this->request('GET', '/');
$this->assertTrue($this->response->headers->has('X-Symfony-Cache'));
$this->assertEquals('GET /: miss', $this->response->headers->get('X-Symfony-Cache'));
}
public function testTraceLevelDefaultsToNoneIfNotDebug()
{
$this->cacheConfig['debug'] = false;
$this->setNextResponse();
$this->request('GET', '/');
$this->assertFalse($this->response->headers->has('X-Symfony-Cache'));
}
public function testTraceLevelShort()
{
$this->cacheConfig['trace_level'] = 'short';
$this->setNextResponse();
$this->request('GET', '/');
$this->assertTrue($this->response->headers->has('X-Symfony-Cache'));
$this->assertEquals('miss', $this->response->headers->get('X-Symfony-Cache'));
}
}
class TestKernel implements HttpKernelInterface