[9.x] Remove reduceWithKeys and merge the functionality with reduce (#35901)

* remove reduce from LazyCollection

* remove reduce from Collection

* add reduce to EnumeratesValues

* move tap method a bit down to its alphabetically correct place

* add test for reduce with keys

* Remove testReduceWithKeys

we don't have the method anymore so we're not testing it

Author: mokhosh

src/Illuminate/Collections/Collection.php

@@ -872,36 +872,6 @@ public function random($number = null)
         return new static(Arr::random($this->items, $number));
     }
 
-    /**
-     * Reduce the collection to a single value.
-     *
-     * @param  callable  $callback
-     * @param  mixed  $initial
-     * @return mixed
-     */
-    public function reduce(callable $callback, $initial = null)
-    {
-        return array_reduce($this->items, $callback, $initial);
-    }
-
-    /**
-     * Reduce an associative collection to a single value.
-     *
-     * @param  callable  $callback
-     * @param  mixed $initial
-     * @return mixed
-     */
-    public function reduceWithKeys(callable $callback, $initial = null)
-    {
-        $result = $initial;
-
-        foreach ($this->items as $key => $value) {
-            $result = $callback($result, $value, $key);
-        }
-
-        return $result;
-    }
-
     /**
      * Replace the collection items with the given items.
      *

src/Illuminate/Collections/LazyCollection.php

@@ -827,42 +827,6 @@ public function random($number = null)
         return is_null($number) ? $result : new static($result);
     }
 
-    /**
-     * Reduce the collection to a single value.
-     *
-     * @param  callable  $callback
-     * @param  mixed  $initial
-     * @return mixed
-     */
-    public function reduce(callable $callback, $initial = null)
-    {
-        $result = $initial;
-
-        foreach ($this as $value) {
-            $result = $callback($result, $value);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Reduce an associative collection to a single value.
-     *
-     * @param  callable  $callback
-     * @param  mixed $initial
-     * @return mixed
-     */
-    public function reduceWithKeys(callable $callback, $initial = null)
-    {
-        $result = $initial;
-
-        foreach ($this as $key => $value) {
-            $result = $callback($result, $value, $key);
-        }
-
-        return $result;
-    }
-
     /**
      * Replace the collection items with the given items.
      *

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -704,16 +704,21 @@ public function pipeInto($class)
     }
 
     /**
-     * Pass the collection to the given callback and then return it.
+     * Reduce the collection to a single value.
      *
      * @param  callable  $callback
-     * @return $this
+     * @param  mixed  $initial
+     * @return mixed
      */
-    public function tap(callable $callback)
+    public function reduce(callable $callback, $initial = null)
     {
-        $callback(clone $this);
+        $result = $initial;
 
-        return $this;
+        foreach ($this as $key => $value) {
+            $result = $callback($result, $value, $key);
+        }
+
+        return $result;
     }
 
     /**
@@ -733,6 +738,19 @@ public function reject($callback = true)
         });
     }
 
+    /**
+     * Pass the collection to the given callback and then return it.
+     *
+     * @param  callable  $callback
+     * @return $this
+     */
+    public function tap(callable $callback)
+    {
+        $callback(clone $this);
+
+        return $this;
+    }
+
     /**
      * Return only unique items from the collection array.
      *

tests/Support/SupportCollectionTest.php

@@ -3590,18 +3590,12 @@ public function testReduce($collection)
         $this->assertEquals(6, $data->reduce(function ($carry, $element) {
             return $carry += $element;
         }));
-    }
 
-    /**
-     * @dataProvider collectionClassProvider
-     */
-    public function testReduceWithKeys($collection)
-    {
         $data = new $collection([
-            'foo' => 'bar',
-            'baz' => 'qux',
+            'foo' => 'bar',	            'foo' => 'bar',
+            'baz' => 'qux',	            'baz' => 'qux',
         ]);
-        $this->assertEquals('foobarbazqux', $data->reduceWithKeys(function ($carry, $element, $key) {
+        $this->assertEquals('foobarbazqux', $data->reduce(function ($carry, $element, $key) {
             return $carry .= $key.$element;
         }));
     }