CachingIterator: refactoring

Author: dg

src/Iterators/CachingIterator.php

@@ -31,26 +31,12 @@ class CachingIterator extends \CachingIterator implements \Countable
 	private int $counter = 0;
 
 
-	public function __construct($iterator)
+	public function __construct(iterable|\stdClass $iterable)
 	{
-		if (is_array($iterator) || $iterator instanceof \stdClass) {
-			$iterator = new \ArrayIterator($iterator);
-
-		} elseif ($iterator instanceof \IteratorAggregate) {
-			do {
-				$iterator = $iterator->getIterator();
-			} while ($iterator instanceof \IteratorAggregate);
-
-			assert($iterator instanceof \Iterator);
-
-		} elseif ($iterator instanceof \Iterator) {
-		} elseif ($iterator instanceof \Traversable) {
-			$iterator = new \IteratorIterator($iterator);
-		} else {
-			throw new Nette\InvalidArgumentException(sprintf('Invalid argument passed to %s; array or Traversable expected, %s given.', self::class, get_debug_type($iterator)));
-		}
-
-		parent::__construct($iterator, 0);
+		$iterable = $iterable instanceof \stdClass
+			? new \ArrayIterator($iterable)
+			: Nette\Utils\Iterables::toIterator($iterable);
+		parent::__construct($iterable, 0);
 	}
 
 

tests/Iterators/CachingIterator.construct.phpt

@@ -86,7 +86,7 @@ test('object', function () {
 	Assert::exception(function () {
 		$arr = dir('.');
 		foreach (new Iterators\CachingIterator($arr) as $k => $v);
-	}, InvalidArgumentException::class, null);
+	}, TypeError::class, null);
 });