diff --git a/lib/classes/module/console/systemClearCache.class.php b/lib/classes/module/console/systemClearCache.class.php index b14ec665b0..602901ceb9 100644 --- a/lib/classes/module/console/systemClearCache.class.php +++ b/lib/classes/module/console/systemClearCache.class.php @@ -48,7 +48,7 @@ class module_console_systemClearCache extends Command $filesystem->remove($finder); - if (setup::is_installed()) { + if ($this->container['phraseanet.configuration']->isInstalled()) { $this->getService('phraseanet.cache-service')->flushAll(); } diff --git a/lib/classes/module/console/systemConfigCheck.class.php b/lib/classes/module/console/systemConfigCheck.class.php index a1fedbc7f2..0da9a3653e 100644 --- a/lib/classes/module/console/systemConfigCheck.class.php +++ b/lib/classes/module/console/systemConfigCheck.class.php @@ -43,7 +43,7 @@ class module_console_systemConfigCheck extends Command $ok = true; - if (setup::is_installed()) { + if ($this->container['phraseanet.configuration']->isInstalled()) { $registry = $this->container['phraseanet.registry']; $output->writeln(_('*** CHECK BINARY CONFIGURATION ***')); diff --git a/lib/classes/module/console/systemUpgrade.class.php b/lib/classes/module/console/systemUpgrade.class.php index 15c9264b42..22e76f27d1 100644 --- a/lib/classes/module/console/systemUpgrade.class.php +++ b/lib/classes/module/console/systemUpgrade.class.php @@ -70,13 +70,17 @@ class module_console_systemUpgrade extends Command try { $output->write('Upgrading...', true); + $this->container['phraseanet.registry'] = new \Setup_Registry(); + if (count(User_Adapter::get_wrong_email_users($this->container)) > 0) { return $output->writeln(sprintf('You have to fix your database before upgrade with the system:mailCheck command ')); } - $upgrader = new Setup_Upgrade($this->getService('phraseanet.appbox'), $input->getOption('force')); + $upgrader = new Setup_Upgrade($this->container, $input->getOption('force')); - $this->getService('phraseanet.appbox')->forceUpgrade($upgrader); + $this->getService('phraseanet.appbox')->forceUpgrade($upgrader, $this->container); + + $this->container['phraseanet.registry'] = new \registry($this->container); foreach ($upgrader->getRecommendations() as $recommendation) { list($message, $command) = $recommendation;