Update Zip operation using proxy methods.

loophp · Aug 19, 2019 · 0d7e849 · 0d7e849
1 parent 4bba092
commit 0d7e849
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/src/Operation/Zip.php b/src/Operation/Zip.php
@@ -30,24 +30,10 @@ static function ($iterable) {
                             }
                         );
 
-                $iteratorCurrent = static function (\Iterator $iterator) {
-                    return $iterator->current();
-                };
+                while ($iterators->proxy('map', 'valid')->contains(true)) {
+                    yield $iterators->proxy('map', 'current');
 
-                $iteratorIsValid = static function (\Iterator $iterator) {
-                    return $iterator->valid();
-                };
-
-                $iteratorNext = static function (\Iterator $iterator) {
-                    $iterator->next();
-
-                    return $iterator;
-                };
-
-                while ($iterators->map($iteratorIsValid)->contains(true)) {
-                    yield Collection::with($iterators->map($iteratorCurrent));
-
-                    $iterators = $iterators->map($iteratorNext);
+                    $iterators = $iterators->proxy('apply', 'next');
                 }
             }
         );