bug #15803 [Finder] Exclude files based on path before applying the sorting (stof)

fabpot · fabpot · commit 306d88a1e318 · 2015-09-15T11:46:38.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Finder] Exclude files based on path before applying the sorting | Q | A | ------------- | --- | Bug fix? | yes (perf) | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Sorting can be slow, so it is best to applied it after all filtering rules are applied instead of using a bigger list and filtering again after that. This impacts only people using both the sorting and the name filtering (with ``->names()`` or ``notNames()``) Commits ------- e5bf0ab Exclude files based on path before applying the sorting
diff --git a/src/Symfony/Component/Finder/Adapter/PhpAdapter.php b/src/Symfony/Component/Finder/Adapter/PhpAdapter.php
@@ -68,15 +68,15 @@ public function searchInDirectory($dir)
             $iterator = new Iterator\CustomFilterIterator($iterator, $this->filters);
         }
 
+        if ($this->paths || $this->notPaths) {
+            $iterator = new Iterator\PathFilterIterator($iterator, $this->paths, $this->notPaths);
+        }
+
         if ($this->sort) {
             $iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort);
             $iterator = $iteratorAggregate->getIterator();
         }
 
-        if ($this->paths || $this->notPaths) {
-            $iterator = new Iterator\PathFilterIterator($iterator, $this->paths, $this->notPaths);
-        }
-
         return $iterator;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -68,15 +68,15 @@ public function searchInDirectory($dir)`
`68`	`68`	`$iterator = new Iterator\CustomFilterIterator($iterator, $this->filters);`
`69`	`69`	`}`
`70`	`70`
	`71`	`+ if ($this->paths \|\| $this->notPaths) {`
	`72`	`+ $iterator = new Iterator\PathFilterIterator($iterator, $this->paths, $this->notPaths);`
	`73`	`+ }`
	`74`	`+`
`71`	`75`	`if ($this->sort) {`
`72`	`76`	`$iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort);`
`73`	`77`	`$iterator = $iteratorAggregate->getIterator();`
`74`	`78`	`}`
`75`	`79`
`76`		`- if ($this->paths \|\| $this->notPaths) {`
`77`		`- $iterator = new Iterator\PathFilterIterator($iterator, $this->paths, $this->notPaths);`
`78`		`- }`
`79`		`-`
`80`	`80`	`return $iterator;`
`81`	`81`	`}`
`82`	`82`