[redis][symfony] Add ability to set custom redis instance in transport factory.

makasim · makasim · commit f4b97d574dfd · 2018-02-15T11:07:14.000+02:00
diff --git a/pkg/redis/Symfony/RedisTransportFactory.php b/pkg/redis/Symfony/RedisTransportFactory.php
@@ -49,10 +49,14 @@ public function addConfiguration(ArrayNodeDefinition $builder)
                 ->end()
                 ->integerNode('port')->end()
                 ->enumNode('vendor')
-                    ->values(['phpredis', 'predis'])
+                    ->values(['phpredis', 'predis', 'custom'])
                     ->cannotBeEmpty()
                     ->info('The library used internally to interact with Redis server')
                 ->end()
+                ->scalarNode('redis')
+                    ->cannotBeEmpty()
+                    ->info('A custom redis service id, used with vendor true only')
+                ->end()
                 ->booleanNode('persisted')
                     ->defaultFalse()
                     ->info('bool, Whether it use single persisted connection or open a new one for every context')
@@ -73,6 +77,10 @@ public function addConfiguration(ArrayNodeDefinition $builder)
      */
     public function createConnectionFactory(ContainerBuilder $container, array $config)
     {
+        if (false == empty($config['redis'])) {
+            $config['redis'] = new Reference($config['redis']);
+        }
+
         $factory = new Definition(RedisConnectionFactory::class);
         $factory->setArguments([isset($config['dsn']) ? $config['dsn'] : $config]);
 
diff --git a/pkg/redis/Tests/Symfony/RedisTransportFactoryTest.php b/pkg/redis/Tests/Symfony/RedisTransportFactoryTest.php
@@ -104,6 +104,35 @@ public function testShouldCreateConnectionFactory()
         ]], $factory->getArguments());
     }
 
+    public function testShouldCreateConnectionFactoryWithCustomRedisInstance()
+    {
+        $container = new ContainerBuilder();
+
+        $transport = new RedisTransportFactory();
+
+        $serviceId = $transport->createConnectionFactory($container, [
+            'host' => 'localhost',
+            'port' => 123,
+            'vendor' => 'custom',
+            'redis' => 'a.redis.service',
+        ]);
+
+        $this->assertTrue($container->hasDefinition($serviceId));
+        $factory = $container->getDefinition($serviceId);
+        $this->assertEquals(RedisConnectionFactory::class, $factory->getClass());
+
+        $config = $factory->getArgument(0);
+
+        $this->assertInternalType('array', $config);
+
+        $this->assertArrayHasKey('vendor', $config);
+        $this->assertSame('custom', $config['vendor']);
+
+        $this->assertArrayHasKey('redis', $config);
+        $this->assertInstanceOf(Reference::class, $config['redis']);
+        $this->assertSame('a.redis.service', (string) $config['redis']);
+    }
+
     public function testShouldCreateContext()
     {
         $container = new ContainerBuilder();
