[Finder] use proper keys to not override appended files #40023
Merged
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
Member
xabbuh
commented
Jan 28, 2021
| Q | A |
|---|---|
| Branch? | 4.4 |
| Bug fix? | yes |
| New feature? | no |
| Deprecations? | no |
| Tickets | Fix #40022 |
| License | MIT |
| Doc PR |
xabbuh
commented
Jan 28, 2021
| @@ -669,7 +669,8 @@ public function append($iterator) | |||
| } elseif ($iterator instanceof \Traversable || \is_array($iterator)) { | |||
| $it = new \ArrayIterator(); | |||
| foreach ($iterator as $file) { | |||
| $it->append($file instanceof \SplFileInfo ? $file : new \SplFileInfo($file)); | |||
| $file = $file instanceof \SplFileInfo ? $file : new \SplFileInfo($file); | |||
| $it[$file->getRealPath()] = $file; | |||
There was a problem hiding this comment.
This won't work for non-existing files. Not sure if that's an issue though.
There was a problem hiding this comment.
Instead of getRealPath(), I suggest usinggetPathname(), which would also work for stream wrappers not supporting realpath().
Non-existent files are OK to me. I don't think this is an expected supported case for the Finder anyway.
shyim
approved these changes
Jan 28, 2021
jderusse
approved these changes
Jan 28, 2021
nicolas-grekas
approved these changes
Jan 28, 2021
|
Thank you @xabbuh. |
Merged
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.