Merge branch 'v0.9/response-namespace'

CHANGELOG.md

@@ -20,6 +20,9 @@ v0.9.0 (201x-xx-xx)
 - Most classes and interfaces in the `Predis\Protocol` namespace have been moved
   or renamed while rationalizing the whole API of external protocol processors.
 
+- All of the interfaces and classes related to translated Redis response types
+  have been moved in the new `Predis\Response` namespace.
+
 
 v0.8.5 (2013-xx-xx)
 ===============================================================================

lib/Predis/Client.php

@@ -24,6 +24,9 @@ use Predis\Monitor\MonitorContext;
 use Predis\Pipeline\PipelineContext;
 use Predis\Profile\ServerProfile;
 use Predis\PubSub\PubSubContext;
+use Predis\Response\ResponseErrorInterface;
+use Predis\Response\ResponseObjectInterface;
+use Predis\Response\ServerException;
 use Predis\Transaction\MultiExecContext;
 
 /**

lib/Predis/Connection/PhpiredisConnection.php

@@ -12,9 +12,9 @@
 namespace Predis\Connection;
 
 use Predis\NotSupportedException;
-use Predis\ResponseError;
-use Predis\ResponseQueued;
 use Predis\Command\CommandInterface;
+use Predis\Response\ResponseError;
+use Predis\Response\ResponseQueued;
 
 /**
  * This class provides the implementation of a Predis connection that uses the

lib/Predis/Connection/PhpiredisStreamConnection.php

@@ -12,9 +12,9 @@
 namespace Predis\Connection;
 
 use Predis\NotSupportedException;
-use Predis\ResponseError;
-use Predis\ResponseQueued;
 use Predis\Command\CommandInterface;
+use Predis\Response\ResponseError;
+use Predis\Response\ResponseQueued;
 
 /**
  * This class provides the implementation of a Predis connection that uses PHP's

lib/Predis/Connection/RedisCluster.php

@@ -14,9 +14,9 @@ namespace Predis\Connection;
 use Predis\ClientException;
 use Predis\Cluster\CommandHashStrategyInterface;
 use Predis\NotSupportedException;
-use Predis\ResponseErrorInterface;
 use Predis\Cluster\RedisClusterHashStrategy;
 use Predis\Command\CommandInterface;
+use Predis\Response\ResponseErrorInterface;
 
 /**
  * Abstraction for Redis cluster (Redis v3.0).

lib/Predis/Connection/StreamConnection.php

@@ -11,9 +11,10 @@
 
 namespace Predis\Connection;
 
-use Predis\ResponseError;
-use Predis\ResponseQueued;
 use Predis\Command\CommandInterface;
+use Predis\Response\ResponseError;
+use Predis\Response\ResponseQueued;
+
 /**
  * Standard connection to Redis servers implemented on top of PHP's streams.
  * The connection parameters supported by this class are:

lib/Predis/Connection/WebdisConnection.php

@@ -12,10 +12,10 @@
 namespace Predis\Connection;
 
 use Predis\NotSupportedException;
-use Predis\ResponseError;
 use Predis\Command\CommandInterface;
 use Predis\Connection\ConnectionException;
 use Predis\Protocol\ProtocolException;
+use Predis\Response\ResponseError;
 
 /**
  * This class implements a Predis connection that actually talks with Webdis

lib/Predis/Pipeline/MultiExecExecutor.php

@@ -13,13 +13,13 @@ namespace Predis\Pipeline;
 
 use SplQueue;
 use Predis\ClientException;
-use Predis\ResponseErrorInterface;
-use Predis\ResponseObjectInterface;
-use Predis\ServerException;
 use Predis\Connection\ConnectionInterface;
 use Predis\Connection\SingleConnectionInterface;
 use Predis\Profile\ServerProfile;
 use Predis\Profile\ServerProfileInterface;
+use Predis\Response\ResponseErrorInterface;
+use Predis\Response\ResponseObjectInterface;
+use Predis\Response\ServerException;
 
 /**
  * Implements a pipeline executor that wraps the whole pipeline

lib/Predis/Pipeline/StandardExecutor.php

@@ -12,12 +12,12 @@
 namespace Predis\Pipeline;
 
 use SplQueue;
-use Predis\ResponseErrorInterface;
-use Predis\ResponseObjectInterface;
-use Predis\ServerException;
 use Predis\Command\CommandInterface;
 use Predis\Connection\ConnectionInterface;
 use Predis\Connection\ReplicationConnectionInterface;
+use Predis\Response\ResponseErrorInterface;
+use Predis\Response\ResponseObjectInterface;
+use Predis\Response\ServerException;
 
 /**
  * Implements the standard pipeline executor strategy used

lib/Predis/Protocol/Text/Handler/ErrorResponse.php

@@ -11,8 +11,8 @@
 
 namespace Predis\Protocol\Text\Handler;
 
-use Predis\ResponseError;
 use Predis\Connection\ComposableConnectionInterface;
+use Predis\Response\ResponseError;
 
 /**
  * Handler for the error response type in the standard Redis wire protocol.

lib/Predis/Protocol/Text/Handler/StatusResponse.php

@@ -11,8 +11,8 @@
 
 namespace Predis\Protocol\Text\Handler;
 
-use Predis\ResponseQueued;
 use Predis\Connection\ComposableConnectionInterface;
+use Predis\Response\ResponseQueued;
 
 /**
  * Handler for the status response type in the standard Redis wire protocol.

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

lib/Predis/Protocol/Text/ProtocolProcessor.php

@@ -12,13 +12,13 @@
 namespace Predis\Protocol\Text;
 
 use Predis\CommunicationException;
-use Predis\ResponseError;
-use Predis\ResponseQueued;
 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.

lib/Predis/Iterator/MultiBulkResponse.php → lib/Predis/Response/Iterator/MultiBulkResponse.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Iterator;
+namespace Predis\Response\Iterator;
 
 use Iterator;
 use Countable;
-use Predis\ResponseObjectInterface;
+use Predis\Response\ResponseObjectInterface;
 
 /**
  * Iterator that abstracts the access to multibulk responses allowing them to be

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;
 

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;

lib/Predis/ResponseError.php → lib/Predis/Response/ResponseError.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis;
+namespace Predis\Response;
 
 /**
  * Represents an error returned by Redis (-ERR replies) during the execution

lib/Predis/ResponseErrorInterface.php → lib/Predis/Response/ResponseErrorInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis;
+namespace Predis\Response;
 
 /**
  * Represents an error returned by Redis (replies identified by "-" in the

lib/Predis/ResponseObjectInterface.php → lib/Predis/Response/ResponseObjectInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis;
+namespace Predis\Response;
 
 /**
  * Represents a complex reply object from Redis.

lib/Predis/ResponseQueued.php → lib/Predis/Response/ResponseQueued.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis;
+namespace Predis\Response;
 
 /**
  * Represents a +QUEUED response returned by Redis as a reply to each command

lib/Predis/ServerException.php → lib/Predis/Response/ServerException.php

@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis;
+namespace Predis\Response;
+
+use Predis\PredisException;
 
 /**
  * Exception class that identifies server-side Redis errors.

lib/Predis/Transaction/MultiExecContext.php

@@ -18,9 +18,9 @@ use Predis\ClientInterface;
 use Predis\CommunicationException;
 use Predis\ExecutableContextInterface;
 use Predis\NotSupportedException;
-use Predis\ResponseErrorInterface;
-use Predis\ResponseQueued;
-use Predis\ServerException;
+use Predis\Response\ResponseErrorInterface;
+use Predis\Response\ResponseQueued;
+use Predis\Response\ServerException;
 use Predis\Command\CommandInterface;
 use Predis\Connection\AggregatedConnectionInterface;
 use Predis\Protocol\ProtocolException;

tests/PHPUnit/ConnectionTestCase.php

@@ -219,7 +219,7 @@ abstract class ConnectionTestCase extends StandardTestCase
         $connection->writeCommand($profile->createCommand('multi'));
         $connection->writeCommand($profile->createCommand('ping'));
         $this->assertTrue($connection->read());
-        $this->assertInstanceOf('Predis\ResponseQueued', $connection->read());
+        $this->assertInstanceOf('Predis\Response\ResponseQueued', $connection->read());
     }
 
     /**
@@ -261,7 +261,7 @@ abstract class ConnectionTestCase extends StandardTestCase
         $connection->executeCommand($profile->createCommand('set', array('foo', 'bar')));
         $connection->writeCommand($profile->createCommand('rpush', array('foo', 'baz')));
 
-        $this->assertInstanceOf('Predis\ResponseError', $error = $connection->read());
+        $this->assertInstanceOf('Predis\Response\ResponseError', $error = $connection->read());
         $this->assertRegExp('/[ERR|WRONGTYPE] Operation against a key holding the wrong kind of value/', $error->getMessage());
     }
 

tests/Predis/ClientTest.php

@@ -17,6 +17,8 @@ use Predis\Connection\ConnectionFactory;
 use Predis\Connection\MasterSlaveReplication;
 use Predis\Connection\PredisCluster;
 use Predis\Profile\ServerProfile;
+use Predis\Response\ResponseError;
+use Predis\Response\ResponseQueued;
 
 /**
  *
@@ -398,7 +400,7 @@ class ClientTest extends StandardTestCase
 
     /**
      * @group disconnected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testExecuteCommandThrowsExceptionOnRedisError()
@@ -461,7 +463,7 @@ class ClientTest extends StandardTestCase
 
     /**
      * @group disconnected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testCallingRedisCommandThrowsExceptionOnServerError()

tests/Predis/Command/ConnectionSelectTest.php

@@ -74,7 +74,7 @@ class ConnectionSelectTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR invalid DB index
      */
     public function testThrowsExceptionOnUnexpectedDatabase()

