[redis] fix tests.

Author: makasim

docker-compose.yml

@@ -21,6 +21,8 @@ services:
       - AMQP_DSN=amqp://guest:guest@rabbitmq:5672/mqdev
       - AMQPS_DSN=amqps://guest:guest@rabbitmqssl:5671
       - DOCTRINE_DSN=mysql://root:rootpass@mysql/mqdev
+      - PREDIS_DSN=redis+predis://redis
+      - PHPREDIS_DSN=redis+phpredis://redis
       - RABBITMQ_HOST=rabbitmq
       - RABBITMQ_USER=guest
       - RABBITMQ_PASSWORD=guest

pkg/redis/PhpRedis.php

@@ -74,14 +74,14 @@ public function connect(): void
 
         $this->redis = new \Redis();
 
-        $connectionMethod = $this->config['persisted'] ? 'pconnect' : 'connect';
+        $connectionMethod = $this->config['persistent'] ? 'pconnect' : 'connect';
 
         $result = call_user_func(
             [$this->redis, $connectionMethod],
             'unix' === $this->config['scheme'] ? $this->config['path'] : $this->config['host'],
             $this->config['port'],
             $this->config['timeout'],
-            $this->config['persisted'] ? ($this->config['phpredis_persistent_id'] ?? null) : null,
+            $this->config['persistent'] ? ($this->config['phpredis_persistent_id'] ?? null) : null,
             $this->config['phpredis_retry_interval'] ?? null,
             $this->config['read_write_timeout']
         );

pkg/redis/RedisConnectionFactory.php

@@ -33,6 +33,7 @@ class RedisConnectionFactory implements PsrConnectionFactory
      *  'password' => Accepts a value used to authenticate with a Redis server protected by password with the AUTH command.
      *  'async' => Specifies if connections to the server is estabilished in a non-blocking way (that is, the client is not blocked while the underlying resource performs the actual connection).
      *  'persistent' => Specifies if the underlying connection resource should be left open when a script ends its lifecycle.
+     *  'lazy' => The connection will be performed as later as possible, if the option set to true
      *  'timeout' => Timeout (expressed in seconds) used to connect to a Redis server after which an exception is thrown.
      *  'read_write_timeout' => Timeout (expressed in seconds) used when performing read or write operations on the underlying network resource after which an exception is thrown.
      *  'predis_options' => An array of predis specific options.
@@ -65,7 +66,7 @@ public function __construct($config = 'redis:')
             $config = $this->parseDsn($config);
         } elseif (is_array($config)) {
             if (array_key_exists('dsn', $config)) {
-                $config = array_replace($config, $this->parseDsn($config['dsn']));
+                $config = array_replace_recursive($config, $this->parseDsn($config['dsn']));
 
                 unset($config['dsn']);
             }
@@ -120,9 +121,11 @@ private function parseDsn(string $dsn): array
             ));
         }
 
-        $database = null;
-        if ('unix' !== $dsn->getSchemeProtocol() && $dsn->getPath()) {
-            $database = ltrim($dsn->getPath());
+        $database = $dsn->getInt('database');
+
+        // try use path as database name if not set.
+        if (null === $database && 'unix' !== $dsn->getSchemeProtocol() && null !== $dsn->getPath()) {
+            $database = (int) ltrim($dsn->getPath(), '/');
         }
 
         return array_filter(array_replace($dsn->getQuery(), [
@@ -152,9 +155,11 @@ private function defaultConfig(): array
             'password' => null,
             'async' => false,
             'persistent' => false,
+            'lazy' => true,
             'timeout' => 5.0,
             'read_write_timeout' => null,
             'predis_options' => null,
+            'ssl' => null,
         ];
     }
 }

pkg/redis/Symfony/RedisTransportFactory.php

@@ -57,9 +57,9 @@ public function addConfiguration(ArrayNodeDefinition $builder)
                     ->cannotBeEmpty()
                     ->info('A custom redis service id, used with vendor true only')
                 ->end()
-                ->booleanNode('persisted')
+                ->booleanNode('persistent')
                     ->defaultFalse()
-                    ->info('bool, Whether it use single persisted connection or open a new one for every context')
+                    ->info('bool, Whether it use single persistent connection or open a new one for every context')
                 ->end()
                 ->booleanNode('lazy')
                     ->defaultTrue()