Skip to content

Commit cc6c0c7

Browse files
Merge branch '6.2' into 6.3
* 6.2: [PhpUnitBridge] Kill the last concurrent process when it stales for more than 60s [Intl] fix test [Intl] Use VarExporter::export() in PhpBundleWriter 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
2 parents 84d58ed + caafc50 commit cc6c0c7

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Iterator/ExcludeDirectoryFilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function __construct(\Iterator $iterator, array $directories)
5959
*/
6060
public function accept(): bool
6161
{
62-
if ($this->isRecursive && isset($this->excludedDirs[$this->getFilename()]) && $this->isDir()) {
62+
if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) {
6363
return false;
6464
}
6565

Iterator/RecursiveDirectoryIterator.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
2525
{
2626
private bool $ignoreUnreadableDirs;
2727
private bool $ignoreFirstRewind = true;
28-
private ?bool $rewindable = null;
2928

3029
// these 3 properties take part of the performance optimization to avoid redoing the same work in all iterations
3130
private string $rootPath;

0 commit comments

Comments
 (0)