nextcloud / server

lib/private/Security/Normalizer/IpAddress.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		}
 		$pos = strpos($ip, '%'); // if there is an explicit interface added to the IP, e.g. fe80::ae2d:d1e7:fe1e:9a8d%enp2s0
 		if ($pos !== false) {
-			$ip = substr($ip, 0, $pos-1);
+			$ip = substr($ip, 0, $pos - 1);
 		}
 		$binary = \inet_pton($ip);
 		for ($i = 128; $i > $maskBits; $i -= 8) {

lib/private/Files/Type/Detection.php

Spacing +8 added lines, -8 removed lines

@@ -123,12 +123,12 @@ 
 	}
 
 	private function loadCustomDefinitions(string $fileName, array $definitions): array {
-		if (file_exists($this->customConfigDir . '/' . $fileName)) {
-			$custom = json_decode(file_get_contents($this->customConfigDir . '/' . $fileName), true);
+		if (file_exists($this->customConfigDir.'/'.$fileName)) {
+			$custom = json_decode(file_get_contents($this->customConfigDir.'/'.$fileName), true);
 			if (json_last_error() === JSON_ERROR_NONE) {
 				$definitions = array_merge($definitions, $custom);
 			} else {
-				$this->logger->warning('Failed to parse ' . $fileName . ': ' . json_last_error_msg());
+				$this->logger->warning('Failed to parse '.$fileName.': '.json_last_error_msg());
 			}
 		}
 		return $definitions;
@@ -142,7 +142,7 @@ 
 			return;
 		}
 
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypealiases.dist.json'), true);
 		$this->mimeTypeAlias = $this->loadCustomDefinitions(self::CUSTOM_MIMETYPEALIASES, $this->mimeTypeAlias);
 	}
 
@@ -156,7 +156,7 @@ 
 
 	public function getOnlyDefaultAliases(): array {
 		$this->loadMappings();
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypealiases.dist.json'), true);
 		return $this->mimeTypeAlias;
 	}
 
@@ -168,7 +168,7 @@ 
 			return;
 		}
 
-		$mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypemapping.dist.json'), true);
+		$mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypemapping.dist.json'), true);
 		$mimetypeMapping = $this->loadCustomDefinitions(self::CUSTOM_MIMETYPEMAPPING, $mimetypeMapping);
 
 		$this->registerTypeArray($mimetypeMapping);
@@ -364,7 +364,7 @@ 
 
 		// Icon exists?
 		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/'.$icon.'.svg');
 			return $this->mimetypeIcons[$mimetype];
 		} catch (\RuntimeException $e) {
 			// Specified image not found
@@ -373,7 +373,7 @@ 
 		// Try only the first part of the filetype
 		$mimePart = substr($icon, 0, strpos($icon, '-'));
 		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/'.$mimePart.'.svg');
 			return $this->mimetypeIcons[$mimetype];
 		} catch (\RuntimeException $e) {
 			// Image for the first part of the mimetype not found

apps/comments/lib/Search/Result.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 			$suffix = '…';
 		}
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+		return $prefix.mb_substr($message, $start, $end - $start).$suffix;
 	}
 
 }

apps/files/lib/Notification/Notifier.php

Spacing +13 added lines, -13 removed lines

@@ -120,7 +120,7 @@ 
 				$this->urlGenerator->getAbsoluteURL(
 					$this->urlGenerator->linkTo(
 						'',
-						'ocs/v2.php/apps/files/api/v1/transferownership/' . $id
+						'ocs/v2.php/apps/files/api/v1/transferownership/'.$id
 					)
 				),
 				IAction::TYPE_POST
@@ -133,7 +133,7 @@ 
 				$this->urlGenerator->getAbsoluteURL(
 					$this->urlGenerator->linkTo(
 						'',
-						'ocs/v2.php/apps/files/api/v1/transferownership/' . $id
+						'ocs/v2.php/apps/files/api/v1/transferownership/'.$id
 					)
 				),
 				IAction::TYPE_DELETE
@@ -156,7 +156,7 @@ 
 				[
 					'path' => [
 						'type' => 'highlight',
-						'id' => $param['targetUser'] . '::' . $param['nodeName'],
+						'id' => $param['targetUser'].'::'.$param['nodeName'],
 						'name' => $param['nodeName'],
 					]
 				])
@@ -165,7 +165,7 @@ 
 		return $notification;
 	}
 
