Remove separate indexed versions of collection functions

Author: mpajunen

src/Builder/InnerFunctions.php

@@ -444,27 +444,6 @@ public static function each(callable $function, $collection)
         return $collection;
     }
 
-    /**
-     * Calls the given function for each element in the collection and returns the original collection.
-     *
-     * Like `each`, but the supplied `function` receives three arguments: `item`, `index`, `collection`.
-     *
-     * @param callable                      $function
-     * @param array|\Traversable|Collection $collection
-     *
-     * @return array|\Traversable|Collection
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `each` now receives three arguments as well.
-     */
-    public static function eachIndexed(callable $function, $collection)
-    {
-        foreach ($collection as $key => $item) {
-            $function($item, $key, $collection);
-        }
-
-        return $collection;
-    }
-
     /**
      * Returns a function that returns `true` when either of the predicates matches, `false` otherwise.
      *
@@ -562,23 +541,6 @@ public static function filter(callable $predicate, $collection)
         return static::_filter($predicate, $collection);
     }
 
-    /**
-     * Returns a new collection containing the items that match the given predicate.
-     *
-     * Like `filter`, but the supplied `predicate` receives three arguments: `item`, `index`, `collection`.
-     *
-     * @param callable                      $predicate
-     * @param array|\Traversable|Collection $collection
-     *
-     * @return array|Collection
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `filter` now receives three arguments as well.
-     */
-    public static function filterIndexed(callable $predicate, $collection)
-    {
-        return static::_filter($predicate, $collection);
-    }
-
     /**
      * Returns the first item of a collection for which the given predicate matches, or null if no match is found.
      *
@@ -965,23 +927,6 @@ public static function map(callable $function, $collection)
         return static::_map($function, $collection);
     }
 
-    /**
-     * Returns a new collection where values are created from the original collection by calling the supplied function.
-     *
-     * Like `map`, but the supplied `function` receives three arguments: `item`, `index`, `collection`.
-     *
-     * @param callable                      $function
-     * @param array|\Traversable|Collection $collection
-     *
-     * @return array|Collection
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `map` now receives three arguments as well.
-     */
-    public static function mapIndexed(callable $function, $collection)
-    {
-        return static::_map($function, $collection);
-    }
-
     /**
      * Returns the largest value in the collection.
      *
@@ -1363,24 +1308,6 @@ public static function reduce(callable $function, $initial, $collection)
         return static::_reduce($function, $initial, $collection);
     }
 
-    /**
-     * Returns a value accumulated by calling the given function for each element of the collection.
-     *
-     * Like `reduce`, but the supplied `function` receives four arguments: `previousValue`, `item`, `index`, `collection`.
-     *
-     * @param callable           $function
-     * @param mixed              $initial
-     * @param array|\Traversable $collection
-     *
-     * @return mixed
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `reduce` now receives four arguments as well.
-     */
-    public static function reduceIndexed(callable $function, $initial, $collection)
-    {
-        return static::_reduce($function, $initial, $collection);
-    }
-
     /**
      * Returns a value accumulated by calling the given function for each element of the collection in reverse order.
      *
@@ -1397,24 +1324,6 @@ public static function reduceRight(callable $function, $initial, $collection)
         return static::_reduce($function, $initial, static::_reverse($collection));
     }
 
-    /**
-     * Returns a value accumulated by calling the given function for each element of the collection in reverse order.
-     *
-     * Like `reduceRight`, but the supplied `function` receives four arguments: `previousValue`, `item`, `index`, `collection`.
-     *
-     * @param callable           $function
-     * @param mixed              $initial
-     * @param array|\Traversable $collection
-     *
-     * @return mixed
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `reduceRight` now receives four arguments as well.
-     */
-    public static function reduceRightIndexed(callable $function, $initial, $collection)
-    {
-        return static::_reduce($function, $initial, static::_reverse($collection));
-    }
-
     /**
      * Returns a new collection containing the items that do not match the given predicate.
      *
@@ -1430,23 +1339,6 @@ public static function reject(callable $predicate, $collection)
         return static::_filter(Phamda::not($predicate), $collection);
     }
 
-    /**
-     * Returns a new collection containing the items that do not match the given predicate.
-     *
-     * Like `reject`, but the supplied `predicate` receives three arguments: `item`, `index`, `collection`.
-     *
-     * @param callable                      $predicate
-     * @param array|\Traversable|Collection $collection
-     *
-     * @return array|Collection
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `reject` now receives three arguments as well.
-     */
-    public static function rejectIndexed(callable $predicate, $collection)
-    {
-        return static::_filter(Phamda::not($predicate), $collection);
-    }
-
     /**
      * Returns a new collection where the items are in a reverse order.
      *

src/Phamda.php

@@ -630,47 +630,17 @@ public static function divide($x = null, $y = null)
      *
      * ```php
      * $date = new \DateTime('2015-02-02');
-     * $addDays = function ($number) use ($date) { $date->modify("+{$number} days"); };
-     * P::each($addDays, [3, 6, 2]);
-     * $date->format('Y-m-d'); // => '2015-02-13'
-     * ```
-     *
-     * @param callable                      $function
-     * @param array|\Traversable|Collection $collection
-     *
-     * @return callable|array|\Traversable|Collection
-     */
-    public static function each($function = null, $collection = null)
-    {
-        return static::curry2(function (callable $function, $collection) {
-            foreach ($collection as $key => $item) {
-                $function($item, $key, $collection);
-            }
-
-            return $collection;
-        }, func_get_args());
-    }
-
-    /**
-     * Calls the given function for each element in the collection and returns the original collection.
-     *
-     * Like `each`, but the supplied `function` receives three arguments: `item`, `index`, `collection`.
-     *
-     * ```php
-     * $date = new \DateTime('2015-02-02');
      * $addCalendar = function ($number, $type) use ($date) { $date->modify("+{$number} {$type}"); };
-     * P::eachIndexed($addCalendar, ['months' => 3, 'weeks' => 6, 'days' => 2]);
+     * P::each($addCalendar, ['months' => 3, 'weeks' => 6, 'days' => 2]);
      * $date->format('Y-m-d'); // => '2015-06-15'
      * ```
      *
      * @param callable                      $function
      * @param array|\Traversable|Collection $collection
      *
      * @return callable|array|\Traversable|Collection
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `each` now receives three arguments as well.
      */
