Skip to content

Commit 17ab4ad

Browse files
committed
Update promise dependency
1 parent dad3a54 commit 17ab4ad

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"require": {
1414
"php": ">=5.3",
15-
"react/promise": "1.*|2.*",
15+
"react/promise": "^2.0 || ^1.1",
1616
"react/socket-client": "^0.5 || ^0.4 || ^0.3",
1717
"react/event-loop": "0.3.*|0.4.*",
1818
"clue/redis-protocol": "0.3.*",

src/Factory.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use BadMethodCallException;
1313
use Exception;
1414
use React\EventLoop\LoopInterface;
15+
use React\Promise;
1516

1617
class Factory
1718
{
@@ -109,13 +110,8 @@ private function connect($target)
109110
{
110111
try {
111112
$parts = $this->parseUrl($target);
112-
}
113-
catch (Exception $e) {
114-
if (class_exists('React\Promise\When')) {
115-
return \React\Promise\When::reject($e);
116-
} else {
117-
return \React\Promise\reject($e);
118-
}
113+
} catch (Exception $e) {
114+
return Promise\reject($e);
119115
}
120116

121117
return $this->connector->create($parts['host'], $parts['port']);

0 commit comments

Comments
 (0)