Skip to content

[Cache][HttpKernel] Fix #[Cache] overrides controller no-store directive #62708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ayyoub-afwallah wants to merge 1 commit into from
Closed

[Cache][HttpKernel] Fix #[Cache] overrides controller no-store directive #62708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ public function __invoke(string $key): bool
}

$hasPublicOrPrivateCacheControlDirective = $hasCacheControlDirective('public') || $hasCacheControlDirective('private');
$hasNoStoreCacheControlDirective = $hasCacheControlDirective('no-store');

foreach ($attributes as $cache) {
if (true === $cache->public && !$hasPublicOrPrivateCacheControlDirective) {
Expand All @@ -184,7 +185,7 @@ public function __invoke(string $key): bool
$response->headers->addCacheControlDirective('no-store');
}

if (false === $cache->noStore) {
if (false === $cache->noStore && !$hasNoStoreCacheControlDirective) {
$response->headers->removeCacheControlDirective('no-store');
}
}
Expand Down
11 changes: 11 additions & 0 deletions src/Symfony/Component/HttpKernel/Tests/EventListener/CacheAttributeListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,17 @@ public function testAttributeRespectsExplicitPublicFromController()
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
}

public function testAttributeNoStoreDoesNotRemoveExplicitNoStore()
{
$request = $this->createRequest(new Cache(noStore: false));
$response = new Response();
$response->headers->addCacheControlDirective('no-store');

$this->listener->onKernelResponse($this->createEventMock($request, $response));

$this->assertTrue($response->headers->hasCacheControlDirective('no-store'));
}

public static function provideVaryHeaderScenarios(): \Traversable
{
yield 'no vary headers at all' => [
Expand Down
Loading