Skip to content

Commit 32506ed

Browse files
authored
Merge pull request #44 from clue-labs/promise-v3
Forward compatibility with upcoming Promise v3
2 parents 86acc26 + 684f377 commit 32506ed

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
],
1313
"require": {
1414
"php": ">=5.3",
15-
"react/promise": " ^2.1 || ^1.2.1",
16-
"react/socket": "^1.9",
15+
"react/promise": "^3 || ^2.1 || ^1.2.1",
16+
"react/socket": "^1.12",
1717
"ringcentral/psr7": "^1.2"
1818
},
1919
"require-dev": {
20-
"clue/block-react": "^1.1",
20+
"clue/block-react": "^1.5",
2121
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8",
2222
"react/event-loop": "^1.2",
2323
"react/http": "^1.5"

tests/ProxyConnectorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function testCancelPromiseWillCancelPendingConnection()
137137

138138
$promise = $proxy->connect('google.com:80');
139139

140-
$this->assertInstanceOf('React\Promise\CancellablePromiseInterface', $promise);
140+
$this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
141141

142142
$promise->cancel();
143143
}
@@ -477,7 +477,7 @@ public function testCancelPromiseWhileConnectionIsReadyWillCloseOpenConnectionAn
477477

478478
$deferred->resolve($stream);
479479

480-
$this->assertInstanceOf('React\Promise\CancellablePromiseInterface', $promise);
480+
$this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
481481

482482
$promise->cancel();
483483

0 commit comments

Comments
 (0)