Fix RedisClient construction after merge

amphp · Aug 20, 2023 · 548d2c5 · 548d2c5
1 parent 6ae1efa
commit 548d2c5
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/examples/basic.php b/examples/basic.php
@@ -5,7 +5,7 @@
 use Amp\Redis\RedisClient;
 use function Amp\Redis\createRedisClient;
 
-$redis = new RedisClient(createRedisClient('redis://'));
+$redis = createRedisClient('redis://');
 
 $redis->set('foo', '21');
 $result = $redis->increment('foo', 21);

diff --git a/examples/blpop-timeout.php b/examples/blpop-timeout.php
@@ -6,7 +6,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$client = new RedisClient(createRedisClient('redis://'));
+$client = createRedisClient('redis://');
 
 $client->delete('foobar-list');
 

diff --git a/examples/blpop.php b/examples/blpop.php
@@ -7,7 +7,7 @@
 use function Amp\Redis\createRedisClient;
 
 $future = async(function (): void {
- $popClient = new RedisClient(createRedisClient('redis://'));
+ $popClient = createRedisClient('redis://');
 
  try {
  $value = $popClient->getList('foobar-list')->popHeadBlocking();
@@ -17,7 +17,7 @@
  }
 });
 
-$pushClient = new RedisClient(createRedisClient('redis://'));
+$pushClient = createRedisClient('redis://');
 
 print 'Pushing value…' . PHP_EOL;
 $pushClient->getList('foobar-list')->pushHead('42');

diff --git a/examples/mutex/stress-random-keys/stress.php b/examples/mutex/stress-random-keys/stress.php
@@ -4,7 +4,7 @@
 
 use function Amp\Redis\createRedisClient;
 
-$redis = new \Amp\Redis\RedisClient(createRedisClient('redis://'));
+$redis = createRedisClient('redis://');
 $mutex = new Amp\Redis\Sync\RedisMutex(createRedisClient('redis://'));
 
 for ($i = 0; $i < 100; $i++) {

diff --git a/examples/mutex/stress-single-key/stress.php b/examples/mutex/stress-single-key/stress.php
@@ -4,7 +4,7 @@
 
 use function Amp\Redis\createRedisClient;
 
-$redis = new \Amp\Redis\RedisClient(createRedisClient('redis://'));
+$redis = createRedisClient('redis://');
 $mutex = new Amp\Redis\Sync\RedisMutex(createRedisClient('redis://'));
 
 for ($i = 0; $i < 100; $i++) {

diff --git a/src/Sync/RedisMutex.php b/src/Sync/RedisMutex.php
@@ -123,7 +123,7 @@ public function __construct(
  ?PsrLogger $logger = null,
  ) {
  $this->options = $options ?? new RedisMutexOptions;
- $this->redis = new RedisClient($client);
+ $this->redis = $client;
  $this->logger = $logger ?? new NullLogger;
  }
 

diff --git a/src/Sync/RedisParcel.php b/src/Sync/RedisParcel.php
@@ -40,7 +40,7 @@ private function __construct(
  private readonly string $key,
  ?Serializer $serializer = null,
  ) {
- $this->redis = new RedisClient($mutex->getClient());
+ $this->redis = $mutex->getClient();
  $this->serializer = $serializer ?? new NativeSerializer();
  }
 

diff --git a/test/AuthTest.php b/test/AuthTest.php
@@ -38,14 +38,14 @@ public static function tearDownAfterClass(): void
 
  public function testSuccess(): void
  {
- $redis = new RedisClient(createRedisClient(\sprintf(self::URI_FORMAT, self::PORT, self::PASSWORD)));
+ $redis = createRedisClient(\sprintf(self::URI_FORMAT, self::PORT, self::PASSWORD));
  $this->assertSame('PONG', $redis->echo('PONG'));
  $redis->quit();
  }
 
  public function testFailure(): void
  {
- $redis = new RedisClient(createRedisClient(\sprintf(self::URI_FORMAT, self::PORT, 'wrong')));
+ $redis = createRedisClient(\sprintf(self::URI_FORMAT, self::PORT, 'wrong'));
 
  $this->expectException(RedisChannelException::class);
 
@@ -58,7 +58,7 @@ public function testGarbageCollection(): void
  {
  // This will hit stream select limits if garbage isn't collected as it should (e.g. due to circular references)
  for ($i = 0; $i < 10000; $i++) {
- $redis = new RedisClient(createRedisClient(\sprintf(self::URI_FORMAT, self::PORT, self::PASSWORD)));
+ $redis = createRedisClient(\sprintf(self::URI_FORMAT, self::PORT, self::PASSWORD));
 
  $this->assertSame('PONG', $redis->echo('PONG'));
  }

diff --git a/test/DownTest.php b/test/DownTest.php
@@ -11,7 +11,7 @@ public function test(): void
  {
  $this->expectException(RedisChannelException::class);
 
- $redis = new RedisClient(createRedisClient('tcp://127.0.0.1:25325'));
+ $redis = createRedisClient('tcp://127.0.0.1:25325');
  $redis->ping();
  }
 }
diff --git a/test/IntegrationTest.php b/test/IntegrationTest.php
@@ -23,7 +23,7 @@ protected function setUp(): void
 
  final protected function createInstance(): RedisClient
  {
- return new RedisClient(createRedisClient($this->getUri()));
+ return createRedisClient($this->getUri());
  }
 
  final protected function getUri(): ?string

diff --git a/test/RedisTest.php b/test/RedisTest.php
@@ -12,7 +12,7 @@ public function test(): void
 
  $this->assertTrue($this->redis->set('foo', 'bar'));
  $this->assertSame('bar', $this->redis->get('foo'));
- $this->assertSame('bar', $this->redis->query('get', 'foo'));
+ $this->assertSame('bar', $this->redis->execute('get', 'foo'));
  $this->assertSame('foo', $this->redis->getRandomKey());
  $this->assertTrue($this->redis->expireIn('foo', 2));
  $this->assertGreaterThan(1000, $this->redis->getTtlInMillis('foo'));