Move the Predis\Iterator namespace into Predis\Response.

This commit is contained in:
Daniele Alessandri
2013-11-16 12:07:35 +01:00
parent a8edc02eb6
commit 7f9d06bb83
9 changed files with 14 additions and 14 deletions
@@ -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;
/**
@@ -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.
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Predis\Iterator;
namespace Predis\Response\Iterator;
use Iterator;
use Countable;
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Predis\Iterator;
namespace Predis\Response\Iterator;
use Predis\Connection\SingleConnectionInterface;
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Predis\Iterator;
namespace Predis\Response\Iterator;
use OuterIterator;
use RuntimeException;
@@ -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));
}
@@ -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));
}
/**
@@ -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());
}
/**
@@ -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());