Skip to content

Commit 22f8e7b

Browse files
committed
Lock minimum promise version for cancellation support
1 parent 5566f21 commit 22f8e7b

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"php": ">=5.3.0",
88
"react/cache": "~0.4.0|~0.3.0",
99
"react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
10+
"react/promise": "^2.1 || ^1.2.1",
11+
"react/promise-timer": "^1.2",
1012
"react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5 || ^0.4.4",
11-
"react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.5",
12-
"react/promise": "~2.1|~1.2",
13-
"react/promise-timer": "~1.1"
13+
"react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.5"
1414
},
1515
"require-dev": {
1616
"phpunit/phpunit": "^5.0 || ^4.8.10"

tests/Query/TimeoutExecutorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function testRejectsPromiseWhenWrappedRejects()
7676

7777
public function testWrappedWillBeCancelledOnTimeout()
7878
{
79-
$this->executor = new TimeoutExecutor($this->wrapped, 0.001, $this->loop);
79+
$this->executor = new TimeoutExecutor($this->wrapped, 0, $this->loop);
8080

8181
$cancelled = 0;
8282

0 commit comments

Comments
 (0)