nextcloud / circles

lib/Command/MembersAdd.php

Spacing +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
 		$federatedUser = $this->federatedUserService->generateFederatedUser($userId, (int)$type);
 		$outcome = $this->memberService->addMember($circleId, $federatedUser);
 
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
 
 		return 0;
 	}
@@ -178,7 +178,7 @@ 
 				$instance = $host;
 			}
 
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
 		}
 
 //		if ($userId === '') {

lib/Service/FederatedUserService.php

Spacing +2 added lines, -2 removed lines

@@ -230,7 +230,7 @@ 
 	public function getLocalFederatedUser(string $userId): FederatedUser {
 		$user = $this->userManager->get($userId);
 		if ($user === null) {
-			throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
+			throw new FederatedUserNotFoundException('user '.$userId.' not found');
 		}
 
 		$federatedUser = new FederatedUser();
@@ -513,7 +513,7 @@ 
 			$circle = new Circle();
 			$id = $this->token(ManagedModel::ID_LENGTH);
 
-			$circle->setName('single:' . $federatedUser->getUserId() . ':' . $id)
+			$circle->setName('single:'.$federatedUser->getUserId().':'.$id)
 				   ->setId($id)
 				   ->setConfig(Circle::CFG_SINGLE);
 			$this->circleRequest->save($circle);

lib/FederatedItems/MemberAdd.php

Spacing +8 added lines, -8 removed lines

@@ -160,14 +160,14 @@ 
 		$initiatorHelper = new MemberHelper($initiator);
 		$initiatorHelper->mustBeModerator();
 
-		$federatedId = $member->getUserId() . '@' . $member->getInstance();
+		$federatedId = $member->getUserId().'@'.$member->getInstance();
 		try {
 			$federatedUser =
 				$this->federatedUserService->getFederatedUser($federatedId, $member->getUserType());
 		} catch (MemberNotFoundException $e) {
 			throw new MemberNotFoundException(
-				ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' %s not found',
-				['member' => $member->getUserId() . '@' . $member->getInstance()]
+				ucfirst(Member::$DEF_TYPE[$member->getUserType()]).' %s not found',
+				['member' => $member->getUserId().'@'.$member->getInstance()]
 			);
 		}
 		$member->importFromIFederatedUser($federatedUser);
@@ -176,8 +176,8 @@ 
 			$knownMember = $this->memberRequest->searchMember($member);
 			// TODO: maybe member is requesting access
 			throw new MemberAlreadyExistsException(
-				ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' %s is already a member',
-				['member' => $member->getUserId() . '@' . $member->getInstance()]
+				ucfirst(Member::$DEF_TYPE[$member->getUserType()]).' %s is already a member',
+				['member' => $member->getUserId().'@'.$member->getInstance()]
 			);
 		} catch (MemberNotFoundException $e) {
 		}
@@ -490,7 +490,7 @@ 
 			$this->sendMailExistingShares($template, $author, $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -642,7 +642,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -684,7 +684,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}

lib/Command/CirclesMemberships.php

Spacing +15 added lines, -15 removed lines

@@ -179,10 +179,10 @@ 
 		$type = Member::parseTypeString($input->getOption('type'));
 		$federatedUser = $this->federatedUserService->getFederatedUser($userId, (int)$type);
 
-		$output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>');
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
-		$output->writeln('Type: <info>' . Member::$DEF_TYPE[$federatedUser->getUserType()] . '</info>');
-		$output->writeln('SingleId: <info>' . $federatedUser->getSingleId() . '</info>');
+		$output->writeln('Id: <info>'.$federatedUser->getUserId().'</info>');
+		$output->writeln('Instance: <info>'.$federatedUser->getInstance().'</info>');
+		$output->writeln('Type: <info>'.Member::$DEF_TYPE[$federatedUser->getUserType()].'</info>');
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
 
 		$this->singleId = $federatedUser->getSingleId();
 		$tree = new NC21TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser]));
@@ -192,8 +192,8 @@ 
 		$output->writeln('Memberships:');
 		foreach ($federatedUser->getMemberships() as $membership) {
 			$output->writeln(
-				'- <info>' . $membership->getCircleId() . '</info> ('
-				. Member::$DEF_LEVEL[$membership->getLevel()] . ')'
+				'- <info>'.$membership->getCircleId().'</info> ('
+				. Member::$DEF_LEVEL[$membership->getLevel()].')'
 			);
 		}
 		$output->writeln('');
