Fix bug in ClosureIterator::rewind().

loophp · Dec 25, 2019 · f3779ae · f3779ae
1 parent bae14bf
commit f3779ae
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/spec/drupol/collection/CollectionSpec.php b/spec/drupol/collection/CollectionSpec.php
@@ -499,6 +499,12 @@ public function it_can_flip(): void
         $this::with($input)
             ->flip()
             ->shouldIterateAs($output);
+
+        $this::with(['a', 'b', 'c', 'd', 'a'])
+            ->flip()
+            ->flip()
+            ->all()
+            ->shouldIterateAs(['a', 'b', 'c', 'd', 'a']);
     }
 
     public function it_can_forget(): void
@@ -1096,6 +1102,13 @@ public function it_can_tail(): void
         $this
             ->tail(100)
             ->shouldIterateAs(range('A', 'F'));
+
+        $this::with(['a', 'b', 'c', 'd', 'a'])
+            ->flip()
+            ->flip()
+            ->tail(2)
+            ->all()
+            ->shouldIterateAs([3 => 'd', 4 => 'a']);
     }
 
     public function it_can_until(): void

diff --git a/spec/drupol/collection/Iterator/ClosureIteratorSpec.php b/spec/drupol/collection/Iterator/ClosureIteratorSpec.php
@@ -33,6 +33,30 @@ public function it_can_get_a_key(): void
             ->shouldReturn(0);
     }
 
+    public function it_can_rewind()
+    {
+        $rdmString = static function () {
+            yield 'foo';
+        };
+
+        $this
+            ->beConstructedWith($rdmString);
+
+        $this
+            ->current()
+            ->shouldReturn('foo');
+
+        $this
+            ->next()
+            ->current()
+            ->shouldReturn(null);
+
+        $this
+            ->rewind()
+            ->current()
+            ->shouldReturn('foo');
+    }
+
     public function it_can_use_next(): void
     {
         $callback = static function () {

diff --git a/src/Iterator/ClosureIterator.php b/src/Iterator/ClosureIterator.php
@@ -69,11 +69,14 @@ public function next()
     }
 
     /**
-     * {@inheritdoc}
+     * @return \drupol\collection\Iterator\ClosureIterator
      */
-    public function rewind(): void
+    public function rewind()
     {
+        $this->generator = null;
         $this->getGenerator();
+
+        return $this;
     }
 
     /**