geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-10-19 18:26:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use static closures (#1652)

Browse Source
This commit is contained in:
Till Krüss
2026-03-09 13:30:46 -07:00
committed by GitHub
parent f57dfcbeea
commit 87390e7381
59 changed files with 253 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Predis/Transaction/MultiExecTest.php
+37 -37
View File
@@ -138,7 +138,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback($expected, $commands);
$tx = $this->getMockedTransaction($callback);
$responses = $tx->execute(function ($tx) {
$responses = $tx->execute(static function ($tx) {
$tx->echo('one');
$tx->echo('two');
$tx->echo('three');
@@ -161,7 +161,7 @@ class MultiExecTest extends PredisTestCase
$exception = null;
try {
$tx->echo('foo')->execute(function ($tx) {
$tx->echo('foo')->execute(static function ($tx) {
$tx->echo('bar');
});
} catch (Exception $ex) {
@@ -182,7 +182,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback(null, $commands);
$tx = $this->getMockedTransaction($callback);
$responses = $tx->execute(function ($tx) {
$responses = $tx->execute(static function ($tx) {
// NOOP
});
@@ -203,7 +203,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback(null, $commands);
$tx = $this->getMockedTransaction($callback);
$responses = $tx->execute(function ($tx) {
$responses = $tx->execute(static function ($tx) {
$tx->exec();
});
@@ -221,7 +221,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback(null, $commands);
$tx = $this->getMockedTransaction($callback);
$responses = $tx->execute(function ($tx) {
$responses = $tx->execute(static function ($tx) {
$tx->discard();
});
@@ -239,7 +239,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback(null, $commands);
$tx = $this->getMockedTransaction($callback);
$responses = $tx->execute(function ($tx) {
$responses = $tx->execute(static function ($tx) {
$tx->set('foo', 'bar');
$tx->get('foo');
$tx->discard();
@@ -260,7 +260,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback($expected, $commands);
$tx = $this->getMockedTransaction($callback);
$responses = $tx->execute(function ($tx) {
$responses = $tx->execute(static function ($tx) {
$tx->echo('before DISCARD');
$tx->discard();
$tx->echo('after DISCARD');
@@ -312,7 +312,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback($expected, $txCommands, $casCommands);
$tx = $this->getMockedTransaction($callback, $options);
$responses = $tx->execute(function ($tx) {
$responses = $tx->execute(static function ($tx) {
$tx->get('foo');
$tx->get('hoge');
});
@@ -363,7 +363,7 @@ class MultiExecTest extends PredisTestCase
$tx = $this->getMockedTransaction($callback, $options);
$test = $this;
$responses = $tx->execute(function ($tx) use ($test) {
$responses = $tx->execute(static function ($tx) use ($test) {
$tx->watch('foobar');
$response1 = $tx->get('foo');
@@ -394,7 +394,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback([], $txCommands, $casCommands);
$tx = $this->getMockedTransaction($callback, $options);
$tx->execute(function ($tx) {
$tx->execute(static function ($tx) {
$tx->multi();
});
@@ -413,7 +413,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback([], $txCommands, $casCommands);
$tx = $this->getMockedTransaction($callback, $options);
$tx->execute(function ($tx) {
$tx->execute(static function ($tx) {
$tx->get('foo');
$tx->set('hoge', 'piyo');
});
@@ -457,7 +457,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback($expected, $txCommands, $casCommands);
$tx = $this->getMockedTransaction($callback, $options);
$responses = $tx->execute(function (MultiExec $tx) use ($signal, &$attempts) {
$responses = $tx->execute(static function (MultiExec $tx) use ($signal, &$attempts) {
$tx->get('foo');
if ($attempts > 0) {
@@ -484,7 +484,7 @@ class MultiExecTest extends PredisTestCase
$callback = $this->getExecuteCallback();
$tx = $this->getMockedTransaction($callback);
$tx->execute(function ($tx) {
$tx->execute(static function ($tx) {
$tx->echo('!!ABORT!!');
});
}
@@ -503,7 +503,7 @@ class MultiExecTest extends PredisTestCase
$responses = null;
try {
$responses = $tx->execute(function (MultiExec $tx) {
$responses = $tx->execute(static function (MultiExec $tx) {
$tx->set('foo', 'bar');
$tx->get('foo');
@@ -532,7 +532,7 @@ class MultiExecTest extends PredisTestCase
$responses = null;
try {
$responses = $tx->execute(function (MultiExec $tx) {
$responses = $tx->execute(static function (MultiExec $tx) {
$tx->set('foo', 'bar');
$tx->echo('ERR Invalid operation');
$tx->get('foo');
@@ -550,7 +550,7 @@ class MultiExecTest extends PredisTestCase
*/
public function testProperlyDiscardsTransactionAfterServerExceptionInBlock(): void
{
$connection = $this->getMockedConnection(function (CommandInterface $command) {
$connection = $this->getMockedConnection(static function (CommandInterface $command) {
switch ($command->getId()) {
case 'MULTI':
return true;
@@ -596,7 +596,7 @@ class MultiExecTest extends PredisTestCase
{
$expected = ['before', new Response\Error('ERR simulated error'), 'after'];
$connection = $this->getMockedConnection(function (CommandInterface $command) use ($expected) {
$connection = $this->getMockedConnection(static function (CommandInterface $command) use ($expected) {
switch ($command->getId()) {
case 'MULTI':
return true;
@@ -632,7 +632,7 @@ class MultiExecTest extends PredisTestCase
$expected = ['before', new Response\Error('ERR simulated error'), 'after'];
$connection = $this->getMockedConnection(function (CommandInterface $command) use ($expected) {
$connection = $this->getMockedConnection(static function (CommandInterface $command) use ($expected) {
switch ($command->getId()) {
case 'MULTI':
return true;
@@ -659,7 +659,7 @@ class MultiExecTest extends PredisTestCase
$this->expectException('Predis\Response\ServerException');
$this->expectExceptionMessage('ERR simulated failure on EXEC');
$connection = $this->getMockedConnection(function (CommandInterface $command) {
$connection = $this->getMockedConnection(static function (CommandInterface $command) {
switch ($command->getId()) {
case 'MULTI':
return true;
@@ -718,7 +718,7 @@ class MultiExecTest extends PredisTestCase
$tx = new MultiExec(new Client($mockConnection));
$responses = $tx->execute(function (MultiExec $tx) {
$responses = $tx->execute(static function (MultiExec $tx) {
$tx->set('key', 'value');
$tx->set('key', 'value');
$tx->set('key', 'value');
@@ -740,7 +740,7 @@ class MultiExecTest extends PredisTestCase
$exception = null;
try {
$client->transaction(function (MultiExec $tx) {
$client->transaction(static function (MultiExec $tx) {
$tx->set('foo', 'bar');
throw new RuntimeException('TEST');
});
@@ -762,7 +762,7 @@ class MultiExecTest extends PredisTestCase
$value = (string) rand();
try {
$client->transaction(function (MultiExec $tx) use ($value) {
$client->transaction(static function (MultiExec $tx) use ($value) {
$tx->set('foo', 'bar');
$tx->lpush('foo', 'bar');
$tx->set('foo', $value);
@@ -783,7 +783,7 @@ class MultiExecTest extends PredisTestCase
{
$client = $this->getClient([], ['exceptions' => false]);
$responses = $client->transaction(function (MultiExec $tx) {
$responses = $client->transaction(static function (MultiExec $tx) {
$tx->set('foo', 'bar');
$tx->lpush('foo', 'bar');
$tx->echo('foobar');
@@ -802,7 +802,7 @@ class MultiExecTest extends PredisTestCase
{
$client = $this->getClient([], ['exceptions' => false]);
$responses = $client->transaction(function (MultiExec $tx) {
$responses = $client->transaction(static function (MultiExec $tx) {
$tx->set('foo', 'bar');
$tx->lpush('foo', 'bar');
$tx->echo('foobar');
@@ -821,7 +821,7 @@ class MultiExecTest extends PredisTestCase
{
$client = $this->getClient();
$responses = $client->transaction(function (MultiExec $tx) {
$responses = $client->transaction(static function (MultiExec $tx) {
$tx->set('foo', 'bar');
$tx->discard();
$tx->set('hoge', 'piyo');
@@ -844,7 +844,7 @@ class MultiExecTest extends PredisTestCase
$client2 = $this->getClient();
try {
$client1->transaction(['watch' => 'sentinel'], function ($tx) use ($client2) {
$client1->transaction(['watch' => 'sentinel'], static function ($tx) use ($client2) {
$tx->set('sentinel', 'client1');
$tx->get('sentinel');
$client2->set('sentinel', 'client2');
@@ -869,7 +869,7 @@ class MultiExecTest extends PredisTestCase
$client2 = $this->getClient();
try {
$client1->transaction(['watch' => 'sentinel'], function ($tx) use ($client2) {
$client1->transaction(['watch' => 'sentinel'], static function ($tx) use ($client2) {
$tx->set('sentinel', 'client1');
$tx->get('sentinel');
$client2->set('sentinel', 'client2');
@@ -893,7 +893,7 @@ class MultiExecTest extends PredisTestCase
$client->set('foo', 'bar');
$options = ['watch' => 'foo', 'cas' => true];
$responses = $client->transaction($options, function ($tx) {
$responses = $client->transaction($options, static function ($tx) {
$tx->watch('foobar');
$foo = $tx->get('foo');
@@ -911,7 +911,7 @@ class MultiExecTest extends PredisTestCase
$client->set('foo', 'bar');
$options = ['watch' => 'foo', 'cas' => true, 'retry' => 1];
$responses = $client->transaction($options, function ($tx) use ($client2, &$hijack) {
$responses = $client->transaction($options, static function ($tx) use ($client2, &$hijack) {
$foo = $tx->get('foo');
$tx->multi();
@@ -940,7 +940,7 @@ class MultiExecTest extends PredisTestCase
{
$redis = $this->getClient();
$response = $redis->transaction(function (MultiExec $tx) {
$response = $redis->transaction(static function (MultiExec $tx) {
$tx->set('{foo}foo', 'value');
$tx->set('{foo}bar', 'value');
$tx->set('{foo}baz', 'value');
@@ -964,7 +964,7 @@ class MultiExecTest extends PredisTestCase
'To be able to execute a transaction against cluster, all commands should operate on the same hash slot'
);
$redis->transaction(function (MultiExec $tx) {
$redis->transaction(static function (MultiExec $tx) {
$tx->set('foo_bar_baz', 'value');
$tx->set('{foo}bar', 'value');
$tx->set('{foo}baz', 'value');
@@ -982,7 +982,7 @@ class MultiExecTest extends PredisTestCase
$redis = $this->getClient();
$options = ['cas' => true, 'watch' => ['{foo}foo', '{foo}bar', '{foo}baz']];
$response = $redis->transaction($options, function (MultiExec $tx) {
$response = $redis->transaction($options, static function (MultiExec $tx) {
$tx->multi();
$tx->set('{foo}foo', 'value');
$tx->set('{foo}bar', 'value');
@@ -1003,7 +1003,7 @@ class MultiExecTest extends PredisTestCase
$redis = $this->getClient();
$options = ['cas' => true, 'watch' => ['{foo}foo', '{foo}bar', '{foo}baz']];
$response = $redis->transaction($options, function (MultiExec $tx) {
$response = $redis->transaction($options, static function (MultiExec $tx) {
$tx->multi();
$tx->set('{foo}foo', 'value');
$tx->set('{foo}bar', 'value');
@@ -1028,7 +1028,7 @@ class MultiExecTest extends PredisTestCase
$this->expectException(TransactionException::class);
$this->expectExceptionMessage('WATCHed keys should point to the same hash slot');
$redis->transaction($options, function (MultiExec $tx) {
$redis->transaction($options, static function (MultiExec $tx) {
$tx->multi();
$tx->set('{foo}foo', 'value');
$tx->set('{foo}bar', 'value');
@@ -1052,7 +1052,7 @@ class MultiExecTest extends PredisTestCase
'To be able to execute a transaction against cluster, all commands should operate on the same hash slot'
);
$redis->transaction($options, function (MultiExec $tx) {
$redis->transaction($options, static function (MultiExec $tx) {
$tx->multi();
$tx->set('{foo}foo', 'value');
$tx->set('{foo}bar', 'value');
@@ -1128,7 +1128,7 @@ class MultiExecTest extends PredisTestCase
): callable {
$multi = $watch = $abort = false;
return function (CommandInterface $command) use (&$expected, &$commands, &$cas, &$multi, &$watch, &$abort) {
return static function (CommandInterface $command) use (&$expected, &$commands, &$cas, &$multi, &$watch, &$abort) {
$cmd = $command->getId();
if ($multi || $cmd === 'MULTI') {
@@ -1208,7 +1208,7 @@ class MultiExecTest extends PredisTestCase
*/
protected static function commandsToIDs(array $commands): array
{
return array_map(function ($cmd) { return $cmd->getId(); }, $commands);
return array_map(static function ($cmd) { return $cmd->getId(); }, $commands);
}
/**