address review

Co-authored-by: Nicolas Grekas <nicolas.grekas@gmail.com>
symfony · Jul 13, 2023 · 6cdfe93 · 6cdfe93
1 parent a10c114
commit 6cdfe93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
@@ -581,16 +581,17 @@ public function sortByModifiedTime(): static
      * The anonymous function receives a \SplFileInfo and must return false
      * to remove files.
      *
-     * When prune is enabled, directories are not traversed further.
-     *
      * @param \Closure(SplFileInfo): bool $closure
      *
+     * @Symfony7param bool $prune Whether to traverse directories further
+     *
      * @return $this
      *
      * @see CustomFilterIterator
      */
-    public function filter(\Closure $closure, bool $prune = false): static
+    public function filter(\Closure $closure/* , bool $prune = false */): static
     {
+        $prune = \func_num_args() >= 2 ? func_get_arg(1) : false;
         $this->filters[] = $closure;
 
         if ($prune) {

diff --git a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
@@ -73,12 +73,8 @@ public function __construct(\Iterator $iterator, array $directories)
     public function accept(): bool
     {
         $hasChildren = null;
-        if (isset($this->excludedDirs[$this->getFilename()])) {
-            $hasChildren = $this->hasChildren();
-
-            if ($hasChildren) {
-                return false;
-            }
+        if (isset($this->excludedDirs[$this->getFilename()]) && $hasChildren = $this->hasChildren()) {
+            return false;
         }
 
         if ($this->excludedPattern) {
@@ -88,16 +84,10 @@ public function accept(): bool
             return !preg_match($this->excludedPattern, $path);
         }
 
-        if ($this->pruneFilters) {
-            if (null === $hasChildren) {
-                $hasChildren = $this->hasChildren();
-            }
-
-            if ($hasChildren) {
-                foreach ($this->pruneFilters as $pruneFilter) {
-                    if (!$pruneFilter($this->current())) {
-                        return false;
-                    }
+        if ($this->pruneFilters && $hasChildren ??= $this->hasChildren()) {
+            foreach ($this->pruneFilters as $pruneFilter) {
+                if (!$pruneFilter($this->current())) {
+                    return false;
                 }
             }
         }