[FrameworkBundle] [Command] Clean bundle directory, fixes #23177 #23195
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
This was referenced Jun 15, 2017
stof
requested changes
Jun 15, 2017
| @@ -132,7 +133,19 @@ protected function execute(InputInterface $input, OutputInterface $output) | |||
| $this->hardCopy($originDir, $targetDir); | |||
| } | |||
| } | |||
| if (is_dir($targetDir)) { | |||
| array_push($validAssetDir, $targetDir); | |||
There was a problem hiding this comment.
use $validAssetDir[] = $targetDir instead.
| @@ -132,7 +133,19 @@ protected function execute(InputInterface $input, OutputInterface $output) | |||
| $this->hardCopy($originDir, $targetDir); | |||
| } | |||
| } | |||
| if (is_dir($targetDir)) { | |||
There was a problem hiding this comment.
instead of adding this condition, move this inside the previous if. There are 2 reasons for this:
- the variable is not assigned if the previous condition was false, which means it will either reuse the value from the previous iteration or fail with an undefined variable notice. Both are bad behaviors
- if we decided to install some assets for the bundle (which is what the previous condition is about), we know that the director us valid
| } | ||
| } | ||
| // Check in $bundlesDir, if all links/folder still have an existing Bundle | ||
| if ($dir = opendir($bundlesDir)) { |
There was a problem hiding this comment.
use a DirectoryIterator. The code will be simpler:
- no need to skip
.and..(you can configure the iterator to skip them for you) - no need to close the directory at the end (btw, you don't properly close it if
$filesystem->removethrows an exception) - you can just do a
foreach
There was a problem hiding this comment.
opendir() 😆 it's at least 10 years ago since a last used that function (you make me feel old 😢😉).
sstok
reviewed
Jun 15, 2017
| } | ||
| } | ||
| // Check in $bundlesDir, if all links/folder still have an existing Bundle | ||
| foreach (new \FilesystemIterator($bundlesDir) as $file) { |
There was a problem hiding this comment.
FYI it's actually a dir not a file 😉 other parts looks good 👍
stof
requested changes
Jun 16, 2017
| @@ -89,6 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output) | |||
| $output->writeln('Installing assets as <comment>hard copies</comment>.'); | |||
| } | |||
|
|
|||
| $validAssetDir = array(); | |||
There was a problem hiding this comment.
The variable name should be a plural. It is not a directory, but a list of directories.
| $validAssetDirs[] = $targetDir; | ||
| } | ||
| } | ||
| // Check in $bundlesDir, if all links/folder still have an existing Bundle |
There was a problem hiding this comment.
This comment explains "how it does" something, but I'd recommend to explain "what it does" instead. Something like this:
// remove the assets of the bundles that no longer exist
fabpot
approved these changes
Jun 16, 2017
|
Thank you @NicolasPion. |
fabpot
added a commit
that referenced
this pull request
Jun 16, 2017
…23177 (NicolasPion) This PR was squashed before being merged into the 2.7 branch (closes #23195). Discussion ---------- [FrameworkBundle] [Command] Clean bundle directory, fixes #23177 | Q | A | ------------- | --- | Branch? | 2.7 <!-- see comment below --> | Bug fix? | yes | New feature? | no <!-- don't forget updating src/**/CHANGELOG.md files --> | BC breaks? | no | Deprecations? | no <!-- don't forget updating UPGRADE-*.md files --> | Tests pass? | no | Fixed tickets | #23177 | License | MIT This PR fix #23177 when running an assets:install, it will remove directorys who do not have anymore a valid Bundle Commits ------- 180f178 [FrameworkBundle] [Command] Clean bundle directory, fixes #23177
This was referenced Jul 3, 2017
Merged
Merged
Merged
Merged
fabpot
added a commit
that referenced
this pull request
Jul 4, 2017
This PR was merged into the 2.7 branch. Discussion ---------- [FrameworkBundle] Do not remove files from assets dir | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The patch introduced in #23195 removes files from `web/bundles` (eg. `.gitignore`) which is unintentional I think. Commits ------- 6ed9c8d [FrameworkBundle] Do not remove files from assets dir
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.
This PR fix #23177
when running an assets:install, it will remove directorys who do not have anymore a valid Bundle