Browse Source

Move the Predis\Iterator namespace into Predis\Response.

Daniele Alessandri 11 years ago
parent
commit
7f9d06bb83

+ 1 - 1
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;
 
 /**

+ 1 - 1
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.

+ 1 - 1
lib/Predis/Iterator/MultiBulkResponse.php → 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;

+ 1 - 1
lib/Predis/Iterator/MultiBulkResponseSimple.php → 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;
 

+ 1 - 1
lib/Predis/Iterator/MultiBulkResponseTuple.php → 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;

+ 1 - 1
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));
     }
 

+ 1 - 1
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));
     }
 
     /**

+ 4 - 4
tests/Predis/Iterator/MultiBulkResponseSimpleTest.php → 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());
     }
 
     /**

+ 3 - 3
tests/Predis/Iterator/MultiBulkResponseTupleTest.php → 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());