Merge pull request #41 from worksolutions/fix-iterator-behavior

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

Author: antonLytkin18

composer.json

@@ -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",

src/WS/Utils/Collections/CollectionFactory.php

@@ -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');
             }
@@ -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;