diff options
Diffstat (limited to 'core/ajax/update.php')
-rw-r--r-- | core/ajax/update.php | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php index 0868eff72b4..798a81ff6ee 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -6,6 +6,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ use OC\DB\MigratorExecuteSqlEvent; +use OC\Installer; +use OC\IntegrityCheck\Checker; use OC\Repair\Events\RepairAdvanceEvent; use OC\Repair\Events\RepairErrorEvent; use OC\Repair\Events\RepairFinishEvent; @@ -13,6 +15,8 @@ use OC\Repair\Events\RepairInfoEvent; use OC\Repair\Events\RepairStartEvent; use OC\Repair\Events\RepairStepEvent; use OC\Repair\Events\RepairWarningEvent; +use OC\SystemConfig; +use OC\Updater; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventDispatcher; use OCP\IAppConfig; @@ -22,6 +26,8 @@ use OCP\IEventSourceFactory; use OCP\IL10N; use OCP\L10N\IFactory; use OCP\Server; +use OCP\ServerVersion; +use OCP\Util; use Psr\Log\LoggerInterface; if (!str_contains(@ini_get('disable_functions'), 'set_time_limit')) { @@ -30,10 +36,10 @@ if (!str_contains(@ini_get('disable_functions'), 'set_time_limit')) { require_once '../../lib/base.php'; -/** @var \OCP\IL10N $l */ -$l = \OC::$server->get(IFactory::class)->get('core'); +/** @var IL10N $l */ +$l = Server::get(IFactory::class)->get('core'); -$eventSource = \OC::$server->get(IEventSourceFactory::class)->create(); +$eventSource = Server::get(IEventSourceFactory::class)->create(); // need to send an initial message to force-init the event source, // which will then trigger its own CSRF check and produces its own CSRF error // message @@ -77,8 +83,8 @@ class FeedBackHandler { } } -if (\OCP\Util::needUpgrade()) { - $config = \OC::$server->getSystemConfig(); +if (Util::needUpgrade()) { + $config = Server::get(SystemConfig::class); if ($config->getValue('upgrade.disable-web', false)) { $eventSource->send('failure', $l->t('Please use the command line updater because updating via browser is disabled in your config.php.')); $eventSource->close(); @@ -90,19 +96,19 @@ if (\OCP\Util::needUpgrade()) { \OC_User::setIncognitoMode(true); $config = Server::get(IConfig::class); - $updater = new \OC\Updater( - Server::get(\OCP\ServerVersion::class), + $updater = new Updater( + Server::get(ServerVersion::class), $config, Server::get(IAppConfig::class), - \OC::$server->getIntegrityCodeChecker(), + Server::get(Checker::class), Server::get(LoggerInterface::class), - Server::get(\OC\Installer::class) + Server::get(Installer::class) ); $incompatibleApps = []; $incompatibleOverwrites = $config->getSystemValue('app_install_overwrite', []); /** @var IEventDispatcher $dispatcher */ - $dispatcher = \OC::$server->get(IEventDispatcher::class); + $dispatcher = Server::get(IEventDispatcher::class); $dispatcher->addListener( MigratorExecuteSqlEvent::class, function (MigratorExecuteSqlEvent $event) use ($eventSource, $l): void { @@ -118,50 +124,50 @@ if (\OCP\Util::needUpgrade()) { $dispatcher->addListener(RepairWarningEvent::class, [$feedBack, 'handleRepairFeedback']); $dispatcher->addListener(RepairErrorEvent::class, [$feedBack, 'handleRepairFeedback']); - $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l): void { $eventSource->send('success', $l->t('Turned on maintenance mode')); }); - $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l): void { $eventSource->send('success', $l->t('Turned off maintenance mode')); }); - $updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l): void { $eventSource->send('success', $l->t('Maintenance mode is kept active')); }); - $updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($eventSource, $l): void { $eventSource->send('success', $l->t('Updating database schema')); }); - $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l): void { $eventSource->send('success', $l->t('Updated database')); }); - $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l): void { $eventSource->send('success', $l->t('Update app "%s" from App Store', [$app])); }); - $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l): void { $eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app])); }); - $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l): void { $eventSource->send('success', $l->t('Updated "%1$s" to %2$s', [$app, $version])); }); - $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps, &$incompatibleOverwrites) { + $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps, &$incompatibleOverwrites): void { if (!in_array($app, $incompatibleOverwrites)) { $incompatibleApps[] = $app; } }); - $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) { + $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config): void { $eventSource->send('failure', $message); $eventSource->close(); $config->setSystemValue('maintenance', false); }); - $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l): void { $eventSource->send('success', $l->t('Set log level to debug')); }); - $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l): void { $eventSource->send('success', $l->t('Reset log level')); }); - $updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($eventSource, $l): void { $eventSource->send('success', $l->t('Starting code integrity check')); }); - $updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($eventSource, $l): void { $eventSource->send('success', $l->t('Finished code integrity check')); }); |