Updated to use lazy client and always have a working one available

PHP-DI-Definitions · Mar 11, 2019 · 6127058 · 6127058
1 parent ba49fc5
commit 6127058
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 299 deletions.
diff --git a/.php_cs b/.php_cs
@@ -6,8 +6,7 @@ use PhpCsFixer\Config;
 return (function (): Config
 {
     $paths = [
-        __DIR__ . DIRECTORY_SEPARATOR . 'src',
-        __DIR__ . DIRECTORY_SEPARATOR . 'tests',
+        __DIR__ . DIRECTORY_SEPARATOR . 'etc',
     ];
 
     return PhpCsFixerConfig::create()

diff --git a/composer.json b/composer.json
@@ -4,9 +4,7 @@
     "description": "PHP-DI definition for clue/redis-react",
     "require": {
         "php": "^7.2",
-        "clue/redis-react": "^2.2",
-        "psr/log": "^1.0",
-        "wyrihaximus/psr-3-callable-throwable-logger": "^1.0"
+        "clue/redis-react": "^2.3"
     },
     "require-dev": {
         "api-clients/test-utilities": "^5.1"

diff --git a/composer.lock b/composer.lock
diff --git a/etc/di/redis-client.php b/etc/di/redis-client.php
@@ -1,13 +1,12 @@
-<?php
+<?php declare(strict_types=1);
 
 use Clue\React\Redis\Client;
-use PHPDIDefinitions\Clue\Redis\Client\WaitingClient;
-use Psr\Log\LoggerInterface;
+use Clue\React\Redis\Factory;
 use React\EventLoop\LoopInterface;
 
 return [
-    Client::class => \DI\factory(function (LoopInterface $loop, string $dsn, LoggerInterface $logger = null) {
-        return WaitingClient::create($loop, $dsn, $logger);
+    Client::class => \DI\factory(function (LoopInterface $loop, string $dsn) {
+        return (new Factory($loop))->createLazyClient($dsn);
     })
         ->parameter('dsn', \DI\get('config.redis.dsn')),
 ];
diff --git a/src/WaitingClient.php b/src/WaitingClient.php
diff --git a/tests/RedisClient.php b/tests/RedisClient.php