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

Merge branch maxailloud

Browse source
This commit is contained in:
William DURAND 2011-05-25 00:04:27 +02:00
commit 465fad8872
4 changed files with 131 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Command/PhingCommand.php
View file

@ -195,6 +195,9 @@ EOT
<user>%username%</user>
<password>%password%</password>
</connection>
<settings>
<setting id="charset">%charset%</setting>
</settings>
</datasource>
EOT
@ -204,6 +207,7 @@ EOT
'%dsn%' => $datasource['connection']['dsn'],
'%username%' => $datasource['connection']['user'],
'%password%' => $datasource['connection']['password'],
'%charset%' => $container->getParameter('propel.charset'),
));
}
@ -310,7 +314,7 @@ EOT;
protected function checkConfiguration()
{
$parameters = $this->container->get('propel.configuration')->getParameters();
if (0 === count($parameters['datasources'])) {
if (!isset($parameters['datasources']) ||0 === count($parameters['datasources'])) {
throw new \RuntimeException('Propel should be configured (no database configuration found).');
}
}