fix: Update return types.

loophp · Dec 22, 2021 · c48eebf · c48eebf
1 parent d1a1ed6
commit c48eebf
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/src/ClosureIteratorAggregate.php b/src/ClosureIteratorAggregate.php
@@ -9,8 +9,8 @@
 
 namespace loophp\iterators;
 
+use Iterator;
 use IteratorAggregate;
-use Traversable;
 
 /**
  * @template TKey
@@ -40,7 +40,10 @@ public function __construct(callable $callable, iterable $parameters = [])
         $this->parameters = $parameters;
     }
 
-    public function getIterator(): Traversable
+    /**
+     * @return Iterator<TKey, T>
+     */
+    public function getIterator(): Iterator
     {
         yield from ($this->callable)(...$this->parameters);
     }

diff --git a/src/IterableIteratorAggregate.php b/src/IterableIteratorAggregate.php
@@ -9,8 +9,8 @@
 
 namespace loophp\iterators;
 
+use Iterator;
 use IteratorAggregate;
-use Traversable;
 
 /**
  * @template TKey
@@ -34,9 +34,9 @@ public function __construct(iterable $iterable)
     }
 
     /**
-     * @return Traversable<TKey, T>
+     * @return Iterator<TKey, T>
      */
-    public function getIterator(): Traversable
+    public function getIterator(): Iterator
     {
         yield from $this->iterator->getIterator();
     }

diff --git a/src/PackIterableAggregate.php b/src/PackIterableAggregate.php
@@ -9,8 +9,8 @@
 
 namespace loophp\iterators;
 
+use Iterator;
 use IteratorAggregate;
-use Traversable;
 
 /**
  * @template TKey
@@ -34,9 +34,9 @@ public function __construct(iterable $iterable)
     }
 
     /**
-     * @return Traversable<int, array{0: TKey, 1: T}>
+     * @return Iterator<int, array{0: TKey, 1: T}>
      */
-    public function getIterator(): Traversable
+    public function getIterator(): Iterator
     {
         foreach ($this->iterable as $key => $value) {
             yield [$key, $value];

diff --git a/src/PausableIteratorAggregate.php b/src/PausableIteratorAggregate.php
@@ -14,7 +14,6 @@
 use Iterator;
 use IteratorAggregate;
 use loophp\iterators\Contract\PausableIteratorAggregateInterface;
-use Traversable;
 
 /**
  * @template TKey
@@ -44,9 +43,9 @@ public function __construct(Iterator $iterator)
     }
 
     /**
-     * @return Traversable<TKey, T>
+     * @return Iterator<TKey, T>
      */
-    public function getIterator(): Traversable
+    public function getIterator(): Iterator
     {
         /** @var Iterator<TKey, T> $iterator */
         $iterator = $this->iteratorAggregate->getIterator();

diff --git a/src/RandomIterableAggregate.php b/src/RandomIterableAggregate.php
@@ -11,6 +11,7 @@
 
 use ArrayIterator;
 use Generator;
+use Iterator;
 use IteratorAggregate;
 use Traversable;
 
@@ -39,9 +40,9 @@ public function __construct(iterable $iterable, int $seed = 0)
     }
 
     /**
-     * @return Traversable<TKey, T>
+     * @return Iterator<TKey, T>
      */
-    public function getIterator(): Traversable
+    public function getIterator(): Iterator
     {
         mt_srand($this->seed);
 

diff --git a/src/SimpleCachingIteratorAggregate.php b/src/SimpleCachingIteratorAggregate.php
@@ -12,7 +12,6 @@
 use CachingIterator;
 use Iterator;
 use IteratorAggregate;
-use Traversable;
 
 /**
  * @template TKey of array-key
@@ -41,9 +40,9 @@ public function __construct(Iterator $iterator)
     }
 
     /**
-     * @return Traversable<int|string, T>
+     * @return Iterator<int|string, T>
      */
-    public function getIterator(): Traversable
+    public function getIterator(): Iterator
     {
         if (false === $this->hasStarted) {
             $this->hasStarted = true;