SymfonySessionRedisFactory fixed for Redis and REdisFactory fixed for…

… connection options
selamiphp · Sep 19, 2017 · e8c2b97 · e8c2b97
1 parent acc96da
commit e8c2b97
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/RedisFactory.php b/src/RedisFactory.php
@@ -33,21 +33,29 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
 
     private function connect()
     {
-        $this->redisClient->connect(
+
+        $redisConfig = [
             $this->config['redis']['host'],
-            $this->config['redis']['port'] ?? null,
-            $this->config['redis']['timeout'] ?? null,
-            $this->config['redis']['reserved'] ?? null,
-            $this->config['redis']['retry_interval'] ?? null
-        );
+            $this->config['redis']['port'] ?? 6379,
+            $this->config['redis']['timeout'] ?? 0
+        ];
+
+        if (isset($this->config['redis']['retry_interval'])) {
+            $redisConfig[] = null;
+            $redisConfig[] = $this->config['redis']['retry_interval'];
+        } elseif (isset($this->config['redis']['reserved'])) {
+            $redisConfig[] = $this->config['redis']['reserved'];
+        }
+
+        $this->redisClient->connect(...$redisConfig);
     }
 
     private function pconnect()
     {
         $this->redisClient->pconnect(
             $this->config['redis']['host'],
-            $this->config['redis']['port'] ?? null,
-            $this->config['redis']['timeout'] ?? null,
+            $this->config['redis']['port'] ?? 6379,
+            $this->config['redis']['timeout'] ?? 0,
             $this->config['redis']['persistent_id'] ?? null
         );
     }

diff --git a/src/SymfonySessionRedisFactory.php b/src/SymfonySessionRedisFactory.php
@@ -8,7 +8,7 @@
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
 use Selami\Factories\Adapters\Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Memcached;
+use Redis;
 
 class SymfonySessionRedisFactory implements FactoryInterface
 {