Run php-cs-fixer with new configuration.

This commit is contained in:
Daniele Alessandri
2015-07-24 23:05:30 +02:00
parent 35e97967fd
commit 8dd9893a2f
59 changed files with 93 additions and 89 deletions
+3 -3
View File
@@ -15,9 +15,9 @@ require __DIR__.'/shared.php';
// their own distributors used by the client to distribute keys among a cluster
// of servers.
use Predis\Cluster\PredisStrategy;
use Predis\Cluster\Distributor\DistributorInterface;
use Predis\Cluster\Hash\HashGeneratorInterface;
use Predis\Cluster\PredisStrategy;
use Predis\Connection\Aggregate\PredisCluster;
class NaiveDistributor implements DistributorInterface, HashGeneratorInterface
@@ -34,7 +34,7 @@ class NaiveDistributor implements DistributorInterface, HashGeneratorInterface
public function add($node, $weight = null)
{
$this->nodes[] = $node;
$this->nodesCount++;
++$this->nodesCount;
}
public function remove($node)
@@ -99,7 +99,7 @@ $options = array(
$client = new Predis\Client($multiple_servers, $options);
for ($i = 0; $i < 100; $i++) {
for ($i = 0; $i < 100; ++$i) {
$client->set("key:$i", str_pad($i, 4, '0', 0));
$client->get("key:$i");
}
+2 -2
View File
@@ -26,7 +26,7 @@ var_export($response); echo PHP_EOL;
$mkv = array(
'uid:0001' => '1st user',
'uid:0002' => '2nd user',
'uid:0003' => '3rd user'
'uid:0003' => '3rd user',
);
$client->mset($mkv);
@@ -45,7 +45,7 @@ array (
// their arguments are not filtered nor responses coming from Redis are parsed.
$response = $client->executeRaw(array(
'MGET', 'uid:0001', 'uid:0002', 'uid:0003'
'MGET', 'uid:0001', 'uid:0002', 'uid:0003',
));
var_export($response); echo PHP_EOL;
+1 -1
View File
@@ -55,7 +55,7 @@ $client = new Predis\Client($single_server, array(
$profile->defineCommand('increxby', 'IncrementExistingKeysBy');
return $profile;
}
},
));
$client->mset('foo', 10, 'foobar', 100);
+1 -1
View File
@@ -28,7 +28,7 @@ foreach (($monitor = $client->monitor()) as $event) {
// If we notice a ECHO command with the message QUIT_MONITOR, we stop the
// monitor consumer and then break the loop.
if ($event->command === 'ECHO' && $event->arguments === '"QUIT_MONITOR"') {
echo "Exiting the monitor loop...", PHP_EOL;
echo 'Exiting the monitor loop...', PHP_EOL;
$monitor->stop();
break;
}
+1 -1
View File
@@ -36,7 +36,7 @@ foreach ($pubsub as $message) {
case 'message':
if ($message->channel == 'control_channel') {
if ($message->payload == 'quit_loop') {
echo "Aborting pubsub loop...", PHP_EOL;
echo 'Aborting pubsub loop...', PHP_EOL;
$pubsub->unsubscribe();
} else {
echo "Received an unrecognized command: {$message->payload}.", PHP_EOL;
+1 -1
View File
@@ -34,7 +34,7 @@ $client = new Predis\Client($single_server, array('profile' => '2.8'));
// Prepare some keys for our example
$client->del('predis:set', 'predis:zset', 'predis:hash');
for ($i = 0; $i < 5; $i++) {
for ($i = 0; $i < 5; ++$i) {
$client->sadd('predis:set', "member:$i");
$client->zadd('predis:zset', -$i, "member:$i");
$client->hset('predis:hash', "field:$i", "value:$i");
+1 -1
View File
@@ -81,5 +81,5 @@ $hashes = $client->hmgetall('metavars', 'servers');
$replication = $client->getConnection();
$stillOnSlave = $replication->getCurrent() === $replication->getConnectionById('slave');
echo "Is still on slave? ", $stillOnSlave ? 'YES!' : 'NO!', PHP_EOL;
echo 'Is still on slave? ', $stillOnSlave ? 'YES!' : 'NO!', PHP_EOL;
var_export($hashes);
+1 -1
View File
@@ -25,7 +25,7 @@ require __DIR__.'/shared.php';
//
if (!interface_exists('SessionHandlerInterface')) {
die("ATTENTION: the session handler implemented by Predis requires PHP >= 5.4.0 ".
die('ATTENTION: the session handler implemented by Predis requires PHP >= 5.4.0 '.
"or a polyfill for SessionHandlerInterface provided by an external package.\n");
}
+1 -1
View File
@@ -25,7 +25,7 @@ function redis_version($info)
$single_server = array(
'host' => '127.0.0.1',
'port' => 6379,
'database' => 15
'database' => 15,
);
$multiple_servers = array(
+1 -1
View File
@@ -49,4 +49,4 @@ function zpop($client, $key)
$client = new Predis\Client($single_server);
$zpopped = zpop($client, 'zset');
echo isset($zpopped) ? "ZPOPed $zpopped" : "Nothing to ZPOP!", PHP_EOL;
echo isset($zpopped) ? "ZPOPed $zpopped" : 'Nothing to ZPOP!', PHP_EOL;
+6 -6
View File
@@ -16,8 +16,8 @@ use Predis\Command\RawCommand;
use Predis\Command\ScriptCommand;
use Predis\Configuration\Options;
use Predis\Configuration\OptionsInterface;
use Predis\Connection\ConnectionInterface;
use Predis\Connection\AggregateConnectionInterface;
use Predis\Connection\ConnectionInterface;
use Predis\Connection\ParametersInterface;
use Predis\Monitor\Consumer as MonitorConsumer;
use Predis\Pipeline\Pipeline;
@@ -64,9 +64,9 @@ class Client implements ClientInterface
*
* @param mixed $options Client options.
*
* @throws \InvalidArgumentException
* @return OptionsInterface
*
* @throws \InvalidArgumentException
*/
protected function createOptions($options)
{
@@ -96,9 +96,9 @@ class Client implements ClientInterface
*
* @param mixed $parameters Connection parameters or connection instance.
*
* @throws \InvalidArgumentException
* @return ConnectionInterface
*
* @throws \InvalidArgumentException
*/
protected function createConnection($parameters)
{
@@ -189,9 +189,9 @@ class Client implements ClientInterface
*
* @param string $connectionID Identifier of a connection.
*
* @throws \InvalidArgumentException
* @return Client
*
* @throws \InvalidArgumentException
*/
public function getClientFor($connectionID)
{
@@ -253,9 +253,9 @@ class Client implements ClientInterface
*
* @param string $connectionID Index or alias of the single connection.
*
* @throws NotSupportedException
* @return Connection\NodeConnectionInterface
*
* @throws NotSupportedException
*/
public function getConnectionById($connectionID)
{
@@ -342,9 +342,9 @@ class Client implements ClientInterface
* @param CommandInterface $command Redis command that generated the error.
* @param ErrorResponseInterface $response Instance of the error response.
*
* @throws ServerException
* @return mixed
*
* @throws ServerException
*/
protected function onErrorResponse(CommandInterface $command, ErrorResponseInterface $response)
{
+2 -2
View File
@@ -11,9 +11,9 @@
namespace Predis\Cluster;
use Predis\NotSupportedException;
use Predis\Cluster\Hash\HashGeneratorInterface;
use Predis\Cluster\Hash\CRC16;
use Predis\Cluster\Hash\HashGeneratorInterface;
use Predis\NotSupportedException;
/**
* Default class used by Predis to calculate hashes out of keys of
+2
View File
@@ -3,6 +3,8 @@
/*
* This file is part of the Predis package.
*
* (c) Daniele Alessandri <suppakilla@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+2 -2
View File
@@ -11,8 +11,8 @@
namespace Predis\Connection;
use Predis\CommunicationException;
use Predis\Command\CommandInterface;
use Predis\CommunicationException;
use Predis\Protocol\ProtocolException;
/**
@@ -51,9 +51,9 @@ abstract class AbstractConnection implements NodeConnectionInterface
*
* @param ParametersInterface $parameters Initialization parameters for the connection.
*
* @throws \InvalidArgumentException
* @return ParametersInterface
*
* @throws \InvalidArgumentException
*/
protected function assertParameters(ParametersInterface $parameters)
{
+1 -1
View File
@@ -11,11 +11,11 @@
namespace Predis\Connection\Aggregate;
use Predis\NotSupportedException;
use Predis\Cluster\PredisStrategy;
use Predis\Cluster\StrategyInterface;
use Predis\Command\CommandInterface;
use Predis\Connection\NodeConnectionInterface;
use Predis\NotSupportedException;
/**
* Abstraction for a cluster of aggregate connections to various Redis servers
+4 -4
View File
@@ -11,13 +11,13 @@
namespace Predis\Connection\Aggregate;
use Predis\NotSupportedException;
use Predis\Cluster\StrategyInterface;
use Predis\Cluster\RedisStrategy as RedisClusterStrategy;
use Predis\Cluster\StrategyInterface;
use Predis\Command\CommandInterface;
use Predis\Command\RawCommand;
use Predis\Connection\NodeConnectionInterface;
use Predis\Connection\FactoryInterface;
use Predis\Connection\NodeConnectionInterface;
use Predis\NotSupportedException;
use Predis\Response\ErrorInterface as ErrorResponseInterface;
/**
@@ -313,9 +313,9 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
*
* @param int $slot Slot index.
*
* @throws \OutOfBoundsException
* @return NodeConnectionInterface
*
* @throws \OutOfBoundsException
*/
public function getConnectionBySlot($slot)
{
+1 -1
View File
@@ -34,9 +34,9 @@ class Factory implements FactoryInterface
*
* @param mixed $initializer FQN of a connection class or a callable for lazy initialization.
*
* @throws \InvalidArgumentException
* @return mixed
*
* @throws \InvalidArgumentException
*/
protected function checkInitializer($initializer)
{
+2 -2
View File
@@ -69,9 +69,9 @@ class Parameters implements ParametersInterface
*
* @param string $uri URI string.
*
* @throws \InvalidArgumentException
* @return array
*
* @throws \InvalidArgumentException
*/
public static function parse($uri)
{
@@ -111,9 +111,9 @@ class Parameters implements ParametersInterface
*
* @param string $uri URI string.
*
* @throws \InvalidArgumentException
* @return array
*
* @throws \InvalidArgumentException
*/
public static function parseIANA($uri)
{
+1 -1
View File
@@ -11,8 +11,8 @@
namespace Predis\Connection;
use Predis\NotSupportedException;
use Predis\Command\CommandInterface;
use Predis\NotSupportedException;
use Predis\Response\Error as ErrorResponse;
use Predis\Response\Status as StatusResponse;
+1 -1
View File
@@ -11,8 +11,8 @@
namespace Predis\Connection;
use Predis\NotSupportedException;
use Predis\Command\CommandInterface;
use Predis\NotSupportedException;
use Predis\Response\Error as ErrorResponse;
use Predis\Response\Status as StatusResponse;
+2 -2
View File
@@ -11,8 +11,8 @@
namespace Predis\Connection;
use Predis\NotSupportedException;
use Predis\Command\CommandInterface;
use Predis\NotSupportedException;
use Predis\Protocol\ProtocolException;
use Predis\Response\Error as ErrorResponse;
use Predis\Response\Status as StatusResponse;
@@ -219,9 +219,9 @@ class WebdisConnection implements NodeConnectionInterface
*
* @param CommandInterface $command Command instance.
*
* @throws NotSupportedException
* @return string
*
* @throws NotSupportedException
*/
protected function getCommandId(CommandInterface $command)
{
+1 -1
View File
@@ -12,8 +12,8 @@
namespace Predis\Monitor;
use Predis\ClientInterface;
use Predis\NotSupportedException;
use Predis\Connection\AggregateConnectionInterface;
use Predis\NotSupportedException;
/**
* Redis MONITOR consumer.
+2 -2
View File
@@ -11,11 +11,11 @@
namespace Predis\Pipeline;
use Predis\NotSupportedException;
use Predis\CommunicationException;
use Predis\Connection\Aggregate\ClusterInterface;
use Predis\Connection\ConnectionInterface;
use Predis\Connection\NodeConnectionInterface;
use Predis\Connection\Aggregate\ClusterInterface;
use Predis\NotSupportedException;
/**
* Command pipeline that does not throw exceptions on connection errors, but
+3 -3
View File
@@ -15,8 +15,8 @@ use Predis\ClientContextInterface;
use Predis\ClientException;
use Predis\ClientInterface;
use Predis\Command\CommandInterface;
use Predis\Connection\ConnectionInterface;
use Predis\Connection\Aggregate\ReplicationInterface;
use Predis\Connection\ConnectionInterface;
use Predis\Response\ErrorInterface as ErrorResponseInterface;
use Predis\Response\ResponseInterface;
use Predis\Response\ServerException;
@@ -192,10 +192,10 @@ class Pipeline implements ClientContextInterface
*
* @param mixed $callable Optional callback for execution.
*
* @return array
*
* @throws \Exception
* @throws \InvalidArgumentException
* @return array
*
*/
public function execute($callable = null)
{
+2 -2
View File
@@ -83,9 +83,9 @@ final class Factory
*
* @param string $version Profile version or alias.
*
* @return ProfileInterface
*
* @throws ClientException
*
* @return ProfileInterface
*/
public static function get($version)
{
@@ -13,8 +13,8 @@ namespace Predis\Protocol\Text\Handler;
use Predis\CommunicationException;
use Predis\Connection\CompositeConnectionInterface;
use Predis\Response\Iterator\MultiBulk as MultiBulkIterator;
use Predis\Protocol\ProtocolException;
use Predis\Response\Iterator\MultiBulk as MultiBulkIterator;
/**
* Handler for the multibulk response type in the standard Redis wire protocol.
+2 -2
View File
@@ -11,14 +11,14 @@
namespace Predis\Protocol\Text;
use Predis\CommunicationException;
use Predis\Command\CommandInterface;
use Predis\CommunicationException;
use Predis\Connection\CompositeConnectionInterface;
use Predis\Protocol\ProtocolException;
use Predis\Protocol\ProtocolProcessorInterface;
use Predis\Response\Status as StatusResponse;
use Predis\Response\Error as ErrorResponse;
use Predis\Response\Iterator\MultiBulk as MultiBulkIterator;
use Predis\Response\Status as StatusResponse;
/**
* Protocol processor for the standard Redis wire protocol.
+1 -1
View File
@@ -14,8 +14,8 @@ namespace Predis\PubSub;
use Predis\ClientException;
use Predis\ClientInterface;
use Predis\Command\Command;
use Predis\NotSupportedException;
use Predis\Connection\AggregateConnectionInterface;
use Predis\NotSupportedException;
/**
* PUB/SUB consumer abstraction.
+2 -2
View File
@@ -11,8 +11,8 @@
namespace Predis\Replication;
use Predis\NotSupportedException;
use Predis\Command\CommandInterface;
use Predis\NotSupportedException;
/**
* Defines a strategy for master/slave replication.
@@ -41,9 +41,9 @@ class ReplicationStrategy
*
* @param CommandInterface $command Command instance.
*
* @throws NotSupportedException
* @return bool
*
* @throws NotSupportedException
*/
public function isReadOperation(CommandInterface $command)
{
+11 -11
View File
@@ -14,14 +14,14 @@ namespace Predis\Transaction;
use Predis\ClientContextInterface;
use Predis\ClientException;
use Predis\ClientInterface;
use Predis\Command\CommandInterface;
use Predis\CommunicationException;
use Predis\Connection\AggregateConnectionInterface;
use Predis\NotSupportedException;
use Predis\Protocol\ProtocolException;
use Predis\Response\ErrorInterface as ErrorResponseInterface;
use Predis\Response\ServerException;
use Predis\Response\Status as StatusResponse;
use Predis\Command\CommandInterface;
use Predis\Connection\AggregateConnectionInterface;
use Predis\Protocol\ProtocolException;
/**
* Client-side abstraction of a Redis transaction based on MULTI / EXEC.
@@ -168,9 +168,9 @@ class MultiExec implements ClientContextInterface
* @param string $commandID Command ID.
* @param array $arguments Arguments for the command.
*
* @throws ServerException
* @return mixed
*
* @throws ServerException
*/
protected function call($commandID, array $arguments = array())
{
@@ -190,10 +190,10 @@ class MultiExec implements ClientContextInterface
*
* @param CommandInterface $command Command instance.
*
* @return $this|mixed
*
* @throws AbortedMultiExecException
* @throws CommunicationException
* @return $this|mixed
*
*/
public function executeCommand(CommandInterface $command)
{
@@ -221,10 +221,10 @@ class MultiExec implements ClientContextInterface
*
* @param string|array $keys One or more keys.
*
* @return mixed
*
* @throws NotSupportedException
* @throws ClientException
* @return mixed
*
*/
public function watch($keys)
{
@@ -262,9 +262,9 @@ class MultiExec implements ClientContextInterface
/**
* Executes UNWATCH.
*
* @throws NotSupportedException
* @return MultiExec
*
* @throws NotSupportedException
*/
public function unwatch()
{
@@ -350,11 +350,11 @@ class MultiExec implements ClientContextInterface
*
* @param mixed $callable Optional callback for execution.
*
* @return array
*
* @throws CommunicationException
* @throws AbortedMultiExecException
* @throws ServerException
* @return array
*
*/
public function execute($callable = null)
{
+1 -1
View File
@@ -11,9 +11,9 @@
namespace Predis\Command;
use PredisTestCase;
use Predis\Client;
use Predis\Profile;
use PredisTestCase;
/**
*
+1 -1
View File
@@ -11,8 +11,8 @@
namespace Predis\Connection;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
* @group realm-connection
+1 -1
View File
@@ -11,9 +11,9 @@
namespace Predis\Profile;
use PredisTestCase;
use Predis\Command\CommandInterface;
use Predis\Command\Processor\ProcessorChain;
use PredisTestCase;
/**
*
+1 -1
View File
@@ -182,9 +182,9 @@ abstract class PredisTestCase extends \PHPUnit_Framework_TestCase
/**
* Returns the server version of the Redis instance used by the test suite.
*
* @throws RuntimeException When the client cannot retrieve the current server version
* @return string
*
* @throws RuntimeException When the client cannot retrieve the current server version
*/
protected function getRedisServerVersion()
{
+1 -1
View File
@@ -11,8 +11,8 @@
namespace Predis\Cluster;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
*
+1 -1
View File
@@ -11,8 +11,8 @@
namespace Predis\Cluster;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
*
@@ -11,8 +11,8 @@
namespace Predis\Collection\Iterator;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
* @group realm-iterators
@@ -11,8 +11,8 @@
namespace Predis\Collection\Iterator;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
* @group realm-iterators
@@ -11,8 +11,8 @@
namespace Predis\Collection\Iterator;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
* @group realm-iterators
@@ -11,8 +11,8 @@
namespace Predis\Collection\Iterator;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
* @group realm-iterators
@@ -11,8 +11,8 @@
namespace Predis\Collection\Iterator;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
* @group realm-iterators
@@ -11,8 +11,8 @@
namespace Predis\Command\Processor;
use PredisTestCase;
use Predis\Command\RawCommand;
use PredisTestCase;
/**
*
@@ -3,6 +3,8 @@
/*
* This file is part of the Predis package.
*
* (c) Daniele Alessandri <suppakilla@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
@@ -11,9 +11,9 @@
namespace Predis\Configuration;
use PredisTestCase;
use Predis\Command\Processor\KeyPrefixProcessor;
use Predis\Profile;
use PredisTestCase;
/**
*
@@ -11,10 +11,10 @@
namespace Predis\Connection\Aggregate;
use PredisTestCase;
use Predis\Connection;
use Predis\Profile;
use Predis\Replication\ReplicationStrategy;
use PredisTestCase;
/**
*
@@ -11,9 +11,9 @@
namespace Predis\Connection\Aggregate;
use PredisTestCase;
use Predis\Connection;
use Predis\Profile;
use PredisTestCase;
/**
*
@@ -11,11 +11,11 @@
namespace Predis\Connection\Aggregate;
use PredisTestCase;
use Predis\Command;
use Predis\Connection;
use Predis\Profile;
use Predis\Response;
use PredisTestCase;
/**
*
@@ -11,8 +11,8 @@
namespace Predis\Connection;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
* @group ext-curl
+2 -2
View File
@@ -11,10 +11,10 @@
namespace Predis\Monitor;
use PredisTestCase;
use Predis\Client;
use Predis\Profile;
use Predis\Monitor\Consumer as MonitorConsumer;
use Predis\Profile;
use PredisTestCase;
/**
* @group realm-monitor
+1 -1
View File
@@ -11,9 +11,9 @@
namespace Predis\Pipeline;
use PredisTestCase;
use Predis\Client;
use Predis\Response;
use PredisTestCase;
/**
*
+1 -1
View File
@@ -11,8 +11,8 @@
namespace Predis\Pipeline;
use PredisTestCase;
use Predis\Client;
use PredisTestCase;
/**
*
+1 -1
View File
@@ -11,11 +11,11 @@
namespace Predis\Pipeline;
use PredisTestCase;
use Predis\Client;
use Predis\ClientException;
use Predis\Profile;
use Predis\Response;
use PredisTestCase;
/**
*
+1 -1
View File
@@ -11,10 +11,10 @@
namespace Predis\PubSub;
use PredisTestCase;
use Predis\Client;
use Predis\Profile;
use Predis\PubSub\Consumer as PubSubConsumer;
use PredisTestCase;
/**
* @group realm-pubsub
+1 -1
View File
@@ -11,8 +11,8 @@
namespace Predis\PubSub;
use PredisTestCase;
use Predis\Client;
use PredisTestCase;
/**
* @group realm-pubsub
@@ -11,8 +11,8 @@
namespace Predis\Replication;
use PredisTestCase;
use Predis\Profile;
use PredisTestCase;
/**
*
@@ -11,10 +11,10 @@
namespace Predis\Response\Iterator;
use PredisTestCase;
use Predis\Client;
use Predis\Connection\CompositeStreamConnection;
use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
use PredisTestCase;
/**
* @group realm-iterators
@@ -11,10 +11,10 @@
namespace Predis\Response\Iterator;
use PredisTestCase;
use Predis\Client;
use Predis\Connection\CompositeStreamConnection;
use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
use PredisTestCase;
/**
* @group realm-iterators
@@ -11,8 +11,8 @@
namespace Predis\Transaction;
use PredisTestCase;
use Predis\Client;
use PredisTestCase;
/**
*
+1 -1
View File
@@ -11,10 +11,10 @@
namespace Predis\Transaction;
use PredisTestCase;
use Predis\Client;
use Predis\Command\CommandInterface;
use Predis\Response;
use PredisTestCase;
/**
* @group realm-transaction