Merge pull request #241 from symfony-cmf/doctrine-cache-bundle

switch to DoctrineCacheBundle

Author: dbu

README.md

@@ -56,14 +56,7 @@ and then install the dependencies:
 
 The Doctrine DBAL implementation is installed by default already along side the Jackrabbit implementation.
 
-To enable the meta data and node cache to improve performance first enable ``LiipDoctrineCacheBundle``
-in ``app/AppKernel.php`` and then also perform:
-
-    php composer.phar require liip/doctrine-cache-bundle:dev-master --no-update
-    php composer.phar update liip/doctrine-cache-bundle
-
-Finally uncomment the ``caches`` settings in the `phpcr.yml` as well as the ``liip_doctrine_cache``
-settings in ``app/config/config.yml``.
+To disable the meta data and node cache for debugging comment the ``caches`` settings in the `phpcr.yml`.
 
 
 Note: On Windows you need to run the shell as Administrator or edit the `composer.json` and

app/AppKernel.php

@@ -57,7 +57,7 @@ public function registerBundles()
             new Liip\ImagineBundle\LiipImagineBundle(),
 
             // jackalope doctrine caching
-            // new Liip\DoctrineCacheBundle\LiipDoctrineCacheBundle(),
+            new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(),
 
             // block caching and feeds
             new Sonata\CacheBundle\SonataCacheBundle(),

app/config/config.yml

@@ -311,13 +311,12 @@ fm_elfinder:
                 upload_allow: ['all']
                 upload_max_size: 2M
 
-# jackalope doctrine caching
-#liip_doctrine_cache:
-#    namespaces:
-#        meta:
-#            type: file_system
-#        nodes:
-#            type: file_system
+doctrine_cache:
+    providers:
+        phpcr_meta:
+            type: file_system
+        phpcr_nodes:
+            type: file_system
 
 fos_rest:
     view:

app/config/phpcr_doctrine_dbal.yml.dist

@@ -2,9 +2,9 @@ parameters:
     phpcr_backend:
         type: doctrinedbal
         connection: default
-#        caches:
-#            meta: liip_doctrine_cache.ns.meta
-#            nodes: liip_doctrine_cache.ns.nodes
+        caches:
+            meta: doctrine_cache.providers.phpcr_meta
+            nodes: doctrine_cache.providers.phpcr_nodes
     phpcr_workspace: default
     phpcr_user: admin
     phpcr_pass: admin

composer.json

@@ -31,6 +31,7 @@
         "jackalope/jackalope-jackrabbit": "~1.1",
         "doctrine/doctrine-bundle": "~1.2",
         "doctrine/data-fixtures": "1.0.*",
+        "doctrine/doctrine-cache-bundle": "~1.0",
         "sonata-project/cache-bundle": "~2.1",
         "sonata-project/doctrine-phpcr-admin-bundle": "~1.1",
         "symfony-cmf/block-bundle": "~1.1",