Remove map() function

Author: clue

README.md

@@ -42,7 +42,6 @@ Table of Contents
      * [all()](#all)
      * [race()](#race)
      * [any()](#any)
-     * [map()](#map)
 4. [Examples](#examples)
    * [How to use Deferred](#how-to-use-deferred)
    * [How promise forwarding works](#how-promise-forwarding-works)
@@ -363,7 +362,7 @@ once all consumers called the `cancel()` method of the promise.
 
 ### Functions
 
-Useful functions for creating, joining and mapping collections of promises.
+Useful functions for creating and joining collections of promises.
 
 All functions working on promise collections (like `all()`, `race()`,
 etc.) support cancellation. This means, if you call `cancel()` on the returned
@@ -439,18 +438,6 @@ which holds all rejection reasons. The rejection reasons can be obtained with
 The returned promise will also reject with a `React\Promise\Exception\LengthException`
 if `$promisesOrValues` contains 0 items.
 
-#### map()
-
-```php
-$promise = React\Promise\map(array $promisesOrValues, callable $mapFunc);
-```
-
-Traditional map function, similar to `array_map()`, but allows input to contain
-promises and/or values, and `$mapFunc` may return either a value or a promise.
-
-The map function receives each item as argument, where item is a fully resolved
-value of a promise or value in `$promisesOrValues`.
-
 Examples
 --------
 

src/functions.php

@@ -73,9 +73,33 @@ function reject(\Throwable $reason): PromiseInterface
  */
 function all(array $promisesOrValues): PromiseInterface
 {
-    return map($promisesOrValues, function ($val) {
-        return $val;
-    });
+    if (!$promisesOrValues) {
+        return resolve([]);
+    }
+
+    $cancellationQueue = new Internal\CancellationQueue();
+
+    return new Promise(function ($resolve, $reject) use ($promisesOrValues, $cancellationQueue): void {
+        $toResolve = \count($promisesOrValues);
+        $values    = [];
+
+        foreach ($promisesOrValues as $i => $promiseOrValue) {
+            $cancellationQueue->enqueue($promiseOrValue);
+            $values[$i] = null;
+
+            resolve($promiseOrValue)
+                ->done(
+                    function ($mapped) use ($i, &$values, &$toResolve, $resolve): void {
+                        $values[$i] = $mapped;
+
+                        if (0 === --$toResolve) {
+                            $resolve($values);
+                        }
+                    },
+                    $reject
+                );
+        }
+    }, $cancellationQueue);
 }
 
 /**
@@ -168,49 +192,6 @@ function any(array $promisesOrValues): PromiseInterface
     }, $cancellationQueue);
 }
 
-/**
- * Traditional map function, similar to `array_map()`, but allows input to contain
- * promises and/or values, and `$mapFunc` may return either a value or a promise.
- *
- * The map function receives each item as argument, where item is a fully resolved
- * value of a promise or value in `$promisesOrValues`.
- *
- * @param array $promisesOrValues
- * @param callable $mapFunc
- * @return PromiseInterface
- */
-function map(array $promisesOrValues, callable $mapFunc): PromiseInterface
-{
-    if (!$promisesOrValues) {
-        return resolve([]);
-    }
-
-    $cancellationQueue = new Internal\CancellationQueue();
-
-    return new Promise(function ($resolve, $reject) use ($promisesOrValues, $mapFunc, $cancellationQueue): void {
-        $toResolve = \count($promisesOrValues);
-        $values    = [];
-
-        foreach ($promisesOrValues as $i => $promiseOrValue) {
-            $cancellationQueue->enqueue($promiseOrValue);
-            $values[$i] = null;
-
-            resolve($promiseOrValue)
-                ->then($mapFunc)
-                ->done(
-                    function ($mapped) use ($i, &$values, &$toResolve, $resolve): void {
-                        $values[$i] = $mapped;
-
-                        if (0 === --$toResolve) {
-                            $resolve($values);
-                        }
-                    },
-                    $reject
-                );
-        }
-    }, $cancellationQueue);
-}
-
 /**
  * @internal
  */