RedisConnectionFactory accept an exist redis object

Author: charleslxh2

Diff for: docs/transport/redis.md

@@ -78,6 +78,38 @@ $connectionFactory = new RedisConnectionFactory([
 $psrContext = $connectionFactory->createContext();
 ```
 
+* Use an exist php redis object:
+
+```php
+<?
+use Enqueue\Redis\RedisConnectionFactory;
+
+$redis = new \Redis();
+
+$client = $redis->connect('localhost', 6379, 1);
+
+$connectionFactory = new RedisConnectionFactory($client);
+
+$psrContext = $connectionFactory->createContext();
+```
+
+* Use an exist predis object:
+
+```php
+<?
+use Predis\Client;
+use Enqueue\Redis\RedisConnectionFactory;
+
+$redis = new Client(array(
+    'host' => 'localhost',
+    'port' => 6379,
+));
+
+$connectionFactory = new RedisConnectionFactory($redis);
+
+$psrContext = $connectionFactory->createContext();
+```
+
 ## Send message to topic
 
 ```php

Diff for: pkg/redis/PhpRedis.php

@@ -15,19 +15,23 @@ class PhpRedis implements Redis
     private $config;
 
     /**
-     * @param array $config
+     * @param array|\Redis $param
      */
-    public function __construct(array $config)
+    public function __construct($param)
     {
-        $this->config = array_replace([
-            'host' => null,
-            'port' => null,
-            'timeout' => null,
-            'reserved' => null,
-            'retry_interval' => null,
-            'persisted' => false,
-            'database' => 0,
-        ], $config);
+        if ($param instanceof \Redis) {
+            $this->redis = $param;
+        } else {
+            $this->config = array_replace([
+                'host' => null,
+                'port' => null,
+                'timeout' => null,
+                'reserved' => null,
+                'retry_interval' => null,
+                'persisted' => false,
+                'database' => 0,
+            ], $param);
+        }
     }
 
     /**

Diff for: pkg/redis/RedisConnectionFactory.php

@@ -4,6 +4,7 @@
 
 use Interop\Queue\PsrConnectionFactory;
 use Predis\Client;
+use Predis\ClientInterface;
 
 class RedisConnectionFactory implements PsrConnectionFactory
 {
@@ -13,12 +14,12 @@ class RedisConnectionFactory implements PsrConnectionFactory
     private $config;
 
     /**
-     * @var \Redis
+     * @var Redis
      */
     private $redis;
 
     /**
-     * $config = [
+     * $param = [
      *  'host' => can be a host, or the path to a unix domain socket
      *  'port' => optional
      *  'timeout' => value in seconds (optional, default is 0.0 meaning unlimited)
@@ -35,20 +36,34 @@ class RedisConnectionFactory implements PsrConnectionFactory
      * redis:
      * redis:?vendor=predis
      *
-     * @param array|string|null $config
+     * or
+     *
+     * A redis instance of Predis or phpredis.
+     *
+     * @param array|string|ClientInterface|\Redis|null $param
      */
-    public function __construct($config = 'redis:')
+    public function __construct($param = 'redis:')
     {
-        if (empty($config) || 'redis:' === $config) {
-            $config = [];
-        } elseif (is_string($config)) {
-            $config = $this->parseDsn($config);
-        } elseif (is_array($config)) {
+        if ($param instanceof ClientInterface) {
+            $this->redis = new PRedis($param);
+            return;
+        }
+
+        if ($param instanceof \Redis) {
+            $this->redis = new PhpRedis($param);
+            return;
+        }
+
+        if (empty($param) || 'redis:' === $param) {
+            $param = [];
+        } elseif (is_string($param)) {
+            $param = $this->parseDsn($param);
+        } elseif (is_array($param)) {
         } else {
             throw new \LogicException('The config must be either an array of options, a DSN string or null');
         }
 
-        $this->config = array_replace($this->defaultConfig(), $config);
+        $this->config = array_replace($this->defaultConfig(), $param);
 
         $supportedVendors = ['predis', 'phpredis'];
         if (false == in_array($this->config['vendor'], $supportedVendors, true)) {

Diff for: pkg/redis/Symfony/RedisTransportFactory.php

@@ -35,7 +35,7 @@ public function addConfiguration(ArrayNodeDefinition $builder)
         $builder
             ->beforeNormalization()
                 ->ifTrue(function ($node) {
-                    return empty($node['dsn']) && (empty($node['host']) || empty($node['vendor']));
+                    return empty($node['dsn']) && empty($node['service']) && (empty($node['host']) || empty($node['vendor']));
                 })
                 ->thenInvalid('Invalid configuration %s')
             ->end()
@@ -65,6 +65,9 @@ public function addConfiguration(ArrayNodeDefinition $builder)
                     ->defaultValue(0)
                     ->info('Database index to select when connected.')
                 ->end()
+                ->scalarNode('service')
+                    ->defaultNull()
+                ->end()
         ;
     }
 
@@ -74,7 +77,12 @@ public function addConfiguration(ArrayNodeDefinition $builder)
     public function createConnectionFactory(ContainerBuilder $container, array $config)
     {
         $factory = new Definition(RedisConnectionFactory::class);
-        $factory->setArguments([isset($config['dsn']) ? $config['dsn'] : $config]);
+
+        if (empty($config['service'])) {
+            $factory->setArguments([isset($config['dsn']) ? $config['dsn'] : $config]);
+        } else {
+            $factory->setArguments([new Reference($config['service'])]);
+        }
 
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
         $container->setDefinition($factoryId, $factory);