This repository has been archived by the owner on Jan 11, 2023. It is now read-only.
Fix problem using IteratorAggregates with skip and take #27
Conversation
This file contains 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
|
Fixes #26 |
| @@ -135,7 +136,8 @@ public function take($count) | |||
| return new Linq([]); | |||
| } | |||
|
|
|||
| return new Linq(new \LimitIterator($this->iterator, 0, $count)); | |||
| // IteratorIterator wraps $this->iterator because it might be Traversable but not an Iterator. | |||
There was a problem hiding this comment.
Please include this url in the comment "https://bugs.php.net/bug.php?id=52280" so that there is more context.
| @@ -134,8 +139,14 @@ public function take($count) | |||
| if ($count == 0) { | |||
| return new Linq([]); | |||
| } | |||
| $innerIterator = $this->iterator; | |||
| if ($innerIterator instanceof \Iterator === false) { | |||
There was a problem hiding this comment.
Please use if (!($innerIterator instanceof \Iterator)) so that we use a consistent coding style (see e.x. https://github.com/fusonic/linq/blob/master/src/Fusonic/Linq/Linq.php#L330)
There was a problem hiding this comment.
Okay, no problemo.
|
Looks good to me 👍 I will merge it as soon as there is feedback from Travis. |
davidroth
added a commit
that referenced
this pull request
Mar 1, 2016
Fix problem using IteratorAggregates with skip and take
|
Thanks! |
|
No problemo. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary of changes:
TestIteratorAggregateclassI hope that will do until a safer LimitIterator implementation materialises.