Skip to content

Commit a12027a

Browse files
clueclue
committed
Rename Client implementation to StreamingClient
1 parent 708cb32 commit a12027a

5 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎src/Factory.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use React\SocketClient\ConnectorInterface;
66
use React\Stream\Stream;
7-
use Clue\React\Redis\Client;
7+
use Clue\React\Redis\StreamingClient;
88
use Clue\Redis\Protocol\Factory as ProtocolFactory;
99
use InvalidArgumentException;
1010
use BadMethodCallException;
@@ -38,11 +38,11 @@ public function createClient($target = null)
3838
$protocol = $this->protocol;
3939

4040
$promise = $this->connect($target)->then(function (Stream $stream) use ($protocol) {
41-
return new Client($stream, $protocol->createResponseParser(), $protocol->createSerializer());
41+
return new StreamingClient($stream, $protocol->createResponseParser(), $protocol->createSerializer());
4242
});
4343

4444
if ($auth !== null) {
45-
$promise = $promise->then(function (Client $client) use ($auth) {
45+
$promise = $promise->then(function (StreamingClient $client) use ($auth) {
4646
return $client->auth($auth)->then(
4747
function () use ($client) {
4848
return $client;
@@ -56,7 +56,7 @@ function ($error) use ($client) {
5656
}
5757

5858
if ($db !== null) {
59-
$promise = $promise->then(function (Client $client) use ($db) {
59+
$promise = $promise->then(function (StreamingClient $client) use ($db) {
6060
return $client->select($db)->then(
6161
function () use ($client) {
6262
return $client;

src/Client.php renamed to src/StreamingClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Clue\Redis\Protocol\Model\ErrorReply;
1616
use Clue\Redis\Protocol\Model\ModelInterface;
1717

18-
class Client extends EventEmitter
18+
class StreamingClient extends EventEmitter
1919
{
2020
private $stream;
2121
private $parser;

‎tests/FactoryTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Clue\React\Redis\Server;
66

7-
use Clue\React\Redis\Client;
7+
use Clue\React\Redis\StreamingClient;
88

99
use Clue\React\Redis\Factory;
1010

@@ -32,7 +32,7 @@ public function testClientDefaultSuccess()
3232
{
3333
$promise = $this->factory->createClient();
3434

35-
$this->expectPromiseResolve($promise)->then(function (Client $client) {
35+
$this->expectPromiseResolve($promise)->then(function (StreamingClient $client) {
3636
$client->end();
3737
});
3838

@@ -46,7 +46,7 @@ public function testClientAuthSelect()
4646
{
4747
$promise = $this->factory->createClient('tcp://authenticationpassword@127.0.0.1:6379/0');
4848

49-
$this->expectPromiseResolve($promise)->then(function (Client $client) {
49+
$this->expectPromiseResolve($promise)->then(function (StreamingClient $client) {
5050
$client->end();
5151
});
5252

@@ -60,7 +60,7 @@ public function testClientAuthenticationContainsColons()
6060
{
6161
$promise = $this->factory->createClient('tcp://authentication:can:contain:colons@127.0.0.1:6379');
6262

63-
$this->expectPromiseResolve($promise)->then(function (Client $client) {
63+
$this->expectPromiseResolve($promise)->then(function (StreamingClient $client) {
6464
$client->end();
6565
});
6666

‎tests/FunctionalTest.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Clue\React\Redis\Factory;
88

9-
use Clue\React\Redis\Client;
9+
use Clue\React\Redis\StreamingClient;
1010

1111
class FunctionalTest extends TestCase
1212
{
@@ -40,10 +40,10 @@ public function testPing()
4040

4141
/**
4242
*
43-
* @param Client $client
43+
* @param StreamingClient $client
4444
* @depends testPing
4545
*/
46-
public function testPipeline(Client $client)
46+
public function testPipeline(StreamingClient $client)
4747
{
4848
$this->assertFalse($client->isBusy());
4949

@@ -61,10 +61,10 @@ public function testPipeline(Client $client)
6161

6262
/**
6363
*
64-
* @param Client $client
64+
* @param StreamingClient $client
6565
* @depends testPipeline
6666
*/
67-
public function testInvalidCommand(Client $client)
67+
public function testInvalidCommand(StreamingClient $client)
6868
{
6969
$client->doesnotexist(1, 2, 3)->then($this->expectCallableNever());
7070

@@ -75,10 +75,10 @@ public function testInvalidCommand(Client $client)
7575

7676
/**
7777
*
78-
* @param Client $client
78+
* @param StreamingClient $client
7979
* @depends testInvalidCommand
8080
*/
81-
public function testMultiExecEmpty(Client $client)
81+
public function testMultiExecEmpty(StreamingClient $client)
8282
{
8383
$client->multi()->then($this->expectCallableOnce('OK'));
8484
$client->exec()->then($this->expectCallableOnce(array()));
@@ -90,10 +90,10 @@ public function testMultiExecEmpty(Client $client)
9090

9191
/**
9292
*
93-
* @param Client $client
93+
* @param StreamingClient $client
9494
* @depends testMultiExecEmpty
9595
*/
96-
public function testMultiExecQueuedExecHasValues(Client $client)
96+
public function testMultiExecQueuedExecHasValues(StreamingClient $client)
9797
{
9898
$client->multi()->then($this->expectCallableOnce('OK'));
9999
$client->set('b', 10)->then($this->expectCallableOnce('QUEUED'));
@@ -191,7 +191,7 @@ protected function createClientResponse($response)
191191

192192
$stream = new Stream($fp, self::$loop);
193193

194-
return new Client($stream);
194+
return new StreamingClient($stream);
195195
}
196196

197197
protected function createServer($response)
@@ -201,7 +201,7 @@ protected function createServer($response)
201201

202202
}
203203

204-
protected function waitFor(Client $client)
204+
protected function waitFor(StreamingClient $client)
205205
{
206206
$this->assertTrue($client->isBusy());
207207

tests/ClientTest.php renamed to tests/StreamingClientTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
use Clue\React\Redis\Client;
3+
use Clue\React\Redis\StreamingClient;
44
use Clue\Redis\Protocol\Parser\ParserException;
55
use Clue\Redis\Protocol\Model\IntegerReply;
66
use Clue\Redis\Protocol\Model\BulkReply;
@@ -19,7 +19,7 @@ public function setUp()
1919
$this->parser = $this->getMock('Clue\Redis\Protocol\Parser\ParserInterface');
2020
$this->serializer = $this->getMock('Clue\Redis\Protocol\Serializer\SerializerInterface');
2121

22-
$this->client = new Client($this->stream, $this->parser, $this->serializer);
22+
$this->client = new StreamingClient($this->stream, $this->parser, $this->serializer);
2323
}
2424

2525
public function testSending()
@@ -76,7 +76,7 @@ public function testReceiveThrowMessageEmitsErrorEvent()
7676

7777
public function testDefaultCtor()
7878
{
79-
$client = new Client($this->stream);
79+
$client = new StreamingClient($this->stream);
8080
}
8181

8282
public function testPingPong()

0 commit comments

Comments
 (0)