Skip to content

Fix. Iterator must have rewind method to used as state pattern. #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2021
Merged

Fix. Iterator must have rewind method to used as state pattern. #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Collections library for php language",
"minimum-stability": "dev",
"license": "MIT",
"version": "1.1.3",
"version": "1.1.4",
"authors": [
{
"name": "Maxim Sokolovsky",
Expand Down
13 changes: 8 additions & 5 deletions src/WS/Utils/Collections/CollectionFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ public static function fromStrict(array $values): Collection
*/
public static function fromIterable(iterable $iterable): Collection
{
if ($iterable instanceof IteratorAggregate) {
/** @noinspection PhpUnhandledExceptionInspection */
$iterable = $iterable->getIterator();
}
if (self::isStatePatternIterator($iterable)) {
if ($iterable instanceof IteratorAggregate) {
/** @noinspection PhpUnhandledExceptionInspection */
$iterable = $iterable->getIterator();
}
if (!$iterable instanceof Iterator) {
throw new UnsupportedException('Only Iterator interface can be applied to IteratorCollection');
}
Expand All @@ -104,13 +104,16 @@ private static function isStatePatternIterator(iterable $iterable): bool
if (!is_object($iterable)) {
return false;
}
if (!method_exists($iterable, 'rewind')) {
return false;
}
$i = 2;
$lastItem = null;
foreach ($iterable as $item) {
if ($i === 0) {
break;
}
if (is_object($item) && $item === $lastItem && method_exists($item, 'rewind')) {
if (is_object($item) && $item === $lastItem) {
return true;
}
$lastItem = $item;
Expand Down