Skip to content

Commit 4028cf1

Browse files
committed
use scalar for default connection alias
1 parent dbbc9e5 commit 4028cf1

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

Command/AbstractCommand.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,10 @@ protected function createBuildTimeFile($file)
383383

384384
$propelConfiguration = $container->get('propel.configuration');
385385
foreach ($propelConfiguration['datasources'] as $name => $datasource) {
386+
if (is_scalar($datasource)) {
387+
continue;
388+
}
389+
386390
$xml .= strtr(<<<EOT
387391
<datasource id="%name%">
388392
<adapter>%adapter%</adapter>

Command/SqlInsertCommand.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ protected function getConnections()
111111

112112
$connections = array();
113113
foreach ($propelConfiguration['datasources'] as $name => $config) {
114+
if (is_scalar($config)) {
115+
continue;
116+
}
117+
114118
$connections[$name] = $config['connection'];
115119
}
116120

DependencyInjection/PropelExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ protected function dbalLoad(array $config, ContainerBuilder $container)
126126

127127
// Alias the default connection if not defined
128128
if (!isset($c['datasources']['default'])) {
129-
$c['datasources']['default'] = $c['datasources'][$connectionName];
129+
$c['datasources']['default'] = $connectionName;
130130
}
131131

132132
$container->getDefinition('propel.configuration')->setArguments(array($c));

0 commit comments

Comments
 (0)