refactor: Update Since operation.

loophp · Jan 8, 2021 · c8c3d9b · c8c3d9b
1 parent dbb9307
commit c8c3d9b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/spec/loophp/collection/CollectionSpec.php b/spec/loophp/collection/CollectionSpec.php
@@ -2177,8 +2177,10 @@ static function ($letter) {
             return 5 < $value;
         };
 
-        $this::fromIterable([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3])
-            ->since($isGreaterThanFive, $isGreaterThanThree)
+        $input = [1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3];
+
+        $this::fromIterable($input)
+            ->since($isGreaterThanThree, $isGreaterThanFive)
             ->shouldIterateAs([
                 3 => 4,
                 4 => 5,
@@ -2190,6 +2192,19 @@ static function ($letter) {
                 10 => 2,
                 11 => 3,
             ]);
+
+        $this::fromIterable($input)
+            ->since($isGreaterThanThree)
+            ->since($isGreaterThanFive)
+            ->shouldIterateAs([
+                5 => 6,
+                6 => 7,
+                7 => 8,
+                8 => 9,
+                9 => 1,
+                10 => 2,
+                11 => 3,
+            ]);
     }
 
     public function it_can_slice(): void

diff --git a/src/Operation/Since.php b/src/Operation/Since.php
@@ -61,22 +61,24 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                      * @psalm-param bool $carry
                                      * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool $callable
                                      */
-                                    static fn (bool $carry, callable $callable): bool => ($callable($current, $key, $iterator)) || $carry;
+                                    static fn (bool $carry, callable $callable): bool => $carry || ($callable($current, $key, $iterator));
+
+                    $result = false;
 
                     foreach ($iterator as $key => $current) {
-                        $result = array_reduce(
-                            $callbacks,
-                            $reducerCallback($key)($current)($iterator),
-                            false
-                        );
+                        if (false === $result) {
+                            $result = array_reduce(
+                                $callbacks,
+                                $reducerCallback($key)($current)($iterator),
+                                false
+                            );
+                        }
 
-                        if (false !== $result) {
-                            break;
+                        if (false === $result) {
+                            continue;
                         }
-                    }
 
-                    for (; $iterator->valid(); $iterator->next()) {
-                        yield $iterator->key() => $iterator->current();
+                        yield $key => $current;
                     }
                 };
     }