nextcloud / server

core/Command/Background/Job.php

Indentation +116 added lines, -116 removed lines

@@ -19,120 +19,120 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Job extends Command {
-	public function __construct(
-		protected IJobList $jobList,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure(): void {
-		$this
-			->setName('background-job:execute')
-			->setDescription('Execute a single background job manually')
-			->addArgument(
-				'job-id',
-				InputArgument::REQUIRED,
-				'The ID of the job in the database'
-			)
-			->addOption(
-				'force-execute',
-				null,
-				InputOption::VALUE_NONE,
-				'Force execute the background job, independent from last run and being reserved'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$jobId = (string)$input->getArgument('job-id');
-
-		$job = $this->jobList->getById($jobId);
-		if ($job === null) {
-			$output->writeln('<error>Job with ID ' . $jobId . ' could not be found in the database</error>');
-			return 1;
-		}
-
-		$this->printJobInfo($jobId, $job, $output);
-		$output->writeln('');
-
-		$lastRun = $job->getLastRun();
-		if ($input->getOption('force-execute')) {
-			$lastRun = 0;
-			$output->writeln('<comment>Forcing execution of the job</comment>');
-			$output->writeln('');
-
-			$this->jobList->resetBackgroundJob($job);
-		}
-
-		$job = $this->jobList->getById($jobId);
-		if ($job === null) {
-			$output->writeln('<error>Something went wrong when trying to retrieve Job with ID ' . $jobId . ' from database</error>');
-			return 1;
-		}
-		$job->start($this->jobList);
-		$job = $this->jobList->getById($jobId);
-
-		if (($job === null) || ($lastRun !== $job->getLastRun())) {
-			$output->writeln('<info>Job executed!</info>');
-			$output->writeln('');
-
-			if ($job instanceof TimedJob) {
-				$this->printJobInfo($jobId, $job, $output);
-			}
-		} else {
-			$output->writeln('<comment>Job was not executed because it is not due</comment>');
-			$output->writeln('Specify the <question>--force-execute</question> option to run it anyway');
-		}
-
-		return 0;
-	}
-
-	protected function printJobInfo(string $jobId, IJob $job, OutputInterface $output): void {
-		$row = $this->jobList->getDetailsById($jobId);
-
-		$lastRun = new \DateTime();
-		$lastRun->setTimestamp((int)$row['last_run']);
-		$lastChecked = new \DateTime();
-		$lastChecked->setTimestamp((int)$row['last_checked']);
-		$reservedAt = new \DateTime();
-		$reservedAt->setTimestamp((int)$row['reserved_at']);
-
-		$output->writeln('Job class:            ' . get_class($job));
-		$output->writeln('Arguments:            ' . json_encode($job->getArgument()));
-
-		$isTimedJob = $job instanceof TimedJob;
-		if ($isTimedJob) {
-			$output->writeln('Type:                 timed');
-		} elseif ($job instanceof QueuedJob) {
-			$output->writeln('Type:                 queued');
-		} else {
-			$output->writeln('Type:                 job');
-		}
-
-		$output->writeln('');
-		$output->writeln('Last checked:         ' . $lastChecked->format(\DateTimeInterface::ATOM));
-		if ((int)$row['reserved_at'] === 0) {
-			$output->writeln('Reserved at:          -');
-		} else {
-			$output->writeln('Reserved at:          <comment>' . $reservedAt->format(\DateTimeInterface::ATOM) . '</comment>');
-		}
-		$output->writeln('Last executed:        ' . $lastRun->format(\DateTimeInterface::ATOM));
-		$output->writeln('Last duration:        ' . $row['execution_duration']);
-
-		if ($isTimedJob) {
-			$reflection = new \ReflectionClass($job);
-			$intervalProperty = $reflection->getProperty('interval');
-			$intervalProperty->setAccessible(true);
-			$interval = $intervalProperty->getValue($job);
-
-			$nextRun = new \DateTime();
-			$nextRun->setTimestamp($row['last_run'] + $interval);
-
-			if ($nextRun > new \DateTime()) {
-				$output->writeln('Next execution:       <comment>' . $nextRun->format(\DateTimeInterface::ATOM) . '</comment>');
-			} else {
-				$output->writeln('Next execution:       <info>' . $nextRun->format(\DateTimeInterface::ATOM) . '</info>');
-			}
-		}
-	}
+    public function __construct(
+        protected IJobList $jobList,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void {
+        $this
+            ->setName('background-job:execute')
+            ->setDescription('Execute a single background job manually')
+            ->addArgument(
+                'job-id',
+                InputArgument::REQUIRED,
+                'The ID of the job in the database'
+            )
+            ->addOption(
+                'force-execute',
+                null,
+                InputOption::VALUE_NONE,
+                'Force execute the background job, independent from last run and being reserved'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $jobId = (string)$input->getArgument('job-id');
+
+        $job = $this->jobList->getById($jobId);
+        if ($job === null) {
+            $output->writeln('<error>Job with ID ' . $jobId . ' could not be found in the database</error>');
+            return 1;
+        }
+
+        $this->printJobInfo($jobId, $job, $output);
+        $output->writeln('');
+
+        $lastRun = $job->getLastRun();
+        if ($input->getOption('force-execute')) {
+            $lastRun = 0;
+            $output->writeln('<comment>Forcing execution of the job</comment>');
+            $output->writeln('');
+
+            $this->jobList->resetBackgroundJob($job);
+        }
+
+        $job = $this->jobList->getById($jobId);
+        if ($job === null) {
+            $output->writeln('<error>Something went wrong when trying to retrieve Job with ID ' . $jobId . ' from database</error>');
+            return 1;
+        }
+        $job->start($this->jobList);
+        $job = $this->jobList->getById($jobId);
+
+        if (($job === null) || ($lastRun !== $job->getLastRun())) {
+            $output->writeln('<info>Job executed!</info>');
+            $output->writeln('');
+
+            if ($job instanceof TimedJob) {
+                $this->printJobInfo($jobId, $job, $output);
+            }
+        } else {
+            $output->writeln('<comment>Job was not executed because it is not due</comment>');
+            $output->writeln('Specify the <question>--force-execute</question> option to run it anyway');
+        }
+
+        return 0;
+    }
+
+    protected function printJobInfo(string $jobId, IJob $job, OutputInterface $output): void {
+        $row = $this->jobList->getDetailsById($jobId);
+
+        $lastRun = new \DateTime();
+        $lastRun->setTimestamp((int)$row['last_run']);
+        $lastChecked = new \DateTime();
+        $lastChecked->setTimestamp((int)$row['last_checked']);
+        $reservedAt = new \DateTime();
+        $reservedAt->setTimestamp((int)$row['reserved_at']);
+
+        $output->writeln('Job class:            ' . get_class($job));
+        $output->writeln('Arguments:            ' . json_encode($job->getArgument()));
+
+        $isTimedJob = $job instanceof TimedJob;
+        if ($isTimedJob) {
+            $output->writeln('Type:                 timed');
+        } elseif ($job instanceof QueuedJob) {
+            $output->writeln('Type:                 queued');
+        } else {
+            $output->writeln('Type:                 job');
+        }
+
+        $output->writeln('');
+        $output->writeln('Last checked:         ' . $lastChecked->format(\DateTimeInterface::ATOM));
+        if ((int)$row['reserved_at'] === 0) {
+            $output->writeln('Reserved at:          -');
+        } else {
+            $output->writeln('Reserved at:          <comment>' . $reservedAt->format(\DateTimeInterface::ATOM) . '</comment>');
+        }
+        $output->writeln('Last executed:        ' . $lastRun->format(\DateTimeInterface::ATOM));
+        $output->writeln('Last duration:        ' . $row['execution_duration']);
+
+        if ($isTimedJob) {
+            $reflection = new \ReflectionClass($job);
+            $intervalProperty = $reflection->getProperty('interval');
+            $intervalProperty->setAccessible(true);
+            $interval = $intervalProperty->getValue($job);
+
+            $nextRun = new \DateTime();
+            $nextRun->setTimestamp($row['last_run'] + $interval);
+
+            if ($nextRun > new \DateTime()) {
+                $output->writeln('Next execution:       <comment>' . $nextRun->format(\DateTimeInterface::ATOM) . '</comment>');
+            } else {
+                $output->writeln('Next execution:       <info>' . $nextRun->format(\DateTimeInterface::ATOM) . '</info>');
+            }
+        }
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -44,11 +44,11 @@ 
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$jobId = (string)$input->getArgument('job-id');
+		$jobId = (string) $input->getArgument('job-id');
 
 		$job = $this->jobList->getById($jobId);
 		if ($job === null) {
-			$output->writeln('<error>Job with ID ' . $jobId . ' could not be found in the database</error>');
+			$output->writeln('<error>Job with ID '.$jobId.' could not be found in the database</error>');
 			return 1;
 		}
 
@@ -66,7 +66,7 @@ 
 
 		$job = $this->jobList->getById($jobId);
 		if ($job === null) {
-			$output->writeln('<error>Something went wrong when trying to retrieve Job with ID ' . $jobId . ' from database</error>');
+			$output->writeln('<error>Something went wrong when trying to retrieve Job with ID '.$jobId.' from database</error>');
 			return 1;
 		}
 		$job->start($this->jobList);
@@ -91,14 +91,14 @@ 
 		$row = $this->jobList->getDetailsById($jobId);
 
 		$lastRun = new \DateTime();
-		$lastRun->setTimestamp((int)$row['last_run']);
+		$lastRun->setTimestamp((int) $row['last_run']);
 		$lastChecked = new \DateTime();
-		$lastChecked->setTimestamp((int)$row['last_checked']);
+		$lastChecked->setTimestamp((int) $row['last_checked']);
 		$reservedAt = new \DateTime();
-		$reservedAt->setTimestamp((int)$row['reserved_at']);
+		$reservedAt->setTimestamp((int) $row['reserved_at']);
 
-		$output->writeln('Job class:            ' . get_class($job));
-		$output->writeln('Arguments:            ' . json_encode($job->getArgument()));
+		$output->writeln('Job class:            '.get_class($job));
+		$output->writeln('Arguments:            '.json_encode($job->getArgument()));
 
 		$isTimedJob = $job instanceof TimedJob;
 		if ($isTimedJob) {
@@ -110,14 +110,14 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('Last checked:         ' . $lastChecked->format(\DateTimeInterface::ATOM));
-		if ((int)$row['reserved_at'] === 0) {
+		$output->writeln('Last checked:         '.$lastChecked->format(\DateTimeInterface::ATOM));
+		if ((int) $row['reserved_at'] === 0) {
 			$output->writeln('Reserved at:          -');
 		} else {
-			$output->writeln('Reserved at:          <comment>' . $reservedAt->format(\DateTimeInterface::ATOM) . '</comment>');
+			$output->writeln('Reserved at:          <comment>'.$reservedAt->format(\DateTimeInterface::ATOM).'</comment>');
 		}
-		$output->writeln('Last executed:        ' . $lastRun->format(\DateTimeInterface::ATOM));
-		$output->writeln('Last duration:        ' . $row['execution_duration']);
+		$output->writeln('Last executed:        '.$lastRun->format(\DateTimeInterface::ATOM));
+		$output->writeln('Last duration:        '.$row['execution_duration']);
 
 		if ($isTimedJob) {
 			$reflection = new \ReflectionClass($job);
@@ -129,9 +129,9 @@ 
 			$nextRun->setTimestamp($row['last_run'] + $interval);
 
 			if ($nextRun > new \DateTime()) {
-				$output->writeln('Next execution:       <comment>' . $nextRun->format(\DateTimeInterface::ATOM) . '</comment>');
+				$output->writeln('Next execution:       <comment>'.$nextRun->format(\DateTimeInterface::ATOM).'</comment>');
 			} else {
-				$output->writeln('Next execution:       <info>' . $nextRun->format(\DateTimeInterface::ATOM) . '</info>');
+				$output->writeln('Next execution:       <info>'.$nextRun->format(\DateTimeInterface::ATOM).'</info>');
 			}
 		}
 	}

core/Command/Background/JobBase.php

Indentation +59 added lines, -59 removed lines

@@ -20,63 +20,63 @@
 
 abstract class JobBase extends Base {
 
-	public function __construct(
-		protected IJobList $jobList,
-		protected LoggerInterface $logger,
-	) {
-		parent::__construct();
-	}
-
-	protected function printJobInfo(string $jobId, IJob $job, OutputInterface $output): void {
-		$row = $this->jobList->getDetailsById($jobId);
-
-		if ($row === null) {
-			return;
-		}
-
-		$lastRun = new \DateTime();
-		$lastRun->setTimestamp((int)$row['last_run']);
-		$lastChecked = new \DateTime();
-		$lastChecked->setTimestamp((int)$row['last_checked']);
-		$reservedAt = new \DateTime();
-		$reservedAt->setTimestamp((int)$row['reserved_at']);
-
-		$output->writeln('Job class:            ' . get_class($job));
-		$output->writeln('Arguments:            ' . json_encode($job->getArgument()));
-
-		$isTimedJob = $job instanceof TimedJob;
-		if ($isTimedJob) {
-			$output->writeln('Type:                 timed');
-		} elseif ($job instanceof QueuedJob) {
-			$output->writeln('Type:                 queued');
-		} else {
-			$output->writeln('Type:                 job');
-		}
-
-		$output->writeln('');
-		$output->writeln('Last checked:         ' . $lastChecked->format(\DateTimeInterface::ATOM));
-		if ((int)$row['reserved_at'] === 0) {
-			$output->writeln('Reserved at:          -');
-		} else {
-			$output->writeln('Reserved at:          <comment>' . $reservedAt->format(\DateTimeInterface::ATOM) . '</comment>');
-		}
-		$output->writeln('Last executed:        ' . $lastRun->format(\DateTimeInterface::ATOM));
-		$output->writeln('Last duration:        ' . $row['execution_duration']);
-
-		if ($isTimedJob) {
-			$reflection = new \ReflectionClass($job);
-			$intervalProperty = $reflection->getProperty('interval');
-			$intervalProperty->setAccessible(true);
-			$interval = $intervalProperty->getValue($job);
-
-			$nextRun = new \DateTime();
-			$nextRun->setTimestamp((int)$row['last_run'] + $interval);
-
-			if ($nextRun > new \DateTime()) {
-				$output->writeln('Next execution:       <comment>' . $nextRun->format(\DateTimeInterface::ATOM) . '</comment>');
-			} else {
-				$output->writeln('Next execution:       <info>' . $nextRun->format(\DateTimeInterface::ATOM) . '</info>');
-			}
-		}
-	}
+    public function __construct(
+        protected IJobList $jobList,
+        protected LoggerInterface $logger,
+    ) {
+        parent::__construct();
+    }
+
+    protected function printJobInfo(string $jobId, IJob $job, OutputInterface $output): void {
+        $row = $this->jobList->getDetailsById($jobId);
+
+        if ($row === null) {
+            return;
+        }
+
+        $lastRun = new \DateTime();
+        $lastRun->setTimestamp((int)$row['last_run']);
+        $lastChecked = new \DateTime();
+        $lastChecked->setTimestamp((int)$row['last_checked']);
+        $reservedAt = new \DateTime();
+        $reservedAt->setTimestamp((int)$row['reserved_at']);
+
+        $output->writeln('Job class:            ' . get_class($job));
+        $output->writeln('Arguments:            ' . json_encode($job->getArgument()));
+
+        $isTimedJob = $job instanceof TimedJob;
+        if ($isTimedJob) {
+            $output->writeln('Type:                 timed');
+        } elseif ($job instanceof QueuedJob) {
+            $output->writeln('Type:                 queued');
+        } else {
+            $output->writeln('Type:                 job');
+        }
+
+        $output->writeln('');
+        $output->writeln('Last checked:         ' . $lastChecked->format(\DateTimeInterface::ATOM));
+        if ((int)$row['reserved_at'] === 0) {
+            $output->writeln('Reserved at:          -');
+        } else {
+            $output->writeln('Reserved at:          <comment>' . $reservedAt->format(\DateTimeInterface::ATOM) . '</comment>');
+        }
+        $output->writeln('Last executed:        ' . $lastRun->format(\DateTimeInterface::ATOM));
+        $output->writeln('Last duration:        ' . $row['execution_duration']);
+
+        if ($isTimedJob) {
+            $reflection = new \ReflectionClass($job);
+            $intervalProperty = $reflection->getProperty('interval');
+            $intervalProperty->setAccessible(true);
+            $interval = $intervalProperty->getValue($job);
+
+            $nextRun = new \DateTime();
+            $nextRun->setTimestamp((int)$row['last_run'] + $interval);
+
+            if ($nextRun > new \DateTime()) {
+                $output->writeln('Next execution:       <comment>' . $nextRun->format(\DateTimeInterface::ATOM) . '</comment>');
+            } else {
+                $output->writeln('Next execution:       <info>' . $nextRun->format(\DateTimeInterface::ATOM) . '</info>');
+            }
+        }
+    }
 }

core/Command/Background/Delete.php

Indentation +38 added lines, -38 removed lines

@@ -17,49 +17,49 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Delete extends Base {
-	public function __construct(
-		protected IJobList $jobList,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected IJobList $jobList,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('background-job:delete')
-			->setDescription('Remove a background job from database')
-			->addArgument(
-				'job-id',
-				InputArgument::REQUIRED,
-				'The ID of the job in the database'
-			);
-	}
+    protected function configure(): void {
+        $this
+            ->setName('background-job:delete')
+            ->setDescription('Remove a background job from database')
+            ->addArgument(
+                'job-id',
+                InputArgument::REQUIRED,
+                'The ID of the job in the database'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$jobId = (string)$input->getArgument('job-id');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $jobId = (string)$input->getArgument('job-id');
 
-		$job = $this->jobList->getById($jobId);
-		if ($job === null) {
-			$output->writeln('<error>Job with ID ' . $jobId . ' could not be found in the database</error>');
-			return 1;
-		}
+        $job = $this->jobList->getById($jobId);
+        if ($job === null) {
+            $output->writeln('<error>Job with ID ' . $jobId . ' could not be found in the database</error>');
+            return 1;
+        }
 
-		$output->writeln('Job class: ' . get_class($job));
-		$output->writeln('Arguments: ' . json_encode($job->getArgument()));
-		$output->writeln('');
+        $output->writeln('Job class: ' . get_class($job));
+        $output->writeln('Arguments: ' . json_encode($job->getArgument()));
+        $output->writeln('');
 
-		$question = new ConfirmationQuestion(
-			'<comment>Do you really want to delete this background job ? It could create some misbehaviours in Nextcloud.</comment> (y/N) ', false,
-			'/^(y|Y)/i'
-		);
+        $question = new ConfirmationQuestion(
+            '<comment>Do you really want to delete this background job ? It could create some misbehaviours in Nextcloud.</comment> (y/N) ', false,
+            '/^(y|Y)/i'
+        );
 
-		/** @var QuestionHelper $helper */
-		$helper = $this->getHelper('question');
-		if (!$helper->ask($input, $output, $question)) {
-			$output->writeln('aborted.');
-			return 0;
-		}
+        /** @var QuestionHelper $helper */
+        $helper = $this->getHelper('question');
+        if (!$helper->ask($input, $output, $question)) {
+            $output->writeln('aborted.');
+            return 0;
+        }
 
-		$this->jobList->remove($job, $job->getArgument());
-		return 0;
-	}
+        $this->jobList->remove($job, $job->getArgument());
+        return 0;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -35,16 +35,16 @@
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$jobId = (string)$input->getArgument('job-id');
+		$jobId = (string) $input->getArgument('job-id');
 
 		$job = $this->jobList->getById($jobId);
 		if ($job === null) {
-			$output->writeln('<error>Job with ID ' . $jobId . ' could not be found in the database</error>');
+			$output->writeln('<error>Job with ID '.$jobId.' could not be found in the database</error>');
 			return 1;
 		}
 
-		$output->writeln('Job class: ' . get_class($job));
-		$output->writeln('Arguments: ' . json_encode($job->getArgument()));
+		$output->writeln('Job class: '.get_class($job));
+		$output->writeln('Arguments: '.json_encode($job->getArgument()));
 		$output->writeln('');
 
 		$question = new ConfirmationQuestion(