refactor: Optimize DropWhile operation.

loophp · Jan 2, 2021 · d91eb93 · d91eb93
1 parent aa418fe
commit d91eb93
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/src/Operation/DropWhile.php b/src/Operation/DropWhile.php
@@ -29,24 +29,26 @@ public function __invoke(): Closure
              * @psalm-return Closure(Iterator<TKey, T>): Generator<TKey, T>
              */
             static fn (callable ...$callbacks): Closure => static function (Iterator $iterator) use ($callbacks): Generator {
-                for (; $iterator->valid(); $iterator->next()) {
-                    $reduced = array_reduce(
-                        $callbacks,
-                        static fn (bool $carry, callable $callback): bool => ($callback($iterator->current(), $iterator->key(), $iterator)) ?
-                            $carry :
-                            false,
-                        true
-                    );
-
-                    if (true === $reduced) {
-                        continue;
-                    }
+                $break = false;
 
-                    break;
-                }
+                foreach ($iterator as $key => $current) {
+                    if (false === $break) {
+                        $reduced = array_reduce(
+                            $callbacks,
+                            static fn (bool $carry, callable $callback): bool => ($callback($current, $key, $iterator)) ?
+                                $carry :
+                                false,
+                            true
+                        );
+
+                        if (true === $reduced) {
+                            continue;
+                        }
+
+                        $break = true;
+                    }
 
-                for (; $iterator->valid(); $iterator->next()) {
-                    yield $iterator->key() => $iterator->current();
+                    yield $key => $current;
                 }
             };
     }