[redis] PR-515 fixes

Author: makasim

pkg/redis/PRedis.php

@@ -26,6 +26,7 @@ class PRedis implements Redis
     public function __construct(array $config)
     {
         $this->config = $this->config = array_replace([
+            'scheme' => null,
             'host' => null,
             'port' => null,
             'pass' => null,

pkg/redis/PhpRedis.php

@@ -20,6 +20,7 @@ class PhpRedis implements Redis
     public function __construct(array $config)
     {
         $this->config = array_replace([
+            'scheme' => null,
             'host' => null,
             'port' => null,
             'pass' => null,
@@ -73,6 +74,10 @@ public function connect(): void
             return;
         }
 
+        if ('rediss' == $this->config['scheme']) {
+            throw new \LogicException('The phpredis extension does not support secured connections. Try to use predis library as vendor.');
+        }
+
         $this->redis = new \Redis();
 
         if ($this->config['persisted']) {

pkg/redis/RedisConnectionFactory.php

@@ -65,14 +65,13 @@ public function __construct($config = 'redis:')
         }
 
         $this->config = array_replace($this->defaultConfig(), $config);
-        $vendor = $this->config['vendor'];
 
         $supportedVendors = ['predis', 'phpredis', 'custom'];
-        if (false == in_array($vendor, $supportedVendors, true)) {
+        if (false == in_array($this->config['vendor'], $supportedVendors, true)) {
             throw new \LogicException(sprintf(
                 'Unsupported redis vendor given. It must be either "%s". Got "%s"',
                 implode('", "', $supportedVendors),
-                $vendor
+                $this->config['vendor']
             ));
         }
     }
@@ -122,10 +121,8 @@ private function createRedis(): Redis
 
     private function parseDsn(string $dsn): array
     {
-        $unsupportedError = 'The given DSN "%s" is not supported. Must start with "redis:".';
-
         if ((false === strpos($dsn, 'redis:')) and (false === strpos($dsn, 'rediss:'))) {
-            throw new \LogicException(sprintf($unsupportedError, $dsn));
+            throw new \LogicException(sprintf('The given DSN "%s" is not supported. Must start with "redis:" or "rediss:".', $dsn));
         }
 
         if (false === $config = parse_url($dsn)) {
@@ -143,18 +140,6 @@ private function parseDsn(string $dsn): array
             $config = array_replace($queryConfig, $config);
         }
 
-        if (isset($config['vendor'])) {
-            $vendor = $config['vendor'];
-        } else {
-            $vendor = "";
-        }
-
-
-        //predis additionaly supports tls as scheme, but it must remain in the $config array
-        if ($vendor!='predis') {
-            if ($config['scheme']!='redis') throw new \LogicException(sprintf($unsupportedError, $dsn));
-            unset($config['scheme']);
-        }
         unset($config['query']);
 
         $config['lazy'] = empty($config['lazy']) ? false : true;