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

Merge branch '2.0'

Browse source
This commit is contained in:
William DURAND 2012-02-21 16:00:39 +01:00
parent 2be58a2cb9 51b58bf428
commit 566472cc9b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/AbstractPropelCommand.php
View file

@ -96,7 +96,7 @@ abstract class AbstractPropelCommand extends ContainerAwareCommand
if (isset($properties['propel.schema.dir'])) {
$this->cacheDir = $properties['propel.schema.dir'];
} else {
$this->cacheDir = $kernel->getRootDir().'/cache/' . $kernel->getEnvironment() . '/propel';
$this->cacheDir = $kernel->getCacheDir().'/propel';
$filesystem = new Filesystem();
$filesystem->remove($this->cacheDir);

2
Command/ReverseCommand.php
View file

@ -62,8 +62,8 @@ EOT
$ret = $this->callPhing('reverse', array(
'propel.project' => $name,
'propel.database' => $defaultConfig['adapter'],
'propel.database.url' => $defaultConfig['connection']['dsn'],
'propel.database.database' => $defaultConfig['adapter'],
'propel.database.user' => $defaultConfig['connection']['user'],
'propel.database.password' => isset($defaultConfig['connection']['password']) ? $defaultConfig['connection']['password'] : '',
));