Resolve merge conflicts

This commit is contained in:
vladvildanov
2023-06-13 14:05:29 +03:00
183 changed files with 2248 additions and 1909 deletions
@@ -724,6 +724,7 @@ class MultiExecTest extends PredisTestCase
/**
* @group connected
* @group relay-incompatible
*/
public function testIntegrationReturnsErrorObjectOnRedisErrorInBlock(): void
{
@@ -740,6 +741,25 @@ class MultiExecTest extends PredisTestCase
$this->assertSame('foobar', $responses[2]);
}
/**
* @group connected
* @group ext-relay
*/
public function testIntegrationReturnsErrorObjectOnRedisErrorInBlockWhenUsingRelay(): void
{
$client = $this->getClient([], ['exceptions' => false]);
$responses = $client->transaction(function (MultiExec $tx) {
$tx->set('foo', 'bar');
$tx->lpush('foo', 'bar');
$tx->echo('foobar');
});
$this->assertSame('OK', $responses[0]);
$this->assertInstanceOf('Predis\Response\Error', $responses[1]);
$this->assertSame('foobar', $responses[2]);
}
/**
* @group connected
* @requiresRedisVersion >= 2.0.0