Fix annotations and static analysis.

loophp · Dec 20, 2021 · 4a653b0 · 4a653b0
1 parent b898474
commit 4a653b0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/CachingIteratorAggregate.php b/src/CachingIteratorAggregate.php
@@ -38,9 +38,9 @@ public function __construct(Iterator $iterator)
     }
 
     /**
-     * @return Traversable<TKey, T>
+     * @return Iterator<TKey, T>
      */
-    public function getIterator(): Traversable
+    public function getIterator(): Iterator
     {
         yield from new UnpackIterableAggregate($this->iterator->getIterator());
     }

diff --git a/src/Contract/PausableIteratorAggregateInterface.php b/src/Contract/PausableIteratorAggregateInterface.php
@@ -10,7 +10,7 @@
 namespace loophp\iterators\Contract;
 
 use IteratorAggregate;
-use Traversable;
+use Iterator;
 
 /**
  * @template TKey
@@ -21,7 +21,7 @@
 interface PausableIteratorAggregateInterface extends IteratorAggregate
 {
     /**
-     * @return Traversable<TKey, T>
+     * @return Iterator<TKey, T>
      */
-    public function rest(): Traversable;
+    public function rest(): Iterator;
 }
diff --git a/src/PausableIteratorAggregate.php b/src/PausableIteratorAggregate.php
@@ -10,6 +10,7 @@
 namespace loophp\iterators;
 
 use ArrayIterator;
+use Generator;
 use Iterator;
 use IteratorAggregate;
 use loophp\iterators\Contract\PausableIteratorAggregateInterface;
@@ -19,7 +20,7 @@
  * @template TKey
  * @template T
  *
- * @implements IteratorAggregate<TKey, T>
+ * @implements PausableIteratorAggregateInterface<TKey, T>
  */
 final class PausableIteratorAggregate implements PausableIteratorAggregateInterface
 {
@@ -47,15 +48,18 @@ public function __construct(Iterator $iterator)
      */
     public function getIterator(): Traversable
     {
-        $this->iterator = $this->iteratorAggregate->getIterator();
+        /** @var Iterator<TKey, T> $iterator */
+        $iterator = $this->iteratorAggregate->getIterator();
+
+        $this->iterator = $iterator;
 
         yield from $this->iterator;
     }
 
     /**
-     * @return Traversable<TKey, T>
+     * @return Generator<TKey, T>
      */
-    public function rest(): Traversable
+    public function rest(): Generator
     {
         $this->iterator->next();