Always use functions, keep When/Util for BC only

Author: jsor

src/React/Promise/Deferred.php

@@ -52,10 +52,10 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
     public function resolve($result = null)
     {
         if (null !== $this->completed) {
-            return Util::promiseFor($result);
+            return resolve($result);
         }
 
-        $this->completed = Util::promiseFor($result);
+        $this->completed = resolve($result);
 
         $this->processQueue($this->handlers, $this->completed);
 
@@ -66,7 +66,7 @@ public function resolve($result = null)
 
     public function reject($reason = null)
     {
-        return $this->resolve(Util::rejectedPromiseFor($reason));
+        return $this->resolve(reject($reason));
     }
 
     public function progress($update = null)

src/React/Promise/FulfilledPromise.php

@@ -22,7 +22,7 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
                 trigger_error('Invalid $fulfilledHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
             }
 
-            return Util::promiseFor($result);
+            return resolve($result);
         } catch (\Exception $exception) {
             return new RejectedPromise($exception);
         }

src/React/Promise/LazyPromise.php

@@ -16,7 +16,7 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
     {
         if (null === $this->promise) {
             try {
-                $this->promise = Util::promiseFor(call_user_func($this->factory));
+                $this->promise = resolve(call_user_func($this->factory));
             } catch (\Exception $exception) {
                 $this->promise = new RejectedPromise($exception);
             }

src/React/Promise/RejectedPromise.php

@@ -22,7 +22,7 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
                 return new RejectedPromise($this->reason);
             }
 
-            return Util::promiseFor(call_user_func($errorHandler, $this->reason));
+            return resolve(call_user_func($errorHandler, $this->reason));
         } catch (\Exception $exception) {
             return new RejectedPromise($exception);
         }

src/React/Promise/Util.php

@@ -6,21 +6,11 @@ class Util
 {
     public static function promiseFor($promiseOrValue)
     {
-        if ($promiseOrValue instanceof PromiseInterface) {
-            return $promiseOrValue;
-        }
-
-        return new FulfilledPromise($promiseOrValue);
+        return resolve($promiseOrValue);
     }
 
     public static function rejectedPromiseFor($promiseOrValue)
     {
-        if ($promiseOrValue instanceof PromiseInterface) {
-            return $promiseOrValue->then(function ($value) {
-                return new RejectedPromise($value);
-            });
-        }
-
-        return new RejectedPromise($promiseOrValue);
+        return reject($promiseOrValue);
     }
 }

src/React/Promise/functions.php

@@ -8,12 +8,22 @@
 
 function resolve($promiseOrValue = null)
 {
-    return Util::promiseFor($promiseOrValue);
+    if ($promiseOrValue instanceof PromiseInterface) {
+        return $promiseOrValue;
+    }
+
+    return new FulfilledPromise($promiseOrValue);
 }
 
 function reject($promiseOrValue = null)
 {
-    return Util::rejectedPromiseFor($promiseOrValue);
+    if ($promiseOrValue instanceof PromiseInterface) {
+        return $promiseOrValue->then(function ($value) {
+            return new RejectedPromise($value);
+        });
+    }
+
+    return new RejectedPromise($promiseOrValue);
 }
 
 function all($promisesOrValues)