tests/Predis/Command/HashDeleteTest.php

@@ -112,7 +112,7 @@ class HashDeleteTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashExistsTest.php

@@ -101,7 +101,7 @@ class HashExistsTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashGetAllTest.php

@@ -102,7 +102,7 @@ class HashGetAllTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashGetMultipleTest.php

@@ -118,7 +118,7 @@ class HashGetMultipleTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashGetTest.php

@@ -98,7 +98,7 @@ class HashGetTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashIncrementByFloatTest.php

@@ -110,7 +110,7 @@ class HashIncrementByFloatTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR hash value is not a valid float
      */
     public function testThrowsExceptionOnStringField()
@@ -123,7 +123,7 @@ class HashIncrementByFloatTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashIncrementByTest.php

@@ -110,7 +110,7 @@ class HashIncrementByTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR hash value is not an integer
      */
     public function testThrowsExceptionOnStringField()
@@ -123,7 +123,7 @@ class HashIncrementByTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashKeysTest.php

@@ -102,7 +102,7 @@ class HashKeysTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashLengthTest.php

@@ -97,7 +97,7 @@ class HashLengthTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashSetMultipleTest.php

@@ -124,7 +124,7 @@ class HashSetMultipleTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashSetPreserveTest.php

@@ -101,7 +101,7 @@ class HashSetPreserveTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashSetTest.php

@@ -100,7 +100,7 @@ class HashSetTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/HashValuesTest.php

@@ -102,7 +102,7 @@ class HashValuesTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/KeyMoveTest.php

@@ -107,7 +107,7 @@ class KeyMoveTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR index out of range
      */
     public function testThrowsExceptionOnInvalidDatabases()

tests/Predis/Command/KeyRenamePreserveTest.php

@@ -99,7 +99,7 @@ class KeyRenamePreserveTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR no such key
      */
     public function testReturnsFalseOnNonExistingKeys()

tests/Predis/Command/KeyRenameTest.php

@@ -98,7 +98,7 @@ class KeyRenameTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR no such key
      */
     public function testThrowsExceptionOnNonExistingKeys()

tests/Predis/Command/KeySortTest.php

@@ -268,7 +268,7 @@ class KeySortTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListIndexTest.php

@@ -113,7 +113,7 @@ class ListIndexTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListInsertTest.php

@@ -121,7 +121,7 @@ class ListInsertTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListLengthTest.php

@@ -108,7 +108,7 @@ class ListLengthTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListPopFirstTest.php

@@ -108,7 +108,7 @@ class ListPopFirstTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListPopLastPushHeadTest.php

@@ -127,7 +127,7 @@ class ListPopLastPushHeadTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()
@@ -140,7 +140,7 @@ class ListPopLastPushHeadTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfDestinationKey()

tests/Predis/Command/ListPopLastTest.php

@@ -108,7 +108,7 @@ class ListPopLastTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListPushHeadTest.php

@@ -111,7 +111,7 @@ class ListPushHeadTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListPushHeadXTest.php

@@ -109,7 +109,7 @@ class ListPushHeadXTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListPushTailTest.php

@@ -111,7 +111,7 @@ class ListPushTailTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListPushTailXTest.php

@@ -109,7 +109,7 @@ class ListPushTailXTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListRangeTest.php

@@ -152,7 +152,7 @@ class ListRangeTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListRemoveTest.php

@@ -136,7 +136,7 @@ class ListRemoveTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListSetTest.php

@@ -97,7 +97,7 @@ class ListSetTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR index out of range
      */
     public function testThrowsExceptionOnIndexOutOfRange()
@@ -110,7 +110,7 @@ class ListSetTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/ListTrimTest.php

@@ -142,7 +142,7 @@ class ListTrimTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/PubSubSubscribeByPatternTest.php

@@ -171,7 +171,7 @@ class PubSubSubscribeByPatternTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR only (P)SUBSCRIBE / (P)UNSUBSCRIBE / QUIT allowed in this context
      */
     public function testCannotSendOtherCommandsAfterPsubscribe()

tests/Predis/Command/PubSubSubscribeTest.php

@@ -171,7 +171,7 @@ class PubSubSubscribeTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR only (P)SUBSCRIBE / (P)UNSUBSCRIBE / QUIT allowed in this context
      */
     public function testCannotSendOtherCommandsAfterSubscribe()

tests/Predis/Command/ServerClientTest.php

@@ -187,7 +187,7 @@ BUFFER;
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @dataProvider invalidConnectionNameProvider
      */
     public function testInvalidSetNameOfConnection($invalidConnectionName)
@@ -200,7 +200,7 @@ BUFFER;
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      */
     public function testThrowsExceptioOnWrongModifier()
     {
@@ -211,7 +211,7 @@ BUFFER;
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR No such client
      */
     public function testThrowsExceptionWhenKillingUnknownClient()

tests/Predis/Command/ServerConfigTest.php

@@ -140,7 +140,7 @@ class ServerConfigTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR Unsupported CONFIG parameter: foo
      */
     public function testThrowsExceptionWhenSettingUnknownConfiguration()
@@ -162,7 +162,7 @@ class ServerConfigTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      */
     public function testThrowsExceptionOnUnknownSubcommand()
     {

tests/Predis/Command/ServerEvalSHATest.php

@@ -112,7 +112,7 @@ class ServerEvalSHATest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      */
     public function testThrowsExceptionOnWrongNumberOfKeys()
     {
@@ -127,7 +127,7 @@ class ServerEvalSHATest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      */
     public function testThrowsExceptionOnInvalidScript()
     {

tests/Predis/Command/ServerEvalTest.php

@@ -110,7 +110,7 @@ class ServerEvalTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      */
     public function testThrowsExceptionOnWrongNumberOfKeys()
     {
@@ -122,7 +122,7 @@ class ServerEvalTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      */
     public function testThrowsExceptionOnInvalidScript()
     {

tests/Predis/Command/ServerObjectTest.php

@@ -104,7 +104,7 @@ class ServerObjectTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      */
     public function testThrowsExceptionOnInvalidSubcommand()
     {

tests/Predis/Command/ServerScriptTest.php

@@ -99,7 +99,7 @@ class ServerScriptTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      */
     public function testThrowsExceptionOnInvalidSubcommand()
     {

tests/Predis/Command/ServerSlowlogTest.php

@@ -109,7 +109,7 @@ class ServerSlowlogTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      */
     public function testThrowsExceptionOnInvalidSubcommand()
     {

tests/Predis/Command/SetAddTest.php

@@ -110,7 +110,7 @@ class SetAddTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/SetCardinalityTest.php

@@ -106,7 +106,7 @@ class SetCardinalityTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/SetDifferenceStoreTest.php

@@ -129,7 +129,7 @@ class SetDifferenceStoreTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()

tests/Predis/Command/SetDifferenceTest.php

@@ -131,7 +131,7 @@ class SetDifferenceTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/SetIntersectionStoreTest.php

@@ -142,7 +142,7 @@ class SetIntersectionStoreTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()

tests/Predis/Command/SetIntersectionTest.php

@@ -142,7 +142,7 @@ class SetIntersectionTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/SetIsMemberTest.php

@@ -110,7 +110,7 @@ class SetIsMemberTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/SetMembersTest.php

@@ -102,7 +102,7 @@ class SetMembersTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/SetMoveTest.php

@@ -103,7 +103,7 @@ class SetMoveTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()
@@ -117,7 +117,7 @@ class SetMoveTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfDestinationKey()

tests/Predis/Command/SetPopTest.php

@@ -99,7 +99,7 @@ class SetPopTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/SetRandomMemberTest.php

@@ -107,7 +107,7 @@ class SetRandomMemberTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/SetRemoveTest.php

@@ -114,7 +114,7 @@ class SetRemoveTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/SetUnionStoreTest.php

@@ -129,7 +129,7 @@ class SetUnionStoreTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()

tests/Predis/Command/SetUnionTest.php

@@ -131,7 +131,7 @@ class SetUnionTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringAppendTest.php

@@ -109,7 +109,7 @@ class StringAppendTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringBitCountTest.php

@@ -106,7 +106,7 @@ class StringBitCountTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringBitOpTest.php

@@ -158,7 +158,7 @@ class StringBitOpTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR BITOP NOT must be called with a single source key.
      */
     public function testBitwiseNOTAcceptsOnlyOneSourceKey()
@@ -168,7 +168,7 @@ class StringBitOpTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR syntax error
      */
     public function testThrowsExceptionOnInvalidOperation()
@@ -178,7 +178,7 @@ class StringBitOpTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnInvalidSourceKey()

tests/Predis/Command/StringDecrementByTest.php

@@ -109,7 +109,7 @@ class StringDecrementByTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR value is not an integer or out of range
      */
     public function testThrowsExceptionOnDecrementValueNotInteger()
@@ -121,7 +121,7 @@ class StringDecrementByTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR value is not an integer or out of range
      */
     public function testThrowsExceptionOnKeyValueNotInteger()
@@ -134,7 +134,7 @@ class StringDecrementByTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringDecrementTest.php

@@ -108,7 +108,7 @@ class StringDecrementTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR value is not an integer or out of range
      */
     public function testThrowsExceptionOnKeyValueNotInteger()
@@ -121,7 +121,7 @@ class StringDecrementTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringGetBitTest.php

@@ -101,7 +101,7 @@ class StringGetBitTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR bit offset is not an integer or out of range
      */
     public function testThrowsExceptionOnNegativeOffset()
@@ -114,7 +114,7 @@ class StringGetBitTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR bit offset is not an integer or out of range
      */
     public function testThrowsExceptionOnInvalidOffset()
@@ -127,7 +127,7 @@ class StringGetBitTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringGetRangeTest.php

@@ -112,7 +112,7 @@ class StringGetRangeTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringGetSetTest.php

@@ -98,7 +98,7 @@ class StringGetSetTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringGetTest.php

@@ -119,7 +119,7 @@ class StringGetTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringIncrementByFloatTest.php

@@ -109,7 +109,7 @@ class StringIncrementByFloatTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR value is not a valid float
      */
     public function testThrowsExceptionOnDecrementValueNotFloat()
@@ -121,7 +121,7 @@ class StringIncrementByFloatTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR value is not a valid float
      */
     public function testThrowsExceptionOnKeyValueNotFloat()
@@ -134,7 +134,7 @@ class StringIncrementByFloatTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringIncrementByTest.php

@@ -109,7 +109,7 @@ class StringIncrementByTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR value is not an integer or out of range
      */
     public function testThrowsExceptionOnDecrementValueNotInteger()
@@ -121,7 +121,7 @@ class StringIncrementByTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR value is not an integer or out of range
      */
     public function testThrowsExceptionOnKeyValueNotInteger()
@@ -134,7 +134,7 @@ class StringIncrementByTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringIncrementTest.php

@@ -108,7 +108,7 @@ class StringIncrementTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringPreciseSetExpireTest.php

@@ -109,7 +109,7 @@ class StringPreciseSetExpireTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR value is not an integer or out of range
      */
     public function testThrowsExceptionOnNonIntegerTTL()
@@ -119,7 +119,7 @@ class StringPreciseSetExpireTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR invalid expire time in SETEX
      * @todo Should not Redis return PSETEX instead of SETEX here?
      */
@@ -130,7 +130,7 @@ class StringPreciseSetExpireTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR invalid expire time in SETEX
      * @todo Should not Redis return PSETEX instead of SETEX here?
      */

tests/Predis/Command/StringSetBitTest.php

@@ -113,7 +113,7 @@ class StringSetBitTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR bit is not an integer or out of range
      */
     public function testThrowsExceptionOnInvalidBitValue()
@@ -123,7 +123,7 @@ class StringSetBitTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR bit offset is not an integer or out of range
      */
     public function testThrowsExceptionOnNegativeOffset()
@@ -133,7 +133,7 @@ class StringSetBitTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR bit offset is not an integer or out of range
      */
     public function testThrowsExceptionOnInvalidOffset()
@@ -143,7 +143,7 @@ class StringSetBitTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringSetExpireTest.php

@@ -110,7 +110,7 @@ class StringSetExpireTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR value is not an integer or out of range
      */
     public function testThrowsExceptionOnNonIntegerTTL()
@@ -120,7 +120,7 @@ class StringSetExpireTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR invalid expire time in SETEX
      */
     public function testThrowsExceptionOnZeroTTL()
@@ -130,7 +130,7 @@ class StringSetExpireTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR invalid expire time in SETEX
      */
     public function testThrowsExceptionOnNegativeTTL()

tests/Predis/Command/StringSetRangeTest.php

@@ -127,7 +127,7 @@ class StringSetRangeTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR offset is out of range
      */
     public function testThrowsExceptionOnInvalidOffset()
@@ -137,7 +137,7 @@ class StringSetRangeTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/StringStrlenTest.php

@@ -108,7 +108,7 @@ class StringStrlenTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()

tests/Predis/Command/TransactionDiscardTest.php

@@ -63,14 +63,14 @@ class TransactionDiscardTest extends CommandTestCase
 
         $redis->multi();
 
-        $this->assertInstanceOf('Predis\ResponseQueued', $redis->set('foo', 'bar'));
+        $this->assertInstanceOf('Predis\Response\ResponseQueued', $redis->set('foo', 'bar'));
         $this->assertTrue($redis->discard());
         $this->assertFalse($redis->exists('foo'));
     }
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR DISCARD without MULTI
      */
     public function testThrowsExceptionWhenCallingOutsideTransaction()

tests/Predis/Command/TransactionExecTest.php

@@ -102,7 +102,7 @@ class TransactionExecTest extends CommandTestCase
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR EXEC without MULTI
      */
     public function testThrowsExceptionWhenCallingOutsideTransaction()

tests/Predis/Command/TransactionMultiTest.php

@@ -74,13 +74,13 @@ class TransactionMultiTest extends CommandTestCase
         $redis = $this->getClient();
 
         $this->assertTrue($redis->multi());
-        $this->assertInstanceOf('Predis\ResponseObjectInterface', $redis->echo('tx1'));
-        $this->assertInstanceOf('Predis\ResponseQueued', $redis->echo('tx2'));
+        $this->assertInstanceOf('Predis\Response\ResponseObjectInterface', $redis->echo('tx1'));
+        $this->assertInstanceOf('Predis\Response\ResponseQueued', $redis->echo('tx2'));
     }
 
     /**
      * @group connected
-     * @expectedException Predis\ServerException
+     * @expectedException Predis\Response\ServerException
      * @expectedExceptionMessage ERR MULTI calls can not be nested
      */
     public function testThrowsExceptionWhenCallingMultiInsideTransaction()

tests/Predis/Command/TransactionUnwatchTest.php

@@ -81,6 +81,6 @@ class TransactionUnwatchTest extends CommandTestCase
         $redis = $this->getClient();
 
         $redis->multi();
-        $this->assertInstanceOf('Predis\ResponseQueued', $redis->unwatch());
+        $this->assertInstanceOf('Predis\Response\ResponseQueued', $redis->unwatch());
     }
 }