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

Who attempts of run rewind methods is not allowed for everything iterator

Author: antonLytkin18

composer.json

@@ -3,7 +3,7 @@
   "description": "Collections library for php language",
   "minimum-stability": "dev",
   "license": "MIT",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "authors": [
     {
       "name": "Maxim Sokolovsky",

src/WS/Utils/Collections/CollectionFactory.php

@@ -76,19 +76,20 @@ 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 Iterator) {
-                throw new UnsupportedException('Only Iterator interface can be applied to IteratorCollection');
-            }
-            return new IteratorCollection($iterable);
-        }
         $list = ArrayList::of();
+        $count = 0;
+        $lastItem = null;
+
         foreach ($iterable as $item) {
+            if ($count <= 1) {
+                $isObject = is_object($item);
+                if ($item === $lastItem && $isObject) {
+                    return self::createIterableCollection($iterable);
+                }
+                $lastItem = $item;
+            }
             $list->add($item);
+            $count++;
         }
 
         return $list;
@@ -99,26 +100,15 @@ public static function empty(): Collection
         return ArrayList::of();
     }
 
-    private static function isStatePatternIterator(iterable $iterable): bool
+    private static function createIterableCollection(iterable $iterable): IteratorCollection
     {
-        if (!is_object($iterable)) {
-            return false;
-        }
-        if (!method_exists($iterable, 'rewind')) {
-            return false;
+        if ($iterable instanceof IteratorAggregate) {
+            /** @noinspection PhpUnhandledExceptionInspection */
+            $iterable = $iterable->getIterator();
         }
-        $i = 2;
-        $lastItem = null;
-        foreach ($iterable as $item) {
-            if ($i === 0) {
-                break;
-            }
-            if (is_object($item) && $item === $lastItem) {
-                return true;
-            }
-            $lastItem = $item;
-            $i--;
+        if (!$iterable instanceof Iterator) {
+            throw new UnsupportedException('Only Iterator interface can be applied to IteratorCollection');
         }
-        return false;
+        return new IteratorCollection($iterable);
     }
 }