[DoctrineBundle] Make the proxy dir configurable

symfony · Dec 8, 2010 · 70a793b · 70a793b
1 parent fb41389
commit 70a793b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -215,6 +215,7 @@ protected function loadOrmDefaults(array $config, ContainerBuilder $container)
             'query_cache_driver',
             'result_cache_driver',
             'proxy_namespace',
+            'proxy_dir',
             'auto_generate_proxy_classes'
         );
         foreach ($options as $key) {
@@ -250,7 +251,6 @@ protected function loadOrmEntityManagers(array $config, ContainerBuilder $contai
     protected function loadOrmEntityManager(array $entityManager, ContainerBuilder $container)
     {
         $defaultEntityManager = $container->getParameter('doctrine.orm.default_entity_manager');
-        $proxyCacheDir = $container->getParameter('kernel.cache_dir').'/doctrine/orm/Proxies';
 
         $ormConfigDef = new Definition('Doctrine\ORM\Configuration');
         $container->setDefinition(sprintf('doctrine.orm.%s_configuration', $entityManager['name']), $ormConfigDef);
@@ -263,7 +263,7 @@ protected function loadOrmEntityManager(array $entityManager, ContainerBuilder $
             'setQueryCacheImpl' => new Reference(sprintf('doctrine.orm.%s_query_cache', $entityManager['name'])),
             'setResultCacheImpl' => new Reference(sprintf('doctrine.orm.%s_result_cache', $entityManager['name'])),
             'setMetadataDriverImpl' => new Reference('doctrine.orm.metadata_driver'),
-            'setProxyDir' => $proxyCacheDir,
+            'setProxyDir' => $container->getParameter('doctrine.orm.proxy_dir'),
             'setProxyNamespace' => $container->getParameter('doctrine.orm.proxy_namespace'),
             'setAutoGenerateProxyClasses' => $container->getParameter('doctrine.orm.auto_generate_proxy_classes')
         );

diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
@@ -14,6 +14,7 @@
 
         <!-- proxies -->
         <parameter key="doctrine.orm.proxy_namespace">Proxies</parameter>
+        <parameter key="doctrine.orm.proxy_dir">%kernel.cache_dir%/doctrine/orm/Proxies</parameter>
         <parameter key="doctrine.orm.auto_generate_proxy_classes">false</parameter>
 
         <!-- cache -->