feat: Add hasNext method to Caching iterator aggregates.

loophp · Mar 13, 2022 · 0d80e09 · 0d80e09
1 parent e2cf3ea
commit 0d80e09
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/src/CachingIteratorAggregate.php b/src/CachingIteratorAggregate.php
@@ -24,23 +24,28 @@
 final class CachingIteratorAggregate implements IteratorAggregate
 {
     /**
-     * @var UnpackIterableAggregate<TKey, T>
+     * @var SimpleCachingIteratorAggregate<int, array{0: TKey, 1:T}>
      */
-    private UnpackIterableAggregate $iteratorAggregate;
+    private SimpleCachingIteratorAggregate $cachingIterator;
 
     /**
      * @param Iterator<TKey, T> $iterator
      */
     public function __construct(Iterator $iterator)
     {
-        $this->iteratorAggregate = (new UnpackIterableAggregate(new SimpleCachingIteratorAggregate((new PackIterableAggregate($iterator))->getIterator())));
+        $this->cachingIterator = new SimpleCachingIteratorAggregate((new PackIterableAggregate($iterator))->getIterator());
     }
 
     /**
      * @return Generator<TKey, T>
      */
     public function getIterator(): Generator
     {
-        yield from $this->iteratorAggregate->getIterator();
+        yield from (new UnpackIterableAggregate($this->cachingIterator))->getIterator();
+    }
+
+    public function hasNext(): bool
+    {
+        return $this->cachingIterator->hasNext();
     }
 }
diff --git a/src/SimpleCachingIteratorAggregate.php b/src/SimpleCachingIteratorAggregate.php
@@ -53,4 +53,9 @@ public function getIterator(): Generator
             yield $this->iterator->key() => $this->iterator->current();
         }
     }
+
+    public function hasNext(): bool
+    {
+        return $this->iterator->hasNext();
+    }
 }
diff --git a/tests/unit/CachingIteratorAggregateTest.php b/tests/unit/CachingIteratorAggregateTest.php
@@ -9,6 +9,7 @@
 
 namespace tests\loophp\iterators;
 
+use ArrayIterator;
 use Generator;
 use loophp\iterators\CachingIteratorAggregate;
 use PHPUnit\Framework\TestCase;
@@ -20,6 +21,19 @@
  */
 final class CachingIteratorAggregateTest extends TestCase
 {
+    public function testHasNext(): void
+    {
+        $range = range('a', 'c');
+        $iteratorAggregate = new CachingIteratorAggregate(new ArrayIterator($range));
+        $iterator = $iteratorAggregate->getIterator();
+
+        self::assertTrue($iteratorAggregate->hasNext());
+        $iterator->next();
+        self::assertTrue($iteratorAggregate->hasNext());
+        $iterator->next();
+        self::assertFalse($iteratorAggregate->hasNext());
+    }
+
     public function testWithAGenerator(): void
     {
         $input = static function (): Generator {

diff --git a/tests/unit/SimpleCachingIteratorAggregateTest.php b/tests/unit/SimpleCachingIteratorAggregateTest.php
@@ -9,6 +9,7 @@
 
 namespace tests\loophp\iterators;
 
+use ArrayIterator;
 use Generator;
 use loophp\iterators\SimpleCachingIteratorAggregate;
 use PHPUnit\Framework\TestCase;
@@ -19,6 +20,19 @@
  */
 final class SimpleCachingIteratorAggregateTest extends TestCase
 {
+    public function testHasNext(): void
+    {
+        $range = range('a', 'c');
+        $iteratorAggregate = new SimpleCachingIteratorAggregate(new ArrayIterator($range));
+        $iterator = $iteratorAggregate->getIterator();
+
+        self::assertTrue($iteratorAggregate->hasNext());
+        $iterator->next();
+        self::assertTrue($iteratorAggregate->hasNext());
+        $iterator->next();
+        self::assertFalse($iteratorAggregate->hasNext());
+    }
+
     public function testWithAGenerator(): void
     {
         $input = static function () use (&$stack): Generator {