[FrameworkBundle] Bugfixes in buildDir in the CacheClear command #38548
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Nyholm
commented
Oct 13, 2020
| @@ -141,7 +141,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int | |||
| } | |||
|
|
|||
| if (!$fs->exists($warmupDir.'/'.$containerDir)) { | |||
| $fs->rename($realCacheDir.'/'.$containerDir, $warmupDir.'/'.$containerDir); | |||
| $fs->rename($realBuildDir.'/'.$containerDir, $warmupDir.'/'.$containerDir); | |||
There was a problem hiding this comment.
If we have a separate buildDir and warming the cache. The container will never be located in $warmupDir. It will always be in $readBuildDir.
If we dont have a separate buildDir. Then $readBuildDir === $readCacheDir`
| } else { | ||
| $fs->remove($realCacheDir); | ||
|
|
||
| if ($oldBuildDir !== $oldCacheDir) { |
There was a problem hiding this comment.
We should not try to rename or remove $realCacheDir again.
|
|
||
| if ($realCacheDir !== $realBuildDir) { | ||
| // Copy the content of the warmed cache in the build dir | ||
| $fs->mirror($realCacheDir, $realBuildDir); |
There was a problem hiding this comment.
This was just a typo: copy() is for files, mirror() is for directories.
|
Funny, you submitted at the same time as #38549 :) |
BoShurik
reviewed
Oct 13, 2020
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
Outdated
Show resolved
Hide resolved
BoShurik
approved these changes
Oct 13, 2020
ace1aa9 to
2cad6bb
Compare
|
Thank you @Nyholm. |
|
Thank you @BoShurik and @nicolas-grekas |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Making sure one can clear cache with and without a buildDir