Issue #5991 -- Adds Convert Symlinks Option #5992
Open
Conversation
This file contains 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
| @@ -140,7 +142,8 @@ public function dump(array $options = [ | |||
| protected function prepareArchiveDir(): void | |||
| { | |||
| $this->filesystem = new Filesystem(); | |||
| $this->archiveDir = FsUtils::tmpDir(self::ARCHIVES_DIR_NAME); | |||
| // $this->archiveDir = FsUtils::tmpDir(self::ARCHIVES_DIR_NAME); | |||
There was a problem hiding this comment.
This needs to be restored to its original state
| $this->logger()->info(var_export($this->archiveDir, true)); | ||
|
|
||
| // If symlinks are disabled, convert symlinks to full content. | ||
| if (is_dir($this->archiveDir)) { |
There was a problem hiding this comment.
Shouldn't archiveDir always be a directory? If creating it might fail, then we should fail-fast above rather than nesting everything under this 'if'.
|
|
||
| $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->archiveDir), RecursiveIteratorIterator::SELF_FIRST); | ||
|
|
||
| foreach ($iterator as $file) { |
There was a problem hiding this comment.
It would be helpful to break this into a separate function, so that we could have a docblock explaining the purpose. The 'convert-symlinks' could be passed in as a named parameter (rather than passing all of $options).
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.
Resolves: #5991
This PR adds a
convert-symlinkoption to thearchive-dumpcommand which will convert symlinks to standard/static files and directories in order to resolve a bug where symlinks external to the project would cause an error on dump.