Cleanup namepaces, variables uses

This commit is contained in:
Romain Neutron
2012-09-28 16:06:28 +02:00
parent 372861deb4
commit 1700565862
232 changed files with 593 additions and 1446 deletions

View File

@@ -98,15 +98,14 @@ class module_console_systemUpgrade extends Command
if ($continue == 'y') {
try {
$output->write('<info>Upgrading...</info>', true);
$appbox = $this->getService('phraseanet.appbox');
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>'));
}
$upgrader = new Setup_Upgrade($appbox, $input->getOption('force'));
$upgrader = new Setup_Upgrade($this->getService('phraseanet.appbox'), $input->getOption('force'));
$appbox->forceUpgrade($upgrader);
$this->getService('phraseanet.appbox')->forceUpgrade($upgrader);
foreach ($upgrader->getRecommendations() as $recommendation) {
list($message, $command) = $recommendation;