optimize - use cached file type from DirectoryIterator

mvorisek · mvorisek · commit 74945e2892bd · 2023-07-12T15:40:44.000+02:00
diff --git a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
@@ -72,8 +72,13 @@ public function __construct(\Iterator $iterator, array $directories)
      */
     public function accept(): bool
     {
-        if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) {
-            return false;
+        $hasChildren = null;
+        if (isset($this->excludedDirs[$this->getFilename()])) {
+            $hasChildren = $this->hasChildren();
+
+            if ($hasChildren) {
+                return false;
+            }
         }
 
         if ($this->excludedPattern) {
@@ -83,10 +88,16 @@ public function accept(): bool
             return !preg_match($this->excludedPattern, $path);
         }
 
-        if ($this->isRecursive && $this->isDir()) {
-            foreach ($this->pruneFilters as $pruneFilter) {
-                if (!$pruneFilter($this->current())) {
-                    return false;
+        if ($this->pruneFilters) {
+            if (null === $hasChildren) {
+                $hasChildren = $this->hasChildren();
+            }
+
+            if ($hasChildren) {
+                foreach ($this->pruneFilters as $pruneFilter) {
+                    if (!$pruneFilter($this->current())) {
+                        return false;
+                    }
                 }
             }
         }
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -1068,25 +1068,20 @@ public function testFilterPrune()
         $this->assertSame([
             ['x', 'is_dir', true],
             ['x', 'list_dir_open', ['a.php', 'b.php', 'd', 'x']],
-            ['x/a.php', 'is_dir', false], // from ExcludeDirectoryFilterIterator::accept()
-            ['x/a.php', 'is_dir', false], // from RecursiveDirectoryIterator::hasChildren()
+            ['x/a.php', 'is_dir', false],
             ['x/a.php', 'exclude_filter', true],
             ['x/b.php', 'is_dir', false],
-            ['x/b.php', 'is_dir', false],
             ['x/b.php', 'exclude_filter', true],
             ['x/d', 'is_dir', true],
             ['x/d', 'exclude_filter', false],
             ['x/x', 'is_dir', true],
             ['x/x', 'exclude_filter', true], // from ExcludeDirectoryFilterIterator::accept() (prune directory filter)
-            ['x/x', 'is_dir', true],
             ['x/x', 'exclude_filter', true], // from CustomFilterIterator::accept() (regular filter)
             ['x/x', 'list_dir_open', ['d']],
             ['x/x/d', 'is_dir', true],
-            ['x/x/d', 'is_dir', true],
             ['x/x/d', 'exclude_filter', true],
             ['x/x/d', 'list_dir_open', ['u2.php']],
             ['x/x/d/u2.php', 'is_dir', false],
-            ['x/x/d/u2.php', 'is_dir', false],
             ['x/x/d/u2.php', 'exclude_filter', true],
         ], $this->vfsLog);
     }

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,13 @@ public function __construct(\Iterator $iterator, array $directories)`
`72`	`72`	`*/`
`73`	`73`	`public function accept(): bool`
`74`	`74`	`{`
`75`		`- if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) {`
`76`		`- return false;`
	`75`	`+ $hasChildren = null;`
	`76`	`+ if (isset($this->excludedDirs[$this->getFilename()])) {`
	`77`	`+ $hasChildren = $this->hasChildren();`
	`78`	`+`
	`79`	`+ if ($hasChildren) {`
	`80`	`+ return false;`
	`81`	`+ }`
`77`	`82`	`}`
`78`	`83`
`79`	`84`	`if ($this->excludedPattern) {`
`@@ -83,10 +88,16 @@ public function accept(): bool`
`83`	`88`	`return !preg_match($this->excludedPattern, $path);`
`84`	`89`	`}`
`85`	`90`
`86`		`- if ($this->isRecursive && $this->isDir()) {`
`87`		`- foreach ($this->pruneFilters as $pruneFilter) {`
`88`		`- if (!$pruneFilter($this->current())) {`
`89`		`- return false;`
	`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`	`+ }`
`90`	`101`	`}`
`91`	`102`	`}`
`92`	`103`	`}`