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

[DoctrineBundle] removed the possibility to define an empty configuration for the DBAL (which does not make sense in real-life)

This commit is contained in:
Fabien Potencier 2011-04-27 10:27:10 +02:00
parent 55f9e6fb99
commit 03511dea5c
6 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Configuration.php
View File

@ -58,11 +58,6 @@ class Configuration implements ConfigurationInterface
$node
->children()
->arrayNode('dbal')
->beforeNormalization()
->ifNull()
// Define a default connection using the default values
->then(function($v) { return array ('connections' => array('default' => array())); })
->end()
->children()
->scalarNode('default_connection')->end()
->end()

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

@ -41,7 +41,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer();
$loader = new DoctrineExtension();
$loader->load(array(array('dbal' => array('connections' => array('default'=> array('password' => 'foo')))), array(), array('dbal' => array('default_connection' => 'foo')), array()), $container);
$loader->load(array(array('dbal' => array('connections' => array('default' => array('password' => 'foo')))), array(), array('dbal' => array('default_connection' => 'foo')), array()), $container);
$arguments = $container->getDefinition('doctrine.dbal.default_connection')->getArguments();
$config = $arguments[0];
@ -109,7 +109,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer();
$loader = new DoctrineExtension();
$loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container);
$loader->load(array(array('dbal' => array('connections' => array('default' => array('password' => 'foo'))), 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => 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'));
@ -140,7 +140,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
);
$container = $this->getContainer();
$loader->load(array(array('dbal' => null, 'orm' => $config)), $container);
$loader->load(array(array('dbal' => array('connections' => array('default' => array('password' => 'foo'))), 'orm' => $config)), $container);
$this->compileContainer($container);
$definition = $container->getDefinition('doctrine.dbal.default_connection');
@ -189,7 +189,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer();
$loader = new DoctrineExtension();
$loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container);
$loader->load(array(array('dbal' => array('connections' => array('default' => array('password' => 'foo'))), 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container);
$this->compileContainer($container);
$definition = $container->getDefinition('doctrine.dbal.default_connection');
@ -221,13 +221,14 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertDICConstructorArguments($definition, array(
array(
'dbname' => 'db',
'host' => 'localhost',
'driver' => 'pdo_mysql',
'driverOptions' => array(),
'port' => null,
'user' => 'root',
'password' => null,
'port' => null,
'driver' => 'pdo_mysql',
'logging' => false,
'driverOptions' => array(),
),
new Reference('doctrine.dbal.default_connection.configuration'),
new Reference('doctrine.dbal.default_connection.event_manager')

5
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml
View File

@ -7,7 +7,10 @@
http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
<config>
<dbal />
<dbal default-connection="default">
<connection name="default" dbname="db" />
</dbal>
<orm default-entity-manager="default">
<entity-manager name="default">
<metadata-cache-driver type="memcache">

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml
View File

@ -7,6 +7,10 @@
http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
<config>
<dbal default-connection="default">
<connection name="default" dbname="db" />
</dbal>
<orm default-entity-manager="default">
<entity-manager name="default">
<mapping name="AnnotationsBundle" />

7
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_simple_single_entity_manager.yml
View File

@ -1,5 +1,10 @@
doctrine:
dbal: ~
dbal:
default_connection: default
connections:
default:
dbname: db
orm:
default_entity_manager: default
entity_managers:

6
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_bundle_mappings.yml
View File

@ -1,4 +1,10 @@
doctrine:
dbal:
default_connection: default
connections:
default:
dbname: db
orm:
default_entity_manager: default
entity_managers: