[DoctrineBundle] Revert removal of dic parameter doctrine.orm.auto_ge…

…nerate_proxy_classes.
symfony · Jan 22, 2011 · a50f56a · a50f56a
1 parent 8d938c5
commit a50f56a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -219,7 +219,7 @@ public function ormLoad(array $configs, ContainerBuilder $container)
 
         $config = $this->mergeOrmConfig($configs, $container);
 
-        $options = array('default_entity_manager', 'default_connection');
+        $options = array('default_entity_manager', 'default_connection', 'auto_generate_proxy_classes');
         foreach ($options as $key) {
             $container->setParameter('doctrine.orm.'.$key, $config[$key]);
         }
@@ -253,6 +253,7 @@ protected function mergeOrmConfig(array $configs, $container)
         $mergedConfig = array(
             'default_entity_manager' => 'default',
             'default_connection' => 'default',
+            'auto_generate_proxy_classes' => false,
             'entity_managers' => array(),
         );
 
@@ -279,6 +280,12 @@ protected function mergeOrmConfig(array $configs, $container)
             } else if (isset($config['default_connection'])) {
                 $mergedConfig['default_connection'] = $config['default_connection'];
             }
+            if (isset($config['auto_generate_proxy_classes'])) {
+                $mergedConfig['auto_generate_proxy_classes'] = $config['auto_generate_proxy_classes'];
+            }
+            if (isset($config['auto-generate-proxy-classes'])) {
+                $mergedConfig['auto_generate_proxy_classes'] = $config['auto-generate-proxy-classes'];
+            }
         }
         $defaultManagerOptions['connection'] = $mergedConfig['default_connection'];
 

diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
@@ -11,6 +11,7 @@
         <parameter key="doctrine.orm.result_cache_driver">array</parameter>
         <parameter key="doctrine.orm.configuration_class">Doctrine\ORM\Configuration</parameter>
         <parameter key="doctrine.orm.entity_manager_class">Doctrine\ORM\EntityManager</parameter>
+        <parameter key="doctrine.orm.auto_generate_proxy_classes">false</parameter>
 
         <!-- proxies -->
         <parameter key="doctrine.orm.proxy_namespace">Proxies</parameter>

diff --git a/...Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/...Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -119,6 +119,7 @@ public function testDependencyInjectionConfigurationDefaults()
         $loader->dbalLoad(array(array()), $container);
         $loader->ormLoad(array(array('mappings' => array('YamlBundle' => array()))), $container);
 
+        $this->assertFalse($container->getParameter('doctrine.orm.auto_generate_proxy_classes'));
         $this->assertEquals('Doctrine\ORM\Configuration', $container->getParameter('doctrine.orm.configuration_class'));
         $this->assertEquals('Doctrine\ORM\EntityManager', $container->getParameter('doctrine.orm.entity_manager_class'));
         $this->assertEquals('Proxies', $container->getParameter('doctrine.orm.proxy_namespace'));