refactor: Use For loop instead of Foreach.

So we do not call rewind before the loop.
loophp · Dec 22, 2020 · c59cea9 · c59cea9
1 parent f826fa4
commit c59cea9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/src/Operation/Apply.php b/src/Operation/Apply.php
@@ -33,7 +33,7 @@ public function __invoke(): Closure
                  * @psalm-return Generator<TKey, T>
                  */
                 static function (Iterator $iterator) use ($callbacks): Generator {
-                    for (; true === $iterator->valid(); $iterator->next()) {
+                    for (; $iterator->valid(); $iterator->next()) {
                         $key = $iterator->key();
                         $current = $iterator->current();
 

diff --git a/src/Operation/Normalize.php b/src/Operation/Normalize.php
@@ -27,8 +27,8 @@ public function __invoke(): Closure
              * @psalm-return Generator<int, T, mixed, void>
              */
             static function (Iterator $iterator): Generator {
-                foreach ($iterator as $value) {
-                    yield $value;
+                for (; $iterator->valid(); $iterator->next()) {
+                    yield $iterator->current();
                 }
             };
     }

diff --git a/src/Operation/Since.php b/src/Operation/Since.php
@@ -63,7 +63,10 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                      */
                                     static fn (bool $carry, callable $callable): bool => ($callable($current, $key, $iterator)) ? $carry : false;
 
-                    foreach ($iterator as $key => $current) {
+                    for (; $iterator->valid(); $iterator->next()) {
+                        $key = $iterator->key();
+                        $current = $iterator->current();
+
                         $result = array_reduce(
                             $callbacks,
                             $reducerCallback($key)($current)($iterator),

diff --git a/src/Operation/TakeWhile.php b/src/Operation/TakeWhile.php
@@ -63,7 +63,7 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                  */
                                 static fn (bool $carry, callable $callable): bool => ($callable($current, $key, $iterator)) ? $carry : false;
 
-                for (; true === $iterator->valid(); $iterator->next()) {
+                for (; $iterator->valid(); $iterator->next()) {
                     $key = $iterator->key();
                     $current = $iterator->current();
 

diff --git a/src/Operation/Until.php b/src/Operation/Until.php
@@ -63,7 +63,10 @@ static function (Iterator $iterator) use ($callbacks): Generator {
                                      */
                                     static fn (bool $carry, callable $callable): bool => ($callable($current, $key, $iterator)) ? $carry : false;
 
-                    foreach ($iterator as $key => $current) {
+                    for (; $iterator->valid(); $iterator->next()) {
+                        $key = $iterator->key();
+                        $current = $iterator->current();
+
                         yield $key => $current;
 
                         $result = array_reduce(