Skip to content

Stop flushing fpc when not asked for #38215

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
merged 4 commits into from
Feb 29, 2024
Merged

Stop flushing fpc when not asked for #38215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ef7ac3
Don't flush FPC when not asking for it explicitly.
hostep Nov 23, 2023
6df0428
Fixed static test failures.
hostep Nov 23, 2023
53b87ab
Updated unit tests.
hostep Nov 23, 2023
37f685c
Merge branch '2.4-develop' into stop-flushing-fpc-when-not-asked-for
engcom-Echo Dec 26, 2023
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
9 changes: 6 additions & 3 deletions app/code/Magento/Backend/Console/Command/CacheCleanCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class CacheCleanCommand extends AbstractCacheTypeManageCommand
{
/**
* {@inheritdoc}
* @inheritdoc
*/
protected function configure()
{
Expand All @@ -32,12 +32,15 @@ protected function configure()
*/
protected function performAction(array $cacheTypes)
{
$this->eventManager->dispatch('adminhtml_cache_flush_system');
if ($cacheTypes === [] || in_array('full_page', $cacheTypes)) {
$this->eventManager->dispatch('adminhtml_cache_flush_system');
}

$this->cacheManager->clean($cacheTypes);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
protected function getDisplayMessage()
{
Expand Down
9 changes: 6 additions & 3 deletions app/code/Magento/Backend/Console/Command/CacheFlushCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class CacheFlushCommand extends AbstractCacheTypeManageCommand
{
/**
* {@inheritdoc}
* @inheritdoc
*/
protected function configure()
{
Expand All @@ -32,12 +32,15 @@ protected function configure()
*/
protected function performAction(array $cacheTypes)
{
$this->eventManager->dispatch('adminhtml_cache_flush_all');
if ($cacheTypes === [] || in_array('full_page', $cacheTypes)) {
$this->eventManager->dispatch('adminhtml_cache_flush_all');
}

$this->cacheManager->flush($cacheTypes);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
protected function getDisplayMessage()
{
Expand Down
12 changes: 10 additions & 2 deletions app/code/Magento/Backend/Test/Unit/Console/Command/AbstractCacheManageCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,22 @@ public function executeDataProvider()
return [
'implicit all' => [
[],
['A', 'B', 'C'],
$this->getExpectedExecutionOutput(['A', 'B', 'C']),
['A', 'B', 'C', 'full_page'],
true,
$this->getExpectedExecutionOutput(['A', 'B', 'C', 'full_page']),
],
'specified types' => [
['types' => ['A', 'B']],
['A', 'B'],
false,
$this->getExpectedExecutionOutput(['A', 'B']),
],
'fpc_only' => [
['types' => ['full_page']],
['full_page'],
true,
$this->getExpectedExecutionOutput(['full_page']),
],
];
}

Expand Down
14 changes: 11 additions & 3 deletions app/code/Magento/Backend/Test/Unit/Console/Command/CacheCleanCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,22 @@ protected function setUp(): void
/**
* @param array $param
* @param array $types
* @param bool $shouldDispatch
* @param string $output
* @dataProvider executeDataProvider
*/
public function testExecute($param, $types, $output)
public function testExecute($param, $types, $shouldDispatch, $output)
{
$this->cacheManagerMock->expects($this->once())->method('getAvailableTypes')->willReturn(['A', 'B', 'C']);
$this->cacheManagerMock->expects($this->once())->method('getAvailableTypes')->willReturn([
'A', 'B', 'C', 'full_page'
]);
$this->cacheManagerMock->expects($this->once())->method('clean')->with($types);
$this->eventManagerMock->expects($this->once())->method('dispatch')->with($this->cacheEventName);

if ($shouldDispatch) {
$this->eventManagerMock->expects($this->once())->method('dispatch')->with($this->cacheEventName);
} else {
$this->eventManagerMock->expects($this->never())->method('dispatch');
}

$commandTester = new CommandTester($this->command);
$commandTester->execute($param);
Expand Down
14 changes: 11 additions & 3 deletions app/code/Magento/Backend/Test/Unit/Console/Command/CacheFlushCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,22 @@ protected function setUp(): void
/**
* @param array $param
* @param array $types
* @param bool $shouldDispatch
* @param string $output
* @dataProvider executeDataProvider
*/
public function testExecute($param, $types, $output)
public function testExecute($param, $types, $shouldDispatch, $output)
{
$this->cacheManagerMock->expects($this->once())->method('getAvailableTypes')->willReturn(['A', 'B', 'C']);
$this->cacheManagerMock->expects($this->once())->method('getAvailableTypes')->willReturn([
'A', 'B', 'C', 'full_page'
]);
$this->cacheManagerMock->expects($this->once())->method('flush')->with($types);
$this->eventManagerMock->expects($this->once())->method('dispatch')->with($this->cacheEventName);

if ($shouldDispatch) {
$this->eventManagerMock->expects($this->once())->method('dispatch')->with($this->cacheEventName);
} else {
$this->eventManagerMock->expects($this->never())->method('dispatch');
}

$commandTester = new CommandTester($this->command);
$commandTester->execute($param);
Expand Down