From 1fd113c57003b0e4cce64aea50743c68035af2e1 Mon Sep 17 00:00:00 2001 From: Daniele Alessandri Date: Tue, 3 Jun 2014 15:45:07 +0200 Subject: [PATCH] Rename ComposableProtocolProcessor to CompositeProtocolProcessor. --- ...rocessor.php => CompositeProtocolProcessor.php} | 4 ++-- ...Test.php => CompositeProtocolProcessorTest.php} | 14 +++++++------- .../Text/Handler/MultiBulkResponseTest.php | 2 +- tests/Predis/Protocol/Text/ResponseReaderTest.php | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename lib/Predis/Protocol/Text/{ComposableProtocolProcessor.php => CompositeProtocolProcessor.php} (94%) rename tests/Predis/Protocol/Text/{ComposableProtocolProcessorTest.php => CompositeProtocolProcessorTest.php} (87%) diff --git a/lib/Predis/Protocol/Text/ComposableProtocolProcessor.php b/lib/Predis/Protocol/Text/CompositeProtocolProcessor.php similarity index 94% rename from lib/Predis/Protocol/Text/ComposableProtocolProcessor.php rename to lib/Predis/Protocol/Text/CompositeProtocolProcessor.php index 41a4d09b..269d2176 100644 --- a/lib/Predis/Protocol/Text/ComposableProtocolProcessor.php +++ b/lib/Predis/Protocol/Text/CompositeProtocolProcessor.php @@ -18,13 +18,13 @@ use Predis\Protocol\RequestSerializerInterface; use Predis\Protocol\ResponseReaderInterface; /** - * Composable protocol processor for the standard Redis wire protocol using + * Composite protocol processor for the standard Redis wire protocol using * pluggable handlers to serialize requests and deserialize responses. * * @link http://redis.io/topics/protocol * @author Daniele Alessandri */ -class ComposableProtocolProcessor implements ProtocolProcessorInterface +class CompositeProtocolProcessor implements ProtocolProcessorInterface { protected $serializer; protected $reader; diff --git a/tests/Predis/Protocol/Text/ComposableProtocolProcessorTest.php b/tests/Predis/Protocol/Text/CompositeProtocolProcessorTest.php similarity index 87% rename from tests/Predis/Protocol/Text/ComposableProtocolProcessorTest.php rename to tests/Predis/Protocol/Text/CompositeProtocolProcessorTest.php index 269a87b0..265bd170 100644 --- a/tests/Predis/Protocol/Text/ComposableProtocolProcessorTest.php +++ b/tests/Predis/Protocol/Text/CompositeProtocolProcessorTest.php @@ -16,14 +16,14 @@ use PredisTestCase; /** * */ -class ComposableProtocolProcessorTest extends PredisTestCase +class CompositeProtocolProcessorTest extends PredisTestCase { /** * @group disconnected */ public function testConstructor() { - $protocol = new ComposableProtocolProcessor(); + $protocol = new CompositeProtocolProcessor(); $this->assertInstanceOf( 'Predis\Protocol\Text\RequestSerializer', $protocol->getRequestSerializer() @@ -41,7 +41,7 @@ class ComposableProtocolProcessorTest extends PredisTestCase $serializer = $this->getMock('Predis\Protocol\RequestSerializerInterface'); $reader = $this->getMock('Predis\Protocol\ResponseReaderInterface'); - $protocol = new ComposableProtocolProcessor($serializer, $reader); + $protocol = new CompositeProtocolProcessor($serializer, $reader); $this->assertSame($serializer, $protocol->getRequestSerializer()); $this->assertSame($reader, $protocol->getResponseReader()); @@ -54,7 +54,7 @@ class ComposableProtocolProcessorTest extends PredisTestCase { $serializer = $this->getMock('Predis\Protocol\RequestSerializerInterface'); - $protocol = new ComposableProtocolProcessor(); + $protocol = new CompositeProtocolProcessor(); $protocol->setRequestSerializer($serializer); $this->assertSame($serializer, $protocol->getRequestSerializer()); @@ -67,7 +67,7 @@ class ComposableProtocolProcessorTest extends PredisTestCase { $reader = $this->getMock('Predis\Protocol\ResponseReaderInterface'); - $protocol = new ComposableProtocolProcessor(); + $protocol = new CompositeProtocolProcessor(); $protocol->setResponseReader($reader); $this->assertSame($reader, $protocol->getResponseReader()); @@ -84,7 +84,7 @@ class ComposableProtocolProcessorTest extends PredisTestCase $connection = $this->getMock('Predis\Connection\CompositeConnectionInterface'); $serializer = $this->getMock('Predis\Protocol\RequestSerializerInterface'); - $protocol = new ComposableProtocolProcessor($serializer); + $protocol = new CompositeProtocolProcessor($serializer); $connection->expects($this->once()) ->method('writeBuffer') @@ -108,7 +108,7 @@ class ComposableProtocolProcessorTest extends PredisTestCase $connection = $this->getMock('Predis\Connection\CompositeConnectionInterface'); $reader = $this->getMock('Predis\Protocol\ResponseReaderInterface'); - $protocol = new ComposableProtocolProcessor(null, $reader); + $protocol = new CompositeProtocolProcessor(null, $reader); $reader->expects($this->once()) ->method('read') diff --git a/tests/Predis/Protocol/Text/Handler/MultiBulkResponseTest.php b/tests/Predis/Protocol/Text/Handler/MultiBulkResponseTest.php index 8d3a78bd..8043aa11 100644 --- a/tests/Predis/Protocol/Text/Handler/MultiBulkResponseTest.php +++ b/tests/Predis/Protocol/Text/Handler/MultiBulkResponseTest.php @@ -29,7 +29,7 @@ class MultiBulkResponseTest extends PredisTestCase $connection->expects($this->once()) ->method('getProtocol') - ->will($this->returnValue(new ComposableProtocolProcessor())); + ->will($this->returnValue(new CompositeProtocolProcessor())); $connection->expects($this->at(1)) ->method('readLine') diff --git a/tests/Predis/Protocol/Text/ResponseReaderTest.php b/tests/Predis/Protocol/Text/ResponseReaderTest.php index f6302924..597534ec 100644 --- a/tests/Predis/Protocol/Text/ResponseReaderTest.php +++ b/tests/Predis/Protocol/Text/ResponseReaderTest.php @@ -54,7 +54,7 @@ class ResponseReaderTest extends PredisTestCase { $reader = new ResponseReader(); - $protocol = new ComposableProtocolProcessor(); + $protocol = new CompositeProtocolProcessor(); $protocol->setResponseReader($reader); $connection = $this->getMock('Predis\Connection\CompositeConnectionInterface');