address review

mvorisek · nicolas-grekas · mvorisek · commit 6cdfe93d6f6e · 2023-07-13T17:50:05.000+02:00
Co-authored-by: Nicolas Grekas &lt;nicolas.grekas@gmail.com&gt;
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;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -581,16 +581,17 @@ public function sortByModifiedTime(): static`
`581`	`581`	`* The anonymous function receives a \SplFileInfo and must return false`
`582`	`582`	`* to remove files.`
`583`	`583`	`*`
`584`		`- * When prune is enabled, directories are not traversed further.`
`585`		`- *`
`586`	`584`	`* @param \Closure(SplFileInfo): bool $closure`
`587`	`585`	`*`
	`586`	`+ * @Symfony7param bool $prune Whether to traverse directories further`
	`587`	`+ *`
`588`	`588`	`* @return $this`
`589`	`589`	`*`
`590`	`590`	`* @see CustomFilterIterator`
`591`	`591`	`*/`
`592`		`- public function filter(\Closure $closure, bool $prune = false): static`
	`592`	`+ public function filter(\Closure $closure/* , bool $prune = false */): static`
`593`	`593`	`{`
	`594`	`+ $prune = \func_num_args() >= 2 ? func_get_arg(1) : false;`
`594`	`595`	`$this->filters[] = $closure;`
`595`	`596`
`596`	`597`	`if ($prune) {`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,8 @@ public function __construct(\Iterator $iterator, array $directories)`
`73`	`73`	`public function accept(): bool`
`74`	`74`	`{`
`75`	`75`	`$hasChildren = null;`
`76`		`- if (isset($this->excludedDirs[$this->getFilename()])) {`
`77`		`- $hasChildren = $this->hasChildren();`
`78`		`-`
`79`		`- if ($hasChildren) {`
`80`		`- return false;`
`81`		`- }`
	`76`	`+ if (isset($this->excludedDirs[$this->getFilename()]) && $hasChildren = $this->hasChildren()) {`
	`77`	`+ return false;`
`82`	`78`	`}`
`83`	`79`
`84`	`80`	`if ($this->excludedPattern) {`
`@@ -88,16 +84,10 @@ public function accept(): bool`
`88`	`84`	`return !preg_match($this->excludedPattern, $path);`
`89`	`85`	`}`
`90`	`86`
`91`		`- if ($this->pruneFilters) {`
`92`		`- if (null === $hasChildren) {`
`93`		`- $hasChildren = $this->hasChildren();`
`94`		`- }`
`95`		`-`
`96`		`- if ($hasChildren) {`
`97`		`- foreach ($this->pruneFilters as $pruneFilter) {`
`98`		`- if (!$pruneFilter($this->current())) {`
`99`		`- return false;`
`100`		`- }`
	`87`	`+ if ($this->pruneFilters && $hasChildren ??= $this->hasChildren()) {`
	`88`	`+ foreach ($this->pruneFilters as $pruneFilter) {`
	`89`	`+ if (!$pruneFilter($this->current())) {`
	`90`	`+ return false;`
`101`	`91`	`}`
`102`	`92`	`}`
`103`	`93`	`}`