Skip to content

Commit 0bbc690

Browse files
committed
Simplify by replacing Request with Deferred.
The Request class was never really needed anyway
1 parent 317a675 commit 0bbc690

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed

src/Client.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
use Clue\Redis\Protocol\Model\ErrorReplyException;
1010
use Clue\Redis\Protocol\Serializer\SerializerInterface;
1111
use Clue\Redis\Protocol\Factory as ProtocolFactory;
12-
use Clue\React\Redis\Request;
1312
use UnderflowException;
1413
use RuntimeException;
14+
use React\Promise\Deferred;
15+
use Clue\Redis\Protocol\Model\ErrorReply;
1516

1617
class Client extends EventEmitter
1718
{
@@ -79,7 +80,7 @@ public function __call($name, $args)
7980

8081
$this->stream->write($this->serializer->getRequestMessage($name, $args));
8182

82-
$request = new Request($name);
83+
$request = new Deferred();
8384
$this->requests []= $request;
8485

8586
return $request->promise();
@@ -94,9 +95,13 @@ public function handleReply($data)
9495
}
9596

9697
$request = array_shift($this->requests);
97-
/* @var $request Request */
98+
/* @var $request Deferred */
9899

99-
$request->handleReply($data);
100+
if ($data instanceof ErrorReply) {
101+
$request->reject($data);
102+
} else {
103+
$request->resolve($data->getValueNative());
104+
}
100105

101106
if ($this->ending && !$this->isBusy()) {
102107
$this->close();

src/Request.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)