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

Merge pull request #392 from havvg/1.5

Browse source 
use scalar for default connection alias
This commit is contained in:
Toni Uebernickel 2016-01-24 11:39:55 +01:00
parent dbbc9e5c92 4028cf19e7
commit 3c50d7859c
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Command/AbstractCommand.php
View file

@ -383,6 +383,10 @@ EOT
$propelConfiguration = $container->get('propel.configuration');
foreach ($propelConfiguration['datasources'] as $name => $datasource) {
if (is_scalar($datasource)) {
continue;
}
$xml .= strtr(<<<EOT
<datasource id="%name%">
<adapter>%adapter%</adapter>

4
Command/SqlInsertCommand.php
View file

@ -111,6 +111,10 @@ EOT
$connections = array();
foreach ($propelConfiguration['datasources'] as $name => $config) {
if (is_scalar($config)) {
continue;
}
$connections[$name] = $config['connection'];
}

2
DependencyInjection/PropelExtension.php
View file

@ -126,7 +126,7 @@ class PropelExtension extends Extension
// Alias the default connection if not defined
if (!isset($c['datasources']['default'])) {
$c['datasources']['default'] = $c['datasources'][$connectionName];
$c['datasources']['default'] = $connectionName;
}
$container->getDefinition('propel.configuration')->setArguments(array($c));