using doctrine abstract extension to load cache driver

.gitignore

@@ -1,2 +1,3 @@
+composer.phar
 composer.lock
 vendor

DependencyInjection/Configuration.php

@@ -234,7 +234,8 @@ private function getOdmCacheDriverNode($name)
                 ->then(function($v) { return array('type' => $v); })
             ->end()
             ->children()
-                ->scalarNode('type')->defaultValue('array')->isRequired()->end()
+                ->scalarNode('type')->defaultValue('array')->end()
+                ->scalarNode('id')->end()
                 ->scalarNode('host')->end()
                 ->scalarNode('port')->end()
                 ->scalarNode('instance_class')->end()

DependencyInjection/DoctrineCouchDBExtension.php

@@ -211,7 +211,6 @@ protected function loadOdmDocumentManagerMappingInformation(array $documentManag
             }
         }
 
-
         $odmConfig->addMethodCall('setDocumentNamespaces', array($this->aliasMap));
     }
 
@@ -223,64 +222,7 @@ protected function loadOdmDocumentManagerMappingInformation(array $documentManag
      */
     protected function loadOdmCacheDrivers(array $documentManager, ContainerBuilder $container)
     {
-        $this->loadOdmDocumentManagerCacheDriver($documentManager, $container, 'metadata_cache');
-    }
-
-    /**
-     * Loads a configured document managers metadata, query or result cache driver.
-     *
-     * @param array            $documentManager A configured ORM document manager.
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param string           $cacheName
-     */
-    protected function loadOdmDocumentManagerCacheDriver(array $documentManager, ContainerBuilder $container, $cacheName)
-    {
-        $cacheDriverService = sprintf('doctrine_couchdb.odm.%s_%s', $documentManager['name'], $cacheName);
-
-        $driver = $cacheName."_driver";
-        $cacheDef = $this->getDocumentManagerCacheDefinition($documentManager, $documentManager[$driver], $container);
-        $container->setDefinition($cacheDriverService, $cacheDef);
-    }
-
-    /**
-     * Gets an document manager cache driver definition for caches.
-     *
-     * @param array            $documentManager The array configuring an document manager.
-     * @param array            $cacheDriver The cache driver configuration.
-     * @param ContainerBuilder $container
-     * @return Definition $cacheDef
-     */
-    protected function getDocumentManagerCacheDefinition(array $documentManager, $cacheDriver, ContainerBuilder $container)
-    {
-        switch ($cacheDriver['type']) {
-            case 'memcache':
-                $memcacheClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%doctrine_couchdb.odm.cache.memcache.class%';
-                $memcacheInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%doctrine_couchdb.odm.cache.memcache_instance.class%';
-                $memcacheHost = !empty($cacheDriver['host']) ? $cacheDriver['host'] : '%doctrine_couchdb.odm.cache.memcache_host%';
-                $memcachePort = !empty($cacheDriver['port']) ? $cacheDriver['port'] : '%doctrine_couchdb.odm.cache.memcache_port%';
-                $cacheDef = new Definition($memcacheClass);
-                $memcacheInstance = new Definition($memcacheInstanceClass);
-                $memcacheInstance->addMethodCall('connect', array(
-                    $memcacheHost, $memcachePort
-                ));
-                $container->setDefinition(sprintf('doctrine_couchdb.odm.%s_memcache_instance', $documentManager['name']), $memcacheInstance);
-                $cacheDef->addMethodCall('setMemcache', array(new Reference(sprintf('doctrine_couchdb.odm.%s_memcache_instance', $documentManager['name']))));
-                break;
-            case 'apc':
-            case 'array':
-            case 'xcache':
-                $cacheDef = new Definition('%'.sprintf('doctrine_couchdb.odm.cache.%s.class', $cacheDriver['type']).'%');
-                break;
-            default:
-                throw new \InvalidArgumentException(sprintf('"%s" is an unrecognized Doctrine cache driver.', $cacheDriver['type']));
-        }
-
-        $cacheDef->setPublic(false);
-        // generate a unique namespace for the given application
-        $namespace = 'sf2couchdb_'.$documentManager['name'].'_'.md5($container->getParameter('kernel.root_dir'));
-        $cacheDef->addMethodCall('setNamespace', array($namespace));
-
-        return $cacheDef;
+        $this->loadObjectManagerCacheDriver($documentManager, $container, 'metadata_cache');
     }
 
     protected function getObjectManagerElementName($name)

Tests/ContainerTest.php

@@ -47,6 +47,7 @@ public function createYamlBundleTestContainer()
             'kernel.debug'       => false,
             'kernel.bundles'     => array('YamlBundle' => 'Fixtures\Bundles\YamlBundle\YamlBundle'),
             'kernel.cache_dir'   => sys_get_temp_dir(),
+            'kernel.environment' => 'test',
             'kernel.root_dir'    => __DIR__ . "/../../../../" // src dir
         )));
 

Tests/DependencyInjection/AbstractDoctrineExtensionTest.php

@@ -126,6 +126,7 @@ protected function getContainer($bundles = 'YamlBundle', $vendor = null)
             'kernel.debug'       => false,
             'kernel.bundles'     => $map,
             'kernel.cache_dir'   => sys_get_temp_dir(),
+            'kernel.environment' => 'test',
             'kernel.root_dir'    => __DIR__ . "/../../../../../" // src dir
         )));
     }

Tests/bootstrap.php

@@ -6,14 +6,3 @@
 php composer.phar install
 ");
 }
-
-spl_autoload_register(function($class) {
-    if (0 === strpos($class, 'Doctrine\\Bundle\\CouchDBBundle')) {
-        $path = __DIR__.'/../'.implode('/', array_slice(explode('\\', $class), 3)).'.php';
-        if (!stream_resolve_include_path($path)) {
-            return false;
-        }
-        require_once $path;
-        return true;
-    }
-});

composer.json

@@ -14,6 +14,9 @@
         "doctrine/couchdb": "*",
         "symfony/symfony": "2.1.*"
     },
+    "require-dev": {
+        "doctrine/couchdb-odm": "*"
+    },
     "suggest": {
         "doctrine/couchdb-odm": "*"
     },