1
0
mirror of synced 2024-12-05 03:06:05 +03:00

[2.0] Fix bug in detection of global Doctrine Cli Configuration finding the empty replacement configuration before the correct one.

This commit is contained in:
beberlei 2010-03-10 19:07:02 +00:00
parent b2cf2e2072
commit 273bc3dc22

View File

@ -6,8 +6,8 @@ $classLoader = new \Doctrine\Common\ClassLoader('Doctrine');
$classLoader->register();
$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
$configuration = new \Doctrine\Common\Cli\Configuration();
$configuration = null;
if (file_exists($configFile)) {
if ( ! is_readable($configFile)) {
trigger_error(
@ -25,5 +25,7 @@ if (file_exists($configFile)) {
}
}
$configuration = ($configuration) ?: new \Doctrine\Common\Cli\Configuration();
$cli = new \Doctrine\Common\Cli\CliController($configuration);
$cli->run($_SERVER['argv']);