Pass the key to the Reduce and Recuction operations.

loophp · Sep 9, 2019 · ca60af0 · ca60af0
1 parent b8a7556
commit ca60af0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/Operation/Reduction.php b/src/Operation/Reduction.php
@@ -42,14 +42,12 @@ public function on(iterable $collection): \Closure
         $initial = $this->initial;
 
         return static function () use ($callback, $initial, $collection) {
-            $result = $initial;
+            $carry = $initial;
 
             yield $initial;
 
-            foreach ($collection as $value) {
-                $result = $callback($result, $value);
-
-                yield $result;
+            foreach ($collection as $key => $value) {
+                yield $carry = $callback($carry, $value, $key);
             }
         };
     }

diff --git a/src/Transformation/Reduce.php b/src/Transformation/Reduce.php
@@ -41,12 +41,12 @@ public function on(iterable $collection)
         $callback = $this->callback;
         $initial = $this->initial;
 
-        $result = $initial;
+        $carry = $initial;
 
-        foreach ($collection as $value) {
-            $result = $callback($result, $value);
+        foreach ($collection as $key => $value) {
+            $carry = $callback($carry, $value, $key);
         }
 
-        return $result;
+        return $carry;
     }
 }