RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-01 20:36:14 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
beberlei 2010-03-10 19:07:02 +00:00
parent b2cf2e2072
commit 273bc3dc22
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/doctrine.php
View file

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