nextcloud / server

cron.php

Spacing +21 added lines, -21 removed lines

@@ -13,7 +13,7 @@ 
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OCP\App\IAppManager;
 use OCP\BackgroundJob\IJobList;
@@ -26,7 +26,7 @@ 
 use Psr\Log\LoggerInterface;
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	if (isset($argv[1]) && ($argv[1] === '-h' || $argv[1] === '--help')) {
 		echo 'Description:
@@ -84,7 +84,7 @@ 
 	$appMode = $appConfig->getValueString('core', 'backgroundjobs_mode', 'ajax');
 	if ($appMode === 'none') {
 		if (OC::$CLI) {
-			echo 'Background Jobs are disabled!' . PHP_EOL;
+			echo 'Background Jobs are disabled!'.PHP_EOL;
 		} else {
 			OC_JSON::error(['data' => ['message' => 'Background jobs disabled!']]);
 		}
@@ -99,16 +99,16 @@ 
 
 		// the cron job must be executed with the right user
 		if (!function_exists('posix_getuid')) {
-			echo 'The posix extensions are required - see https://www.php.net/manual/en/book.posix.php' . PHP_EOL;
+			echo 'The posix extensions are required - see https://www.php.net/manual/en/book.posix.php'.PHP_EOL;
 			exit(1);
 		}
 
 		$user = posix_getuid();
-		$configUser = fileowner(OC::$configDir . 'config.php');
+		$configUser = fileowner(OC::$configDir.'config.php');
 		if ($user !== $configUser) {
-			echo 'Console has to be executed with the user that owns the file config/config.php' . PHP_EOL;
-			echo 'Current user id: ' . $user . PHP_EOL;
-			echo 'Owner id of config.php: ' . $configUser . PHP_EOL;
+			echo 'Console has to be executed with the user that owns the file config/config.php'.PHP_EOL;
+			echo 'Current user id: '.$user.PHP_EOL;
+			echo 'Owner id of config.php: '.$configUser.PHP_EOL;
 			exit(1);
 		}
 
@@ -127,7 +127,7 @@ 
 		$startHour = $config->getSystemValueInt('maintenance_window_start', 100);
 		if ($jobClasses === null && $startHour <= 23) {
 			$date = new \DateTime('now', new \DateTimeZone('UTC'));
-			$currentHour = (int)$date->format('G');
+			$currentHour = (int) $date->format('G');
 			$endHour = $startHour + 4;
 
 			if ($startHour <= 20) {
@@ -160,15 +160,15 @@ 
 				break;
 			}
 
-			$jobDetails = get_class($job) . ' (id: ' . $job->getId() . ', arguments: ' . json_encode($job->getArgument()) . ')';
-			$logger->debug('CLI cron call has selected job ' . $jobDetails, ['app' => 'cron']);
+			$jobDetails = get_class($job).' (id: '.$job->getId().', arguments: '.json_encode($job->getArgument()).')';
+			$logger->debug('CLI cron call has selected job '.$jobDetails, ['app' => 'cron']);
 
 			$timeBefore = time();
 			$memoryBefore = memory_get_usage();
 			$memoryPeakBefore = memory_get_peak_usage();
 
 			if ($verbose) {
-				echo 'Starting job ' . $jobDetails . PHP_EOL;
+				echo 'Starting job '.$jobDetails.PHP_EOL;
 			}
 
 			$job->start($jobList);
@@ -189,23 +189,23 @@ 
 				};
 				$logger->log(
 					$logLevel,
-					'Background job ' . $jobDetails . ' ran for ' . $timeSpent . ' seconds',
+					'Background job '.$jobDetails.' ran for '.$timeSpent.' seconds',
 					['app' => 'cron']
 				);
 			}
 
 			if ($memoryAfter - $memoryBefore > 50_000_000) {
-				$message = 'Used memory grew by more than 50 MB when executing job ' . $jobDetails . ': ' . Util::humanFileSize($memoryAfter) . ' (before: ' . Util::humanFileSize($memoryBefore) . ')';
+				$message = 'Used memory grew by more than 50 MB when executing job '.$jobDetails.': '.Util::humanFileSize($memoryAfter).' (before: '.Util::humanFileSize($memoryBefore).')';
 				$logger->warning($message, ['app' => 'cron']);
 				if ($verbose) {
-					echo $message . PHP_EOL;
+					echo $message.PHP_EOL;
 				}
 			}
 			if ($memoryPeakAfter > 300_000_000 && $memoryPeakBefore <= 300_000_000) {
-				$message = 'Cron job used more than 300 MB of ram after executing job ' . $jobDetails . ': ' . Util::humanFileSize($memoryPeakAfter) . ' (before: ' . Util::humanFileSize($memoryPeakBefore) . ')';
+				$message = 'Cron job used more than 300 MB of ram after executing job '.$jobDetails.': '.Util::humanFileSize($memoryPeakAfter).' (before: '.Util::humanFileSize($memoryPeakBefore).')';
 				$logger->warning($message, ['app' => 'cron']);
 				if ($verbose) {
-					echo $message . PHP_EOL;
+					echo $message.PHP_EOL;
 				}
 			}
 
@@ -214,7 +214,7 @@ 
 			$tempManager->clean();
 
 			if ($verbose) {
-				echo 'Job ' . $jobDetails . ' done in ' . ($timeAfter - $timeBefore) . ' seconds' . PHP_EOL;
+				echo 'Job '.$jobDetails.' done in '.($timeAfter - $timeBefore).' seconds'.PHP_EOL;
 			}
 
 			$jobList->setLastJob($job);
@@ -235,7 +235,7 @@ 
 			$jobList = Server::get(IJobList::class);
 			$job = $jobList->getNext();
 			if ($job != null) {
-				$logger->debug('WebCron call has selected job with ID ' . strval($job->getId()), ['app' => 'cron']);
+				$logger->debug('WebCron call has selected job with ID '.strval($job->getId()), ['app' => 'cron']);
 				$job->start($jobList);
 				$jobList->setLastJob($job);
 			}
@@ -251,13 +251,13 @@ 
 		$ex->getMessage(),
 		['app' => 'cron', 'exception' => $ex]
 	);
-	echo $ex . PHP_EOL;
+	echo $ex.PHP_EOL;
 	exit(1);
 } catch (Error $ex) {
 	Server::get(LoggerInterface::class)->error(
 		$ex->getMessage(),
 		['app' => 'cron', 'exception' => $ex]
 	);
-	echo $ex . PHP_EOL;
+	echo $ex.PHP_EOL;
 	exit(1);
 }

core/Command/Background/JobWorker.php

Spacing +9 added lines, -9 removed lines

@@ -68,7 +68,7 @@ 
 			? null
 			: $this->parseStopAfter($stopAfterOptionValue);
 		if ($stopAfterSeconds !== null) {
-			$output->writeln('<info>Background job worker will stop after ' . $stopAfterSeconds . ' seconds</info>');
+			$output->writeln('<info>Background job worker will stop after '.$stopAfterSeconds.' seconds</info>');
 		}
 
 		$jobClasses = $input->getArgument('job-classes');
@@ -78,7 +78,7 @@ 
 			// at least one class is invalid
 			foreach ($jobClasses as $jobClass) {
 				if (!class_exists($jobClass)) {
-					$output->writeln('<error>Invalid job class: ' . $jobClass . '</error>');
+					$output->writeln('<error>Invalid job class: '.$jobClass.'</error>');
 					return 1;
 				}
 			}
@@ -107,7 +107,7 @@ 
 					if ($jobClasses === null) {
 						$output->writeln('No job is currently queued', OutputInterface::VERBOSITY_VERBOSE);
 					} else {
-						$output->writeln('No job of classes [' . implode(', ', $jobClasses) . '] is currently queued', OutputInterface::VERBOSITY_VERBOSE);
+						$output->writeln('No job of classes ['.implode(', ', $jobClasses).'] is currently queued', OutputInterface::VERBOSITY_VERBOSE);
 					}
 					$output->writeln('Exiting...', OutputInterface::VERBOSITY_VERBOSE);
 					break;
@@ -119,14 +119,14 @@ 
 				continue;
 			}
 
-			$output->writeln('Running job ' . get_class($job) . ' with ID ' . $job->getId());
+			$output->writeln('Running job '.get_class($job).' with ID '.$job->getId());
 
 			if ($output->isVerbose()) {
 				$this->printJobInfo($job->getId(), $job, $output);
 			}
 
 			$job->start($this->jobList);
-			$output->writeln('Job ' . $job->getId() . ' has finished', OutputInterface::VERBOSITY_VERBOSE);
+			$output->writeln('Job '.$job->getId().' has finished', OutputInterface::VERBOSITY_VERBOSE);
 
 			// clean up after unclean jobs
 			$this->setupManager->tearDown();
@@ -158,16 +158,16 @@ 
 
 	private function parseStopAfter(string $value): ?int {
 		if (is_numeric($value)) {
-			return (int)$value;
+			return (int) $value;
 		}
 		if (preg_match("/^(\d+)s$/i", $value, $matches)) {
-			return (int)$matches[0];
+			return (int) $matches[0];
 		}
 		if (preg_match("/^(\d+)m$/i", $value, $matches)) {
-			return 60 * ((int)$matches[0]);
+			return 60 * ((int) $matches[0]);
 		}
 		if (preg_match("/^(\d+)h$/i", $value, $matches)) {
-			return 60 * 60 * ((int)$matches[0]);
+			return 60 * 60 * ((int) $matches[0]);
 		}
 		return null;
 	}

core/Command/Background/Job.php

Spacing +15 added lines, -15 removed lines

@@ -44,11 +44,11 @@ 
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$jobId = (int)$input->getArgument('job-id');
+		$jobId = (int) $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>');
 			}
 		}
 	}