diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Repair.php | 24 | ||||
| -rw-r--r-- | lib/private/Updater.php | 16 | ||||
| -rw-r--r-- | lib/private/legacy/OC_App.php | 2 |
3 files changed, 19 insertions, 23 deletions
diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 98a1f4ce036..496e9b15e2e 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -112,19 +112,19 @@ class Repair implements IOutput { */ public function run() { if (count($this->repairSteps) === 0) { - $this->emit('\OC\Repair', 'info', ['No repair steps available']); + $this->emit('\OC\Repair', 'info', ['message' => 'No repair steps available']); return; } // run each repair step foreach ($this->repairSteps as $step) { $this->currentStep = $step->getName(); - $this->emit('\OC\Repair', 'step', [$this->currentStep]); + $this->emit('\OC\Repair', 'step', ['step' => $this->currentStep]); try { $step->run($this); } catch (\Exception $e) { $this->logger->error("Exception while executing repair step " . $step->getName(), ['exception' => $e]); - $this->emit('\OC\Repair', 'error', [$e->getMessage()]); + $this->emit('\OC\Repair', 'error', ['message' => $e->getMessage()]); } } } @@ -250,20 +250,16 @@ class Repair implements IOutput { } /** - * @param string $scope - * @param string $method - * @param array $arguments + * @param array<string, mixed> $arguments */ - public function emit($scope, $method, array $arguments = []) { - if (!is_null($this->dispatcher)) { - $this->dispatcher->dispatch("$scope::$method", + public function emit(string $scope, string $method, array $arguments = []): void { + $this->dispatcher->dispatch("$scope::$method", new GenericEvent("$scope::$method", $arguments)); - } } public function info($string) { // for now just emit as we did in the past - $this->emit('\OC\Repair', 'info', [$string]); + $this->emit('\OC\Repair', 'info', ['message' => $string]); } /** @@ -271,7 +267,7 @@ class Repair implements IOutput { */ public function warning($message) { // for now just emit as we did in the past - $this->emit('\OC\Repair', 'warning', [$message]); + $this->emit('\OC\Repair', 'warning', ['message' => $message]); } /** @@ -279,7 +275,7 @@ class Repair implements IOutput { */ public function startProgress($max = 0) { // for now just emit as we did in the past - $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]); + $this->emit('\OC\Repair', 'startProgress', ['max' => $max, 'step' => $this->currentStep]); } /** @@ -288,7 +284,7 @@ class Repair implements IOutput { */ public function advance($step = 1, $description = '') { // for now just emit as we did in the past - $this->emit('\OC\Repair', 'advance', [$step, $description]); + $this->emit('\OC\Repair', 'advance', ['step' => $step, 'desc' => $description]); } /** diff --git a/lib/private/Updater.php b/lib/private/Updater.php index b25bb76e957..0889e87383f 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -293,7 +293,7 @@ class Updater extends BasicEmitter { $repair->run(); //Invalidate update feed - $this->config->setAppValue('core', 'lastupdatedat', 0); + $this->config->setAppValue('core', 'lastupdatedat', '0'); // Check for code integrity if not disabled if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) { @@ -482,30 +482,30 @@ class Updater extends BasicEmitter { } switch ($event->getSubject()) { case '\OC\Repair::startProgress': - $log->info('\OC\Repair::startProgress: Starting ... ' . $event->getArgument(1) . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']); + $log->info('\OC\Repair::startProgress: Starting ... ' . $event->getArgument('max') . ' (' . $event->getArgument('step') . ')', ['app' => 'updater']); break; case '\OC\Repair::advance': - $desc = $event->getArgument(1); + $desc = $event->getArgument('desc'); if (empty($desc)) { $desc = ''; } - $log->info('\OC\Repair::advance: ' . $desc . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']); + $log->info('\OC\Repair::advance: ' . $desc . ' (' . $event->getArgument('step') . ')', ['app' => 'updater']); break; case '\OC\Repair::finishProgress': $log->info('\OC\Repair::finishProgress', ['app' => 'updater']); break; case '\OC\Repair::step': - $log->info('\OC\Repair::step: Repair step: ' . $event->getArgument(0), ['app' => 'updater']); + $log->info('\OC\Repair::step: Repair step: ' . $event->getArgument('step'), ['app' => 'updater']); break; case '\OC\Repair::info': - $log->info('\OC\Repair::info: Repair info: ' . $event->getArgument(0), ['app' => 'updater']); + $log->info('\OC\Repair::info: Repair info: ' . $event->getArgument('message'), ['app' => 'updater']); break; case '\OC\Repair::warning': - $log->warning('\OC\Repair::warning: Repair warning: ' . $event->getArgument(0), ['app' => 'updater']); + $log->warning('\OC\Repair::warning: Repair warning: ' . $event->getArgument('message'), ['app' => 'updater']); break; case '\OC\Repair::error': - $log->error('\OC\Repair::error: Repair error: ' . $event->getArgument(0), ['app' => 'updater']); + $log->error('\OC\Repair::error: Repair error: ' . $event->getArgument('message'), ['app' => 'updater']); break; } }; diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index 482fc4e88e7..cd53dc0afc4 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -1055,7 +1055,7 @@ class OC_App { try { $r->addStep($step); } catch (Exception $ex) { - $r->emit('\OC\Repair', 'error', [$ex->getMessage()]); + $r->emit('\OC\Repair', 'error', ['message' => $ex->getMessage()]); \OC::$server->getLogger()->logException($ex); } } |