Removed Future::$nextTick

Improved complete
Improved Promise

Author: andot

examples/src/testco.php

@@ -6,7 +6,7 @@
 function wait() {
     return new Promise(function($reslove, $reject) {
         swoole_timer_after(1, function() use (&$reslove) {
-            $reslove(null);
+            $reslove();
         });
     });
 }
@@ -18,7 +18,7 @@ function wait() {
         yield wait();
         if ($i % 10000 === 0) {
             gc_collect_cycles();
-            var_dump(memory_get_usage(true));
+            var_dump(memory_get_usage(true), time());
         }
     }
 })->then(function() {

src/Hprose/Future.php

@@ -36,46 +36,38 @@ class Future {
     public $value;
     public $reason;
     private $subscribers = array();
-    public static $nextTick = null;
 
     public function __construct($computation = NULL) {
         if (is_callable($computation)) {
-            $self = $this;
-            $nextTick = self::$nextTick;
-            $nextTick(function() use ($self, $computation) {
-                try {
-                    $self->resolve(call_user_func($computation));
-                }
-                catch (UncatchableException $e) {
-                    throw $e->getPrevious();
-                }
-                catch (Exception $e) {
-                    $self->reject($e);
-                }
-                catch (Throwable $e) {
-                    $self->reject($e);
-                }
-            });
-        }
-    }
-
-    private function privateCall($callback, $next, $x) {
-        $nextTick = self::$nextTick;
-        $nextTick(function() use ($callback, $next, $x) {
             try {
-                $r = call_user_func($callback, $x);
-                $next->resolve($r);
+                $this->resolve(call_user_func($computation));
             }
             catch (UncatchableException $e) {
                 throw $e->getPrevious();
             }
             catch (Exception $e) {
-                $next->reject($e);
+                $this->reject($e);
             }
             catch (Throwable $e) {
-                $next->reject($e);
+                $this->reject($e);
             }
-        });
+        }
+    }
+
+    private function privateCall($callback, $next, $x) {
+        try {
+            $r = call_user_func($callback, $x);
+            $next->resolve($r);
+        }
+        catch (UncatchableException $e) {
+            throw $e->getPrevious();
+        }
+        catch (Exception $e) {
+            $next->reject($e);
+        }
+        catch (Throwable $e) {
+            $next->reject($e);
+        }
     }
 
     private function privateResolve($onfulfill, $next, $x) {
@@ -96,7 +88,7 @@ private function privateReject($onreject, $next, $e) {
         }
     }
 
-    public function resolve($value) {
+    public function resolve($value = NULL) {
         if ($value === $this) {
             $this->reject(new TypeError('Self resolution'));
             return;
@@ -193,10 +185,7 @@ public function then($onfulfill, $onreject = NULL) {
 
     public function done($onfulfill, $onreject = NULL) {
         $this->then($onfulfill, $onreject)->then(NULL, function($error) {
-            $nextTick = self::$nextTick;
-            $nextTick(function() use ($error) {
-                throw new UncatchableException("", 0, $error);
-            });
+            throw new UncatchableException("", 0, $error);
         });
     }
 
@@ -242,7 +231,8 @@ function($e) use ($action) {
         );
     }
 
-    public function complete($oncomplete) {
+    public function complete($oncomplete = false) {
+        $oncomplete = $oncomplete ?: function($v) { return $v; };
         return $this->then($oncomplete, $oncomplete);
     }
 

src/Hprose/Future/functions.php

@@ -29,10 +29,6 @@
 use ReflectionMethod;
 use ReflectionObject;
 
-if (Future::$nextTick === null) {
-    Future::$nextTick = function(\Closure $fn) { $fn(); };
-}
-
 function isFuture($obj) {
     return $obj instanceof Future;
 }

src/Hprose/Promise.php

@@ -14,7 +14,7 @@
  *                                                        *
  * Promise for php 5.3+                                   *
  *                                                        *
- * LastModified: Jul 23, 2016                             *
+ * LastModified: Dec 5, 2016                              *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
@@ -27,7 +27,7 @@ public function __construct($executor = null) {
         if (is_callable($executor)) {
             $self = $this;
             call_user_func($executor,
-                function($value) use ($self) {
+                function($value = NULL) use ($self) {
                     $self->resolve($value);
                 },
                 function($reason) use ($self) {