Skip to content

[Finder] Fix children condition in ExcludeDirectoryFilterIterator #50885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2023

Conversation

mvorisek
Copy link
Contributor

@mvorisek mvorisek commented Jul 5, 2023

Q A
Branch? 5.4
Bug fix? yes
New feature? no
Deprecations? no
Tickets no
License MIT
Doc PR no

see https://github.com/php/php-src/blob/6091603b5350c1ca0e792a6da604e25e2a0121c8/ext/spl/spl_directory.h#L113

Original isDir follow symlinks, so this PR has no effect, but it avoids expensive isDir call and makes the condition more correct.

@carsonbot carsonbot added this to the 6.4 milestone Jul 5, 2023
@mvorisek mvorisek changed the base branch from 6.4 to 5.4 July 5, 2023 11:13
@nicolas-grekas
Copy link
Member

Thank you @mvorisek.

@nicolas-grekas nicolas-grekas merged commit 9c1dedb into symfony:5.4 Jul 7, 2023
@mvorisek mvorisek deleted the fix_children_cond branch July 7, 2023 08:20
derrabus added a commit to derrabus/symfony that referenced this pull request Jul 31, 2023
…eDirectoryFilterIterator (mvorisek)"

This reverts commit 9c1dedb, reversing
changes made to 9cbdfc6.
fabpot added a commit that referenced this pull request Jul 31, 2023
…yFilterIterator" (derrabus)

This PR was merged into the 5.4 branch.

Discussion
----------

[Finder] Revert "Fix children condition in ExcludeDirectoryFilterIterator"

| Q             | A
| ------------- | ---
| Branch?       | 5.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #51162, revert #50885
| License       | MIT
| Doc PR        | not needed

This PR reverts #50885 because it did not fix a bug and instead introduced a regression described in #51162.

Commits
-------

2fd4453 Revert "minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)"
fabpot added a commit that referenced this pull request Jul 31, 2023
* 5.4:
  Revert "minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)"
fabpot added a commit that referenced this pull request Jul 31, 2023
* 6.3:
  Revert "minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)"
fabpot added a commit that referenced this pull request Jul 31, 2023
* 6.4:
  Revert "minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)"
nicolas-grekas added a commit that referenced this pull request Jul 31, 2023
* 5.4:
  Update VERSION for 5.4.27
  Update CONTRIBUTORS for 5.4.27
  Update CHANGELOG for 5.4.27
  Revert "minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)"
  CI: Disable Psalm's findUnusedBaselineEntry feature
  Remove 6.2 from the list of potential branch targets
  Bump Symfony version to 5.4.27
  Update VERSION for 5.4.26
  Update CONTRIBUTORS for 5.4.26
  Update CHANGELOG for 5.4.26
  Fix symfony/deprecation-contracts require
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy