diff --git a/lib/Predis/Client.php b/lib/Predis/Client.php index 4db5ac24..cf2410df 100644 --- a/lib/Predis/Client.php +++ b/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; /** diff --git a/lib/Predis/Connection/PhpiredisConnection.php b/lib/Predis/Connection/PhpiredisConnection.php index b6ba304c..bd3fe010 100644 --- a/lib/Predis/Connection/PhpiredisConnection.php +++ b/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 diff --git a/lib/Predis/Connection/PhpiredisStreamConnection.php b/lib/Predis/Connection/PhpiredisStreamConnection.php index caafcff8..6513fcef 100644 --- a/lib/Predis/Connection/PhpiredisStreamConnection.php +++ b/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 diff --git a/lib/Predis/Connection/RedisCluster.php b/lib/Predis/Connection/RedisCluster.php index 7be45625..7906652d 100644 --- a/lib/Predis/Connection/RedisCluster.php +++ b/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). diff --git a/lib/Predis/Connection/StreamConnection.php b/lib/Predis/Connection/StreamConnection.php index 90a60859..09759cb2 100644 --- a/lib/Predis/Connection/StreamConnection.php +++ b/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: diff --git a/lib/Predis/Connection/WebdisConnection.php b/lib/Predis/Connection/WebdisConnection.php index 4c1ea898..2f367cec 100644 --- a/lib/Predis/Connection/WebdisConnection.php +++ b/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 diff --git a/lib/Predis/Iterator/MultiBulkResponse.php b/lib/Predis/Iterator/MultiBulkResponse.php index 6c946eda..9befe9f1 100644 --- a/lib/Predis/Iterator/MultiBulkResponse.php +++ b/lib/Predis/Iterator/MultiBulkResponse.php @@ -13,7 +13,7 @@ namespace Predis\Iterator; use Iterator; use Countable; -use Predis\ResponseObjectInterface; +use Predis\Response\ResponseObjectInterface; /** * Iterator that abstracts the access to multibulk responses allowing them to be diff --git a/lib/Predis/Pipeline/MultiExecExecutor.php b/lib/Predis/Pipeline/MultiExecExecutor.php index 12a7dbed..69f8750d 100644 --- a/lib/Predis/Pipeline/MultiExecExecutor.php +++ b/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 diff --git a/lib/Predis/Pipeline/StandardExecutor.php b/lib/Predis/Pipeline/StandardExecutor.php index 91763104..99643def 100644 --- a/lib/Predis/Pipeline/StandardExecutor.php +++ b/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 diff --git a/lib/Predis/Protocol/Text/Handler/ErrorResponse.php b/lib/Predis/Protocol/Text/Handler/ErrorResponse.php index c7ec336b..0785445e 100644 --- a/lib/Predis/Protocol/Text/Handler/ErrorResponse.php +++ b/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. diff --git a/lib/Predis/Protocol/Text/Handler/StatusResponse.php b/lib/Predis/Protocol/Text/Handler/StatusResponse.php index 54d82a21..1d7cb4c9 100644 --- a/lib/Predis/Protocol/Text/Handler/StatusResponse.php +++ b/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. diff --git a/lib/Predis/Protocol/Text/ProtocolProcessor.php b/lib/Predis/Protocol/Text/ProtocolProcessor.php index 55759941..10b0f5c6 100644 --- a/lib/Predis/Protocol/Text/ProtocolProcessor.php +++ b/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; /** * Protocol processor for the standard Redis wire protocol. diff --git a/lib/Predis/ResponseError.php b/lib/Predis/Response/ResponseError.php similarity index 97% rename from lib/Predis/ResponseError.php rename to lib/Predis/Response/ResponseError.php index f6f310ea..d7f41d37 100644 --- a/lib/Predis/ResponseError.php +++ b/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 diff --git a/lib/Predis/ResponseErrorInterface.php b/lib/Predis/Response/ResponseErrorInterface.php similarity index 96% rename from lib/Predis/ResponseErrorInterface.php rename to lib/Predis/Response/ResponseErrorInterface.php index 8c1a0054..24dcc35b 100644 --- a/lib/Predis/ResponseErrorInterface.php +++ b/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 diff --git a/lib/Predis/ResponseObjectInterface.php b/lib/Predis/Response/ResponseObjectInterface.php similarity index 93% rename from lib/Predis/ResponseObjectInterface.php rename to lib/Predis/Response/ResponseObjectInterface.php index ba81783e..238ba88a 100644 --- a/lib/Predis/ResponseObjectInterface.php +++ b/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. diff --git a/lib/Predis/ResponseQueued.php b/lib/Predis/Response/ResponseQueued.php similarity index 97% rename from lib/Predis/ResponseQueued.php rename to lib/Predis/Response/ResponseQueued.php index c9786fbb..f32120bb 100644 --- a/lib/Predis/ResponseQueued.php +++ b/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 diff --git a/lib/Predis/ServerException.php b/lib/Predis/Response/ServerException.php similarity index 94% rename from lib/Predis/ServerException.php rename to lib/Predis/Response/ServerException.php index 0a60c7e4..1eb5bb7c 100644 --- a/lib/Predis/ServerException.php +++ b/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. diff --git a/lib/Predis/Transaction/MultiExecContext.php b/lib/Predis/Transaction/MultiExecContext.php index b3262610..6ed1c010 100644 --- a/lib/Predis/Transaction/MultiExecContext.php +++ b/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; diff --git a/tests/PHPUnit/ConnectionTestCase.php b/tests/PHPUnit/ConnectionTestCase.php index b806e278..0bcb6e36 100644 --- a/tests/PHPUnit/ConnectionTestCase.php +++ b/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()); } diff --git a/tests/Predis/ClientTest.php b/tests/Predis/ClientTest.php index 80249837..6f2dd5ee 100644 --- a/tests/Predis/ClientTest.php +++ b/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() diff --git a/tests/Predis/Command/ConnectionSelectTest.php b/tests/Predis/Command/ConnectionSelectTest.php index 2e9854e0..90b8fc22 100644 --- a/tests/Predis/Command/ConnectionSelectTest.php +++ b/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() diff --git a/tests/Predis/Command/HashDeleteTest.php b/tests/Predis/Command/HashDeleteTest.php index adb7c2bf..7f3f6b81 100644 --- a/tests/Predis/Command/HashDeleteTest.php +++ b/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() diff --git a/tests/Predis/Command/HashExistsTest.php b/tests/Predis/Command/HashExistsTest.php index 7b27b722..451418ef 100644 --- a/tests/Predis/Command/HashExistsTest.php +++ b/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() diff --git a/tests/Predis/Command/HashGetAllTest.php b/tests/Predis/Command/HashGetAllTest.php index 36c5c79e..198360b8 100644 --- a/tests/Predis/Command/HashGetAllTest.php +++ b/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() diff --git a/tests/Predis/Command/HashGetMultipleTest.php b/tests/Predis/Command/HashGetMultipleTest.php index 4cabd2b4..87500db8 100644 --- a/tests/Predis/Command/HashGetMultipleTest.php +++ b/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() diff --git a/tests/Predis/Command/HashGetTest.php b/tests/Predis/Command/HashGetTest.php index b68067b6..06c9dcd6 100644 --- a/tests/Predis/Command/HashGetTest.php +++ b/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() diff --git a/tests/Predis/Command/HashIncrementByFloatTest.php b/tests/Predis/Command/HashIncrementByFloatTest.php index 286ebc5c..47c017d7 100644 --- a/tests/Predis/Command/HashIncrementByFloatTest.php +++ b/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() diff --git a/tests/Predis/Command/HashIncrementByTest.php b/tests/Predis/Command/HashIncrementByTest.php index 2cf2bbff..6a54ba96 100644 --- a/tests/Predis/Command/HashIncrementByTest.php +++ b/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() diff --git a/tests/Predis/Command/HashKeysTest.php b/tests/Predis/Command/HashKeysTest.php index 04c0a2d3..a8fef419 100644 --- a/tests/Predis/Command/HashKeysTest.php +++ b/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() diff --git a/tests/Predis/Command/HashLengthTest.php b/tests/Predis/Command/HashLengthTest.php index 9c950b65..4b78b739 100644 --- a/tests/Predis/Command/HashLengthTest.php +++ b/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() diff --git a/tests/Predis/Command/HashSetMultipleTest.php b/tests/Predis/Command/HashSetMultipleTest.php index 5f9a1ef9..fb3f6764 100644 --- a/tests/Predis/Command/HashSetMultipleTest.php +++ b/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() diff --git a/tests/Predis/Command/HashSetPreserveTest.php b/tests/Predis/Command/HashSetPreserveTest.php index ca1b35d8..014133ea 100644 --- a/tests/Predis/Command/HashSetPreserveTest.php +++ b/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() diff --git a/tests/Predis/Command/HashSetTest.php b/tests/Predis/Command/HashSetTest.php index fee08e47..6c9dbaf8 100644 --- a/tests/Predis/Command/HashSetTest.php +++ b/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() diff --git a/tests/Predis/Command/HashValuesTest.php b/tests/Predis/Command/HashValuesTest.php index 6cedd8ed..0169441c 100644 --- a/tests/Predis/Command/HashValuesTest.php +++ b/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() diff --git a/tests/Predis/Command/KeyMoveTest.php b/tests/Predis/Command/KeyMoveTest.php index d1839329..ceabf710 100644 --- a/tests/Predis/Command/KeyMoveTest.php +++ b/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() diff --git a/tests/Predis/Command/KeyRenamePreserveTest.php b/tests/Predis/Command/KeyRenamePreserveTest.php index d467ff7c..0128e868 100644 --- a/tests/Predis/Command/KeyRenamePreserveTest.php +++ b/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() diff --git a/tests/Predis/Command/KeyRenameTest.php b/tests/Predis/Command/KeyRenameTest.php index e899d3b5..7c772fad 100644 --- a/tests/Predis/Command/KeyRenameTest.php +++ b/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() diff --git a/tests/Predis/Command/KeySortTest.php b/tests/Predis/Command/KeySortTest.php index 8f6ac6f5..a078236b 100644 --- a/tests/Predis/Command/KeySortTest.php +++ b/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() diff --git a/tests/Predis/Command/ListIndexTest.php b/tests/Predis/Command/ListIndexTest.php index 3de7e751..d9f132a2 100644 --- a/tests/Predis/Command/ListIndexTest.php +++ b/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() diff --git a/tests/Predis/Command/ListInsertTest.php b/tests/Predis/Command/ListInsertTest.php index 2fd3c7e1..d892d294 100644 --- a/tests/Predis/Command/ListInsertTest.php +++ b/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() diff --git a/tests/Predis/Command/ListLengthTest.php b/tests/Predis/Command/ListLengthTest.php index b36e7478..88d6f3ea 100644 --- a/tests/Predis/Command/ListLengthTest.php +++ b/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() diff --git a/tests/Predis/Command/ListPopFirstTest.php b/tests/Predis/Command/ListPopFirstTest.php index c7a60069..1feaf176 100644 --- a/tests/Predis/Command/ListPopFirstTest.php +++ b/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() diff --git a/tests/Predis/Command/ListPopLastPushHeadTest.php b/tests/Predis/Command/ListPopLastPushHeadTest.php index 0df30cc5..201bd738 100644 --- a/tests/Predis/Command/ListPopLastPushHeadTest.php +++ b/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() diff --git a/tests/Predis/Command/ListPopLastTest.php b/tests/Predis/Command/ListPopLastTest.php index 3a66d3e2..07cafcc9 100644 --- a/tests/Predis/Command/ListPopLastTest.php +++ b/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() diff --git a/tests/Predis/Command/ListPushHeadTest.php b/tests/Predis/Command/ListPushHeadTest.php index 685bca2d..13cd4cd8 100644 --- a/tests/Predis/Command/ListPushHeadTest.php +++ b/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() diff --git a/tests/Predis/Command/ListPushHeadXTest.php b/tests/Predis/Command/ListPushHeadXTest.php index 67d9bdf1..8b3e807f 100644 --- a/tests/Predis/Command/ListPushHeadXTest.php +++ b/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() diff --git a/tests/Predis/Command/ListPushTailTest.php b/tests/Predis/Command/ListPushTailTest.php index 8f69bb03..5f5b99c7 100644 --- a/tests/Predis/Command/ListPushTailTest.php +++ b/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() diff --git a/tests/Predis/Command/ListPushTailXTest.php b/tests/Predis/Command/ListPushTailXTest.php index 4175de5c..5816ac52 100644 --- a/tests/Predis/Command/ListPushTailXTest.php +++ b/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() diff --git a/tests/Predis/Command/ListRangeTest.php b/tests/Predis/Command/ListRangeTest.php index ea6f5ef9..fe233a0f 100644 --- a/tests/Predis/Command/ListRangeTest.php +++ b/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() diff --git a/tests/Predis/Command/ListRemoveTest.php b/tests/Predis/Command/ListRemoveTest.php index 32e23cb3..dcbf0293 100644 --- a/tests/Predis/Command/ListRemoveTest.php +++ b/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() diff --git a/tests/Predis/Command/ListSetTest.php b/tests/Predis/Command/ListSetTest.php index 124109d9..83fbf5fe 100644 --- a/tests/Predis/Command/ListSetTest.php +++ b/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() diff --git a/tests/Predis/Command/ListTrimTest.php b/tests/Predis/Command/ListTrimTest.php index b543a630..b65013a9 100644 --- a/tests/Predis/Command/ListTrimTest.php +++ b/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() diff --git a/tests/Predis/Command/PubSubSubscribeByPatternTest.php b/tests/Predis/Command/PubSubSubscribeByPatternTest.php index 94c1a8e6..1b84dfed 100644 --- a/tests/Predis/Command/PubSubSubscribeByPatternTest.php +++ b/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() diff --git a/tests/Predis/Command/PubSubSubscribeTest.php b/tests/Predis/Command/PubSubSubscribeTest.php index 3c424d49..76b961f5 100644 --- a/tests/Predis/Command/PubSubSubscribeTest.php +++ b/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() diff --git a/tests/Predis/Command/ServerClientTest.php b/tests/Predis/Command/ServerClientTest.php index b45e9d9b..86b7a0c3 100644 --- a/tests/Predis/Command/ServerClientTest.php +++ b/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() diff --git a/tests/Predis/Command/ServerConfigTest.php b/tests/Predis/Command/ServerConfigTest.php index bbd3f14f..00ec631d 100644 --- a/tests/Predis/Command/ServerConfigTest.php +++ b/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() { diff --git a/tests/Predis/Command/ServerEvalSHATest.php b/tests/Predis/Command/ServerEvalSHATest.php index d777db0c..3ddf7eef 100644 --- a/tests/Predis/Command/ServerEvalSHATest.php +++ b/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() { diff --git a/tests/Predis/Command/ServerEvalTest.php b/tests/Predis/Command/ServerEvalTest.php index 5aebf6ee..d1393df2 100644 --- a/tests/Predis/Command/ServerEvalTest.php +++ b/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() { diff --git a/tests/Predis/Command/ServerObjectTest.php b/tests/Predis/Command/ServerObjectTest.php index aea730fa..c9a55a4e 100644 --- a/tests/Predis/Command/ServerObjectTest.php +++ b/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() { diff --git a/tests/Predis/Command/ServerScriptTest.php b/tests/Predis/Command/ServerScriptTest.php index 9d69f5c7..6eb16e8e 100644 --- a/tests/Predis/Command/ServerScriptTest.php +++ b/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() { diff --git a/tests/Predis/Command/ServerSlowlogTest.php b/tests/Predis/Command/ServerSlowlogTest.php index 64ab9497..4beabb6b 100644 --- a/tests/Predis/Command/ServerSlowlogTest.php +++ b/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() { diff --git a/tests/Predis/Command/SetAddTest.php b/tests/Predis/Command/SetAddTest.php index 6452cb9a..53076ff2 100644 --- a/tests/Predis/Command/SetAddTest.php +++ b/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() diff --git a/tests/Predis/Command/SetCardinalityTest.php b/tests/Predis/Command/SetCardinalityTest.php index 5a806263..6bc90ec7 100644 --- a/tests/Predis/Command/SetCardinalityTest.php +++ b/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() diff --git a/tests/Predis/Command/SetDifferenceStoreTest.php b/tests/Predis/Command/SetDifferenceStoreTest.php index b575f38a..27b00325 100644 --- a/tests/Predis/Command/SetDifferenceStoreTest.php +++ b/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() diff --git a/tests/Predis/Command/SetDifferenceTest.php b/tests/Predis/Command/SetDifferenceTest.php index e8318f13..9fced2c3 100644 --- a/tests/Predis/Command/SetDifferenceTest.php +++ b/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() diff --git a/tests/Predis/Command/SetIntersectionStoreTest.php b/tests/Predis/Command/SetIntersectionStoreTest.php index cd68398a..493914c5 100644 --- a/tests/Predis/Command/SetIntersectionStoreTest.php +++ b/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() diff --git a/tests/Predis/Command/SetIntersectionTest.php b/tests/Predis/Command/SetIntersectionTest.php index f9f4c164..9ead2132 100644 --- a/tests/Predis/Command/SetIntersectionTest.php +++ b/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() diff --git a/tests/Predis/Command/SetIsMemberTest.php b/tests/Predis/Command/SetIsMemberTest.php index 30c5e0ae..d92fe0d4 100644 --- a/tests/Predis/Command/SetIsMemberTest.php +++ b/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() diff --git a/tests/Predis/Command/SetMembersTest.php b/tests/Predis/Command/SetMembersTest.php index 2d8cc4be..04ac3b3b 100644 --- a/tests/Predis/Command/SetMembersTest.php +++ b/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() diff --git a/tests/Predis/Command/SetMoveTest.php b/tests/Predis/Command/SetMoveTest.php index dda704dd..4b119555 100644 --- a/tests/Predis/Command/SetMoveTest.php +++ b/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() diff --git a/tests/Predis/Command/SetPopTest.php b/tests/Predis/Command/SetPopTest.php index a72bbf0a..d3b0f046 100644 --- a/tests/Predis/Command/SetPopTest.php +++ b/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() diff --git a/tests/Predis/Command/SetRandomMemberTest.php b/tests/Predis/Command/SetRandomMemberTest.php index 7bc408e6..69227abe 100644 --- a/tests/Predis/Command/SetRandomMemberTest.php +++ b/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() diff --git a/tests/Predis/Command/SetRemoveTest.php b/tests/Predis/Command/SetRemoveTest.php index ed6e20c8..21570a92 100644 --- a/tests/Predis/Command/SetRemoveTest.php +++ b/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() diff --git a/tests/Predis/Command/SetUnionStoreTest.php b/tests/Predis/Command/SetUnionStoreTest.php index 9c76d10f..4428cede 100644 --- a/tests/Predis/Command/SetUnionStoreTest.php +++ b/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() diff --git a/tests/Predis/Command/SetUnionTest.php b/tests/Predis/Command/SetUnionTest.php index 5f936347..93394528 100644 --- a/tests/Predis/Command/SetUnionTest.php +++ b/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() diff --git a/tests/Predis/Command/StringAppendTest.php b/tests/Predis/Command/StringAppendTest.php index 847981ce..3956f867 100644 --- a/tests/Predis/Command/StringAppendTest.php +++ b/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() diff --git a/tests/Predis/Command/StringBitCountTest.php b/tests/Predis/Command/StringBitCountTest.php index 82ac0dac..b04d06b9 100644 --- a/tests/Predis/Command/StringBitCountTest.php +++ b/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() diff --git a/tests/Predis/Command/StringBitOpTest.php b/tests/Predis/Command/StringBitOpTest.php index dacf4b41..e3fd5eb7 100644 --- a/tests/Predis/Command/StringBitOpTest.php +++ b/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() diff --git a/tests/Predis/Command/StringDecrementByTest.php b/tests/Predis/Command/StringDecrementByTest.php index a21c9690..af8e73b5 100644 --- a/tests/Predis/Command/StringDecrementByTest.php +++ b/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() diff --git a/tests/Predis/Command/StringDecrementTest.php b/tests/Predis/Command/StringDecrementTest.php index 080be9f1..50711a16 100644 --- a/tests/Predis/Command/StringDecrementTest.php +++ b/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() diff --git a/tests/Predis/Command/StringGetBitTest.php b/tests/Predis/Command/StringGetBitTest.php index e945d263..a6b701d1 100644 --- a/tests/Predis/Command/StringGetBitTest.php +++ b/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() diff --git a/tests/Predis/Command/StringGetRangeTest.php b/tests/Predis/Command/StringGetRangeTest.php index 3f0f74cb..f7e5d98c 100644 --- a/tests/Predis/Command/StringGetRangeTest.php +++ b/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() diff --git a/tests/Predis/Command/StringGetSetTest.php b/tests/Predis/Command/StringGetSetTest.php index d151fda8..d99d77e7 100644 --- a/tests/Predis/Command/StringGetSetTest.php +++ b/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() diff --git a/tests/Predis/Command/StringGetTest.php b/tests/Predis/Command/StringGetTest.php index 7233e229..6da814f6 100644 --- a/tests/Predis/Command/StringGetTest.php +++ b/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() diff --git a/tests/Predis/Command/StringIncrementByFloatTest.php b/tests/Predis/Command/StringIncrementByFloatTest.php index f3d0dc73..dab01fbf 100644 --- a/tests/Predis/Command/StringIncrementByFloatTest.php +++ b/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() diff --git a/tests/Predis/Command/StringIncrementByTest.php b/tests/Predis/Command/StringIncrementByTest.php index 711d377c..15305970 100644 --- a/tests/Predis/Command/StringIncrementByTest.php +++ b/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() diff --git a/tests/Predis/Command/StringIncrementTest.php b/tests/Predis/Command/StringIncrementTest.php index 6e2a1fb0..8435c81e 100644 --- a/tests/Predis/Command/StringIncrementTest.php +++ b/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() diff --git a/tests/Predis/Command/StringPreciseSetExpireTest.php b/tests/Predis/Command/StringPreciseSetExpireTest.php index 5ce521f7..5e2f4ffa 100644 --- a/tests/Predis/Command/StringPreciseSetExpireTest.php +++ b/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? */ diff --git a/tests/Predis/Command/StringSetBitTest.php b/tests/Predis/Command/StringSetBitTest.php index 1c1aceef..1b942b52 100644 --- a/tests/Predis/Command/StringSetBitTest.php +++ b/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() diff --git a/tests/Predis/Command/StringSetExpireTest.php b/tests/Predis/Command/StringSetExpireTest.php index 7cc31253..587bf392 100644 --- a/tests/Predis/Command/StringSetExpireTest.php +++ b/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() diff --git a/tests/Predis/Command/StringSetRangeTest.php b/tests/Predis/Command/StringSetRangeTest.php index e5b70c20..8a2d21ef 100644 --- a/tests/Predis/Command/StringSetRangeTest.php +++ b/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() diff --git a/tests/Predis/Command/StringStrlenTest.php b/tests/Predis/Command/StringStrlenTest.php index 947e3e11..593edfe2 100644 --- a/tests/Predis/Command/StringStrlenTest.php +++ b/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() diff --git a/tests/Predis/Command/TransactionDiscardTest.php b/tests/Predis/Command/TransactionDiscardTest.php index 20fa9662..256c5a17 100644 --- a/tests/Predis/Command/TransactionDiscardTest.php +++ b/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() diff --git a/tests/Predis/Command/TransactionExecTest.php b/tests/Predis/Command/TransactionExecTest.php index fd09ddda..2c604355 100644 --- a/tests/Predis/Command/TransactionExecTest.php +++ b/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() diff --git a/tests/Predis/Command/TransactionMultiTest.php b/tests/Predis/Command/TransactionMultiTest.php index 78bfe633..7a4007cf 100644 --- a/tests/Predis/Command/TransactionMultiTest.php +++ b/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() diff --git a/tests/Predis/Command/TransactionUnwatchTest.php b/tests/Predis/Command/TransactionUnwatchTest.php index c1f8f1f7..7f986242 100644 --- a/tests/Predis/Command/TransactionUnwatchTest.php +++ b/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()); } } diff --git a/tests/Predis/Command/TransactionWatchTest.php b/tests/Predis/Command/TransactionWatchTest.php index b98673ce..a3f45d50 100644 --- a/tests/Predis/Command/TransactionWatchTest.php +++ b/tests/Predis/Command/TransactionWatchTest.php @@ -108,7 +108,7 @@ class TransactionWatchTest extends CommandTestCase $this->assertTrue($redis1->watch('foo', 'hoge')); $this->assertTrue($redis1->multi()); - $this->assertInstanceOf('Predis\ResponseQueued', $redis1->get('foo')); + $this->assertInstanceOf('Predis\Response\ResponseQueued', $redis1->get('foo')); $this->assertTrue($redis2->set('foo', 'hijacked')); $this->assertNull($redis1->exec()); $this->assertSame('hijacked', $redis1->get('foo')); @@ -124,7 +124,7 @@ class TransactionWatchTest extends CommandTestCase $this->assertTrue($redis1->watch('foo')); $this->assertTrue($redis1->multi()); - $this->assertInstanceOf('Predis\ResponseQueued', $redis1->set('foo', 'bar')); + $this->assertInstanceOf('Predis\Response\ResponseQueued', $redis1->set('foo', 'bar')); $this->assertTrue($redis2->set('foo', 'hijacked')); $this->assertNull($redis1->exec()); $this->assertSame('hijacked', $redis1->get('foo')); @@ -132,7 +132,7 @@ class TransactionWatchTest extends CommandTestCase /** * @group connected - * @expectedException Predis\ServerException + * @expectedException Predis\Response\ServerException * @expectedExceptionMessage ERR WATCH inside MULTI is not allowed */ public function testThrowsExceptionWhenCallingInsideTransaction() diff --git a/tests/Predis/Command/ZSetAddTest.php b/tests/Predis/Command/ZSetAddTest.php index 74394423..c0d2216d 100644 --- a/tests/Predis/Command/ZSetAddTest.php +++ b/tests/Predis/Command/ZSetAddTest.php @@ -123,7 +123,7 @@ class ZSetAddTest 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() diff --git a/tests/Predis/Command/ZSetCardinalityTest.php b/tests/Predis/Command/ZSetCardinalityTest.php index 272286f7..95cb67c2 100644 --- a/tests/Predis/Command/ZSetCardinalityTest.php +++ b/tests/Predis/Command/ZSetCardinalityTest.php @@ -97,7 +97,7 @@ class ZSetCardinalityTest 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() diff --git a/tests/Predis/Command/ZSetCountTest.php b/tests/Predis/Command/ZSetCountTest.php index 19c288c4..0c7d7f6f 100644 --- a/tests/Predis/Command/ZSetCountTest.php +++ b/tests/Predis/Command/ZSetCountTest.php @@ -130,7 +130,7 @@ class ZSetCountTest 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() diff --git a/tests/Predis/Command/ZSetIncrementByTest.php b/tests/Predis/Command/ZSetIncrementByTest.php index 45fe321f..593fc478 100644 --- a/tests/Predis/Command/ZSetIncrementByTest.php +++ b/tests/Predis/Command/ZSetIncrementByTest.php @@ -97,7 +97,7 @@ class ZSetIncrementByTest 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() diff --git a/tests/Predis/Command/ZSetIntersectionStoreTest.php b/tests/Predis/Command/ZSetIntersectionStoreTest.php index 084b661f..99b865bf 100644 --- a/tests/Predis/Command/ZSetIntersectionStoreTest.php +++ b/tests/Predis/Command/ZSetIntersectionStoreTest.php @@ -191,7 +191,7 @@ class ZSetIntersectionStoreTest 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() diff --git a/tests/Predis/Command/ZSetRangeByScoreTest.php b/tests/Predis/Command/ZSetRangeByScoreTest.php index 37110df7..7086eec0 100644 --- a/tests/Predis/Command/ZSetRangeByScoreTest.php +++ b/tests/Predis/Command/ZSetRangeByScoreTest.php @@ -246,7 +246,7 @@ class ZSetRangeByScoreTest 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() diff --git a/tests/Predis/Command/ZSetRangeTest.php b/tests/Predis/Command/ZSetRangeTest.php index 4ef10b6f..a3f6fedb 100644 --- a/tests/Predis/Command/ZSetRangeTest.php +++ b/tests/Predis/Command/ZSetRangeTest.php @@ -169,7 +169,7 @@ class ZSetRangeTest 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() diff --git a/tests/Predis/Command/ZSetRankTest.php b/tests/Predis/Command/ZSetRankTest.php index 4070a262..d2333327 100644 --- a/tests/Predis/Command/ZSetRankTest.php +++ b/tests/Predis/Command/ZSetRankTest.php @@ -100,7 +100,7 @@ class ZSetRankTest 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() diff --git a/tests/Predis/Command/ZSetRemoveRangeByRankTest.php b/tests/Predis/Command/ZSetRemoveRangeByRankTest.php index 01499b59..c291f43a 100644 --- a/tests/Predis/Command/ZSetRemoveRangeByRankTest.php +++ b/tests/Predis/Command/ZSetRemoveRangeByRankTest.php @@ -112,7 +112,7 @@ class ZSetRemoveRangeByRankTest 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() diff --git a/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php b/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php index 3e145a3e..a27cdbe8 100644 --- a/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php +++ b/tests/Predis/Command/ZSetRemoveRangeByScoreTest.php @@ -112,7 +112,7 @@ class ZSetRemoveRangeByScoreTest 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() diff --git a/tests/Predis/Command/ZSetRemoveTest.php b/tests/Predis/Command/ZSetRemoveTest.php index 0fe8ae8d..17fca3ff 100644 --- a/tests/Predis/Command/ZSetRemoveTest.php +++ b/tests/Predis/Command/ZSetRemoveTest.php @@ -99,7 +99,7 @@ class ZSetRemoveTest 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() diff --git a/tests/Predis/Command/ZSetReverseRangeByScoreTest.php b/tests/Predis/Command/ZSetReverseRangeByScoreTest.php index 6cfaa862..112e99ec 100644 --- a/tests/Predis/Command/ZSetReverseRangeByScoreTest.php +++ b/tests/Predis/Command/ZSetReverseRangeByScoreTest.php @@ -246,7 +246,7 @@ class ZSetReverseRangeByScoreTest 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() diff --git a/tests/Predis/Command/ZSetReverseRangeTest.php b/tests/Predis/Command/ZSetReverseRangeTest.php index 58b17dd6..3c1f5ab0 100644 --- a/tests/Predis/Command/ZSetReverseRangeTest.php +++ b/tests/Predis/Command/ZSetReverseRangeTest.php @@ -169,7 +169,7 @@ class ZSetReverseRangeTest 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() diff --git a/tests/Predis/Command/ZSetReverseRankTest.php b/tests/Predis/Command/ZSetReverseRankTest.php index 10434d5b..0d429063 100644 --- a/tests/Predis/Command/ZSetReverseRankTest.php +++ b/tests/Predis/Command/ZSetReverseRankTest.php @@ -100,7 +100,7 @@ class ZSetReverseRankTest 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() diff --git a/tests/Predis/Command/ZSetScoreTest.php b/tests/Predis/Command/ZSetScoreTest.php index 929a4278..cd484104 100644 --- a/tests/Predis/Command/ZSetScoreTest.php +++ b/tests/Predis/Command/ZSetScoreTest.php @@ -100,7 +100,7 @@ class ZSetScoreTest 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() diff --git a/tests/Predis/Command/ZSetUnionStoreTest.php b/tests/Predis/Command/ZSetUnionStoreTest.php index 2569c0c2..6e46994d 100644 --- a/tests/Predis/Command/ZSetUnionStoreTest.php +++ b/tests/Predis/Command/ZSetUnionStoreTest.php @@ -208,7 +208,7 @@ class ZSetUnionStoreTest 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() diff --git a/tests/Predis/Connection/RedisClusterTest.php b/tests/Predis/Connection/RedisClusterTest.php index 0d63e5c9..63c46745 100644 --- a/tests/Predis/Connection/RedisClusterTest.php +++ b/tests/Predis/Connection/RedisClusterTest.php @@ -13,8 +13,8 @@ namespace Predis\Connection; use \PHPUnit_Framework_TestCase as StandardTestCase; -use Predis\ResponseError; use Predis\Profile\ServerProfile; +use Predis\Response\ResponseError; /** * diff --git a/tests/Predis/Pipeline/MultiExecExecutorTest.php b/tests/Predis/Pipeline/MultiExecExecutorTest.php index b389a59b..f8624885 100644 --- a/tests/Predis/Pipeline/MultiExecExecutorTest.php +++ b/tests/Predis/Pipeline/MultiExecExecutorTest.php @@ -14,10 +14,10 @@ namespace Predis\Pipeline; use \PHPUnit_Framework_TestCase as StandardTestCase; use SplQueue; -use Predis\ResponseError; -use Predis\ResponseObjectInterface; -use Predis\ResponseQueued; use Predis\Profile\ServerProfile; +use Predis\Response\ResponseError; +use Predis\Response\ResponseObjectInterface; +use Predis\Response\ResponseQueued; /** * @@ -69,7 +69,7 @@ class MultiExecExecutorTest extends StandardTestCase /** * @group disconnected - * @expectedException Predis\ServerException + * @expectedException Predis\Response\ServerException * @expectedExceptionMessage ERR Test error */ public function testExecutorWithErrorInTransaction() diff --git a/tests/Predis/Pipeline/PipelineContextTest.php b/tests/Predis/Pipeline/PipelineContextTest.php index 8fce8390..0b0169de 100644 --- a/tests/Predis/Pipeline/PipelineContextTest.php +++ b/tests/Predis/Pipeline/PipelineContextTest.php @@ -358,7 +358,7 @@ class PipelineContextTest extends StandardTestCase $exception = $ex; } - $this->assertInstanceOf('Predis\ServerException', $exception); + $this->assertInstanceOf('Predis\Response\ServerException', $exception); $this->assertTrue($client->exists('foo')); $this->assertTrue($client->exists('hoge')); } @@ -377,7 +377,7 @@ class PipelineContextTest extends StandardTestCase }); $this->assertTrue($results[0]); - $this->assertInstanceOf('Predis\ResponseError', $results[1]); + $this->assertInstanceOf('Predis\Response\ResponseError', $results[1]); $this->assertSame('bar', $results[2]); } diff --git a/tests/Predis/Pipeline/StandardExecutorTest.php b/tests/Predis/Pipeline/StandardExecutorTest.php index e5e1c833..47b2fab2 100644 --- a/tests/Predis/Pipeline/StandardExecutorTest.php +++ b/tests/Predis/Pipeline/StandardExecutorTest.php @@ -14,9 +14,9 @@ namespace Predis\Pipeline; use \PHPUnit_Framework_TestCase as StandardTestCase; use SplQueue; -use Predis\ResponseError; -use Predis\ResponseObjectInterface; use Predis\Profile\ServerProfile; +use Predis\Response\ResponseError; +use Predis\Response\ResponseObjectInterface; /** * @@ -74,7 +74,7 @@ class StandardExecutorTest extends StandardTestCase public function testExecutorDoesNotParseResponseObjects() { $executor = new StandardExecutor(); - $response = $this->getMock('Predis\ResponseObjectInterface'); + $response = $this->getMock('Predis\Response\ResponseObjectInterface'); $this->simpleResponseObjectTest($executor, $response); } @@ -85,14 +85,14 @@ class StandardExecutorTest extends StandardTestCase public function testExecutorCanReturnRedisErrors() { $executor = new StandardExecutor(false); - $response = $this->getMock('Predis\ResponseErrorInterface'); + $response = $this->getMock('Predis\Response\ResponseErrorInterface'); $this->simpleResponseObjectTest($executor, $response); } /** * @group disconnected - * @expectedException Predis\ServerException + * @expectedException Predis\Response\ServerException * @expectedExceptionMessage ERR Test error */ public function testExecutorCanThrowExceptions() @@ -114,7 +114,7 @@ class StandardExecutorTest extends StandardTestCase // ******************************************************************** // /** - * Executes a test for the Predis\ResponseObjectInterface type. + * Executes a test for the Predis\Response\ResponseObjectInterface type. * * @param PipelineExecutorInterface $executor * @param ResponseObjectInterface $response diff --git a/tests/Predis/Protocol/Text/Handler/ErrorResponseTest.php b/tests/Predis/Protocol/Text/Handler/ErrorResponseTest.php index 6f2d157f..589a649a 100644 --- a/tests/Predis/Protocol/Text/Handler/ErrorResponseTest.php +++ b/tests/Predis/Protocol/Text/Handler/ErrorResponseTest.php @@ -33,7 +33,7 @@ class ErrorResponseTest extends StandardTestCase $message = "ERR Operation against a key holding the wrong kind of value"; $response = $handler->handle($connection, $message); - $this->assertInstanceOf('Predis\ResponseError', $response); + $this->assertInstanceOf('Predis\Response\ResponseError', $response); $this->assertSame($message, $response->getMessage()); } } diff --git a/tests/Predis/Protocol/Text/Handler/IntegerResponse.php b/tests/Predis/Protocol/Text/Handler/IntegerResponse.php index af7a0c9c..e937eed7 100644 --- a/tests/Predis/Protocol/Text/Handler/IntegerResponse.php +++ b/tests/Predis/Protocol/Text/Handler/IntegerResponse.php @@ -12,7 +12,7 @@ namespace Predis\Protocol\Text; use \PHPUnit_Framework_TestCase as StandardTestCase; -use Predis\ResponseQueued; +use Predis\Response\ResponseQueued; /** * diff --git a/tests/Predis/Protocol/Text/Handler/StatusResponseTest.php b/tests/Predis/Protocol/Text/Handler/StatusResponseTest.php index 9c2a49f3..c276cf4c 100644 --- a/tests/Predis/Protocol/Text/Handler/StatusResponseTest.php +++ b/tests/Predis/Protocol/Text/Handler/StatusResponseTest.php @@ -12,7 +12,7 @@ namespace Predis\Protocol\Text; use \PHPUnit_Framework_TestCase as StandardTestCase; -use Predis\ResponseQueued; +use Predis\Response\ResponseQueued; /** * @@ -46,7 +46,7 @@ class StatusResponseTest extends StandardTestCase $connection->expects($this->never())->method('readLine'); $connection->expects($this->never())->method('readBytes'); - $this->assertInstanceOf('Predis\ResponseQueued', $handler->handle($connection, 'QUEUED')); + $this->assertInstanceOf('Predis\Response\ResponseQueued', $handler->handle($connection, 'QUEUED')); } /** diff --git a/tests/Predis/ResponseErrorTest.php b/tests/Predis/Response/ResponseErrorTest.php similarity index 87% rename from tests/Predis/ResponseErrorTest.php rename to tests/Predis/Response/ResponseErrorTest.php index ec9e8bdc..ee3217ae 100644 --- a/tests/Predis/ResponseErrorTest.php +++ b/tests/Predis/Response/ResponseErrorTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Predis; +namespace Predis\Response; use \PHPUnit_Framework_TestCase as StandardTestCase; @@ -27,8 +27,8 @@ class ResponseErrorTest extends StandardTestCase { $error = new ResponseError(self::ERR_WRONG_KEY_TYPE); - $this->assertInstanceOf('Predis\ResponseErrorInterface', $error); - $this->assertInstanceOf('Predis\ResponseObjectInterface', $error); + $this->assertInstanceOf('Predis\Response\ResponseErrorInterface', $error); + $this->assertInstanceOf('Predis\Response\ResponseObjectInterface', $error); } /** diff --git a/tests/Predis/ResponseQueuedTest.php b/tests/Predis/Response/ResponseQueuedTest.php similarity index 89% rename from tests/Predis/ResponseQueuedTest.php rename to tests/Predis/Response/ResponseQueuedTest.php index fb40011e..09bf06fd 100644 --- a/tests/Predis/ResponseQueuedTest.php +++ b/tests/Predis/Response/ResponseQueuedTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Predis; +namespace Predis\Response; use \PHPUnit_Framework_TestCase as StandardTestCase; @@ -25,7 +25,7 @@ class ResponseQueuedTest extends StandardTestCase { $queued = new ResponseQueued(); - $this->assertInstanceOf('Predis\ResponseObjectInterface', $queued); + $this->assertInstanceOf('Predis\Response\ResponseObjectInterface', $queued); } /** diff --git a/tests/Predis/ServerExceptionTest.php b/tests/Predis/Response/ServerExceptionTest.php similarity index 76% rename from tests/Predis/ServerExceptionTest.php rename to tests/Predis/Response/ServerExceptionTest.php index 92410448..4dfa7508 100644 --- a/tests/Predis/ServerExceptionTest.php +++ b/tests/Predis/Response/ServerExceptionTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Predis; +namespace Predis\Response; use \PHPUnit_Framework_TestCase as StandardTestCase; @@ -25,7 +25,7 @@ class ServerExceptionTest extends StandardTestCase */ public function testExceptionMessage() { - $this->setExpectedException('Predis\ServerException', self::ERR_WRONG_KEY_TYPE); + $this->setExpectedException('Predis\Response\ServerException', self::ERR_WRONG_KEY_TYPE); throw new ServerException(self::ERR_WRONG_KEY_TYPE); } @@ -37,9 +37,9 @@ class ServerExceptionTest extends StandardTestCase { $exception = new ServerException(self::ERR_WRONG_KEY_TYPE); - $this->assertInstanceOf('Predis\ServerException', $exception); - $this->assertInstanceOf('Predis\ResponseErrorInterface', $exception); - $this->assertInstanceOf('Predis\ResponseObjectInterface', $exception); + $this->assertInstanceOf('Predis\Response\ServerException', $exception); + $this->assertInstanceOf('Predis\Response\ResponseErrorInterface', $exception); + $this->assertInstanceOf('Predis\Response\ResponseObjectInterface', $exception); $this->assertInstanceOf('Predis\PredisException', $exception); } @@ -61,7 +61,7 @@ class ServerExceptionTest extends StandardTestCase $exception = new ServerException(self::ERR_WRONG_KEY_TYPE); $error = $exception->toResponseError(); - $this->assertInstanceOf('Predis\ResponseError', $error); + $this->assertInstanceOf('Predis\Response\ResponseError', $error); $this->assertEquals($exception->getMessage(), $error->getMessage()); $this->assertEquals($exception->getErrorType(), $error->getErrorType()); diff --git a/tests/Predis/Transaction/MultiExecContextTest.php b/tests/Predis/Transaction/MultiExecContextTest.php index b6e0e6a8..212d5231 100644 --- a/tests/Predis/Transaction/MultiExecContextTest.php +++ b/tests/Predis/Transaction/MultiExecContextTest.php @@ -14,9 +14,9 @@ namespace Predis\Transaction; use \PHPUnit_Framework_TestCase as StandardTestCase; use Predis\Client; -use Predis\ResponseQueued; -use Predis\ServerException; use Predis\Command\CommandInterface; +use Predis\Response\ResponseQueued; +use Predis\Response\ServerException; /** * @group realm-transaction @@ -514,7 +514,7 @@ class MultiExecContextTest extends StandardTestCase $exception = $ex; } - $this->assertInstanceOf('Predis\ResponseErrorInterface', $exception); + $this->assertInstanceOf('Predis\Response\ResponseErrorInterface', $exception); $this->assertSame($value, $client->get('foo')); } @@ -532,7 +532,7 @@ class MultiExecContextTest extends StandardTestCase }); $this->assertTrue($replies[0]); - $this->assertInstanceOf('Predis\ResponseErrorInterface', $replies[1]); + $this->assertInstanceOf('Predis\Response\ResponseErrorInterface', $replies[1]); $this->assertSame('foobar', $replies[2]); }