Merge pull request #93 from MaxGoryunov/feature/85

Feature/85
MaxGoryunov · Aug 27, 2021 · e96d259 · e96d259
2 parents 09f66c5 + d87d879
commit e96d259
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/SavingIterator.php b/src/SavingIterator.php
@@ -41,17 +41,28 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
-     * @return TValue|false
+     * Returns target after adding a value from origin.
+     *
+     * @phpstan-return AddingIterator<TKey, TValue>
+     * @return AddingIterator
      */
-    public function current(): mixed
+    private function added(): AddingIterator
     {
         /**
-         * @todo #66:25min Codebeat complains about similar code in two methods.
-         *  It should be refactored.
+         * @todo #85:40min There is a private function in this class. It should
+         *  be removed without creating the code duplication problem again.
          */
         $this->target = $this->target->from($this->origin);
-        return $this->target->current();
+        return $this->target;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @return TValue|false
+     */
+    public function current(): mixed
+    {
+        return $this->added()->current();
     }
 
     /**
@@ -60,8 +71,7 @@ public function current(): mixed
      */
     public function key(): mixed
     {
-        $this->target = $this->target->from($this->origin);
-        return $this->target->key();
+        return $this->added()->key();
     }
 
     /**

diff --git a/tests/src/SavingIteratorTest.php b/tests/src/SavingIteratorTest.php
@@ -23,6 +23,7 @@ class SavingIteratorTest extends TestCase
 
     /**
      * @covers ::__construct
+     * @covers ::added
      * @covers ::rewind
      * @covers ::valid
      * @covers ::current
@@ -101,6 +102,7 @@ public function testDoesNotCallOriginIfValuesAreInCache(): void
 
     /**
      * @covers ::__construct
+     * @covers ::added
      * @covers ::rewind
      * @covers ::valid
      * @covers ::current
@@ -138,6 +140,7 @@ public function testWorksWithGenerator(): void
 
     /**
      * @covers ::__construct
+     * @covers ::added
      * @covers ::rewind
      * @covers ::valid
      * @covers ::current
@@ -173,6 +176,7 @@ public function testWorksWithGeneratorMultipleTimes(): void
 
     /**
      * @covers ::__construct
+     * @covers ::added
      * @covers ::rewind
      * @covers ::valid
      * @covers ::current
@@ -204,6 +208,7 @@ public function testWorksWithEmptyGenerator(): void
 
     /**
      * @covers ::__construct
+     * @covers ::added
      * @covers ::rewind
      * @covers ::valid
      * @covers ::current
@@ -234,6 +239,7 @@ public function testIterationsGiveSameResults(): void
 
     /**
      * @covers ::__construct
+     * @covers ::added
      * @covers ::rewind
      * @covers ::valid
      * @covers ::current
@@ -275,6 +281,7 @@ function (Iterator $iterator) use ($input): void {
 
     /**
      * @covers ::__construct
+     * @covers ::added
      * @covers ::rewind
      * @covers ::valid
      * @covers ::current
@@ -302,6 +309,7 @@ public function testWorksWithEmptyIterator(): void
 
     /**
      * @covers ::__construct
+     * @covers ::added
      * @covers ::rewind
      * @covers ::valid
      * @covers ::current