merged branch guilhermeblanco/redis_support (PR #5224)

fabpot · fabpot · commit 50df1a72aab9 · 2012-08-15T19:23:23.000+02:00
Commits ------- 493aa12 Added support to redis, wincache and zend data cache. Discussion ---------- Added support to redis, wincache and zend data cache. These three drivers were missing support on DoctrineBundle. DoctrineBundle PR doctrine/DoctrineBundle#99 must be merged first --------------------------------------------------------------------------- by stof at 2012-08-09T20:35:21Z This looks good to me
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -331,9 +331,24 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
                 $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManager['name'])), $memcachedInstance);
                 $cacheDef->addMethodCall('setMemcached', array(new Reference($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManager['name'])))));
                 break;
+             case 'redis':
+                $redisClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.redis.class').'%';
+                $redisInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%'.$this->getObjectManagerElementName('cache.redis_instance.class').'%';
+                $redisHost = !empty($cacheDriver['host']) ? $cacheDriver['host'] : '%'.$this->getObjectManagerElementName('cache.redis_host').'%';
+                $redisPort = !empty($cacheDriver['port']) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.redis_port').'%';
+                $cacheDef = new Definition($redisClass);
+                $redisInstance = new Definition($redisInstanceClass);
+                $redisInstance->addMethodCall('connect', array(
+                    $redisHost, $redisPort
+                ));
+                $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManager['name'])), $redisInstance);
+                $cacheDef->addMethodCall('setRedis', array(new Reference($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManager['name'])))));
+                break;
             case 'apc':
             case 'array':
             case 'xcache':
+            case 'wincache':
+            case 'zenddata':
                 $cacheDef = new Definition('%'.$this->getObjectManagerElementName(sprintf('cache.%s.class', $cacheDriver['type'])).'%');
                 break;
             default:
