nextcloud / server

apps/files/lib/Command/TransferOwnership.php

Spacing +6 added lines, -6 removed lines

@@ -100,25 +100,25 @@ 
 		$destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
 
 		if (!$sourceUserObject instanceof IUser) {
-			$output->writeln('<error>Unknown source user ' . $input->getArgument('source-user') . '</error>');
+			$output->writeln('<error>Unknown source user '.$input->getArgument('source-user').'</error>');
 			return self::FAILURE;
 		}
 
 		if (!$destinationUserObject instanceof IUser) {
-			$output->writeln('<error>Unknown destination user ' . $input->getArgument('destination-user') . '</error>');
+			$output->writeln('<error>Unknown destination user '.$input->getArgument('destination-user').'</error>');
 			return self::FAILURE;
 		}
 
 		$path = ltrim($input->getOption('path'), '/');
 		$includeExternalStorage = $input->getOption('include-external-storage');
 		if ($includeExternalStorage) {
-			$mounts = $this->mountManager->findIn('/' . rtrim($sourceUserObject->getUID() . '/files/' . $path, '/'));
+			$mounts = $this->mountManager->findIn('/'.rtrim($sourceUserObject->getUID().'/files/'.$path, '/'));
 			/** @var IMountPoint[] $mounts */
 			$mounts = array_filter($mounts, fn ($mount) => $mount->getMountProvider() === ConfigAdapter::class);
 			if (count($mounts) > 0) {
-				$output->writeln(count($mounts) . ' external storages will be transferred:');
+				$output->writeln(count($mounts).' external storages will be transferred:');
 				foreach ($mounts as $mount) {
-					$output->writeln('  - <info>' . $mount->getMountPoint() . '</info>');
+					$output->writeln('  - <info>'.$mount->getMountPoint().'</info>');
 				}
 				$output->writeln('');
 				$output->writeln('<comment>Any other users with access to these external storages will lose access to the files.</comment>');
@@ -146,7 +146,7 @@ 
 				$input->getOption('use-user-id') === true,
 			);
 		} catch (TransferOwnershipException $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return $e->getCode() !== 0 ? $e->getCode() : self::FAILURE;
 		}
 

apps/files/lib/Service/OwnershipTransferService.php

Spacing +25 added lines, -25 removed lines

@@ -78,7 +78,7 @@ 
 		$output = $output ?? new NullOutput();
 		$sourceUid = $sourceUser->getUID();
 		$destinationUid = $destinationUser->getUID();
-		$sourcePath = rtrim($sourceUid . '/files/' . $path, '/');
+		$sourcePath = rtrim($sourceUid.'/files/'.$path, '/');
 
 		// If encryption is on we have to ensure the user has logged in before and that all encryption modules are ready
 		if (($this->encryptionManager->isEnabled() && $destinationUser->getLastLogin() === 0)
@@ -114,11 +114,11 @@ 
 				}
 			}
 
-			$finalTarget = "$destinationUid/files/" . $this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$cleanUserName, $date]));
+			$finalTarget = "$destinationUid/files/".$this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$cleanUserName, $date]));
 			try {
 				$view->verifyPath(dirname($finalTarget), basename($finalTarget));
 			} catch (InvalidPathException $e) {
-				$finalTarget = "$destinationUid/files/" . $this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$sourceUid, $date]));
+				$finalTarget = "$destinationUid/files/".$this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$sourceUid, $date]));
 			}
 		}
 
@@ -188,7 +188,7 @@ 
 			$move
 		);
 
-		$destinationPath = $finalTarget . '/' . $path;
+		$destinationPath = $finalTarget.'/'.$path;
 		// restore the shares
 		$this->restoreShares(
 			$sourceUid,
@@ -239,7 +239,7 @@ 
 			throw new TransferOwnershipException("Unknown path provided: $sourcePath", 1);
 		}
 		$size = $sourceFileInfo->getSize(false);
