Browse Source
Add void return types to callables
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/33640/head
Côme Chilliet
3 years ago
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
3 changed files with
10 additions and
7 deletions
-
core/Command/Upgrade.php
-
core/ajax/update.php
-
lib/private/Updater.php
|
|
|
@ -105,7 +105,7 @@ class Upgrade extends Command { |
|
|
|
$dispatcher = \OC::$server->get(IEventDispatcher::class); |
|
|
|
$progress = new ProgressBar($output); |
|
|
|
$progress->setFormat(" %message%\n %current%/%max% [%bar%] %percent:3s%%"); |
|
|
|
$listener = function (MigratorExecuteSqlEvent $event) use ($progress, $output) { |
|
|
|
$listener = function (MigratorExecuteSqlEvent $event) use ($progress, $output): void { |
|
|
|
$message = $event->getSql(); |
|
|
|
if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) { |
|
|
|
$output->writeln(' Executing SQL ' . $message); |
|
|
|
@ -126,7 +126,7 @@ class Upgrade extends Command { |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
$repairListener = function (Event $event) use ($progress, $output) { |
|
|
|
$repairListener = function (Event $event) use ($progress, $output): void { |
|
|
|
if ($event instanceof RepairStartEvent) { |
|
|
|
$progress->setMessage('Starting ...'); |
|
|
|
$output->writeln($event->getCurrentStepName()); |
|
|
|
|
|
|
|
@ -121,9 +121,12 @@ if (\OCP\Util::needUpgrade()) { |
|
|
|
|
|
|
|
/** @var IEventDispatcher $dispatcher */ |
|
|
|
$dispatcher = \OC::$server->get(IEventDispatcher::class); |
|
|
|
$dispatcher->addListener(MigratorExecuteSqlEvent::class, function (MigratorExecuteSqlEvent $event) use ($eventSource, $l) { |
|
|
|
$eventSource->send('success', $l->t('[%d / %d]: %s', [$event->getCurrentStep(), $event->getMaxStep(), $event->getSql()])); |
|
|
|
}); |
|
|
|
$dispatcher->addListener( |
|
|
|
MigratorExecuteSqlEvent::class, |
|
|
|
function (MigratorExecuteSqlEvent $event) use ($eventSource, $l): void { |
|
|
|
$eventSource->send('success', $l->t('[%d / %d]: %s', [$event->getCurrentStep(), $event->getMaxStep(), $event->getSql()])); |
|
|
|
} |
|
|
|
); |
|
|
|
$feedBack = new FeedBackHandler($eventSource, $l); |
|
|
|
$dispatcher->addListener(RepairStartEvent::class, [$feedBack, 'handleRepairFeedback']); |
|
|
|
$dispatcher->addListener(RepairAdvanceEvent::class, [$feedBack, 'handleRepairFeedback']); |
|
|
|
|
|
|
|
@ -447,12 +447,12 @@ class Updater extends BasicEmitter { |
|
|
|
$dispatcher = \OC::$server->get(IEventDispatcher::class); |
|
|
|
$dispatcher->addListener( |
|
|
|
MigratorExecuteSqlEvent::class, |
|
|
|
function (MigratorExecuteSqlEvent $event) use ($log) { |
|
|
|
function (MigratorExecuteSqlEvent $event) use ($log): void { |
|
|
|
$log->info(get_class($event).': ' . $event->getSql() . ' (' . $event->getCurrentStep() . ' of ' . $event->getMaxStep() . ')', ['app' => 'updater']); |
|
|
|
} |
|
|
|
); |
|
|
|
|
|
|
|
$repairListener = function (Event $event) use ($log) { |
|
|
|
$repairListener = function (Event $event) use ($log): void { |
|
|
|
if ($event instanceof RepairStartEvent) { |
|
|
|
$log->info(get_class($event).': Starting ... ' . $event->getMaxStep() . ' (' . $event->getCurrentStepName() . ')', ['app' => 'updater']); |
|
|
|
} elseif ($event instanceof RepairAdvanceEvent) { |
|
|
|
|