geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-10-09 21:38:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

use short array syntax

Browse Source
This commit is contained in:
Till Krüss
2023-01-17 13:48:22 -08:00
committed by Till Krüss
parent 31b65f614b
commit cc40219268
299 changed files with 3373 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Predis/ClientTest.php
+107 -107
View File
@@ -93,7 +93,7 @@ class ClientTest extends PredisTestCase
*/
public function testConstructorWithArrayArgument(): void
{
$client = new Client($arg1 = array('host' => 'localhost', 'port' => 7000));
$client = new Client($arg1 = ['host' => 'localhost', 'port' => 7000]);
/** @var NodeConnectionInterface */
$connection = $client->getConnection();
@@ -111,10 +111,10 @@ class ClientTest extends PredisTestCase
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage('Array of connection parameters requires `cluster`, `replication` or `aggregate` client option');
$arg1 = array(
array('host' => 'localhost', 'port' => 7000),
array('host' => 'localhost', 'port' => 7001),
);
$arg1 = [
['host' => 'localhost', 'port' => 7000],
['host' => 'localhost', 'port' => 7001],
];
$client = new Client($arg1);
}
@@ -124,14 +124,14 @@ class ClientTest extends PredisTestCase
*/
public function testConstructorWithArrayOfArrayArgumentAndClusterOption(): void
{
$arg1 = array(
array('host' => 'localhost', 'port' => 7000),
array('host' => 'localhost', 'port' => 7001),
);
$arg1 = [
['host' => 'localhost', 'port' => 7000],
['host' => 'localhost', 'port' => 7001],
];
$client = new Client($arg1, array(
$client = new Client($arg1, [
'aggregate' => $this->getAggregateInitializer($arg1),
));
]);
$this->assertInstanceOf('Predis\Connection\AggregateConnectionInterface', $client->getConnection());
}
@@ -156,11 +156,11 @@ class ClientTest extends PredisTestCase
*/
public function testConstructorWithArrayOfStringArgument(): void
{
$arg1 = array('tcp://localhost:7000', 'tcp://localhost:7001');
$arg1 = ['tcp://localhost:7000', 'tcp://localhost:7001'];
$client = new Client($arg1, array(
$client = new Client($arg1, [
'aggregate' => $this->getAggregateInitializer($arg1),
));
]);
$this->assertInstanceOf('Predis\Connection\AggregateConnectionInterface', $client->getConnection());
}
@@ -170,14 +170,14 @@ class ClientTest extends PredisTestCase
*/
public function testConstructorWithArrayOfConnectionsArgument(): void
{
$arg1 = array(
$arg1 = [
$this->getMockBuilder('Predis\Connection\NodeConnectionInterface')->getMock(),
$this->getMockBuilder('Predis\Connection\NodeConnectionInterface')->getMock(),
);
];
$client = new Client($arg1, array(
$client = new Client($arg1, [
'aggregate' => $this->getAggregateInitializer($arg1),
));
]);
$this->assertInstanceOf('Predis\Connection\AggregateConnectionInterface', $client->getConnection());
}
@@ -245,7 +245,7 @@ class ClientTest extends PredisTestCase
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
$callable = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$callable
->expects($this->once())
@@ -269,7 +269,7 @@ class ClientTest extends PredisTestCase
$wrongType = $this->getMockBuilder('stdClass')->getMock();
$callable = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$callable
->expects($this->once())
@@ -287,7 +287,7 @@ class ClientTest extends PredisTestCase
{
$connections = $this->getMockBuilder('Predis\Connection\FactoryInterface')->getMock();
$arg2 = array('prefix' => 'prefix:', 'connections' => $connections);
$arg2 = ['prefix' => 'prefix:', 'connections' => $connections];
$client = new Client(null, $arg2);
/** @var CommandFactory */
@@ -305,8 +305,8 @@ class ClientTest extends PredisTestCase
*/
public function testConstructorWithArrayAndOptionReplication(): void
{
$arg1 = array('tcp://127.0.0.1:6379?role=master', 'tcp://127.0.0.1:6380?role=slave');
$arg2 = array('replication' => 'predis');
$arg1 = ['tcp://127.0.0.1:6379?role=master', 'tcp://127.0.0.1:6380?role=slave'];
$arg2 = ['replication' => 'predis'];
$client = new Client($arg1, $arg2);
/** @var MasterSlaveReplication */
@@ -322,12 +322,12 @@ class ClientTest extends PredisTestCase
*/
public function testClusterOptionHasPrecedenceOverReplicationOptionAndAggregateOption(): void
{
$arg1 = array('tcp://host1', 'tcp://host2');
$arg1 = ['tcp://host1', 'tcp://host2'];
$connection = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')->getMock();
$fncluster = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$fncluster
->expects($this->once())
@@ -340,24 +340,24 @@ class ClientTest extends PredisTestCase
->willReturn($connection);
$fnreplication = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$fnreplication
->expects($this->never())
->method('__invoke');
$fnaggregate = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$fnaggregate
->expects($this->never())
->method('__invoke');
$arg2 = array(
$arg2 = [
'cluster' => $fncluster,
'replication' => $fnreplication,
'aggregate' => $fnaggregate,
);
];
$client = new Client($arg1, $arg2);
@@ -369,12 +369,12 @@ class ClientTest extends PredisTestCase
*/
public function testReplicationOptionHasPrecedenceOverAggregateOption(): void
{
$arg1 = array('tcp://host1', 'tcp://host2');
$arg1 = ['tcp://host1', 'tcp://host2'];
$connection = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')->getMock();
$fnreplication = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$fnreplication
->expects($this->once())
@@ -387,16 +387,16 @@ class ClientTest extends PredisTestCase
->willReturn($connection);
$fnaggregate = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$fnaggregate
->expects($this->never())
->method('__invoke');
$arg2 = array(
$arg2 = [
'replication' => $fnreplication,
'aggregate' => $fnaggregate,
);
];
$client = new Client($arg1, $arg2);
}
@@ -406,7 +406,7 @@ class ClientTest extends PredisTestCase
*/
public function testAggregateOptionDoesNotTriggerAggregationInClient(): void
{
$arg1 = array('tcp://host1', 'tcp://host2');
$arg1 = ['tcp://host1', 'tcp://host2'];
$connections = $this->getMockBuilder('Predis\Connection\FactoryInterface')->getMock();
$connections
@@ -420,7 +420,7 @@ class ClientTest extends PredisTestCase
->method('add');
$fnaggregate = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$fnaggregate
->expects($this->once())
@@ -432,7 +432,7 @@ class ClientTest extends PredisTestCase
)
->willReturn($connection);
$arg2 = array('aggregate' => $fnaggregate, 'connections' => $connections);
$arg2 = ['aggregate' => $fnaggregate, 'connections' => $connections];
$client = new Client($arg1, $arg2);
@@ -512,17 +512,17 @@ class ClientTest extends PredisTestCase
*/
public function testCreatesNewCommandUsingSpecifiedCommandFactory(): void
{
$ping = $this->getCommandFactory()->create('ping', array());
$ping = $this->getCommandFactory()->create('ping', []);
$commands = $this->getMockBuilder('Predis\Command\FactoryInterface')->getMock();
$commands
->expects($this->once())
->method('create')
->with('ping', array())
->with('ping', [])
->willReturn($ping);
$client = new Client(null, array('commands' => $commands));
$this->assertSame($ping, $client->createCommand('ping', array()));
$client = new Client(null, ['commands' => $commands]);
$this->assertSame($ping, $client->createCommand('ping', []));
}
/**
@@ -532,26 +532,26 @@ class ClientTest extends PredisTestCase
{
$commands = $this->getCommandFactory();
$ping = $commands->create('ping', array());
$hgetall = $commands->create('hgetall', array('metavars', 'foo', 'hoge'));
$ping = $commands->create('ping', []);
$hgetall = $commands->create('hgetall', ['metavars', 'foo', 'hoge']);
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
$connection
->expects($this->exactly(2))
->method('executeCommand')
->withConsecutive(
array($ping),
array($hgetall)
[$ping],
[$hgetall]
)
->willReturnOnConsecutiveCalls(
new Response\Status('PONG'),
array('foo', 'bar', 'hoge', 'piyo')
['foo', 'bar', 'hoge', 'piyo']
);
$client = new Client($connection);
$this->assertEquals('PONG', $client->executeCommand($ping));
$this->assertSame(array('foo' => 'bar', 'hoge' => 'piyo'), $client->executeCommand($hgetall));
$this->assertSame(['foo' => 'bar', 'hoge' => 'piyo'], $client->executeCommand($hgetall));
}
/**
@@ -562,7 +562,7 @@ class ClientTest extends PredisTestCase
$this->expectException('Predis\Response\ServerException');
$this->expectExceptionMessage('Operation against a key holding the wrong kind of value');
$ping = $this->getCommandFactory()->create('ping', array());
$ping = $this->getCommandFactory()->create('ping', []);
$expectedResponse = new Response\Error('ERR Operation against a key holding the wrong kind of value');
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
@@ -580,7 +580,7 @@ class ClientTest extends PredisTestCase
*/
public function testExecuteCommandReturnsErrorResponseOnRedisError(): void
{
$ping = $this->getCommandFactory()->create('ping', array());
$ping = $this->getCommandFactory()->create('ping', []);
$expectedResponse = new Response\Error('ERR Operation against a key holding the wrong kind of value');
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
@@ -589,7 +589,7 @@ class ClientTest extends PredisTestCase
->method('executeCommand')
->willReturn($expectedResponse);
$client = new Client($connection, array('exceptions' => false));
$client = new Client($connection, ['exceptions' => false]);
$response = $client->executeCommand($ping);
$this->assertSame($response, $expectedResponse);
@@ -600,7 +600,7 @@ class ClientTest extends PredisTestCase
*/
public function testCallingRedisCommandExecutesInstanceOfCommand(): void
{
$ping = $this->getCommandFactory()->create('ping', array());
$ping = $this->getCommandFactory()->create('ping', []);
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
$connection
@@ -613,15 +613,15 @@ class ClientTest extends PredisTestCase
$commands
->expects($this->once())
->method('create')
->with('ping', array())
->with('ping', [])
->willReturn($ping);
$options = array('commands' => $commands);
$options = ['commands' => $commands];
/** @var ClientInterface */
$client = $this->getMockBuilder('Predis\Client')
->onlyMethods(array())
->setConstructorArgs(array($connection, $options))
->onlyMethods([])
->setConstructorArgs([$connection, $options])
->getMock();
$this->assertEquals('PONG', $client->ping());
@@ -662,7 +662,7 @@ class ClientTest extends PredisTestCase
->with($this->isRedisCommand('PING'))
->willReturn($expectedResponse);
$client = new Client($connection, array('exceptions' => false));
$client = new Client($connection, ['exceptions' => false]);
$response = $client->ping();
$this->assertSame($response, $expectedResponse);
@@ -678,9 +678,9 @@ class ClientTest extends PredisTestCase
->expects($this->exactly(3))
->method('executeCommand')
->withConsecutive(
array($this->isRedisCommand('SET', array('foo', 'bar'))),
array($this->isRedisCommand('GET', array('foo'))),
array($this->isRedisCommand('PING'))
[$this->isRedisCommand('SET', ['foo', 'bar'])],
[$this->isRedisCommand('GET', ['foo'])],
[$this->isRedisCommand('PING')]
)
->willReturnOnConsecutiveCalls(
new Response\Status('OK'),
@@ -690,11 +690,11 @@ class ClientTest extends PredisTestCase
$client = new Client($connection);
$this->assertSame('OK', $client->executeRaw(array('SET', 'foo', 'bar')));
$this->assertSame('bar', $client->executeRaw(array('GET', 'foo')));
$this->assertSame('OK', $client->executeRaw(['SET', 'foo', 'bar']));
$this->assertSame('bar', $client->executeRaw(['GET', 'foo']));
$error = true; // $error is always populated by reference.
$this->assertSame('PONG', $client->executeRaw(array('PING'), $error));
$this->assertSame('PONG', $client->executeRaw(['PING'], $error));
$this->assertFalse($error);
}
@@ -708,18 +708,18 @@ class ClientTest extends PredisTestCase
->expects($this->exactly(2))
->method('executeCommand')
->withConsecutive(
array($this->isRedisCommand('SET', array('foo', 'bar'))),
array($this->isRedisCommand('GET', array('foo')))
[$this->isRedisCommand('SET', ['foo', 'bar'])],
[$this->isRedisCommand('GET', ['foo'])]
)
->willReturnOnConsecutiveCalls(
new Response\Status('OK'),
'bar'
);
$client = new Client($connection, array('prefix' => 'predis:'));
$client = new Client($connection, ['prefix' => 'predis:']);
$this->assertSame('OK', $client->executeRaw(array('SET', 'foo', 'bar')));
$this->assertSame('bar', $client->executeRaw(array('GET', 'foo')));
$this->assertSame('OK', $client->executeRaw(['SET', 'foo', 'bar']));
$this->assertSame('bar', $client->executeRaw(['GET', 'foo']));
}
/**
@@ -737,9 +737,9 @@ class ClientTest extends PredisTestCase
->with($this->isRedisCommand('PING'))
->willReturn($response);
$client = new Client($connection, array('exceptions' => true));
$client = new Client($connection, ['exceptions' => true]);
$this->assertSame($message, $client->executeRaw(array('PING'), $error));
$this->assertSame($message, $client->executeRaw(['PING'], $error));
$this->assertTrue($error);
}
@@ -762,11 +762,11 @@ class ClientTest extends PredisTestCase
{
/** @var Client */
$client = $this->getMockBuilder('Predis\Client')
->onlyMethods(array())
->setConstructorArgs(array(
array('tcp://host1?alias=node01', 'tcp://host2?alias=node02'),
array('cluster' => 'predis'),
))
->onlyMethods([])
->setConstructorArgs([
['tcp://host1?alias=node01', 'tcp://host2?alias=node02'],
['cluster' => 'predis'],
])
->setMockClassName('SubclassedClient')
->getMock();
@@ -781,7 +781,7 @@ class ClientTest extends PredisTestCase
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
$aggregate = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')
->onlyMethods(array('getConnectionById'))
->onlyMethods(['getConnectionById'])
->getMockForAbstractClass();
$aggregate
->expects($this->once())
@@ -823,7 +823,7 @@ class ClientTest extends PredisTestCase
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
$aggregate = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')
->addMethods(array('getConnectionByAlias'))
->addMethods(['getConnectionByAlias'])
->getMockForAbstractClass();
$aggregate
->expects($this->once())
@@ -846,7 +846,7 @@ class ClientTest extends PredisTestCase
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
$aggregate = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')
->addMethods(array('getConnectionByKey'))
->addMethods(['getConnectionByKey'])
->getMockForAbstractClass();
$aggregate
->expects($this->once())
@@ -869,7 +869,7 @@ class ClientTest extends PredisTestCase
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
$aggregate = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')
->addMethods(array('getConnectionBySlot'))
->addMethods(['getConnectionBySlot'])
->getMockForAbstractClass();
$aggregate
->expects($this->once())
@@ -892,7 +892,7 @@ class ClientTest extends PredisTestCase
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
$aggregate = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')
->addMethods(array('getConnectionByRole'))
->addMethods(['getConnectionByRole'])
->getMockForAbstractClass();
$aggregate
->expects($this->once())
@@ -916,7 +916,7 @@ class ClientTest extends PredisTestCase
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
$aggregate = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')
->onlyMethods(array('getConnectionByCommand'))
->onlyMethods(['getConnectionByCommand'])
->getMockForAbstractClass();
$aggregate
->expects($this->once())
@@ -974,9 +974,9 @@ class ClientTest extends PredisTestCase
{
$client = new Client();
$this->assertInstanceOf('Predis\Pipeline\Pipeline', $client->pipeline(array()));
$this->assertInstanceOf('Predis\Pipeline\Atomic', $client->pipeline(array('atomic' => true)));
$this->assertInstanceOf('Predis\Pipeline\FireAndForget', $client->pipeline(array('fire-and-forget' => true)));
$this->assertInstanceOf('Predis\Pipeline\Pipeline', $client->pipeline([]));
$this->assertInstanceOf('Predis\Pipeline\Atomic', $client->pipeline(['atomic' => true]));
$this->assertInstanceOf('Predis\Pipeline\FireAndForget', $client->pipeline(['fire-and-forget' => true]));
}
/**
@@ -985,7 +985,7 @@ class ClientTest extends PredisTestCase
public function testPipelineWithCallableExecutesPipeline(): void
{
$callable = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$callable
->expects($this->once())
@@ -1012,7 +1012,7 @@ class ClientTest extends PredisTestCase
public function testPubSubLoopWithArrayReturnsPubSubConsumerWithOptions(): void
{
$connection = $this->getMockBuilder('Predis\Connection\NodeConnectionInterface')->getMock();
$options = array('subscribe' => 'channel');
$options = ['subscribe' => 'channel'];
$client = new Client($connection);
@@ -1036,17 +1036,17 @@ class ClientTest extends PredisTestCase
$connection
->expects($this->once())
->method('read')
->willReturn(array('subscribe', 'channel', 0));
->willReturn(['subscribe', 'channel', 0]);
$callable = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$callable
->expects($this->once())
->method('__invoke');
$client = new Client($connection);
$this->assertNull($client->pubSubLoop(array('subscribe' => 'channel'), $callable));
$this->assertNull($client->pubSubLoop(['subscribe' => 'channel'], $callable));
}
/**
@@ -1059,32 +1059,32 @@ class ClientTest extends PredisTestCase
->expects($this->exactly(2))
->method('read')
->willReturnOnConsecutiveCalls(
array('subscribe', 'channel', 1),
array('unsubscribe', 'channel', 0)
['subscribe', 'channel', 1],
['unsubscribe', 'channel', 0]
);
$connection
->expects($this->exactly(2))
->method('writeRequest')
->withConsecutive(
array($this->isRedisCommand('SUBSCRIBE')),
array($this->isRedisCommand('UNSUBSCRIBE'))
[$this->isRedisCommand('SUBSCRIBE')],
[$this->isRedisCommand('UNSUBSCRIBE')]
);
$callable = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$callable
->expects($this->exactly(2))
->method('__invoke')
->withConsecutive(
array(
[
$this->isInstanceOf('Predis\PubSub\Consumer'),
(object) array('kind' => 'subscribe', 'channel' => 'channel', 'payload' => 1)
),
array(
(object) ['kind' => 'subscribe', 'channel' => 'channel', 'payload' => 1]
],
[
$this->isInstanceOf('Predis\PubSub\Consumer'),
(object) array('kind' => 'unsubscribe', 'channel' => 'channel', 'payload' => 0)
)
(object) ['kind' => 'unsubscribe', 'channel' => 'channel', 'payload' => 0]
]
)
->willReturnOnConsecutiveCalls(
false,
@@ -1093,7 +1093,7 @@ class ClientTest extends PredisTestCase
$client = new Client($connection);
$this->assertNull($client->pubSubLoop(array('subscribe' => 'channel'), $callable));
$this->assertNull($client->pubSubLoop(['subscribe' => 'channel'], $callable));
}
/**
@@ -1111,7 +1111,7 @@ class ClientTest extends PredisTestCase
*/
public function testTransactionWithArrayReturnsMultiExecTransactionWithOptions(): void
{
$options = array('cas' => true, 'retry' => 3);
$options = ['cas' => true, 'retry' => 3];
$client = new Client();
@@ -1133,7 +1133,7 @@ class ClientTest extends PredisTestCase
public function testTransactionWithArrayAndCallableExecutesMultiExec(): void
{
// We use CAS here as we don't care about the actual MULTI/EXEC context.
$options = array('cas' => true, 'retry' => 3);
$options = ['cas' => true, 'retry' => 3];
$connection = $this->getMockBuilder('Predis\Connection\NodeConnectionInterface')->getMock();
$connection
@@ -1142,7 +1142,7 @@ class ClientTest extends PredisTestCase
->willReturn(new Response\Status('QUEUED'));
$callable = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$callable
->expects($this->once())
@@ -1171,7 +1171,7 @@ class ClientTest extends PredisTestCase
{
$luaScriptBody = 'return redis.call(\'exists\', KEYS[1])';
$command = $this->getMockForAbstractClass('Predis\Command\ScriptCommand', array(), '', true, true, true, array('parseResponse'));
$command = $this->getMockForAbstractClass('Predis\Command\ScriptCommand', [], '', true, true, true, ['parseResponse']);
$command
->expects($this->once())
->method('getScript')
@@ -1187,8 +1187,8 @@ class ClientTest extends PredisTestCase
->expects($this->exactly(2))
->method('executeCommand')
->withConsecutive(
array($command),
array($this->isRedisCommand('EVAL', array($luaScriptBody)))
[$command],
[$this->isRedisCommand('EVAL', [$luaScriptBody])]
)
->willReturnOnConsecutiveCalls(
new Response\Error('NOSCRIPT'),
@@ -1294,7 +1294,7 @@ class ClientTest extends PredisTestCase
$connection = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')->getMock();
$callable = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
->addMethods(['__invoke'])
->getMock();
$callable
->expects($this->once())