Skip to content

Commit 290b022

Browse files
Merge branch '6.4' into 7.0
* 6.4: [AssetMapper] Handle assets with non-ascii characters in dev server [Translation] Fix `TranslationNodeVisitor` with constant domain CS fix [Routing] Remove `@final` annotation from `Route` attribute [Messenger] [AMQP] Throw exception on `nack` callback [Validator] revise Latvian translations [ErrorHandler] Fix `RecursiveDirectoryIterator` exception with wrong composer autoload [HttpFoundation] Request without content-type or content-length header should result in null values, not empty strings [Cache] Fix possible infinite loop in `CachePoolPass` grab a service from the container only if it exists [Mime] Fix undefined array key 0 when empty sender [Console] Allow '0' as a $shortcut in InputOption.php fix multi-byte code area to convert [Validator] Make it explicit when English translation differs from its resource name
2 parents 2da1273 + f9482da commit 290b022

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Command/CachePoolClearCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7272

7373
$poolNames = $input->getArgument('pools');
7474
$excludedPoolNames = $input->getOption('exclude');
75-
if ($input->getOption('all')) {
75+
if ($clearAll = $input->getOption('all')) {
7676
if (!$this->poolNames) {
7777
throw new InvalidArgumentException('Could not clear all cache pools, try specifying a specific pool or cache clearer.');
7878
}
@@ -91,7 +91,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
9191
foreach ($poolNames as $id) {
9292
if ($this->poolClearer->hasPool($id)) {
9393
$pools[$id] = $id;
94-
} else {
94+
} elseif (!$clearAll || $kernel->getContainer()->has($id)) {
9595
$pool = $kernel->getContainer()->get($id);
9696

9797
if ($pool instanceof CacheItemPoolInterface) {

0 commit comments

Comments
 (0)