From 8744285cb3391f5edf744ffa21a9a01cd3e18f1d Mon Sep 17 00:00:00 2001 From: Daniele Alessandri Date: Tue, 10 Dec 2013 18:08:14 +0100 Subject: [PATCH] Ignoring the plural form of "reply" for renames is dumb... [ci skip] --- FAQ.md | 6 +- examples/PipeliningCommands.php | 4 +- lib/Predis/Command/ServerInfo.php | 4 +- lib/Predis/Connection/PhpiredisConnection.php | 14 +-- .../Connection/PhpiredisStreamConnection.php | 14 +-- lib/Predis/Connection/PredisCluster.php | 6 +- lib/Predis/Connection/WebdisConnection.php | 6 +- lib/Predis/Pipeline/Atomic.php | 2 +- .../Handler/StreamableMultiBulkResponse.php | 5 +- .../Protocol/Text/ProtocolProcessor.php | 6 +- lib/Predis/Response/Error.php | 2 +- lib/Predis/Response/ErrorInterface.php | 4 +- tests/PHPUnit/PredisConnectionTestCase.php | 10 +- tests/Predis/ClientTest.php | 2 +- tests/Predis/Command/ServerSlowlogTest.php | 4 +- tests/Predis/Command/TransactionExecTest.php | 4 +- .../ComposableStreamConnectionTest.php | 2 +- tests/Predis/Pipeline/PipelineTest.php | 10 +- tests/Predis/Transaction/MultiExecTest.php | 98 +++++++++---------- 19 files changed, 101 insertions(+), 102 deletions(-) diff --git a/FAQ.md b/FAQ.md index 41e576a6..87b664e6 100644 --- a/FAQ.md +++ b/FAQ.md @@ -121,7 +121,7 @@ thousands of concurrent clients doing requests! Also, actual performances should to how your application will use Redis. -### I am convinced, but performances for multi-bulk replies (e.g. _KEYS *_) are still worse ### +### I am convinced, but performances for multi-bulk responses (e.g. _KEYS *_) are still worse ### Fair enough, but there is actually an option for you if you need even more speed and it consists on installing __[phpiredis](http://github.com/nrk/phpiredis)__ (note the additional _i_ in the name) @@ -141,8 +141,8 @@ $client = new Predis\Client('tcp://127.0.0.1', array( ``` As simple as it is, nothing will really change in the way you use the library in your application. So, -how fast is it now? There are not much improvements for inline or short bulk replies (e.g. _SET_ or -_GET_), but the speed for parsing multi-bulk replies is now on par with phpredis: +how fast is it now? There are not much improvements for inline or short bulk responses (e.g. _SET_ or +_GET_), but the speed for parsing multi-bulk responses is now on par with phpredis: Using Predis with a phpiredis-based connection to fetch 30000 keys using _KEYS *_: diff --git a/examples/PipeliningCommands.php b/examples/PipeliningCommands.php index 49a81b5f..33ab961b 100644 --- a/examples/PipeliningCommands.php +++ b/examples/PipeliningCommands.php @@ -17,7 +17,7 @@ require 'SharedConfigurations.php'; $client = new Predis\Client($single_server); -$replies = $client->pipeline(function ($pipe) { +$responses = $client->pipeline(function ($pipe) { $pipe->flushdb(); $pipe->incrby('counter', 10); $pipe->incrby('counter', 30); @@ -26,7 +26,7 @@ $replies = $client->pipeline(function ($pipe) { $pipe->mget('does_not_exist', 'counter'); }); -var_export($replies); +var_export($responses); /* OUTPUT: array ( diff --git a/lib/Predis/Command/ServerInfo.php b/lib/Predis/Command/ServerInfo.php index c6834f60..e22c0262 100644 --- a/lib/Predis/Command/ServerInfo.php +++ b/lib/Predis/Command/ServerInfo.php @@ -58,7 +58,7 @@ class ServerInfo extends Command /** * Extracts the statistics of each logical DB from the string buffer. * - * @param string $str Reply buffer. + * @param string $str Response buffer. * @return array */ protected function parseDatabaseStats($str) @@ -76,7 +76,7 @@ class ServerInfo extends Command /** * Parses the response and extracts the allocation statistics. * - * @param string $str Reply buffer. + * @param string $str Response buffer. * @return array */ protected function parseAllocationStats($str) diff --git a/lib/Predis/Connection/PhpiredisConnection.php b/lib/Predis/Connection/PhpiredisConnection.php index 139b7bbe..9a646ac4 100644 --- a/lib/Predis/Connection/PhpiredisConnection.php +++ b/lib/Predis/Connection/PhpiredisConnection.php @@ -20,11 +20,11 @@ use Predis\Response; * PHP socket extension for network communication and wraps the phpiredis C * extension (PHP bindings for hiredis) to parse the Redis protocol. * - * This class is mainly intended to provide an optional low-overhead alternative - * for processing replies from Redis compared to the standard pure-PHP classes. - * Differences in speed when dealing with short inline replies are practically - * nonexistent, the actual speed boost is for long multibulk replies when this - * protocol processor can parse and return replies very fast. + * This class is intended to provide an optional low-overhead alternative for + * processing responses from Redis compared to the standard pure-PHP classes. + * Differences in speed when dealing with short inline responses are practically + * nonexistent, the actual speed boost is for big multibulk responses when this + * protocol processor can parse and return responses very fast. * * For instructions on how to build and install the phpiredis extension, please * consult the repository of the project. @@ -125,7 +125,7 @@ class PhpiredisConnection extends AbstractConnection } /** - * Returns the handler used by the protocol reader to handle status replies. + * Returns the handler used by the protocol reader for inline responses. * * @return \Closure */ @@ -137,7 +137,7 @@ class PhpiredisConnection extends AbstractConnection } /** - * Returns the handler used by the protocol reader to handle Redis errors. + * Returns the handler used by the protocol reader for error responses. * * @return \Closure */ diff --git a/lib/Predis/Connection/PhpiredisStreamConnection.php b/lib/Predis/Connection/PhpiredisStreamConnection.php index 98131d29..e82c8e64 100644 --- a/lib/Predis/Connection/PhpiredisStreamConnection.php +++ b/lib/Predis/Connection/PhpiredisStreamConnection.php @@ -20,11 +20,11 @@ use Predis\Response; * streams for network communication and wraps the phpiredis C extension (PHP * bindings for hiredis) to parse and serialize the Redis protocol. * - * This class is mainly intended to provide an optional low-overhead alternative - * for processing replies from Redis compared to the standard pure-PHP classes. - * Differences in speed when dealing with short inline replies are practically - * nonexistent, the actual speed boost is for long multibulk replies when this - * protocol processor can parse and return replies very fast. + * This class is intended to provide an optional low-overhead alternative for + * processing responses from Redis compared to the standard pure-PHP classes. + * Differences in speed when dealing with short inline responses are practically + * nonexistent, the actual speed boost is for big multibulk responses when this + * protocol processor can parse and return responses very fast. * * For instructions on how to build and install the phpiredis extension, please * consult the repository of the project. @@ -107,7 +107,7 @@ class PhpiredisStreamConnection extends StreamConnection } /** - * Returns the handler used by the protocol reader to handle status replies. + * Returns the handler used by the protocol reader for inline responses. * * @return \Closure */ @@ -119,7 +119,7 @@ class PhpiredisStreamConnection extends StreamConnection } /** - * Returns the handler used by the protocol reader to handle Redis errors. + * Returns the handler used by the protocol reader for error responses. * * @return \Closure */ diff --git a/lib/Predis/Connection/PredisCluster.php b/lib/Predis/Connection/PredisCluster.php index 73dd6e6b..c7c4a7f4 100644 --- a/lib/Predis/Connection/PredisCluster.php +++ b/lib/Predis/Connection/PredisCluster.php @@ -223,12 +223,12 @@ class PredisCluster implements ClusterConnectionInterface, IteratorAggregate, Co */ public function executeCommandOnNodes(CommandInterface $command) { - $replies = array(); + $responses = array(); foreach ($this->pool as $connection) { - $replies[] = $connection->executeCommand($command); + $responses[] = $connection->executeCommand($command); } - return $replies; + return $responses; } } diff --git a/lib/Predis/Connection/WebdisConnection.php b/lib/Predis/Connection/WebdisConnection.php index 30751403..ab31d7dd 100644 --- a/lib/Predis/Connection/WebdisConnection.php +++ b/lib/Predis/Connection/WebdisConnection.php @@ -22,7 +22,7 @@ use Predis\Response; * This class implements a Predis connection that actually talks with Webdis * instead of connecting directly to Redis. It relies on the cURL extension to * communicate with the web server and the phpiredis extension to parse the - * protocol of the replies returned in the http response bodies. + * protocol for responses returned in the http response bodies. * * Some features are not yet available or they simply cannot be implemented: * - Pipelining commands. @@ -145,7 +145,7 @@ class WebdisConnection implements SingleConnectionInterface } /** - * Gets the handler used by the protocol reader to handle status replies. + * Returns the handler used by the protocol reader for inline responses. * * @return \Closure */ @@ -157,7 +157,7 @@ class WebdisConnection implements SingleConnectionInterface } /** - * Gets the handler used by the protocol reader to handle Redis errors. + * Returns the handler used by the protocol reader for error responses. * * @return \Closure */ diff --git a/lib/Predis/Pipeline/Atomic.php b/lib/Predis/Pipeline/Atomic.php index 4dea47b4..cb9c2152 100644 --- a/lib/Predis/Pipeline/Atomic.php +++ b/lib/Predis/Pipeline/Atomic.php @@ -90,7 +90,7 @@ class Atomic extends Pipeline if (count($executed) !== count($commands)) { throw new ClientException( - "Invalid number of replies [expected: ".count($commands)." - actual: ".count($executed)."]" + "Invalid number of responses [expected: ".count($commands)." - actual: ".count($executed)."]" ); } diff --git a/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php b/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php index 6e7eb764..9c7ea521 100644 --- a/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php +++ b/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php @@ -20,9 +20,8 @@ use Predis\Protocol\ProtocolException; * Handler for the multibulk response type in the standard Redis wire protocol. * It returns multibulk responses as iterators that can stream bulk elements. * - * Please note that streamable multibulk replies are not globally supported - * by the abstractions built-in into Predis such as for transactions or - * pipelines. Use them with care! + * Streamable multibulk responses are not globally supported by the abstractions + * built-in into Predis, such as transactions or pipelines. Use them with care! * * @link http://redis.io/topics/protocol * @author Daniele Alessandri diff --git a/lib/Predis/Protocol/Text/ProtocolProcessor.php b/lib/Predis/Protocol/Text/ProtocolProcessor.php index 056fa985..720855c8 100644 --- a/lib/Predis/Protocol/Text/ProtocolProcessor.php +++ b/lib/Predis/Protocol/Text/ProtocolProcessor.php @@ -104,9 +104,9 @@ class ProtocolProcessor implements ProtocolProcessorInterface * iterators used to stream bulk elements of a multibulk response instead * returning a plain array. * - * Please note that streamable multibulk replies are not globally supported - * by the abstractions built-in into Predis such as for transactions or - * pipelines. Use them with care! + * Streamable multibulk responses are not globally supported by the + * abstractions built-in into Predis, such as transactions or pipelines. Use + * them with care! * * @param bool $value Enable or disable streamable multibulk responses. */ diff --git a/lib/Predis/Response/Error.php b/lib/Predis/Response/Error.php index a58f8f70..346e5915 100644 --- a/lib/Predis/Response/Error.php +++ b/lib/Predis/Response/Error.php @@ -12,7 +12,7 @@ namespace Predis\Response; /** - * Represents an error returned by Redis (-ERR replies) during the execution + * Represents an error returned by Redis (-ERR responses) during the execution * of a command on the server. * * @author Daniele Alessandri diff --git a/lib/Predis/Response/ErrorInterface.php b/lib/Predis/Response/ErrorInterface.php index 6a1c5060..6fd31fab 100644 --- a/lib/Predis/Response/ErrorInterface.php +++ b/lib/Predis/Response/ErrorInterface.php @@ -12,8 +12,8 @@ namespace Predis\Response; /** - * Represents an error returned by Redis (replies identified by "-" in the - * Redis response protocol) during the execution of an operation on the server. + * Represents an error returned by Redis (responses identified by "-" in the + * Redis protocol) during the execution of an operation on the server. * * @author Daniele Alessandri */ diff --git a/tests/PHPUnit/PredisConnectionTestCase.php b/tests/PHPUnit/PredisConnectionTestCase.php index 850947d6..73cae97a 100644 --- a/tests/PHPUnit/PredisConnectionTestCase.php +++ b/tests/PHPUnit/PredisConnectionTestCase.php @@ -207,7 +207,7 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected */ - public function testReadsStatusReplies() + public function testReadsStatusResponses() { $connection = $this->getConnection($profile, true); @@ -226,7 +226,7 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected */ - public function testReadsBulkReplies() + public function testReadsBulkResponses() { $connection = $this->getConnection($profile, true); @@ -242,7 +242,7 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected */ - public function testReadsIntegerReplies() + public function testReadsIntegerResponses() { $connection = $this->getConnection($profile, true); @@ -255,7 +255,7 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected */ - public function testReadsErrorRepliesAsResponseErrorObjects() + public function testReadsErrorResponsesAsResponseErrorObjects() { $connection = $this->getConnection($profile, true); @@ -269,7 +269,7 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected */ - public function testReadsMultibulkRepliesAsArrays() + public function testReadsMultibulkResponsesAsArrays() { $connection = $this->getConnection($profile, true); diff --git a/tests/Predis/ClientTest.php b/tests/Predis/ClientTest.php index 10afca0b..85dd026b 100644 --- a/tests/Predis/ClientTest.php +++ b/tests/Predis/ClientTest.php @@ -373,7 +373,7 @@ class ClientTest extends PredisTestCase /** * @group disconnected */ - public function testExecuteCommandReturnsParsedReplies() + public function testExecuteCommandReturnsParsedResponses() { $profile = Profile\Factory::getDefault(); diff --git a/tests/Predis/Command/ServerSlowlogTest.php b/tests/Predis/Command/ServerSlowlogTest.php index 0eb2f411..92fe8c9e 100644 --- a/tests/Predis/Command/ServerSlowlogTest.php +++ b/tests/Predis/Command/ServerSlowlogTest.php @@ -12,8 +12,8 @@ namespace Predis\Command; /** - * In order to support the output of SLOWLOG, the backend connection - * must be able to parse nested multibulk replies deeper than 2 levels. + * In order to support the output of SLOWLOG, the backend connection must be + * able to parse nested multibulk responses deeper than 2 levels. * * @group commands * @group realm-server diff --git a/tests/Predis/Command/TransactionExecTest.php b/tests/Predis/Command/TransactionExecTest.php index 7788aa23..bb187f2f 100644 --- a/tests/Predis/Command/TransactionExecTest.php +++ b/tests/Predis/Command/TransactionExecTest.php @@ -60,7 +60,7 @@ class TransactionExecTest extends PredisCommandTestCase /** * @group connected */ - public function testExecutesTransactionAndReturnsArrayOfReplies() + public function testExecutesTransactionAndReturnsArrayOfResponses() { $redis = $this->getClient(); @@ -86,7 +86,7 @@ class TransactionExecTest extends PredisCommandTestCase /** * @group connected */ - public function testRepliesOfTransactionsAreNotParsed() + public function testResponsesOfTransactionsAreNotParsed() { $redis = $this->getClient(); diff --git a/tests/Predis/Connection/ComposableStreamConnectionTest.php b/tests/Predis/Connection/ComposableStreamConnectionTest.php index c9f36997..919e387c 100644 --- a/tests/Predis/Connection/ComposableStreamConnectionTest.php +++ b/tests/Predis/Connection/ComposableStreamConnectionTest.php @@ -68,7 +68,7 @@ class ComposableStreamConnectionTest extends PredisConnectionTestCase /** * @group connected */ - public function testReadsMultibulkRepliesAsIterators() + public function testReadsMultibulkResponsesAsIterators() { $connection = $this->getConnection($profile, true); $connection->getProtocol()->useIterableMultibulk(true); diff --git a/tests/Predis/Pipeline/PipelineTest.php b/tests/Predis/Pipeline/PipelineTest.php index 9a218b8c..b6cfb1cd 100644 --- a/tests/Predis/Pipeline/PipelineTest.php +++ b/tests/Predis/Pipeline/PipelineTest.php @@ -304,14 +304,14 @@ class PipelineTest extends PredisTestCase $pipeline = new Pipeline(new Client($connection)); - $replies = $pipeline->execute(function ($pipe) { + $responses = $pipeline->execute(function ($pipe) { $pipe->echo('one'); $pipe->echo('two'); $pipe->echo('three'); $pipe->echo('four'); }); - $this->assertSame(array('one', 'two', 'three', 'four'), $replies); + $this->assertSame(array('one', 'two', 'three', 'four'), $responses); } /** @@ -326,10 +326,10 @@ class PipelineTest extends PredisTestCase $pipeline = new Pipeline(new Client($connection)); $exception = null; - $replies = null; + $responses = null; try { - $replies = $pipeline->execute(function ($pipe) { + $responses = $pipeline->execute(function ($pipe) { $pipe->echo('one'); throw new ClientException('TEST'); $pipe->echo('two'); @@ -340,7 +340,7 @@ class PipelineTest extends PredisTestCase $this->assertInstanceOf('Predis\ClientException', $exception); $this->assertSame('TEST', $exception->getMessage()); - $this->assertNull($replies); + $this->assertNull($responses); } // ******************************************************************** // diff --git a/tests/Predis/Transaction/MultiExecTest.php b/tests/Predis/Transaction/MultiExecTest.php index ac64a15a..0fb8d7d7 100644 --- a/tests/Predis/Transaction/MultiExecTest.php +++ b/tests/Predis/Transaction/MultiExecTest.php @@ -87,13 +87,13 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback($expected, $commands); $tx = $this->getMockedTransaction($callback); - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { $tx->echo('one'); $tx->echo('two'); $tx->echo('three'); }); - $this->assertSame($expected, $replies); + $this->assertSame($expected, $responses); $this->assertSame(array('MULTI', 'ECHO', 'ECHO', 'ECHO', 'EXEC'), self::commandsToIDs($commands)); } @@ -131,11 +131,11 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback(null, $commands); $tx = $this->getMockedTransaction($callback); - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { // NOOP }); - $this->assertNull($replies); + $this->assertNull($responses); $this->assertSame(array(), self::commandsToIDs($commands)); } @@ -151,11 +151,11 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback(null, $commands); $tx = $this->getMockedTransaction($callback); - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { $tx->exec(); }); - $this->assertNull($replies); + $this->assertNull($responses); $this->assertSame(array(), self::commandsToIDs($commands)); } @@ -169,11 +169,11 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback(null, $commands); $tx = $this->getMockedTransaction($callback); - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { $tx->discard(); }); - $this->assertNull($replies); + $this->assertNull($responses); $this->assertSame(array(), self::commandsToIDs($commands)); } @@ -187,13 +187,13 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback(null, $commands); $tx = $this->getMockedTransaction($callback); - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { $tx->set('foo', 'bar'); $tx->get('foo'); $tx->discard(); }); - $this->assertNull($replies); + $this->assertNull($responses); $this->assertSame(array('MULTI', 'SET', 'GET', 'DISCARD'), self::commandsToIDs($commands)); } @@ -208,13 +208,13 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback($expected, $commands); $tx = $this->getMockedTransaction($callback); - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { $tx->echo('before DISCARD'); $tx->discard(); $tx->echo('after DISCARD'); }); - $this->assertSame($replies, $expected); + $this->assertSame($responses, $expected); $this->assertSame(array('MULTI', 'ECHO', 'DISCARD', 'MULTI', 'ECHO', 'EXEC'), self::commandsToIDs($commands)); } /** @@ -240,9 +240,9 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback($expected, $commands); $tx = $this->getMockedTransaction($callback); - $replies = $tx->echo('foobar')->unwatch('foo')->execute(); + $responses = $tx->echo('foobar')->unwatch('foo')->execute(); - $this->assertSame($replies, $expected); + $this->assertSame($responses, $expected); $this->assertSame(array('MULTI', 'ECHO', 'UNWATCH', 'EXEC'), self::commandsToIDs($commands)); } @@ -258,12 +258,12 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback($expected, $txCommands, $casCommands); $tx = $this->getMockedTransaction($callback, $options); - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { $tx->get('foo'); $tx->get('hoge'); }); - $this->assertSame($replies, $expected); + $this->assertSame($responses, $expected); $this->assertSame(array('WATCH'), self::commandsToIDs($casCommands)); $this->assertSame(array('foo', 'hoge'), $casCommands[0]->getArguments()); $this->assertSame(array('MULTI', 'GET', 'GET', 'EXEC'), self::commandsToIDs($txCommands)); @@ -284,12 +284,12 @@ class MultiExecTest extends PredisTestCase $this->assertSame('DUMMY_RESPONSE', $tx->get('foo')); $this->assertSame('DUMMY_RESPONSE', $tx->get('hoge')); - $replies = $tx->multi() - ->get('foo') - ->get('hoge') - ->execute(); + $responses = $tx->multi() + ->get('foo') + ->get('hoge') + ->execute(); - $this->assertSame($replies, $expected); + $this->assertSame($responses, $expected); $this->assertSame(array('WATCH', 'WATCH', 'GET', 'GET'), self::commandsToIDs($casCommands)); $this->assertSame(array('MULTI', 'GET', 'GET', 'EXEC'), self::commandsToIDs($txCommands)); } @@ -307,14 +307,14 @@ class MultiExecTest extends PredisTestCase $tx = $this->getMockedTransaction($callback, $options); $test = $this; - $replies = $tx->execute(function ($tx) use ($test) { + $responses = $tx->execute(function ($tx) use ($test) { $tx->watch('foobar'); - $reply1 = $tx->get('foo'); - $reply2 = $tx->get('hoge'); + $response1 = $tx->get('foo'); + $response2 = $tx->get('hoge'); - $test->assertSame('DUMMY_RESPONSE', $reply1); - $test->assertSame('DUMMY_RESPONSE', $reply2); + $test->assertSame('DUMMY_RESPONSE', $response1); + $test->assertSame('DUMMY_RESPONSE', $response2); $tx->multi(); @@ -322,7 +322,7 @@ class MultiExecTest extends PredisTestCase $tx->get('hoge'); }); - $this->assertSame($replies, $expected); + $this->assertSame($responses, $expected); $this->assertSame(array('WATCH', 'WATCH', 'GET', 'GET'), self::commandsToIDs($casCommands)); $this->assertSame(array('MULTI', 'GET', 'GET', 'EXEC'), self::commandsToIDs($txCommands)); } @@ -396,7 +396,7 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback($expected, $txCommands, $casCommands); $tx = $this->getMockedTransaction($callback, $options); - $replies = $tx->execute(function ($tx) use ($sentinel, &$attempts) { + $responses = $tx->execute(function ($tx) use ($sentinel, &$attempts) { $tx->get('foo'); if ($attempts > 0) { @@ -407,7 +407,7 @@ class MultiExecTest extends PredisTestCase } }); - $this->assertSame($replies, $expected); + $this->assertSame($responses, $expected); $this->assertSame(array('WATCH'), self::commandsToIDs($casCommands)); $this->assertSame(array('foo', 'bar'), $casCommands[0]->getArguments()); $this->assertSame(array('MULTI', 'GET', 'EXEC'), self::commandsToIDs($txCommands)); @@ -422,7 +422,7 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback(); $tx = $this->getMockedTransaction($callback); - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { $tx->echo('!!ABORT!!'); }); } @@ -438,10 +438,10 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback($expected, $commands); $tx = $this->getMockedTransaction($callback); - $replies = null; + $responses = null; try { - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { $tx->set('foo', 'bar'); $tx->get('foo'); @@ -451,7 +451,7 @@ class MultiExecTest extends PredisTestCase // NOOP } - $this->assertNull($replies, $expected); + $this->assertNull($responses, $expected); $this->assertSame(array('MULTI', 'SET', 'GET', 'DISCARD'), self::commandsToIDs($commands)); } @@ -466,10 +466,10 @@ class MultiExecTest extends PredisTestCase $callback = $this->getExecuteCallback($expected, $commands); $tx = $this->getMockedTransaction($callback); - $replies = null; + $responses = null; try { - $replies = $tx->execute(function ($tx) { + $responses = $tx->execute(function ($tx) { $tx->set('foo', 'bar'); $tx->echo('ERR Invalid operation'); $tx->get('foo'); @@ -478,7 +478,7 @@ class MultiExecTest extends PredisTestCase $tx->discard(); } - $this->assertNull($replies); + $this->assertNull($responses); $this->assertSame(array('MULTI', 'SET', 'ECHO', 'DISCARD'), self::commandsToIDs($commands)); } @@ -623,15 +623,15 @@ class MultiExecTest extends PredisTestCase { $client = $this->getClient(array(), array('exceptions' => false)); - $replies = $client->transaction(function ($tx) { + $responses = $client->transaction(function ($tx) { $tx->set('foo', 'bar'); $tx->lpush('foo', 'bar'); $tx->echo('foobar'); }); - $this->assertInstanceOf('Predis\Response\Status', $replies[0]); - $this->assertInstanceOf('Predis\Response\Error', $replies[1]); - $this->assertSame('foobar', $replies[2]); + $this->assertInstanceOf('Predis\Response\Status', $responses[0]); + $this->assertInstanceOf('Predis\Response\Error', $responses[1]); + $this->assertSame('foobar', $responses[2]); } /** @@ -641,13 +641,13 @@ class MultiExecTest extends PredisTestCase { $client = $this->getClient(); - $replies = $client->transaction(function ($tx) { + $responses = $client->transaction(function ($tx) { $tx->set('foo', 'bar'); $tx->discard(); $tx->set('hoge', 'piyo'); }); - $this->assertSame(1, count($replies)); + $this->assertSame(1, count($responses)); $this->assertFalse($client->exists('foo')); $this->assertTrue($client->exists('hoge')); } @@ -685,7 +685,7 @@ class MultiExecTest extends PredisTestCase $client->set('foo', 'bar'); $options = array('watch' => 'foo', 'cas' => true); - $replies = $client->transaction($options, function ($tx) { + $responses = $client->transaction($options, function ($tx) { $tx->watch('foobar'); $foo = $tx->get('foo'); @@ -695,15 +695,15 @@ class MultiExecTest extends PredisTestCase $tx->mget('foo', 'foobar'); }); - $this->assertInternalType('array', $replies); - $this->assertSame(array(array('bar', null)), $replies); + $this->assertInternalType('array', $responses); + $this->assertSame(array(array('bar', null)), $responses); $hijack = true; $client2 = $this->getClient(); $client->set('foo', 'bar'); $options = array('watch' => 'foo', 'cas' => true, 'retry' => 1); - $replies = $client->transaction($options, function ($tx) use ($client2, &$hijack) { + $responses = $client->transaction($options, function ($tx) use ($client2, &$hijack) { $foo = $tx->get('foo'); $tx->multi(); @@ -718,8 +718,8 @@ class MultiExecTest extends PredisTestCase $tx->mget('foo', 'foobar'); }); - $this->assertInternalType('array', $replies); - $this->assertSame(array(array('hijacked!', null)), $replies); + $this->assertInternalType('array', $responses); + $this->assertSame(array(array('hijacked!', null)), $responses); } // ******************************************************************** // @@ -763,7 +763,7 @@ class MultiExecTest extends PredisTestCase /** * Returns a callback that emulates a server-side MULTI/EXEC transaction context. * - * @param array $expected Expected replies. + * @param array $expected Expected responses. * @param array $commands Reference to an array that stores the whole flow of commands. * @return \Closure */