Merge pull request #1 from krichprollsch/2.0

check propel.ini existence
This commit is contained in:
Kévin Gomez 2013-11-20 09:54:51 -08:00
commit 816e68266e

View file

@ -321,10 +321,15 @@ EOT;
{
$fs = new Filesystem();
$buildProperties = array_merge(
parse_ini_file($kernel->getRootDir().'/config/propel.ini'),
$this->getContainer()->getParameter('propel.build_properties')
);
$buildProperties = $this->getContainer()->getParameter('propel.build_properties');
$inifile = $kernel->getRootDir().'/config/propel.ini';
if (file_exists($inifile)) {
$buildProperties = array_merge(
parse_ini_file($inifile),
$buildProperties
);
}
$fs->dumpFile($file, $this->arrayToIni($buildProperties));
}