diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DoctrineBundle] Revert removal of dic parameter doctrine.orm.auto_generate_proxy_classes.

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-01-22 16:55:50 +01:00 committed by Fabien Potencier
parent 8d938c54d1
commit a50f56a7e9
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
View File

@ -219,7 +219,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
$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 @@ class DoctrineExtension extends AbstractDoctrineExtension
$mergedConfig = array(
'default_entity_manager' => 'default',
'default_connection' => 'default',
'auto_generate_proxy_classes' => false,
'entity_managers' => array(),
);
@ -279,6 +280,12 @@ class DoctrineExtension extends AbstractDoctrineExtension
} 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'];

1
src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
View File

@ -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>

1
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
View File

@ -119,6 +119,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$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'));