-    public static function eachIndexed($function = null, $collection = null)
+    public static function each($function = null, $collection = null)
     {
         return static::curry2(function (callable $function, $collection) {
             foreach ($collection as $key => $item) {
@@ -821,30 +791,6 @@ public static function filter($predicate = null, $collection = null)
         }, func_get_args());
     }
 
-    /**
-     * Returns a new collection containing the items that match the given predicate.
-     *
-     * Like `filter`, but the supplied `predicate` receives three arguments: `item`, `index`, `collection`.
-     *
-     * ```php
-     * $smallerThanNext = function ($value, $key, $list) { return isset($list[$key + 1]) ? $value < $list[$key + 1] : false; };
-     * P::filterIndexed($smallerThanNext, [3, 6, 2, 19]); // => [0 => 3, 2 => 2]
-     * ```
-     *
-     * @param callable                      $predicate
-     * @param array|\Traversable|Collection $collection
-     *
-     * @return callable|array|Collection
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `filter` now receives three arguments as well.
-     */
-    public static function filterIndexed($predicate = null, $collection = null)
-    {
-        return static::curry2(function (callable $predicate, $collection) {
-            return static::_filter($predicate, $collection);
-        }, func_get_args());
-    }
-
     /**
      * Returns the first item of a collection for which the given predicate matches, or null if no match is found.
      *
@@ -1399,38 +1345,16 @@ public static function lte($x = null, $y = null)
      * ```php
      * $square = function ($x) { return $x ** 2; };
      * P::map($square, [1, 2, 3, 4]); // => [1, 4, 9, 16]
-     * ```
-     *
-     * @param callable                      $function
-     * @param array|\Traversable|Collection $collection
-     *
-     * @return callable|array|Collection
-     */
-    public static function map($function = null, $collection = null)
-    {
-        return static::curry2(function (callable $function, $collection) {
-            return static::_map($function, $collection);
-        }, func_get_args());
-    }
-
-    /**
-     * Returns a new collection where values are created from the original collection by calling the supplied function.
-     *
-     * Like `map`, but the supplied `function` receives three arguments: `item`, `index`, `collection`.
-     *
-     * ```php
      * $keyExp = function ($value, $key) { return $value ** $key; };
-     * P::mapIndexed($keyExp, [1, 2, 3, 4]); // => [1, 2, 9, 64]
+     * P::map($keyExp, [1, 2, 3, 4]); // => [1, 2, 9, 64]
      * ```
      *
      * @param callable                      $function
      * @param array|\Traversable|Collection $collection
      *
      * @return callable|array|Collection
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `map` now receives three arguments as well.
      */
-    public static function mapIndexed($function = null, $collection = null)
+    public static function map($function = null, $collection = null)
     {
         return static::curry2(function (callable $function, $collection) {
             return static::_map($function, $collection);
@@ -2020,73 +1944,23 @@ public static function reduce($function = null, $initial = null, $collection = n
         }, func_get_args());
     }
 
-    /**
-     * Returns a value accumulated by calling the given function for each element of the collection.
-     *
-     * Like `reduce`, but the supplied `function` receives four arguments: `previousValue`, `item`, `index`, `collection`.
-     *
-     * ```php
-     * $concat = function ($accumulator, $value, $key) { return $accumulator . $key . $value; };
-     * P::reduceIndexed($concat, 'no', ['foo' => 'bar', 'fiz' => 'buz']); // => 'nofoobarfizbuz'
-     * ```
-     *
-     * @param callable           $function
-     * @param mixed              $initial
-     * @param array|\Traversable $collection
-     *
-     * @return callable|mixed
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `reduce` now receives four arguments as well.
-     */
-    public static function reduceIndexed($function = null, $initial = null, $collection = null)
-    {
-        return static::curry3(function (callable $function, $initial, $collection) {
-            return static::_reduce($function, $initial, $collection);
-        }, func_get_args());
-    }
-
     /**
      * Returns a value accumulated by calling the given function for each element of the collection in reverse order.
      *
      * The supplied `function` receives four arguments: `previousValue`, `item`, `index`, `collection`.
      *
      * ```php
-     * $concat = function ($x, $y) { return $x . $y; };
-     * P::reduceRight($concat, 'foo', ['bar', 'baz']); // => 'foobazbar'
-     * ```
-     *
-     * @param callable           $function
-     * @param mixed              $initial
-     * @param array|\Traversable $collection
-     *
-     * @return callable|mixed
-     */
-    public static function reduceRight($function = null, $initial = null, $collection = null)
-    {
-        return static::curry3(function (callable $function, $initial, $collection) {
-            return static::_reduce($function, $initial, static::_reverse($collection));
-        }, func_get_args());
-    }
-
-    /**
-     * Returns a value accumulated by calling the given function for each element of the collection in reverse order.
-     *
-     * Like `reduceRight`, but the supplied `function` receives four arguments: `previousValue`, `item`, `index`, `collection`.
-     *
-     * ```php
      * $concat = function ($accumulator, $value, $key) { return $accumulator . $key . $value; };
-     * P::reduceRightIndexed($concat, 'no', ['foo' => 'bar', 'fiz' => 'buz']); // => 'nofizbuzfoobar'
+     * P::reduceRight($concat, 'no', ['foo' => 'bar', 'fiz' => 'buz']); // => 'nofizbuzfoobar'
      * ```
      *
      * @param callable           $function
      * @param mixed              $initial
      * @param array|\Traversable $collection
      *
      * @return callable|mixed
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `reduceRight` now receives four arguments as well.
      */
-    public static function reduceRightIndexed($function = null, $initial = null, $collection = null)
+    public static function reduceRight($function = null, $initial = null, $collection = null)
     {
         return static::curry3(function (callable $function, $initial, $collection) {
             return static::_reduce($function, $initial, static::_reverse($collection));
@@ -2115,30 +1989,6 @@ public static function reject($predicate = null, $collection = null)
         }, func_get_args());
     }
 
-    /**
-     * Returns a new collection containing the items that do not match the given predicate.
-     *
-     * Like `reject`, but the supplied `predicate` receives three arguments: `item`, `index`, `collection`.
-     *
-     * ```php
-     * $smallerThanNext = function ($value, $key, $list) { return isset($list[$key + 1]) ? $value < $list[$key + 1] : false; };
-     * P::rejectIndexed($smallerThanNext, [3, 6, 2, 19]); // => [1 => 6, 3 => 19]
-     * ```
-     *
-     * @param callable                      $predicate
-     * @param array|\Traversable|Collection $collection
-     *
-     * @return callable|array|Collection
-     *
-     * @deprecated Since version 0.4, to be removed in 0.5. The callback of `reject` now receives three arguments as well.
-     */
-    public static function rejectIndexed($predicate = null, $collection = null)
-    {
-        return static::curry2(function (callable $predicate, $collection) {
-            return static::_filter(Phamda::not($predicate), $collection);
-        }, func_get_args());
-    }
-
     /**
      * Returns a new collection where the items are in a reverse order.
      *