nextcloud / server

apps/files/lib/Command/Scan.php

Spacing +21 added lines, -21 removed lines

@@ -109,7 +109,7 @@ 
 		);
 
 		# check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
-		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function (string $path) use ($output, $scanMetadata): void {
+		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function(string $path) use ($output, $scanMetadata): void {
 			$output->writeln("\tFile\t<info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
 			++$this->filesCounter;
 			$this->abortIfInterrupted();
@@ -123,29 +123,29 @@ 
 			}
 		});
 
-		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output): void {
+		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output): void {
 			$output->writeln("\tFolder\t<info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
 			++$this->foldersCounter;
 			$this->abortIfInterrupted();
 		});
 
-		$scanner->listen('\OC\Files\Utils\Scanner', 'StorageNotAvailable', function (StorageNotAvailableException $e) use ($output): void {
-			$output->writeln('Error while scanning, storage not available (' . $e->getMessage() . ')', OutputInterface::VERBOSITY_VERBOSE);
+		$scanner->listen('\OC\Files\Utils\Scanner', 'StorageNotAvailable', function(StorageNotAvailableException $e) use ($output): void {
+			$output->writeln('Error while scanning, storage not available ('.$e->getMessage().')', OutputInterface::VERBOSITY_VERBOSE);
 			++$this->errorsCounter;
 		});
 
-		$scanner->listen('\OC\Files\Utils\Scanner', 'normalizedNameMismatch', function ($fullPath) use ($output): void {
-			$output->writeln("\t<error>Entry \"" . $fullPath . '" will not be accessible due to incompatible encoding</error>');
+		$scanner->listen('\OC\Files\Utils\Scanner', 'normalizedNameMismatch', function($fullPath) use ($output): void {
+			$output->writeln("\t<error>Entry \"".$fullPath.'" will not be accessible due to incompatible encoding</error>');
 			++$this->errorsCounter;
 		});
 
-		$this->eventDispatcher->addListener(NodeAddedToCache::class, function (): void {
+		$this->eventDispatcher->addListener(NodeAddedToCache::class, function(): void {
 			++$this->newCounter;
 		});
-		$this->eventDispatcher->addListener(FileCacheUpdated::class, function (): void {
+		$this->eventDispatcher->addListener(FileCacheUpdated::class, function(): void {
 			++$this->updatedCounter;
 		});
-		$this->eventDispatcher->addListener(NodeRemovedFromCache::class, function (): void {
+		$this->eventDispatcher->addListener(NodeRemovedFromCache::class, function(): void {
 			++$this->removedCounter;
 		});
 
@@ -157,24 +157,24 @@ 
 			}
 		} catch (ForbiddenException $e) {
 			$output->writeln("<error>Home storage for user $user not writable or 'files' subdirectory missing</error>");
-			$output->writeln('  ' . $e->getMessage());
+			$output->writeln('  '.$e->getMessage());
 			$output->writeln('Make sure you\'re running the scan command only as the user the web server runs as');
 			++$this->errorsCounter;
 		} catch (InterruptedException $e) {
 			# exit the function if ctrl-c has been pressed
 			$output->writeln('Interrupted by user');
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Path not found: ' . $e->getMessage() . '</error>');
+			$output->writeln('<error>Path not found: '.$e->getMessage().'</error>');
 			++$this->errorsCounter;
 		} catch (LockedException $e) {
 			if (str_starts_with($e->getPath(), 'scanner::')) {
-				$output->writeln('<error>Another process is already scanning \'' . substr($e->getPath(), strlen('scanner::')) . '\'</error>');
+				$output->writeln('<error>Another process is already scanning \''.substr($e->getPath(), strlen('scanner::')).'\'</error>');
 			} else {
 				throw $e;
 			}
 		} catch (\Exception $e) {
-			$output->writeln('<error>Exception during scan: ' . $e->getMessage() . '</error>');
-			$output->writeln('<error>' . $e->getTraceAsString() . '</error>');
+			$output->writeln('<error>Exception during scan: '.$e->getMessage().'</error>');
+			$output->writeln('<error>'.$e->getTraceAsString().'</error>');
 			++$this->errorsCounter;
 		}
 	}
@@ -187,8 +187,8 @@ 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$inputPath = $input->getOption('path');
 		if ($inputPath) {
-			$inputPath = '/' . trim($inputPath, '/');
-			[, $user,] = explode('/', $inputPath, 3);
+			$inputPath = '/'.trim($inputPath, '/');
+			[, $user, ] = explode('/', $inputPath, 3);
 			$users = [$user];
 		} elseif ($input->getOption('all')) {
 			$users = $this->userManager->search('');
@@ -216,7 +216,7 @@ 
 			if (is_object($user)) {
 				$user = $user->getUID();
 			}
-			$path = $inputPath ?: '/' . $user;
+			$path = $inputPath ?: '/'.$user;
 			++$user_count;
 			if ($this->userManager->userExists($user)) {
 				$output->writeln("Starting scan for user $user_count out of $users_total ($user)");
@@ -268,8 +268,8 @@ 
 			return false;
 		}
 		$e = new \ErrorException($message, 0, $severity, $file, $line);
-		$output->writeln('<error>Error during scan: ' . $e->getMessage() . '</error>');
-		$output->writeln('<error>' . $e->getTraceAsString() . '</error>', OutputInterface::VERBOSITY_VERY_VERBOSE);
+		$output->writeln('<error>Error during scan: '.$e->getMessage().'</error>');
+		$output->writeln('<error>'.$e->getTraceAsString().'</error>', OutputInterface::VERBOSITY_VERY_VERBOSE);
 		++$this->errorsCounter;
 		return true;
 	}
@@ -311,9 +311,9 @@ 
 	 * Formats microtime into a human-readable format
 	 */
 	protected function formatExecTime(): string {
-		$secs = (int)round($this->execTime);
+		$secs = (int) round($this->execTime);
 		# convert seconds into HH:MM:SS form
-		return sprintf('%02d:%02d:%02d', (int)($secs / 3600), ((int)($secs / 60) % 60), $secs % 60);
+		return sprintf('%02d:%02d:%02d', (int) ($secs / 3600), ((int) ($secs / 60) % 60), $secs % 60);
 	}
 
 	protected function reconnectToDatabase(OutputInterface $output): Connection {

apps/files_external/lib/Command/Scan.php

Spacing +3 added lines, -3 removed lines

@@ -71,13 +71,13 @@ 
 		/** @var Scanner $scanner */
 		$scanner = $storage->getScanner();
 
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function (string $path) use ($output): void {
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function(string $path) use ($output): void {
 			$output->writeln("\tFile\t<info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
 			++$this->filesCounter;
 			$this->abortIfInterrupted();
 		});
 
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function (string $path) use ($output): void {
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function(string $path) use ($output): void {
 			$output->writeln("\tFolder\t<info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
 			++$this->foldersCounter;
 			$this->abortIfInterrupted();
@@ -90,7 +90,7 @@ 
 				if ($e->getReadablePath() === 'scanner::') {
 					$output->writeln('<error>Another process is already scanning this storage</error>');
 				} else {
-					$output->writeln('<error>Another process is already scanning \'' . substr($e->getReadablePath(), strlen('scanner::')) . '\' in this storage</error>');
+					$output->writeln('<error>Another process is already scanning \''.substr($e->getReadablePath(), strlen('scanner::')).'\' in this storage</error>');
 				}
 			} else {
 				throw $e;