Skip to content

Cancellation handler must only be called once, ignore double cancellation #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsor merged 2 commits into from
Feb 26, 2016
Merged

Cancellation handler must only be called once, ignore double cancellation #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2626770
Add (failing) tests for double cancellation
clue Feb 25, 2016
98c4441
Cancellation handler must only be called once
clue Feb 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Promise.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ public function cancel()
return;
}

$this->call($this->canceller);
$canceller = $this->canceller;
$this->canceller = null;

$this->call($canceller);
}

private function resolver(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
Expand Down
25 changes: 25 additions & 0 deletions tests/PromiseTest/CancelTestTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,31 @@ public function cancelShouldTriggerCancellerWhenAllChildrenCancel()
$child2->cancel();
}

/** @test */
public function cancelShouldNotTriggerCancellerWhenCancellingOneChildrenMultipleTimes()
{
$adapter = $this->getPromiseTestAdapter($this->expectCallableNever());

$child1 = $adapter->promise()
->then()
->then();

$child2 = $adapter->promise()
->then();

$child1->cancel();
$child1->cancel();
}

/** @test */
public function cancelShouldTriggerCancellerOnlyOnceWhenCancellingMultipleTimes()
{
$adapter = $this->getPromiseTestAdapter($this->expectCallableOnce());

$adapter->promise()->cancel();
$adapter->promise()->cancel();
}

/** @test */
public function cancelShouldAlwaysTriggerCancellerWhenCalledOnRootPromise()
{
Expand Down