minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)

nicolas-grekas · nicolas-grekas · commit a5d572c7b4cb · 2023-07-07T07:57:40.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Finder] Fix children condition in ExcludeDirectoryFilterIterator | 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. Commits ------- 621f75f969 fix children cond
diff --git a/Iterator/ExcludeDirectoryFilterIterator.php b/Iterator/ExcludeDirectoryFilterIterator.php
@@ -59,7 +59,7 @@ public function __construct(\Iterator $iterator, array $directories)
     #[\ReturnTypeWillChange]
     public function accept()
     {
-        if ($this->isRecursive && isset($this->excludedDirs[$this->getFilename()]) && $this->isDir()) {
+        if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) {
             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`	`#[\ReturnTypeWillChange]`
`60`	`60`	`public function accept()`
`61`	`61`	`{`
`62`		`- if ($this->isRecursive && isset($this->excludedDirs[$this->getFilename()]) && $this->isDir()) {`
	`62`	`+ if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) {`
`63`	`63`	`return false;`
`64`	`64`	`}`
`65`	`65`