[Finder] Fix initial directory is opened twice #50884
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
|
Hey! To help keep things organized, we don't allow "Draft" pull requests. Could you please click the "ready for review" button or close this PR and open a new one when you are done? Note that a pull request does not have to be "perfect" or "ready for merge" when you first open it. We just want it to be ready for a first review. Cheers! Carsonbot |
|
Thank you @mvorisek. |
|
@nicolas-grekas the merge from 5.4 to 6.2 branch kept an unused property, please apply the following patch to 6.2 branch and merge up: diff --git a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
index 8bb9b70..34cced6 100644
--- a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
@@ -25,7 +25,6 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
{
private bool $ignoreUnreadableDirs;
private bool $ignoreFirstRewind = true;
- private ?bool $rewindable = null;
// these 3 properties take part of the performance optimization to avoid redoing the same work in all iterations
private string $rootPath;
|
|
Done in 8a28b59, thanks for checking. |
This was referenced Jul 29, 2023
Merged
Merged
Merged
ben-challis
pushed a commit
to ben-challis/sql-migrations
that referenced
this pull request
Jul 30, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [amphp/file](https://togithub.com/amphp/file) | require | patch | `3.0.0-beta.6` -> `3.0.1` | | [symfony/finder](https://symfony.com) ([source](https://togithub.com/symfony/finder)) | require | patch | `6.3.0` -> `6.3.2` | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>amphp/file (amphp/file)</summary> ### [`v3.0.1`](https://togithub.com/amphp/file/releases/tag/v3.0.1): 3.0.1 [Compare Source](https://togithub.com/amphp/file/compare/v3.0.0...v3.0.1) #### What's Changed - Fix `touch()` on non-existent files in ext-uv and ext-eio by [@​kelunik](https://togithub.com/kelunik) ([#​73](https://togithub.com/amphp/file/issues/73)) - Fix `write()` truncation with ext-uv and ext-eio by [@​danog](https://togithub.com/danog) in ([#​76](https://togithub.com/amphp/file/issues/76)) **Full Changelog**: amphp/file@v3.0.0...v3.0.1 ### [`v3.0.0`](https://togithub.com/amphp/file/releases/tag/v3.0.0): 3.0.0 [Compare Source](https://togithub.com/amphp/file/compare/v3.0.0-beta.6...v3.0.0) Stable release compatible with AMPHP v3 and fibers! 🎉 As with other libraries compatible with AMPHP v3, most cases of parameters or returns of `Promise<ResolutionType>` have been replaced with `ResolutionType`. - Renamed `BlockingDriver` to `BlockingFilesystemDriver` - Renamed `EioDriver` to `EioFilesystemDriver` - Renamed `ParallelDriver` to `ParallelFilesystemDriver` - Renamed `StatusCachingDriver` to `StatusCachingFilesystemDriver` - Renamed `UvDriver` to `UvFilesystemDriver` - Renamed `Amp\File\Sync\AsyncFileMutex` to `Amp\File\FileMutex` - Added `?Cancellation` as first parameter of `File::read()` - Added `File::isSeekable()` - Removed `File::SEEK_SET`, `File::SEEK_CUR`, and `File::SEEK_END` - Added `Amp\File\Whence` for seeking instead </details> <details> <summary>symfony/finder (symfony/finder)</summary> ### [`v6.3.2`](https://togithub.com/symfony/finder/releases/tag/v6.3.2) [Compare Source](https://togithub.com/symfony/finder/compare/v6.3.0...v6.3.2) **Changelog** (symfony/finder@v6.3.1...v6.3.2) - bug [symfony/symfony#50884](https://togithub.com/symfony/symfony/issues/50884) \[Finder] Fix initial directory is opened twice ([@​mvorisek](https://togithub.com/mvorisek)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/ben-challis/sql-migrations). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4yNC4yIiwidXBkYXRlZEluVmVyIjoiMzYuMjQuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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.
The issue was introduced in #8120 which was coded wrongly for several reasons:
seekablesupport is about file/stream content seeking, not about rewind support, non-seekable stream handler can support rewind - it worked by coincidenceThe test from #8120 is kept and is passing.
I also improved the ftp support detection to make the test stricter.
To support rewind for ftp I opened - php/php-src#11597 - but this Symfony PR does not need it.