Skip to content

[Cache] Don't clear system caches on cache:clear #59581

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

Merged
nicolas-grekas merged 1 commit into from
Jan 22, 2025
Merged

[Cache] Don't clear system caches on cache:clear #59581

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
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ private function doTestCachePools($options, $adapterClass)
$pool2 = $container->get('cache.pool2');
$pool2->save($item);

$container->get('cache_clearer.alias')->clear($container->getParameter('kernel.cache_dir'));
$item = $pool1->getItem($key);
$this->assertFalse($item->isHit());

$item = $pool2->getItem($key);
$this->assertTrue($item->isHit());

Expand Down
20 changes: 12 additions & 8 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,18 @@ public function testTagsPartialSearch()
$tester->setInputs(['0']);
$tester->run(['command' => 'debug:container', '--tag' => 'kernel.'], ['decorated' => false]);

$this->assertStringContainsString('Select one of the following tags to display its information', $tester->getDisplay());
$this->assertStringContainsString('[0] kernel.cache_clearer', $tester->getDisplay());
$this->assertStringContainsString('[1] kernel.cache_warmer', $tester->getDisplay());
$this->assertStringContainsString('[2] kernel.event_subscriber', $tester->getDisplay());
$this->assertStringContainsString('[3] kernel.fragment_renderer', $tester->getDisplay());
$this->assertStringContainsString('[4] kernel.locale_aware', $tester->getDisplay());
$this->assertStringContainsString('[5] kernel.reset', $tester->getDisplay());
$this->assertStringContainsString('Symfony Container Services Tagged with "kernel.cache_clearer" Tag', $tester->getDisplay());
$this->assertStringMatchesFormat(<<<EOTXT

Select one of the following tags to display its information:
%A
[%d] kernel.reset
%A

Symfony Container Services Tagged with "kernel.%a" Tag
%A
EOTXT,
$tester->getDisplay()
);
}

public function testDescribeEnvVars()
Expand Down
5 changes: 0 additions & 5 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
imports:
- { resource: ../config/default.yml }

services:
cache_clearer.alias:
alias: cache_clearer
public: true
4 changes: 0 additions & 4 deletions src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,6 @@ public function process(ContainerBuilder $container)
$clearer->setArgument(0, $pools);
}
$clearer->addTag('cache.pool.clearer');

if ('cache.system_clearer' === $id) {
$clearer->addTag('kernel.cache_clearer');
}
}

$allPoolsKeys = array_keys($allPools);
Expand Down
Loading