hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
This commit is contained in:
Romain Neutron
2013-10-03 15:29:22 +02:00
parent 642a1a5657 0a86cb635e
commit 1dfbff5666
82 changed files with 2558 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,43 +64,38 @@ class module_console_systemUpgrade extends Command
}
if ($continue == 'y') {
try {
$output->write('<info>Upgrading...</info>', true);
$output->write('<info>Upgrading...</info>', true);
try {
$upgrader = new Setup_Upgrade($this->container, $input->getOption('force'));
} catch (\Exception_Setup_FixBadEmailAddresses $e) {
return $output->writeln(sprintf('<error>You have to fix your database before upgrade with the system:mailCheck command </error>'));
}
if (count(User_Adapter::get_wrong_email_users($this->container)) > 0) {
return $output->writeln(sprintf('<error>You have to fix your database before upgrade with the system:mailCheck command </error>'));
}
$queries = $this->getService('phraseanet.appbox')->forceUpgrade($upgrader, $this->container);
$upgrader = new Setup_Upgrade($this->container, $input->getOption('force'));
if ($input->getOption('dump')) {
if (0 < count($queries)) {
$output->writeln("Some SQL queries can be executed to optimize\n");
$queries = $this->getService('phraseanet.appbox')->forceUpgrade($upgrader, $this->container);
foreach ($queries as $query) {
$output->writeln(" ".$query['sql']);
}
if ($input->getOption('dump')) {
if (0 < count($queries)) {
$output->writeln("Some SQL queries can be executed to optimize\n");
$output->writeln("\n");
} else {
$output->writeln("No SQL queries to execute to optimize\n");
foreach ($queries as $query) {
$output->writeln(" ".$query['sql']);
}
$output->writeln("\n");
} else {
$output->writeln("No SQL queries to execute to optimize\n");
}
}
foreach ($upgrader->getRecommendations() as $recommendation) {
list($message, $command) = $recommendation;
foreach ($upgrader->getRecommendations() as $recommendation) {
list($message, $command) = $recommendation;
$output->writeln(sprintf('<info>%s</info>', $message));
$output->writeln("");
$output->writeln(sprintf("\t\t%s", $command));
$output->writeln("");
$output->writeln("");
}
} catch (\Exception $e) {
$output->writeln(sprintf('<error>An error occured while upgrading : %s </error>', $e->getMessage()));
$output->writeln(sprintf('<info>%s</info>', $message));
$output->writeln("");
$output->writeln(sprintf("\t\t%s", $command));
$output->writeln("");
$output->writeln("");
}
} else {
$output->write('<info>Canceled</info>', true);