-	public function handleTransferOwnershipFailedSource(INotification $notification,  string $languageCode): INotification {
+	public function handleTransferOwnershipFailedSource(INotification $notification, string $languageCode): INotification {
 		$l = $this->l10nFactory->get('files', $languageCode);
 		$param = $notification->getSubjectParameters();
 
@@ -177,7 +177,7 @@ 
 				[
 					'path' => [
 						'type' => 'highlight',
-						'id' => $param['targetUser'] . '::' . $param['nodeName'],
+						'id' => $param['targetUser'].'::'.$param['nodeName'],
 						'name' => $param['nodeName'],
 					],
 					'user' => [
@@ -190,7 +190,7 @@ 
 		return $notification;
 	}
 
-	public function handleTransferOwnershipFailedTarget(INotification $notification,  string $languageCode): INotification {
+	public function handleTransferOwnershipFailedTarget(INotification $notification, string $languageCode): INotification {
 		$l = $this->l10nFactory->get('files', $languageCode);
 		$param = $notification->getSubjectParameters();
 
@@ -202,7 +202,7 @@ 
 				[
 					'path' => [
 						'type' => 'highlight',
-						'id' => $param['sourceUser'] . '::' . $param['nodeName'],
+						'id' => $param['sourceUser'].'::'.$param['nodeName'],
 						'name' => $param['nodeName'],
 					],
 					'user' => [
@@ -216,7 +216,7 @@ 
 		return $notification;
 	}
 
-	public function handleTransferOwnershipDoneSource(INotification $notification,  string $languageCode): INotification {
+	public function handleTransferOwnershipDoneSource(INotification $notification, string $languageCode): INotification {
 		$l = $this->l10nFactory->get('files', $languageCode);
 		$param = $notification->getSubjectParameters();
 
@@ -228,7 +228,7 @@ 
 				[
 					'path' => [
 						'type' => 'highlight',
-						'id' => $param['targetUser'] . '::' . $param['nodeName'],
+						'id' => $param['targetUser'].'::'.$param['nodeName'],
 						'name' => $param['nodeName'],
 					],
 					'user' => [
@@ -242,7 +242,7 @@ 
 		return $notification;
 	}
 
-	public function handleTransferOwnershipDoneTarget(INotification $notification,  string $languageCode): INotification {
+	public function handleTransferOwnershipDoneTarget(INotification $notification, string $languageCode): INotification {
 		$l = $this->l10nFactory->get('files', $languageCode);
 		$param = $notification->getSubjectParameters();
 
@@ -254,7 +254,7 @@ 
 				[
 					'path' => [
 						'type' => 'highlight',
-						'id' => $param['sourceUser'] . '::' . $param['nodeName'],
+						'id' => $param['sourceUser'].'::'.$param['nodeName'],
 						'name' => $param['nodeName'],
 					],
 					'user' => [
@@ -275,7 +275,7 @@ 
 
 		// TODO: This should all be moved to a service that also the transferownershipContoller uses.
 		try {
-			$transferOwnership = $this->mapper->getById((int)$notification->getObjectId());
+			$transferOwnership = $this->mapper->getById((int) $notification->getObjectId());
 		} catch (DoesNotExistException $e) {
 			return;
 		}
@@ -289,7 +289,7 @@ 
 				'targetUser' => $transferOwnership->getTargetUser(),
 				'nodeName' => $transferOwnership->getNodeName()
 			])
-			->setObject('transfer', (string)$transferOwnership->getId());
+			->setObject('transfer', (string) $transferOwnership->getId());
 		$this->notificationManager->notify($notification);
 
 		$this->mapper->delete($transferOwnership);

apps/files/lib/Command/ScanAppData.php

Spacing +11 added lines, -11 removed lines

@@ -73,7 +73,7 @@ 
 		$path = basename($fullPath);
 
 		if ($normalizedPath !== $path) {
-			$output->writeln("\t<error>Entry \"" . $fullPath . '" will not be accessible due to incompatible encoding</error>');
+			$output->writeln("\t<error>Entry \"".$fullPath.'" will not be accessible due to incompatible encoding</error>');
 		}
 	}
 
@@ -89,27 +89,27 @@ 
 		$scanner = new \OC\Files\Utils\Scanner(null, $connection, \OC::$server->query(IEventDispatcher::class), \OC::$server->getLogger());
 
 		# 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 ($path) use ($output) {
+		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
 			$output->writeln("\tFile   <info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
 			++$this->filesCounter;
 			$this->abortIfInterrupted();
 		});
 
-		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output) {
+		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) {
 			$output->writeln("\tFolder <info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
 			++$this->foldersCounter;
 			$this->abortIfInterrupted();
 		});
 
-		$scanner->listen('\OC\Files\Utils\Scanner', 'StorageNotAvailable', function (StorageNotAvailableException $e) use ($output) {
-			$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) {
+			$output->writeln('Error while scanning, storage not available ('.$e->getMessage().')', OutputInterface::VERBOSITY_VERBOSE);
 		});
 
-		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output) {
+		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
 			$this->checkScanWarning($path, $output);
 		});
 
-		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output) {
+		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) {
 			$this->checkScanWarning($path, $output);
 		});
 
@@ -122,10 +122,10 @@ 
 			# 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>');
 		} 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>');
 		}
 	}
 
@@ -222,7 +222,7 @@ 
 	protected function formatExecTime() {
 		$secs = round($this->execTime);
 		# convert seconds into HH:MM:SS form
-		return sprintf('%02d:%02d:%02d', ($secs/3600), ($secs/60%60), $secs%60);
+		return sprintf('%02d:%02d:%02d', ($secs / 3600), ($secs / 60 % 60), $secs % 60);
 	}
 
 	/**

core/Command/App/Enable.php

Spacing +5 added lines, -5 removed lines

@@ -101,7 +101,7 @@ 
 	 * @param OutputInterface $output
 	 */
 	private function enableApp(string $appId, array $groupIds, bool $forceEnable, OutputInterface $output): void {
-		$groupNames = array_map(function (IGroup $group) {
+		$groupNames = array_map(function(IGroup $group) {
 			return $group->getDisplayName();
 		}, $groupIds);
 
@@ -118,13 +118,13 @@ 
 
 			if ($groupIds === []) {
 				$this->appManager->enableApp($appId, $forceEnable);
-				$output->writeln($appId . ' enabled');
+				$output->writeln($appId.' enabled');
 			} else {
 				$this->appManager->enableAppForGroups($appId, $groupIds, $forceEnable);
-				$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groupNames));
+				$output->writeln($appId.' enabled for groups: '.implode(', ', $groupNames));
 			}
 		} catch (AppPathNotFoundException $e) {
-			$output->writeln($appId . ' not found');
+			$output->writeln($appId.' not found');
 			$this->exitCode = 1;
 		} catch (\Exception $e) {
 			$output->writeln($e->getMessage());
@@ -154,7 +154,7 @@ 
 	 */
 	public function completeOptionValues($optionName, CompletionContext $context) {
 		if ($optionName === 'groups') {
-			return array_map(function (IGroup $group) {
+			return array_map(function(IGroup $group) {
 				return $group->getGID();
 			}, $this->groupManager->search($context->getCurrentWord()));
 		}

lib/private/Preview/Office.php

Spacing +5 added lines, -5 removed lines

@@ -49,20 +49,20 @@
 
 		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
+		$defaultParameters = ' -env:UserInstallation=file://'.escapeshellarg($tmpDir.'/owncloud-'.\OC_Util::getInstanceId().'/').' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
 		$clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
 
-		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+		$exec = $this->cmd.$clParameters.escapeshellarg($tmpDir).' '.escapeshellarg($absPath);
 
 		shell_exec($exec);
 
 		//create imagick object from png
 		$pngPreview = null;
 		try {
-			list($dirname, , , $filename) = array_values(pathinfo($absPath));
-			$pngPreview = $tmpDir . '/' . $filename . '.png';
+			list($dirname,,, $filename) = array_values(pathinfo($absPath));
+			$pngPreview = $tmpDir.'/'.$filename.'.png';
 
-			$png = new \imagick($pngPreview . '[0]');
+			$png = new \imagick($pngPreview.'[0]');
 			$png->setImageFormat('jpg');
 		} catch (\Exception $e) {
 			$this->cleanTmpFiles();

apps/files/lib/Controller/DirectEditingController.php

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
 			]);
 		} catch (Exception $e) {
 			$this->logger->logException($e, ['message' => 'Exception when creating a new file through direct editing']);
-			return new DataResponse('Failed to create file: ' . $e->getMessage(), Http::STATUS_FORBIDDEN);
+			return new DataResponse('Failed to create file: '.$e->getMessage(), Http::STATUS_FORBIDDEN);
 		}
 	}
 
@@ -106,7 +106,7 @@ 
 			]);
 		} catch (Exception $e) {
 			$this->logger->logException($e, ['message' => 'Exception when opening a file through direct editing']);
-			return new DataResponse('Failed to open file: ' . $e->getMessage(), Http::STATUS_FORBIDDEN);
+			return new DataResponse('Failed to open file: '.$e->getMessage(), Http::STATUS_FORBIDDEN);
 		}
 	}
 
@@ -122,7 +122,7 @@ 
 			return new DataResponse($this->directEditingManager->getTemplates($editorId, $creatorId));
 		} catch (Exception $e) {
 			$this->logger->logException($e);
-			return new DataResponse('Failed to obtain template list: ' . $e->getMessage(), Http::STATUS_INTERNAL_SERVER_ERROR);
+			return new DataResponse('Failed to obtain template list: '.$e->getMessage(), Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
 	}
 }

resources/update-locales.php

Spacing +2 added lines, -2 removed lines

@@ -29,14 +29,14 @@
 	exit(1);
 }
 
-$locales = array_map(function (string $localeCode) {
+$locales = array_map(function(string $localeCode) {
 	return [
 		'code' => $localeCode,
 		'name' => Locale::getDisplayName($localeCode, 'en')
 	];
 }, ResourceBundle::getLocales(''));
 
-if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
+if (file_put_contents(__DIR__.'/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
 	echo 'Failed to update locales.json';
 	exit(1);
 }