Fixing issue with memcache di configuration.

symfony · Dec 2, 2010 · 53c1f1f · 53c1f1f
1 parent 0b26be1
commit 53c1f1f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -415,20 +415,20 @@ protected function loadOrmEntityManagerResultCacheDriver(array $entityManager, C
     /**
      * Gets an entity manager cache driver definition for metadata, query and result caches.
      *
-     * @param array $entityManager
-     * @param string $cacheDriver
+     * @param array $entityManager The array configuring an entity manager.
+     * @param string|array $cacheDriver The cache driver configuration.
      * @param ContainerBuilder $container
      * @return Definition $cacheDef
      */
     protected function getEntityManagerCacheDefinition(array $entityManager, $cacheDriver, ContainerBuilder $container)
     {
         $type = is_array($cacheDriver) && isset($cacheDriver['type']) ? $cacheDriver['type'] : $cacheDriver;
         if ($type === 'memcache') {
-            $memcacheClass = '%'.sprintf('doctrine.orm.cache.%s_class', $type).'%';
+            $memcacheClass = isset($cacheDriver['class']) ? $cacheDriver['class'] : '%'.sprintf('doctrine.orm.cache.%s_class', $type).'%';
             $cacheDef = new Definition($memcacheClass);
-            $memcacheHost = '%doctrine.orm.cache.memcache_host%';
-            $memcachePort = '%doctrine.orm.cache.memcache_port%';
-            $memcacheInstanceClass = '%doctrine.orm.cache.memcache_instance_class%';
+            $memcacheHost = is_array($cacheDriver) && isset($cacheDriver['host']) ? $cacheDriver['host'] : '%doctrine.orm.cache.memcache_host%';
+            $memcachePort = is_array($cacheDriver) && isset($cacheDriver['port']) ? $cacheDriver['port'] : '%doctrine.orm.cache.memcache_port%';
+            $memcacheInstanceClass = is_array($cacheDriver) && isset($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%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);