From 0b26be1765d546bb0b0bd0e29e774aef58ac87df Mon Sep 17 00:00:00 2001 From: GordonsLondon Date: Sun, 7 Nov 2010 17:17:39 +0100 Subject: [PATCH] [DoctrineBundle] Fixed Memcache bug in extension --- .../DependencyInjection/DoctrineExtension.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php index 5f3e20a1b9..de12e2b4f9 100644 --- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php +++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php @@ -424,11 +424,11 @@ class DoctrineExtension extends Extension { $type = is_array($cacheDriver) && isset($cacheDriver['type']) ? $cacheDriver['type'] : $cacheDriver; if ($type === 'memcache') { - $memcacheClass = isset($cacheDriver['class']) ? $cacheDriver['class'] : '%'.sprintf('doctrine.orm.cache.%s_class', $type).'%'; + $memcacheClass = '%'.sprintf('doctrine.orm.cache.%s_class', $type).'%'; $cacheDef = new Definition($memcacheClass); - $memcacheHost = isset($cacheDriver['host']) ? $cacheDriver['host'] : '%doctrine.orm.cache.memcache_host%'; - $memcachePort = isset($cacheDriver['port']) ? $cacheDriver['port'] : '%doctrine.orm.cache.memcache_port%'; - $memcacheInstanceClass = isset($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%doctrine.orm.cache.memcache_instance_class%'; + $memcacheHost = '%doctrine.orm.cache.memcache_host%'; + $memcachePort = '%doctrine.orm.cache.memcache_port%'; + $memcacheInstanceClass = '%doctrine.orm.cache.memcache_instance_class%'; $memcacheInstance = new Definition($memcacheInstanceClass); $memcacheInstance->addMethodCall('connect', array($memcacheHost, $memcachePort)); $container->setDefinition(sprintf('doctrine.orm.%s_memcache_instance', $entityManager['name']), $memcacheInstance);