Revert "Merge remote-tracking branch 'origin/when-defer'"

This reverts commit efc4015, reversing
changes made to 6c69ee5.

Author: igorw

src/React/Promise/When.php

@@ -4,14 +4,9 @@
 
 class When
 {
-    public static function defer()
-    {
-        return new Deferred();
-    }
-
     public static function resolve($promiseOrValue)
     {
-        $deferred = static::defer();
+        $deferred = new Deferred();
         $deferred->resolve($promiseOrValue);
 
         return $deferred->promise();
@@ -46,17 +41,15 @@ public static function any($promisesOrValues, $fulfilledHandler = null, $errorHa
 
     public static function some($promisesOrValues, $howMany, $fulfilledHandler = null, $errorHandler = null, $progressHandler = null)
     {
-        $deferredFactory = array(get_called_class(), 'defer');
-
-        return When::resolve($promisesOrValues)->then(function ($array) use ($deferredFactory, $howMany, $fulfilledHandler, $errorHandler, $progressHandler) {
+        return When::resolve($promisesOrValues)->then(function ($array) use ($howMany, $fulfilledHandler, $errorHandler, $progressHandler) {
             if (!is_array($array)) {
                 $array = array();
             }
 
             $len       = count($array);
             $toResolve = max(0, min($howMany, $len));
             $values    = array();
-            $deferred  = call_user_func($deferredFactory);
+            $deferred  = new Deferred();
 
             if (!$toResolve) {
                 $deferred->resolve($values);
@@ -113,16 +106,14 @@ public static function some($promisesOrValues, $howMany, $fulfilledHandler = nul
 
     public static function map($promisesOrValues, $mapFunc)
     {
-        $deferredFactory = array(get_called_class(), 'defer');
-
-        return When::resolve($promisesOrValues)->then(function ($array) use ($deferredFactory, $mapFunc) {
+        return When::resolve($promisesOrValues)->then(function ($array) use ($mapFunc) {
             if (!is_array($array)) {
                 $array = array();
             }
 
             $toResolve = count($array);
             $results   = array();
-            $deferred  = call_user_func($deferredFactory);
+            $deferred  = new Deferred();
 
             if (!$toResolve) {
                 $deferred->resolve($results);