Skip to content

Commit

Permalink
Merge pull request #44 from clue-labs/promise-v3
Browse files Browse the repository at this point in the history
Forward compatibility with upcoming Promise v3
  • Loading branch information
SimonFrings authored Aug 30, 2022
2 parents 86acc26 + 684f377 commit 32506ed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
],
"require": {
"php": ">=5.3",
"react/promise": " ^2.1 || ^1.2.1",
"react/socket": "^1.9",
"react/promise": "^3 || ^2.1 || ^1.2.1",
"react/socket": "^1.12",
"ringcentral/psr7": "^1.2"
},
"require-dev": {
"clue/block-react": "^1.1",
"clue/block-react": "^1.5",
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8",
"react/event-loop": "^1.2",
"react/http": "^1.5"
Expand Down
4 changes: 2 additions & 2 deletions tests/ProxyConnectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public function testCancelPromiseWillCancelPendingConnection()

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

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

$promise->cancel();
}
Expand Down Expand Up @@ -477,7 +477,7 @@ public function testCancelPromiseWhileConnectionIsReadyWillCloseOpenConnectionAn

$deferred->resolve($stream);

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

$promise->cancel();

Expand Down

0 comments on commit 32506ed

Please sign in to comment.