Resolve merge conflicts

This commit is contained in:
Vladyslav Vildanov
2023-04-03 15:36:15 +03:00
parent 74d1d1949c
commit 0dd3a293ac
9 changed files with 342 additions and 3 deletions
+2 -1
View File
@@ -886,7 +886,8 @@ class MultiExecTest extends PredisTestCase
?array $expected = [],
?array &$commands = [],
?array &$cas = []
): callable {
): callable
{
$multi = $watch = $abort = false;
return function (CommandInterface $command) use (&$expected, &$commands, &$cas, &$multi, &$watch, &$abort) {