nextcloud / server

core/Controller/GuestAvatarController.php

Spacing +2 added lines, -2 removed lines

@@ -78,12 +78,12 @@
 
 		if ($size <= 64) {
 			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 64;
 		} else {
 			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 512;
 		}

apps/user_ldap/lib/Command/UpdateUUID.php

Spacing +18 added lines, -18 removed lines

@@ -140,7 +140,7 @@ 
 		$entriesToUpdate = $this->estimateNumberOfUpdates($input);
 		$progress = new ProgressBar($output);
 		$progress->start($entriesToUpdate);
-		foreach($this->handleUpdates($input) as $_) {
+		foreach ($this->handleUpdates($input) as $_) {
 			$progress->advance();
 		}
 		$progress->finish();
@@ -190,9 +190,9 @@ 
 			if ($output->isVerbose()) {
 				/** @var UuidUpdateReport $report */
 				foreach ($this->reports[UuidUpdateReport::UNKNOWN] as $report) {
-					$output->writeln(sprintf('  %s: %s',$report->isUser ? 'User' : 'Group', $report->id));
+					$output->writeln(sprintf('  %s: %s', $report->isUser ? 'User' : 'Group', $report->id));
 				}
-				$output->writeln(PHP_EOL . 'Old users can be removed along with their data per occ user:delete.' . PHP_EOL);
+				$output->writeln(PHP_EOL.'Old users can be removed along with their data per occ user:delete.'.PHP_EOL);
 			}
 		}
 
@@ -201,7 +201,7 @@ 
 			if ($output->isVerbose()) {
 				/** @var UuidUpdateReport $report */
 				foreach ($this->reports[UuidUpdateReport::UNREADABLE] as $report) {
-					$output->writeln(sprintf('  %s: %s',$report->isUser ? 'User' : 'Group', $report->id));
+					$output->writeln(sprintf('  %s: %s', $report->isUser ? 'User' : 'Group', $report->id));
 				}
 			}
 		}
@@ -211,7 +211,7 @@ 
 			if ($output->isVerbose()) {
 				/** @var UuidUpdateReport $report */
 				foreach ($this->reports[UuidUpdateReport::UNWRITABLE] as $report) {
-					$output->writeln(sprintf('  %s: %s',$report->isUser ? 'User' : 'Group', $report->id));
+					$output->writeln(sprintf('  %s: %s', $report->isUser ? 'User' : 'Group', $report->id));
 				}
 			}
 		}
