From 7f9d06bb83ee4709536ac2e93fb2e0f623bdb69b Mon Sep 17 00:00:00 2001 From: Daniele Alessandri Date: Sat, 16 Nov 2013 12:07:35 +0100 Subject: [PATCH] Move the Predis\Iterator namespace into Predis\Response. --- .../Protocol/Text/Handler/StreamableMultiBulkResponse.php | 2 +- lib/Predis/Protocol/Text/ProtocolProcessor.php | 2 +- lib/Predis/{ => Response}/Iterator/MultiBulkResponse.php | 2 +- .../{ => Response}/Iterator/MultiBulkResponseSimple.php | 2 +- .../{ => Response}/Iterator/MultiBulkResponseTuple.php | 2 +- .../Predis/Connection/ComposableStreamConnectionTest.php | 2 +- tests/Predis/Protocol/Text/ProtocolProcessorTest.php | 2 +- .../Iterator/MultiBulkResponseSimpleTest.php | 8 ++++---- .../Iterator/MultiBulkResponseTupleTest.php | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) rename lib/Predis/{ => Response}/Iterator/MultiBulkResponse.php (98%) rename lib/Predis/{ => Response}/Iterator/MultiBulkResponseSimple.php (98%) rename lib/Predis/{ => Response}/Iterator/MultiBulkResponseTuple.php (98%) rename tests/Predis/{ => Response}/Iterator/MultiBulkResponseSimpleTest.php (91%) rename tests/Predis/{ => Response}/Iterator/MultiBulkResponseTupleTest.php (94%) diff --git a/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php b/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php index be59f756..7ffebdb2 100644 --- a/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php +++ b/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php @@ -13,7 +13,7 @@ namespace Predis\Protocol\Text\Handler; use Predis\CommunicationException; use Predis\Connection\ComposableConnectionInterface; -use Predis\Iterator\MultiBulkResponseSimple; +use Predis\Response\Iterator\MultiBulkResponseSimple; use Predis\Protocol\ProtocolException; /** diff --git a/lib/Predis/Protocol/Text/ProtocolProcessor.php b/lib/Predis/Protocol/Text/ProtocolProcessor.php index 10b0f5c6..265f547d 100644 --- a/lib/Predis/Protocol/Text/ProtocolProcessor.php +++ b/lib/Predis/Protocol/Text/ProtocolProcessor.php @@ -14,11 +14,11 @@ namespace Predis\Protocol\Text; use Predis\CommunicationException; use Predis\Command\CommandInterface; use Predis\Connection\ComposableConnectionInterface; -use Predis\Iterator\MultiBulkResponseSimple; use Predis\Protocol\ProtocolException; use Predis\Protocol\ProtocolProcessorInterface; use Predis\Response\ResponseError; use Predis\Response\ResponseQueued; +use Predis\Response\Iterator\MultiBulkResponseSimple; /** * Protocol processor for the standard Redis wire protocol. diff --git a/lib/Predis/Iterator/MultiBulkResponse.php b/lib/Predis/Response/Iterator/MultiBulkResponse.php similarity index 98% rename from lib/Predis/Iterator/MultiBulkResponse.php rename to lib/Predis/Response/Iterator/MultiBulkResponse.php index 9befe9f1..822ea404 100644 --- a/lib/Predis/Iterator/MultiBulkResponse.php +++ b/lib/Predis/Response/Iterator/MultiBulkResponse.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Predis\Iterator; +namespace Predis\Response\Iterator; use Iterator; use Countable; diff --git a/lib/Predis/Iterator/MultiBulkResponseSimple.php b/lib/Predis/Response/Iterator/MultiBulkResponseSimple.php similarity index 98% rename from lib/Predis/Iterator/MultiBulkResponseSimple.php rename to lib/Predis/Response/Iterator/MultiBulkResponseSimple.php index 06f83ee7..97507ba5 100644 --- a/lib/Predis/Iterator/MultiBulkResponseSimple.php +++ b/lib/Predis/Response/Iterator/MultiBulkResponseSimple.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Predis\Iterator; +namespace Predis\Response\Iterator; use Predis\Connection\SingleConnectionInterface; diff --git a/lib/Predis/Iterator/MultiBulkResponseTuple.php b/lib/Predis/Response/Iterator/MultiBulkResponseTuple.php similarity index 98% rename from lib/Predis/Iterator/MultiBulkResponseTuple.php rename to lib/Predis/Response/Iterator/MultiBulkResponseTuple.php index 361d56d3..fd126e64 100644 --- a/lib/Predis/Iterator/MultiBulkResponseTuple.php +++ b/lib/Predis/Response/Iterator/MultiBulkResponseTuple.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Predis\Iterator; +namespace Predis\Response\Iterator; use OuterIterator; use RuntimeException; diff --git a/tests/Predis/Connection/ComposableStreamConnectionTest.php b/tests/Predis/Connection/ComposableStreamConnectionTest.php index 6bdeeedb..bbf597cf 100644 --- a/tests/Predis/Connection/ComposableStreamConnectionTest.php +++ b/tests/Predis/Connection/ComposableStreamConnectionTest.php @@ -80,7 +80,7 @@ class ComposableStreamConnectionTest extends ConnectionTestCase $connection->executeCommand($profile->createCommand('rpush', array('metavars', 'foo', 'hoge', 'lol'))); $connection->writeCommand($profile->createCommand('lrange', array('metavars', 0, -1))); - $this->assertInstanceOf('Predis\Iterator\MultiBulkResponse', $iterator = $connection->read()); + $this->assertInstanceOf('Predis\Response\Iterator\MultiBulkResponse', $iterator = $connection->read()); $this->assertSame(array('foo', 'hoge', 'lol'), iterator_to_array($iterator)); } diff --git a/tests/Predis/Protocol/Text/ProtocolProcessorTest.php b/tests/Predis/Protocol/Text/ProtocolProcessorTest.php index f7046a7f..4cb5b836 100644 --- a/tests/Predis/Protocol/Text/ProtocolProcessorTest.php +++ b/tests/Predis/Protocol/Text/ProtocolProcessorTest.php @@ -97,7 +97,7 @@ class ProtocolProcessorTest extends StandardTestCase ->method('readLine') ->will($this->returnValue("*1")); - $this->assertInstanceOf('Predis\Iterator\MultiBulkResponseSimple', $protocol->read($connection)); + $this->assertInstanceOf('Predis\Response\Iterator\MultiBulkResponseSimple', $protocol->read($connection)); } /** diff --git a/tests/Predis/Iterator/MultiBulkResponseSimpleTest.php b/tests/Predis/Response/Iterator/MultiBulkResponseSimpleTest.php similarity index 91% rename from tests/Predis/Iterator/MultiBulkResponseSimpleTest.php rename to tests/Predis/Response/Iterator/MultiBulkResponseSimpleTest.php index 803bff12..fdda7817 100644 --- a/tests/Predis/Iterator/MultiBulkResponseSimpleTest.php +++ b/tests/Predis/Response/Iterator/MultiBulkResponseSimpleTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Predis\Iterator; +namespace Predis\Response\Iterator; use \PHPUnit_Framework_TestCase as StandardTestCase; @@ -32,7 +32,7 @@ class MultiBulkResponseSimpleTest extends StandardTestCase $client->rpush('metavars', 'foo', 'hoge', 'lol'); $this->assertInstanceOf('Iterator', $iterator = $client->lrange('metavars', 0, -1)); - $this->assertInstanceOf('Predis\Iterator\MultiBulkResponseSimple', $iterator); + $this->assertInstanceOf('Predis\Response\Iterator\MultiBulkResponseSimple', $iterator); $this->assertTrue($iterator->valid()); $this->assertSame(3, $iterator->count()); @@ -59,8 +59,8 @@ class MultiBulkResponseSimpleTest extends StandardTestCase $client = $this->getClient(); $client->mset('foo', 'bar', 'hoge', 'piyo'); - $this->assertInstanceOf('Predis\Iterator\MultiBulkResponseSimple', $iterator = $client->mget('foo', 'bar')); - $this->assertInstanceOf('Predis\Iterator\MultiBulkResponseTuple', $iterator->asTuple()); + $this->assertInstanceOf('Predis\Response\Iterator\MultiBulkResponseSimple', $iterator = $client->mget('foo', 'bar')); + $this->assertInstanceOf('Predis\Response\Iterator\MultiBulkResponseTuple', $iterator->asTuple()); } /** diff --git a/tests/Predis/Iterator/MultiBulkResponseTupleTest.php b/tests/Predis/Response/Iterator/MultiBulkResponseTupleTest.php similarity index 94% rename from tests/Predis/Iterator/MultiBulkResponseTupleTest.php rename to tests/Predis/Response/Iterator/MultiBulkResponseTupleTest.php index 1c780568..edda26be 100644 --- a/tests/Predis/Iterator/MultiBulkResponseTupleTest.php +++ b/tests/Predis/Response/Iterator/MultiBulkResponseTupleTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Predis\Iterator; +namespace Predis\Response\Iterator; use \PHPUnit_Framework_TestCase as StandardTestCase; @@ -59,8 +59,8 @@ class MultiBulkResponseTupleTest extends StandardTestCase $client->zadd('metavars', 1, 'foo', 2, 'hoge', 3, 'lol'); $this->assertInstanceOf('OuterIterator', $iterator = $client->zrange('metavars', 0, -1, 'withscores')->asTuple()); - $this->assertInstanceOf('Predis\Iterator\MultiBulkResponseTuple', $iterator); - $this->assertInstanceOf('Predis\Iterator\MultiBulkResponseSimple', $iterator->getInnerIterator()); + $this->assertInstanceOf('Predis\Response\Iterator\MultiBulkResponseTuple', $iterator); + $this->assertInstanceOf('Predis\Response\Iterator\MultiBulkResponseSimple', $iterator->getInnerIterator()); $this->assertTrue($iterator->valid()); $this->assertSame(3, $iterator->count());