Unset canceller callback on resolution

jsor · jsor · commit 2dfc2e890373 · 2017-01-11T08:07:31.000+01:00
diff --git a/src/Promise.php b/src/Promise.php
@@ -76,7 +76,7 @@ public function always(callable $onFulfilledOrRejected)
 
     public function cancel()
     {
-        if (null === $this->canceller || null !== $this->result) {
+        if (null === $this->canceller) {
             return;
         }
 
@@ -130,6 +130,7 @@ private function settle(PromiseInterface $result)
         $handlers = $this->handlers;
 
         $this->handlers = [];
+        $this->canceller = null;
         $this->result = $result;
 
         foreach ($handlers as $handler) {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function always(callable $onFulfilledOrRejected)`
`76`	`76`
`77`	`77`	`public function cancel()`
`78`	`78`	`{`
`79`		`- if (null === $this->canceller \|\| null !== $this->result) {`
	`79`	`+ if (null === $this->canceller) {`
`80`	`80`	`return;`
`81`	`81`	`}`
`82`	`82`
`@@ -130,6 +130,7 @@ private function settle(PromiseInterface $result)`
`130`	`130`	`$handlers = $this->handlers;`
`131`	`131`
`132`	`132`	`$this->handlers = [];`
	`133`	`+ $this->canceller = null;`
`133`	`134`	`$this->result = $result;`
`134`	`135`
`135`	`136`	`foreach ($handlers as $handler) {`