minor symfony#28802 [Finder] make reverse sorting a bit more generic (nicolas-grekas)

This PR was merged into the 4.2-dev branch.

Discussion
----------

[Finder] make reverse sorting a bit more generic

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | symfony#27967 (comment)
| License       | MIT
| Doc PR        | -

Commits
-------

ce861d1 [Finder] make reverse sorting a bit more generic

Author: fabpot

src/Symfony/Component/Finder/CHANGELOG.md

@@ -7,7 +7,7 @@ CHANGELOG
  * added $useNaturalSort option to Finder::sortByName() method
  * the `Finder::sortByName()` method will have a new `$useNaturalSort`
    argument in version 5.0, not defining it is deprecated
- * added `Finder::reverseSorting` to reverse the sorting
+ * added `Finder::reverseSorting()` to reverse the sorting
 
 4.0.0
 -----

src/Symfony/Component/Finder/Finder.php

@@ -750,13 +750,8 @@ private function searchInDirectory(string $dir): \Iterator
             $iterator = new Iterator\PathFilterIterator($iterator, $this->paths, $this->notPaths);
         }
 
-        if ($this->sort) {
-            $iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort);
-            $iterator = $iteratorAggregate->getIterator();
-        }
-
-        if ($this->reverseSorting) {
-            $iteratorAggregate = new Iterator\ReverseSortingIterator($iterator);
+        if ($this->sort || $this->reverseSorting) {
+            $iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort, $this->reverseSorting);
             $iterator = $iteratorAggregate->getIterator();
         }
 

src/Symfony/Component/Finder/Iterator/ReverseSortingIterator.php

@@ -18,6 +18,7 @@
  */
 class SortableIterator implements \IteratorAggregate
 {
+    const SORT_BY_NONE = 0;
     const SORT_BY_NAME = 1;
     const SORT_BY_TYPE = 2;
     const SORT_BY_ACCESSED_TIME = 3;
@@ -34,40 +35,43 @@ class SortableIterator implements \IteratorAggregate
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(\Traversable $iterator, $sort)
+    public function __construct(\Traversable $iterator, $sort, bool $reverseOrder = false)
     {
         $this->iterator = $iterator;
+        $order = $reverseOrder ? -1 : 1;
 
         if (self::SORT_BY_NAME === $sort) {
-            $this->sort = function ($a, $b) {
-                return strcmp($a->getRealpath() ?: $a->getPathname(), $b->getRealpath() ?: $b->getPathname());
+            $this->sort = function ($a, $b) use ($order) {
+                return $order * strcmp($a->getRealpath() ?: $a->getPathname(), $b->getRealpath() ?: $b->getPathname());
             };
         } elseif (self::SORT_BY_NAME_NATURAL === $sort) {
-            $this->sort = function ($a, $b) {
-                return strnatcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
+            $this->sort = function ($a, $b) use ($order) {
+                return $order * strnatcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
             };
         } elseif (self::SORT_BY_TYPE === $sort) {
-            $this->sort = function ($a, $b) {
+            $this->sort = function ($a, $b) use ($order) {
                 if ($a->isDir() && $b->isFile()) {
-                    return -1;
+                    return -$order;
                 } elseif ($a->isFile() && $b->isDir()) {
-                    return 1;
+                    return $order;
                 }
 
-                return strcmp($a->getRealpath() ?: $a->getPathname(), $b->getRealpath() ?: $b->getPathname());
+                return $order * strcmp($a->getRealpath() ?: $a->getPathname(), $b->getRealpath() ?: $b->getPathname());
             };
         } elseif (self::SORT_BY_ACCESSED_TIME === $sort) {
-            $this->sort = function ($a, $b) {
-                return $a->getATime() - $b->getATime();
+            $this->sort = function ($a, $b) use ($order) {
+                return $order * ($a->getATime() - $b->getATime());
             };
         } elseif (self::SORT_BY_CHANGED_TIME === $sort) {
-            $this->sort = function ($a, $b) {
-                return $a->getCTime() - $b->getCTime();
+            $this->sort = function ($a, $b) use ($order) {
+                return $order * ($a->getCTime() - $b->getCTime());
             };
         } elseif (self::SORT_BY_MODIFIED_TIME === $sort) {
-            $this->sort = function ($a, $b) {
-                return $a->getMTime() - $b->getMTime();
+            $this->sort = function ($a, $b) use ($order) {
+                return $order * ($a->getMTime() - $b->getMTime());
             };
+        } elseif (self::SORT_BY_NONE === $sort) {
+            $this->sort = $order;
         } elseif (\is_callable($sort)) {
             $this->sort = $sort;
         } else {
@@ -77,8 +81,17 @@ public function __construct(\Traversable $iterator, $sort)
 
     public function getIterator()
     {
+        if (1 === $this->sort) {
+            return $this->iterator;
+        }
+
         $array = iterator_to_array($this->iterator, true);
-        uasort($array, $this->sort);
+
+        if (-1 === $this->sort) {
+            $array = array_reverse($array);
+        } else {
+            uasort($array, $this->sort);
+        }
 
         return new \ArrayIterator($array);
     }