@@ -262,9 +262,9 @@ 
 				if ($lineNumber === 2) {
 					return '';
 				}
-				$line .= '<info>' . $federatedUser->getSingleId() . '</info>';
+				$line .= '<info>'.$federatedUser->getSingleId().'</info>';
 				if (!$this->configService->isLocalInstance($federatedUser->getInstance())) {
-					$line .= '@' . $federatedUser->getInstance();
+					$line .= '@'.$federatedUser->getInstance();
 				}
 
 				return $line;
@@ -276,25 +276,25 @@ 
 				$circle = $member->getCircle();
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $circle->getId() . '</info>';
+					$line .= '<info>'.$circle->getId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
-					$line .= ' (' . $circle->getName() . ')';
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
+					$line .= ' ('.$circle->getName().')';
+					$line .= ' <info>Level</info>: '.Member::$DEF_LEVEL[$member->getLevel()];
 
 					$knownMembership = $this->memberships[$member->getCircleId()];
 					if ($member->getLevel() !== $knownMembership->getLevel()) {
-						$line .= ' (' . Member::$DEF_LEVEL[$knownMembership->getLevel()] . ')';
+						$line .= ' ('.Member::$DEF_LEVEL[$knownMembership->getLevel()].')';
 					}
 				}
 
 				if ($lineNumber === 2) {
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance() . ' ';
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance().' ';
 					$type =
 						implode(", ", $this->modelManager->getCircleTypes($circle, ModelManager::TYPES_LONG));
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
 				}
 
 				return $line;

lib/Command/MembersList.php

Spacing +12 added lines, -12 removed lines

@@ -164,14 +164,14 @@ 
 		if ($input->getOption('tree')) {
 			$this->federatedUserService->commandLineInitiator($initiator, $circleId, true);
 			$circle = $this->circleService->getCircle($circleId);
-			$output->writeln('<info>Name</info>: ' . $circle->getName());
+			$output->writeln('<info>Name</info>: '.$circle->getName());
 			$owner = $circle->getOwner();
-			$output->writeln('<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance());
+			$output->writeln('<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance());
 			$type =
 				implode(
 					", ", $this->modelManager->getCircleTypes($circle, ModelManager::TYPES_LONG)
 				);
-			$output->writeln('<info>Config</info>: ' . $type);
+			$output->writeln('<info>Config</info>: '.$type);
 			$output->writeln(' ');
 
 			$tree = new NC21TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -193,7 +193,7 @@ 
 		}
 
 		if ($input->getOption('json')) {
-			echo json_encode($members, JSON_PRETTY_PRINT) . "\n";
+			echo json_encode($members, JSON_PRETTY_PRINT)."\n";
 
 			return 0;
 		}
@@ -344,32 +344,32 @@ 
 				$member = $data->gObj('member', Member::class);
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $member->getUserId() . '</info>';
+					$line .= '<info>'.$member->getUserId().'</info>';
 					if (!$this->configService->isLocalInstance($member->getInstance())) {
-						$line .= '@' . $member->getInstance();
+						$line .= '@'.$member->getInstance();
 					}
-					$line .= ' (' . Member::$DEF_LEVEL[$member->getLevel()] . ')';
+					$line .= ' ('.Member::$DEF_LEVEL[$member->getLevel()].')';
 
 					if (!is_null($circle)) {
-						$line .= ' <info>Name</info>: ' . $circle->getName();
+						$line .= ' <info>Name</info>: '.$circle->getName();
 					}
 				}
 
 				if ($lineNumber === 2 && !is_null($circle)) {
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
 					$type =
 						implode(
 							", ", $this->modelManager->getCircleTypes($circle, ModelManager::TYPES_LONG)
 						);
-					$line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : ' <info>Config</info>: '.$type;
 				}
 
 			} else {
 				if ($lineNumber === 1 && !is_null($circle)) {
-					$line .= '<info>' . $circle->getId() . '</info>';
+					$line .= '<info>'.$circle->getId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
 				}
 			}