deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved PropelExtension

Browse source
This commit is contained in:
William DURAND 2011-04-06 01:58:44 +02:00
parent 417165de6c
commit 02552f249d
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
DependencyInjection/PropelExtension.php
View file

@ -37,15 +37,17 @@ class PropelExtension extends Extension
if (!$container->hasParameter('propel.path')) { if (!$container->hasParameter('propel.path')) {
if (!isset($config['path'])) { if (!isset($config['path'])) {
throw new \InvalidArgumentException('The "path" parameter is mandatory.'); throw new \InvalidArgumentException('The "path" parameter is mandatory.');
} else {
$container->setParameter('propel.path', $config['path']);
} }
} }
if (isset($config['path'])) { if (!$container->hasParameter('propel.phing_path')) {
$container->setParameter('propel.path', $config['path']); if (!isset($config['phing_path'])) {
} throw new \InvalidArgumentException('The "phing_path" parameter is mandatory.');
} else {
if (isset($config['phing_path'])) { $container->setParameter('propel.phing_path', $config['phing_path']);
$container->setParameter('propel.phing_path', $config['phing_path']); }
} }
if (isset($config['charset'])) { if (isset($config['charset'])) {
@ -83,7 +85,8 @@ class PropelExtension extends Extension
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('propel.xml'); $loader->load('propel.xml');
} }
/*
/*
$mergedConfig = array( $mergedConfig = array(
'default_connection' => 'default', 'default_connection' => 'default',
); );
@ -141,6 +144,11 @@ class PropelExtension extends Extension
$config = $mergedConfig; $config = $mergedConfig;
*/ */
if (empty ($config['default_connection'])) {
$keys = array_keys($config['connections']);
$config['default_connection'] = reset($keys);
}
$connectionName = $config['default_connection']; $connectionName = $config['default_connection'];
$container->setParameter('propel.dbal.default_connection', $connectionName); $container->setParameter('propel.dbal.default_connection', $connectionName);