Merge branch '5.4' into 6.3

fabpot · fabpot · commit 9915db259f67 · 2023-07-31T10:31:44.000+02:00
* 5.4:
  Revert "minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)"
diff --git a/Iterator/ExcludeDirectoryFilterIterator.php b/Iterator/ExcludeDirectoryFilterIterator.php
@@ -59,7 +59,7 @@ public function __construct(\Iterator $iterator, array $directories)
      */
     public function accept(): bool
     {
-        if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) {
+        if ($this->isRecursive && isset($this->excludedDirs[$this->getFilename()]) && $this->isDir()) {
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function __construct(\Iterator $iterator, array $directories)`
`59`	`59`	`*/`
`60`	`60`	`public function accept(): bool`
`61`	`61`	`{`
`62`		`- if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) {`
	`62`	`+ if ($this->isRecursive && isset($this->excludedDirs[$this->getFilename()]) && $this->isDir()) {`
`63`	`63`	`return false;`
`64`	`64`	`}`
`65`	`65`