Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  [PhpUnitBridge] Kill the last concurrent process when it stales for more than 60s
  [Intl] fix test
  [Intl] Use VarExporter::export() in PhpBundleWriter
  Simplify tests
  [Notifier] Fix Esendex messages serialization
  Use triggering class to generate baseline for deprecation messages from DebugClassLoader
  [Security] Fix false-string handling in RememberMeAuthenticator
  [CssSelector] Tests on Xpath translator will always pass
  [Serializer] Fix Normalizer not utilizing converted name for index variadic param
  [DepdencyInjection] Fix costly logic when checking errored definitions
  Fix merge
  fix children cond
  [DoctrineBridge] Load refreshed user proxy
  [DependencyInjection] Don't ignore attributes on the actual decorator
  [FrameworkBundle] Prevent `cache:clear` to lose files on subsequent runs
  • Loading branch information
nicolas-grekas committed Jul 12, 2023
2 parents afcdf97 + cc6c0c7 commit 3517d32
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion Iterator/ExcludeDirectoryFilterIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function __construct(\Iterator $iterator, array $directories)
*/
public function accept(): bool
{
if ($this->isRecursive && isset($this->excludedDirs[$this->getFilename()]) && $this->isDir()) {
if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) {
return false;
}

Expand Down
1 change: 0 additions & 1 deletion Iterator/RecursiveDirectoryIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 3517d32

Please sign in to comment.