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

Merge pull request #99 from francisbesset/2.0

Browse source 
[2.0] Fixed bug in CLI environment
This commit is contained in:
William DURAND 2012-01-23 00:55:34 -08:00
parent 71ccc1bc80 31c4b8699e
commit 89adb254af
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
DependencyInjection/PropelExtension.php
View file

@ -68,16 +68,14 @@ class PropelExtension extends Extension
$loader->load('converters.xml');
}
if (0 === strncasecmp(PHP_SAPI, 'cli', 3)) {
if (isset($config['build_properties']) && is_array($config['build_properties'])) {
$buildProperties = $config['build_properties'];
} else {
$buildProperties = array();
}
$container->getDefinition('propel.build_properties')->setArguments(array($buildProperties));
if (isset($config['build_properties']) && is_array($config['build_properties'])) {
$buildProperties = $config['build_properties'];
} else {
$buildProperties = array();
}
$container->getDefinition('propel.build_properties')->setArguments(array($buildProperties));
if (!empty($config['dbal'])) {
$this->dbalLoad($config['dbal'], $container);
}