hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 12:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1489 : Let errors happen when they occur

Browse Source
This commit is contained in:
Romain Neutron
2013-10-02 18:30:48 +02:00
parent 3564bd064a
commit abae32ca5f
4 changed files with 133 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/console
View File

@@ -33,7 +33,6 @@ use Alchemy\Phrasea\Command\Setup\XSendFileConfigurationDumper;
require_once __DIR__ . '/../lib/autoload.php'; require_once __DIR__ . '/../lib/autoload.php';
try {
$cli = new CLI(" $cli = new CLI("
_____ _ _ _____ _____ ______ _ _ ______ _______ _____ _ _ _____ _____ ______ _ _ ______ _______
| __ \| | | | __ \ /\ / ____| ____| /\ | \ | | ____|__ __| | __ \| | | | __ \ /\ / ____| ____| /\ | \ | | ____|__ __|
@@ -102,10 +101,4 @@ try {
$cli->loadPlugins(); $cli->loadPlugins();
$result_code = is_int($cli->run()) ? : 1; exit(is_int($cli->run()) ? : 1);
} catch (\Exception $e) {
$result_code = 1;
echo sprintf("\nAn error occured :\n\n\t\033[0;31m%s\033[0;37m\n\n", $e->getMessage());
}
exit($result_code);

9
bin/developer
View File

@@ -44,7 +44,6 @@ use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand;
require_once __DIR__ . '/../lib/autoload.php'; require_once __DIR__ . '/../lib/autoload.php';
try {
$cli = new CLI(" $cli = new CLI("
___ ___ _ _ ___ __ __ ___ ___ ___ ____ __ __ __ ___ ___ ___ _ _ ___ __ __ ___ ___ ___ ____ __ __ __ ___
( \( _)( )( )( _)( ) / \( ,\( _)( ,) (_ _)/ \ / \( ) / __) ( \( _)( )( )( _)( ) / \( ,\( _)( ,) (_ _)/ \ / \( ) / __)
@@ -101,10 +100,4 @@ try {
new ValidateSchemaCommand(), new ValidateSchemaCommand(),
)); ));
$cli->runCLI(); exit($cli->runCLI());
} catch (Exception $e) {
echo "an error occured : " . $e->getMessage();
exit(1);
}
exit(0);

9
bin/setup
View File

@@ -25,7 +25,6 @@ use Alchemy\Phrasea\Command\Setup\CheckEnvironment;
require_once __DIR__ . '/../vendor/autoload.php'; require_once __DIR__ . '/../vendor/autoload.php';
try {
$app = new CLI(" $app = new CLI("
_____ _ _ _____ _____ ______ _ _ ______ _______ _____ _ _ _____ _____ ______ _ _ ______ _______
| __ \| | | | __ \ /\ / ____| ____| /\ | \ | | ____|__ __| | __ \| | | | __ \ /\ / ____| ____| /\ | \ | | ____|__ __|
@@ -65,10 +64,4 @@ try {
$app->command(new CheckEnvironment('check:system')); $app->command(new CheckEnvironment('check:system'));
$app->command(new Install('system:install')); $app->command(new Install('system:install'));
$result_code = is_int($app->run()) ? : 1; exit(is_int($app->run()) ? : 1);
} catch (\Exception $e) {
$result_code = 1;
echo sprintf("\nAn error occured :\n\n\t\033[0;31m%s\033[0;37m\n\n", $e->getMessage());
}
exit($result_code);

5
lib/classes/module/console/systemUpgrade.php
View File

@@ -64,7 +64,6 @@ class module_console_systemUpgrade extends Command
} }
if ($continue == 'y') { if ($continue == 'y') {
try {
$output->write('<info>Upgrading...</info>', true); $output->write('<info>Upgrading...</info>', true);
if (count(User_Adapter::get_wrong_email_users($this->container)) > 0) { if (count(User_Adapter::get_wrong_email_users($this->container)) > 0) {
@@ -98,10 +97,6 @@ class module_console_systemUpgrade extends Command
$output->writeln(""); $output->writeln("");
$output->writeln(""); $output->writeln("");
} }
} catch (\Exception $e) {
$output->writeln(sprintf('<error>An error occured while upgrading : %s </error>', $e->getMessage()));
}
} else { } else {
$output->write('<info>Canceled</info>', true); $output->write('<info>Canceled</info>', true);
} }