-		$freeSpace = $view->free_space($destinationUid . '/files/');
+		$freeSpace = $view->free_space($destinationUid.'/files/');
 		if ($size > $freeSpace && $freeSpace !== FileInfo::SPACE_UNKNOWN) {
 			throw new TransferOwnershipException('Target user does not have enough free space available.', 1);
 		}
@@ -260,7 +260,7 @@ 
 				$encryptedFiles[] = $sourceFileInfo;
 			} else {
 				$this->walkFiles($view, $sourcePath,
-					function (FileInfo $fileInfo) use ($progress, $masterKeyEnabled, &$encryptedFiles, $includeExternalStorage) {
+					function(FileInfo $fileInfo) use ($progress, $masterKeyEnabled, &$encryptedFiles, $includeExternalStorage) {
 						if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
 							$mount = $fileInfo->getMountPoint();
 							// only analyze into folders from main storage,
@@ -297,7 +297,7 @@ 
 			$output->writeln('<error>Some files are encrypted - please decrypt them first.</error>');
 			foreach ($encryptedFiles as $encryptedFile) {
 				/** @var FileInfo $encryptedFile */
-				$output->writeln('  ' . $encryptedFile->getPath());
+				$output->writeln('  '.$encryptedFile->getPath());
 			}
 			throw new TransferOwnershipException('Some files are encrypted - please decrypt them first.', 1);
 		}
@@ -340,12 +340,12 @@ 
 					break;
 				}
 				if ($path !== "$sourceUid/files") {
-					$sharePage = array_filter($sharePage, function (IShare $share) use ($view, $normalizedPath) {
+					$sharePage = array_filter($sharePage, function(IShare $share) use ($view, $normalizedPath) {
 						try {
 							$sourceNode = $share->getNode();
 							$relativePath = $view->getRelativePath($sourceNode->getPath());
 
-							return str_starts_with($relativePath . '/', $normalizedPath . '/');
+							return str_starts_with($relativePath.'/', $normalizedPath.'/');
 						} catch (Exception $e) {
 							return false;
 						}
@@ -359,7 +359,7 @@ 
 		$progress->finish();
 		$output->writeln('');
 
-		return array_values(array_filter(array_map(function (IShare $share) use ($view, $normalizedPath, $output, $sourceUid) {
+		return array_values(array_filter(array_map(function(IShare $share) use ($view, $normalizedPath, $output, $sourceUid) {
 			try {
 				$nodePath = $view->getRelativePath($share->getNode()->getPath());
 			} catch (NotFoundException $e) {
@@ -394,9 +394,9 @@ 
 			}
 
 			if ($path !== null && $path !== "$sourceUid/files") {
-				$sharePage = array_filter($sharePage, static function (IShare $share) use ($sourceUid, $normalizedPath) {
+				$sharePage = array_filter($sharePage, static function(IShare $share) use ($sourceUid, $normalizedPath) {
 					try {
-						return str_starts_with(Filesystem::normalizePath($sourceUid . '/files' . $share->getTarget() . '/', false), $normalizedPath . '/');
+						return str_starts_with(Filesystem::normalizePath($sourceUid.'/files'.$share->getTarget().'/', false), $normalizedPath.'/');
 					} catch (Exception) {
 						return false;
 					}
@@ -433,7 +433,7 @@ 
 		// Else only the content inside folder is transferred which is not correct.
 		if ($sourcePath !== "$sourceUid/files") {
 			$view->mkdir($finalTarget);
-			$finalTarget = $finalTarget . '/' . basename($sourcePath);
+			$finalTarget = $finalTarget.'/'.basename($sourcePath);
 		}
 		$sourceInfo = $view->getFileInfo($sourcePath);
 
@@ -451,7 +451,7 @@ 
 			foreach ($nestedMounts as $mount) {
 				if ($mount->getMountProvider() === ConfigAdapter::class) {
 					$relativePath = substr(trim($mount->getMountPoint(), '/'), strlen($sourcePath));
-					$this->moveMountContents($view, $mount->getMountPoint(), $finalTarget . $relativePath);
+					$this->moveMountContents($view, $mount->getMountPoint(), $finalTarget.$relativePath);
 				}
 			}
 		}
@@ -495,11 +495,11 @@ 
 
 		foreach ($shares as ['share' => $share, 'suffix' => $suffix]) {
 			try {
-				$output->writeln('Transfering share ' . $share->getId() . ' of type ' . $share->getShareType(), OutputInterface::VERBOSITY_VERBOSE);
+				$output->writeln('Transfering share '.$share->getId().' of type '.$share->getShareType(), OutputInterface::VERBOSITY_VERBOSE);
 				if ($share->getShareType() === IShare::TYPE_USER
 					&& $share->getSharedWith() === $destinationUid) {
 					// Unmount the shares before deleting, so we don't try to get the storage later on.
-					$shareMountPoint = $this->mountManager->find('/' . $destinationUid . '/files' . $share->getTarget());
+					$shareMountPoint = $this->mountManager->find('/'.$destinationUid.'/files'.$share->getTarget());
 					if ($shareMountPoint) {
 						$this->mountManager->removeMount($shareMountPoint->getMountPoint());
 					}
@@ -515,7 +515,7 @@ 
 					if ($share->getShareType() === IShare::TYPE_USER
 						&& !$this->userManager->userExists($share->getSharedWith())) {
 						// stray share with deleted user
-						$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted user "' . $share->getSharedWith() . '", deleting</error>');
+						$output->writeln('<error>Share with id '.$share->getId().' points at deleted user "'.$share->getSharedWith().'", deleting</error>');
 						$this->shareManager->deleteShare($share);
 						continue;
 					} else {
@@ -531,9 +531,9 @@ 
 						} catch (NotFoundException) {
 							// ID has changed due to transfer between different storages
 							// Try to get the new ID from the target path and suffix of the share
-							$node = $this->rootFolder->get(Filesystem::normalizePath($targetLocation . '/' . $suffix));
+							$node = $this->rootFolder->get(Filesystem::normalizePath($targetLocation.'/'.$suffix));
 							$newNodeId = $node->getId();
-							$output->writeln('Had to change node id to ' . $newNodeId, OutputInterface::VERBOSITY_VERY_VERBOSE);
+							$output->writeln('Had to change node id to '.$newNodeId, OutputInterface::VERBOSITY_VERY_VERBOSE);
 						}
 						$share->setNodeId($newNodeId);
 
@@ -541,9 +541,9 @@ 
 					}
 				}
 			} catch (NotFoundException $e) {
-				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+				$output->writeln('<error>Share with id '.$share->getId().' points at deleted file, skipping</error>');
 			} catch (\Throwable $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getMessage() . ' : ' . $e->getTraceAsString() . '</error>');
+				$output->writeln('<error>Could not restore share with id '.$share->getId().':'.$e->getMessage().' : '.$e->getTraceAsString().'</error>');
 			}
 			$progress->advance();
 		}
@@ -571,13 +571,13 @@ 
 				// Only restore if share is in given path.
 				$pathToCheck = '/';
 				if (trim($path, '/') !== '') {
-					$pathToCheck = '/' . trim($path) . '/';
+					$pathToCheck = '/'.trim($path).'/';
 				}
 				if (!str_starts_with($share->getTarget(), $pathToCheck)) {
 					continue;
 				}
 				$shareTarget = $share->getTarget();
-				$shareTarget = $finalShareTarget . $shareTarget;
+				$shareTarget = $finalShareTarget.$shareTarget;
 				if ($share->getShareType() === IShare::TYPE_USER
 					&& $share->getSharedBy() === $destinationUid) {
 					$this->shareManager->deleteShare($share);
@@ -621,9 +621,9 @@ 
 					continue;
 				}
 			} catch (NotFoundException $e) {
-				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+				$output->writeln('<error>Share with id '.$share->getId().' points at deleted file, skipping</error>');
 			} catch (\Throwable $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
+				$output->writeln('<error>Could not restore share with id '.$share->getId().':'.$e->getTraceAsString().'</error>');
 			}
 			$progress->advance();
 		}