@@ -219,37 +219,37 @@ 
 
 	protected function handleUpdates(InputInterface $input): \Generator {
 		if ($input->getOption('all')) {
-			foreach($this->handleMappingBasedUpdates(false) as $_) {
+			foreach ($this->handleMappingBasedUpdates(false) as $_) {
 				yield;
 			}
 		} else if ($input->getOption('userId')
 			|| $input->getOption('groupId')
 			|| $input->getOption('dn')
 		) {
-			foreach($this->handleUpdatesByUserId($input->getOption('userId')) as $_) {
+			foreach ($this->handleUpdatesByUserId($input->getOption('userId')) as $_) {
 				yield;
 			}
-			foreach($this->handleUpdatesByGroupId($input->getOption('groupId')) as $_) {
+			foreach ($this->handleUpdatesByGroupId($input->getOption('groupId')) as $_) {
 				yield;
 			}
-			foreach($this->handleUpdatesByDN($input->getOption('dn')) as $_) {
+			foreach ($this->handleUpdatesByDN($input->getOption('dn')) as $_) {
 				yield;
 			}
 		} else {
-			foreach($this->handleMappingBasedUpdates(true) as $_) {
+			foreach ($this->handleMappingBasedUpdates(true) as $_) {
 				yield;
 			}
 		}
 	}
 
 	protected function handleUpdatesByUserId(array $userIds): \Generator {
-		foreach($this->handleUpdatesByEntryId($userIds, $this->userMapping) as $_) {
+		foreach ($this->handleUpdatesByEntryId($userIds, $this->userMapping) as $_) {
 			yield;
 		}
 	}
 
 	protected function handleUpdatesByGroupId(array $groupIds): \Generator {
-		foreach($this->handleUpdatesByEntryId($groupIds, $this->groupMapping) as $_) {
+		foreach ($this->handleUpdatesByEntryId($groupIds, $this->groupMapping) as $_) {
 			yield;
 		}
 	}
@@ -272,10 +272,10 @@ 
 			$this->reports[UuidUpdateReport::UNMAPPED][] = new UuidUpdateReport('', $dn, true, UuidUpdateReport::UNMAPPED);
 			yield;
 		}
-		foreach($this->handleUpdatesByList($this->userMapping, $userList) as $_) {
+		foreach ($this->handleUpdatesByList($this->userMapping, $userList) as $_) {
 			yield;
 		}
-		foreach($this->handleUpdatesByList($this->groupMapping, $groupList) as $_) {
+		foreach ($this->handleUpdatesByList($this->groupMapping, $groupList) as $_) {
 			yield;
 		}
 	}
@@ -284,7 +284,7 @@ 
 		$isUser = $mapping instanceof UserMapping;
 		$list = [];
 		while ($id = array_pop($ids)) {
-			if(!$dn = $mapping->getDNByName($id)) {
+			if (!$dn = $mapping->getDNByName($id)) {
 				$this->reports[UuidUpdateReport::UNMAPPED][] = new UuidUpdateReport($id, '', $isUser, UuidUpdateReport::UNMAPPED);
 				yield;
 				continue;
@@ -293,7 +293,7 @@ 
 			$uuid = $mapping->getUUIDByDN($dn);
 			$list[] = ['name' => $id, 'uuid' => $uuid];
 		}
-		foreach($this->handleUpdatesByList($mapping, $list) as $_) {
+		foreach ($this->handleUpdatesByList($mapping, $list) as $_) {
 			yield;
 		}
 	}
@@ -301,13 +301,13 @@ 
 	protected function handleMappingBasedUpdates(bool $invalidatedOnly): \Generator {
 		$limit = 1000;
 		/** @var AbstractMapping $mapping*/
-		foreach([$this->userMapping, $this->groupMapping] as $mapping) {
+		foreach ([$this->userMapping, $this->groupMapping] as $mapping) {
 			$offset = 0;
 			do {
 				$list = $mapping->getList($offset, $limit, $invalidatedOnly);
 				$offset += $limit;
 
-				foreach($this->handleUpdatesByList($mapping, $list) as $tick) {
+				foreach ($this->handleUpdatesByList($mapping, $list) as $tick) {
 					yield; // null, for it only advances progress counter
 				}
 			} while (count($list) === $limit);

apps/user_ldap/lib/Migration/Version1130Date20211102154716.php

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 
 		while ($nextcloudId = array_shift($idList)) {
 			$update->setParameter('nextcloudId', $nextcloudId);
-			$update->setParameter('invalidatedUuid', 'invalidated_' . \bin2hex(\random_bytes(6)));
+			$update->setParameter('invalidatedUuid', 'invalidated_'.\bin2hex(\random_bytes(6)));
 			try {
 				$update->executeStatement();
 				$this->logger->warning(

apps/files/lib/Service/OwnershipTransferService.php

Spacing +16 added lines, -16 removed lines

@@ -105,7 +105,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)
@@ -238,7 +238,7 @@ 
 							   OutputInterface $output): void {
 		$output->writeln('Validating quota');
 		$size = $view->getFileInfo($sourcePath, false)->getSize(false);
-		$freeSpace = $view->free_space($destinationUid . '/files/');
+		$freeSpace = $view->free_space($destinationUid.'/files/');
 		if ($size > $freeSpace && $freeSpace !== FileInfo::SPACE_UNKNOWN) {
 			$output->writeln('<error>Target user does not have enough free space available.</error>');
 			throw new \Exception('Execution terminated.');
@@ -250,7 +250,7 @@ 
 
 		$encryptedFiles = [];
 		$this->walkFiles($view, $sourcePath,
-			function (FileInfo $fileInfo) use ($progress) {
+			function(FileInfo $fileInfo) use ($progress) {
 				if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
 					// only analyze into folders from main storage,
 					if (!$fileInfo->getStorage()->instanceOfStorage(IHomeStorage::class)) {
@@ -272,7 +272,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 \Exception('Execution terminated.');
 		}
@@ -296,7 +296,7 @@ 
 					break;
 				}
 				if ($path !== "$sourceUid/files") {
-					$sharePage = array_filter($sharePage, function (IShare $share) use ($view, $path) {
+					$sharePage = array_filter($sharePage, function(IShare $share) use ($view, $path) {
 						try {
 							$relativePath = $view->getPath($share->getNodeId());
 							$singleFileTranfer = $view->is_file($path);
@@ -305,8 +305,8 @@ 
 							}
 
 							return mb_strpos(
-								Filesystem::normalizePath($relativePath . '/', false),
-								Filesystem::normalizePath($path . '/', false)) === 0;
+								Filesystem::normalizePath($relativePath.'/', false),
+								Filesystem::normalizePath($path.'/', false)) === 0;
 						} catch (\Exception $e) {
 							return false;
 						}
@@ -371,7 +371,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);
 		}
 		if ($view->rename($sourcePath, $finalTarget) === false) {
 			throw new TransferOwnershipException("Could not transfer files.", 1);
@@ -394,7 +394,7 @@ 
 				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());
 					}
@@ -410,7 +410,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 {
@@ -423,9 +423,9 @@ 
 					}
 				}
 			} catch (\OCP\Files\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();
 		}
@@ -453,13 +453,13 @@ 
 				// Only restore if share is in given path.
 				$pathToCheck = '/';
 				if (trim($path, '/') !== '') {
-					$pathToCheck = '/' . trim($path) . '/';
+					$pathToCheck = '/'.trim($path).'/';
 				}
 				if (substr($share->getTarget(), 0, strlen($pathToCheck)) !== $pathToCheck) {
 					continue;
 				}
 				$shareTarget = $share->getTarget();
-				$shareTarget = $finalShareTarget . $shareTarget;
+				$shareTarget = $finalShareTarget.$shareTarget;
 				if ($share->getShareType() === IShare::TYPE_USER &&
 					$share->getSharedBy() === $destinationUid) {
 					$this->shareManager->deleteShare($share);
@@ -503,9 +503,9 @@ 
 					continue;
 				}
 			} catch (\OCP\Files\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();
 		}

apps/user_ldap/lib/Helper.php

Spacing +5 added lines, -5 removed lines

@@ -128,12 +128,12 @@ 
 
 		sort($serverConnections);
 		$lastKey = array_pop($serverConnections);
-		$lastNumber = (int)str_replace('s', '', $lastKey);
-		return 's' . str_pad((string)($lastNumber + 1), 2, '0', STR_PAD_LEFT);
+		$lastNumber = (int) str_replace('s', '', $lastKey);
+		return 's'.str_pad((string) ($lastNumber + 1), 2, '0', STR_PAD_LEFT);
 	}
 
 	private function getServersConfig(string $value): array {
-		$regex = '/' . $value . '$/S';
+		$regex = '/'.$value.'$/S';
 
 		$keys = $this->config->getAppKeys('user_ldap');
 		$result = [];
@@ -160,7 +160,7 @@ 
 		$query = $this->connection->getQueryBuilder();
 		$query->delete('appconfig')
 			->where($query->expr()->eq('appid', $query->createNamedParameter('user_ldap')))
-			->andWhere($query->expr()->like('configkey', $query->createNamedParameter((string)$prefix . '%')))
+			->andWhere($query->expr()->like('configkey', $query->createNamedParameter((string) $prefix.'%')))
 			->andWhere($query->expr()->notIn('configkey', $query->createNamedParameter([
 				'enabled',
 				'installed_version',
@@ -225,7 +225,7 @@ 
 		}
 
 		if (!is_string($dn)) {
-			throw new \LogicException('String expected ' . \gettype($dn) . ' given');
+			throw new \LogicException('String expected '.\gettype($dn).' given');
 		}
 
 		if (($sanitizedDn = $this->sanitizeDnCache->get($dn)) !== null) {

apps/settings/lib/Hooks.php

Spacing +2 added lines, -2 removed lines

@@ -140,7 +140,7 @@ 
 			$template->setSubject($l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceName]));
 			$template->addHeader();
 			$template->addHeading($l->t('Password changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $l->t('If you did not request this, please contact an administrator.'));
+			$template->addBodyText($text.' '.$l->t('If you did not request this, please contact an administrator.'));
 			$template->addFooter();
 
 
@@ -204,7 +204,7 @@ 
 			$template->setSubject($l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
 			$template->addHeader();
 			$template->addHeading($l->t('Email address changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $l->t('If you did not request this, please contact an administrator.'));
+			$template->addBodyText($text.' '.$l->t('If you did not request this, please contact an administrator.'));
 			if ($user->getEMailAddress()) {
 				$template->addBodyText($l->t('The new email address is %s', [$user->getEMailAddress()]));
 			}

apps/user_ldap/lib/Command/CheckUser.php

Spacing +4 added lines, -4 removed lines

@@ -103,13 +103,13 @@ 
 				$this->dui->markUser($uid);
 				$output->writeln('The user does not exists on LDAP anymore.');
 				$output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
-					. $uid . '"');
+					. $uid.'"');
 				return 0;
 			} else {
 				throw new \Exception('The given user is not a recognized LDAP user.');
 			}
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return 1;
 		}
 	}
@@ -146,12 +146,12 @@ 
 			$avatarAttributes = $access->getConnection()->resolveRule('avatar');
 			$result = $access->search('objectclass=*', $user->getDN(), $attrs, 1, 0);
 			foreach ($result[0] as $attribute => $valueSet) {
-				$output->writeln('  ' . $attribute . ': ');
+				$output->writeln('  '.$attribute.': ');
 				foreach ($valueSet as $value) {
 					if (in_array($attribute, $avatarAttributes)) {
 						$value = '{ImageData}';
 					}
-					$output->writeln('    ' . $value);
+					$output->writeln('    '.$value);
 				}
 			}
 			$access->batchApplyUserAttributes($result);

lib/private/Files/Config/CachedMountFileInfo.php

Spacing +1 added lines, -1 removed lines

@@ -53,6 +53,6 @@
 	}
 
 	public function getPath(): string {
-		return $this->getMountPoint() . $this->getInternalPath();
+		return $this->getMountPoint().$this->getInternalPath();
 	}
 }

lib/private/Files/Mount/CacheMountProvider.php

Spacing +4 added lines, -4 removed lines

@@ -54,15 +54,15 @@
 	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
 		$cacheBaseDir = $this->config->getSystemValue('cache_path', '');
 		if ($cacheBaseDir !== '') {
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
+			$cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID();
 			if (!file_exists($cacheDir)) {
 				mkdir($cacheDir, 0770, true);
-				mkdir($cacheDir . '/uploads', 0770, true);
+				mkdir($cacheDir.'/uploads', 0770, true);
 			}
 
 			return [
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir], $loader, null, null, self::class),
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads'], $loader, null, null, self::class)
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir], $loader, null, null, self::class),
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/uploads', ['datadir' => $cacheDir.'/uploads'], $loader, null, null, self::class)
 			];
 		} else {
 			return [];