Update Since operation.

loophp · Jun 27, 2020 · c3b420c · c3b420c
1 parent 4da37bc
commit c3b420c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/spec/loophp/collection/CollectionSpec.php b/spec/loophp/collection/CollectionSpec.php
@@ -1249,10 +1249,10 @@ static function ($letter) {
         $this
             ->since(
                 static function ($letter) {
-                    return 'b' === $letter;
+                    return 'x' === $letter;
                 },
                 static function ($letter) {
-                    return 'x' === $letter;
+                    return 1 === mb_strlen($letter);
                 }
             )
             ->shouldIterateAs([23 => 'x', 24 => 'y', 25 => 'z']);

diff --git a/src/Operation/Since.php b/src/Operation/Since.php
@@ -7,6 +7,7 @@
 use Closure;
 use Generator;
 use loophp\collection\Contract\Operation;
+use loophp\collection\Iterator\IterableIterator;
 
 final class Since extends AbstractOperation implements Operation
 {
@@ -21,20 +22,24 @@ public function __construct(callable ...$callbacks)
     public function __invoke(): Closure
     {
         return static function (iterable $collection, array $callbacks): Generator {
-            foreach ($collection as $key => $value) {
+            $iterator = new IterableIterator($collection);
+
+            while ($iterator->valid()) {
                 $result = 1;
 
                 foreach ($callbacks as $keyCallback => $callback) {
-                    $result &= $callback($value, $key);
-
-                    if (1 === $result) {
-                        unset($callbacks[$keyCallback]);
-                    }
+                    $result &= $callback($iterator->current(), $iterator->key());
                 }
 
                 if (1 === $result) {
-                    yield $key => $value;
+                    break;
                 }
+
+                $iterator->next();
+            }
+
+            for (; $iterator->valid(); $iterator->next()) {
+                yield $iterator->key() => $iterator->current();
             }
         };
     }