[Finder] Simplify SortableIterator #42111
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Alexander M. Turek <me@derrabus.de>
| @@ -83,15 +89,8 @@ public function __construct(\Traversable $iterator, $sort, bool $reverseOrder = | |||
| */ | |||
| public function getIterator() | |||
| { | |||
| if (1 === $this->sort) { | |||
| return $this->iterator; | |||
There was a problem hiding this comment.
this early return prevented the iterator_to_array to array below, saving some memory in the process
| } elseif (\is_callable($sort)) { | ||
| $this->sort = $reverseOrder ? static function ($a, $b) use ($sort) { return -$sort($a, $b); } : $sort; |
There was a problem hiding this comment.
this adds a call that the previous logic skipped
stof
reviewed
Jul 15, 2021
| @@ -70,9 +74,11 @@ public function __construct(\Traversable $iterator, $sort, bool $reverseOrder = | |||
| return $order * ($a->getMTime() - $b->getMTime()); | |||
| }; | |||
| } elseif (self::SORT_BY_NONE === $sort) { | |||
| $this->sort = $order; | |||
| $this->sort = null; | |||
There was a problem hiding this comment.
This does not preserve the order, that was stored before.
There was a problem hiding this comment.
Right. I was probably a bit too eager here.
| @@ -27,6 +27,10 @@ class SortableIterator implements \IteratorAggregate | |||
| public const SORT_BY_NAME_NATURAL = 6; | |||
|
|
|||
| private $iterator; | |||
|
|
|||
| /** | |||
| * @var \Closure|null | |||
There was a problem hiding this comment.
The existing type is \Closure|int|null (\Closure|1|-1|null to be precise with literal types)
|
I think, I misread the code while fixing the types. I'm closing this PR and will fix my PR against 6.0 accordingly. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Spotted while working on #42106. The sort property is either a callable or zero. This means that
SortableIterator::getIterator()currently handles impossible cases.