From 03511dea5c28336b5bba3481eb9d1dab4b0aaa76 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 27 Apr 2011 10:27:10 +0200 Subject: [PATCH] [DoctrineBundle] removed the possibility to define an empty configuration for the DBAL (which does not make sense in real-life) --- .../DependencyInjection/Configuration.php | 5 ----- .../AbstractDoctrineExtensionTest.php | 15 ++++++++------- .../orm_service_simple_single_entity_manager.xml | 5 ++++- .../config/xml/orm_single_em_bundle_mappings.xml | 4 ++++ .../orm_service_simple_single_entity_manager.yml | 7 ++++++- .../config/yml/orm_single_em_bundle_mappings.yml | 6 ++++++ 6 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Configuration.php index cf1a4dbf6e..6b15c3d25a 100644 --- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Configuration.php @@ -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() diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php index e0db367bae..909463effd 100755 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php @@ -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') diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml index 8ecceb4bc7..0870542e00 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml @@ -7,7 +7,10 @@ http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> - + + + + diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml index 273d368acd..bd40950b34 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml @@ -7,6 +7,10 @@ http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> + + + + diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_simple_single_entity_manager.yml b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_simple_single_entity_manager.yml index 31386392c2..b2082a5f24 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_simple_single_entity_manager.yml +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_simple_single_entity_manager.yml @@ -1,5 +1,10 @@ doctrine: - dbal: ~ + dbal: + default_connection: default + connections: + default: + dbname: db + orm: default_entity_manager: default entity_managers: diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_bundle_mappings.yml b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_bundle_mappings.yml index ee01a6e0b3..ec2d3659c4 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_bundle_mappings.yml +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_bundle_mappings.yml @@ -1,4 +1,10 @@ doctrine: + dbal: + default_connection: default + connections: + default: + dbname: db + orm: default_entity_manager: default entity_managers: