nextcloud / circles

lib/Model/Federated/RemoteInstance.php

Spacing +6 added lines, -6 removed lines

@@ -49,11 +49,11 @@ 
 
 	use TArrayTools;
 
-	const TYPE_UNKNOWN = 'Unknown';    // not trusted
-	const TYPE_PASSIVE = 'Passive';    // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
-	const TYPE_EXTERNAL = 'External';  // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
-	const TYPE_TRUSTED = 'Trusted';    // everything about Federated Circles are broadcasted.
-	const TYPE_GLOBAL_SCALE = 'GlobalScale';  // every Circle is broadcasted,
+	const TYPE_UNKNOWN = 'Unknown'; // not trusted
+	const TYPE_PASSIVE = 'Passive'; // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
+	const TYPE_EXTERNAL = 'External'; // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
+	const TYPE_TRUSTED = 'Trusted'; // everything about Federated Circles are broadcasted.
+	const TYPE_GLOBAL_SCALE = 'GlobalScale'; // every Circle is broadcasted,
 
 	const TEST = 'test';
 	const INCOMING = 'incoming';
@@ -399,7 +399,7 @@ 
 		];
 
 		if ($this->getAuthSigned() !== '') {
-			$data['auth-signed'] = $this->getAlgorithm() . ':' . $this->getAuthSigned();
+			$data['auth-signed'] = $this->getAlgorithm().':'.$this->getAuthSigned();
 		}
 
 		return array_filter(array_merge($data, parent::jsonSerialize()));

lib/Db/CoreQueryBuilder.php

Spacing +58 added lines, -58 removed lines

@@ -161,16 +161,16 @@ 
 		$this->generateMemberSelectAlias($alias, self::PREFIX_MEMBER)
 			 ->leftJoin(
 				 $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $alias,
-				 $expr->eq($alias . '.circle_id', $this->getDefaultSelectAlias() . '.unique_id')
+				 $expr->eq($alias.'.circle_id', $this->getDefaultSelectAlias().'.unique_id')
 			 );
 
 		// TODO: Check in big table if it is better to put condition in andWhere() or in LeftJoin()
 		$this->andWhere(
 			$expr->andX(
-				$expr->eq($alias . '.user_id', $this->createNamedParameter($member->getUserId())),
-				$expr->eq($alias . '.user_type', $this->createNamedParameter($member->getUserType())),
-				$expr->eq($alias . '.instance', $this->createNamedParameter($this->getInstance($member))),
-				$expr->gte($alias . '.level', $this->createNamedParameter($level))
+				$expr->eq($alias.'.user_id', $this->createNamedParameter($member->getUserId())),
+				$expr->eq($alias.'.user_type', $this->createNamedParameter($member->getUserType())),
+				$expr->eq($alias.'.instance', $this->createNamedParameter($this->getInstance($member))),
+				$expr->gte($alias.'.level', $this->createNamedParameter($level))
 			)
 		);
 	}
@@ -191,7 +191,7 @@ 
 			 ->leftJoin(
 				 $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_CIRCLE, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.unique_id', $this->getDefaultSelectAlias() . '.circle_id')
+					 $expr->eq($alias.'.unique_id', $this->getDefaultSelectAlias().'.circle_id')
 				 )
 			 );
 
@@ -221,8 +221,8 @@ 
 			 ->leftJoin(
 				 $circleTableAlias, CoreRequestBuilder::TABLE_MEMBER, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.circle_id', $circleTableAlias . '.unique_id'),
-					 $expr->eq($alias . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+					 $expr->eq($alias.'.circle_id', $circleTableAlias.'.unique_id'),
+					 $expr->eq($alias.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 				 )
 			 );
 	}
@@ -248,11 +248,11 @@ 
 			 ->leftJoin(
 				 $aliasCircle, CoreRequestBuilder::TABLE_MEMBER, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.circle_id', $aliasCircle . '.unique_id'),
-					 $expr->eq($alias . '.user_id', $this->createNamedParameter($initiator->getUserId())),
-					 $expr->eq($alias . '.user_type', $this->createNamedParameter($initiator->getUserType())),
+					 $expr->eq($alias.'.circle_id', $aliasCircle.'.unique_id'),
+					 $expr->eq($alias.'.user_id', $this->createNamedParameter($initiator->getUserId())),
+					 $expr->eq($alias.'.user_type', $this->createNamedParameter($initiator->getUserType())),
 					 $expr->eq(
-						 $alias . '.instance', $this->createNamedParameter($this->getInstance($initiator))
+						 $alias.'.instance', $this->createNamedParameter($this->getInstance($initiator))
 					 )
 				 )
 			 );
@@ -278,9 +278,9 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $alias,
 			$expr->andX(
-				$expr->eq($alias . '.circle_id', $aliasCircle . '.unique_id'),
-				$expr->eq($alias . '.instance', $this->createNamedParameter($instance)),
-				$expr->gte($alias . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->eq($alias.'.circle_id', $aliasCircle.'.unique_id'),
+				$expr->eq($alias.'.instance', $this->createNamedParameter($instance)),
+				$expr->gte($alias.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 	}
@@ -300,7 +300,7 @@ 
 		$expr = $this->expr();
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $alias,
-			$expr->eq($alias . '.instance', $this->createNamedParameter($instance))
+			$expr->eq($alias.'.instance', $this->createNamedParameter($instance))
 		);
 	}
 
@@ -319,15 +319,15 @@ 
 		// - 4 (Visible to everyone)
 		$orX = $expr->orX();
 		$orX->add(
-			$expr->andX($expr->gte($alias . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)))
+			$expr->andX($expr->gte($alias.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)))
 		);
 		$orX->add(
 			$expr->andX(
-				$expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_PERSONAL),
-				$expr->eq($alias . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+				$expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_PERSONAL),
+				$expr->eq($alias.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 			)
 		);
-		$orX->add($expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_VISIBLE));
+		$orX->add($expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_VISIBLE));
 		$this->andWhere($orX);
 
 
@@ -362,10 +362,10 @@ 
 		$expr = $this->expr();
 
 		$orHidden = $expr->orX();
-		$orHidden->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_SINGLE));
-		$orHidden->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_HIDDEN));
-		$orHidden->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_BACKEND));
-		$this->andWhere($this->createFunction('NOT') . $orHidden);
+		$orHidden->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_SINGLE));
+		$orHidden->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_HIDDEN));
+		$orHidden->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_BACKEND));
+		$this->andWhere($this->createFunction('NOT').$orHidden);
 	}
 
 
@@ -394,30 +394,30 @@ 
 
 		$orX = $expr->orX();
 		$orX->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBAL_SCALE))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBAL_SCALE))
 		);
 
 		$orExtOrPassive = $expr->orX();
 		$orExtOrPassive->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
 		);
 		if (!$sensitive) {
 			$orExtOrPassive->add(
-				$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+				$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 			);
 		} else {
 			if ($this->getDefaultSelectAlias() === 'm') {
 				$andPassive = $expr->andX();
 				$andPassive->add(
-					$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+					$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 				);
 				$orMemberOrLevel = $expr->orX();
 				$orMemberOrLevel->add(
-					$expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance')
+					$expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance')
 				);
 				$orMemberOrLevel->add(
 					$expr->eq(
-						$this->getDefaultSelectAlias() . '.level',
+						$this->getDefaultSelectAlias().'.level',
 						$this->createNamedParameter(Member::LEVEL_OWNER)
 					)
 				);
@@ -428,18 +428,18 @@ 
 
 		$andExternal = $expr->andX();
 		$andExternal->add($orExtOrPassive);
-		$andExternal->add($expr->isNotNull($aliasMembers . '.instance'));
+		$andExternal->add($expr->isNotNull($aliasMembers.'.instance'));
 
 		$orExtOrTrusted = $expr->orX();
 		$orExtOrTrusted->add($andExternal);
 		$orExtOrTrusted->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
 		);
 
 		$andTrusted = $expr->andX();
 		$andTrusted->add($orExtOrTrusted);
-		$andTrusted->add($expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_FEDERATED));
-		$andTrusted->add($expr->emptyString($aliasOwner . '.instance'));
+		$andTrusted->add($expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_FEDERATED));
+		$andTrusted->add($expr->emptyString($aliasOwner.'.instance'));
 		$orX->add($andTrusted);
 
 		$this->andWhere($orX);
@@ -450,7 +450,7 @@ 
 	 * @param int $flag
 	 */
 	public function filterConfig(int $flag): void {
-		$this->andWhere($this->expr()->bitwiseAnd($this->getDefaultSelectAlias() . '.config', $flag));
+		$this->andWhere($this->expr()->bitwiseAnd($this->getDefaultSelectAlias().'.config', $flag));
 	}
 
 
@@ -461,15 +461,15 @@ 
 	 * @return $this
 	 */
 	private function generateCircleSelectAlias(string $alias, string $prefix): self {
-		$this->selectAlias($alias . '.unique_id', $prefix . 'unique_id')
-			 ->selectAlias($alias . '.name', $prefix . 'name')
-			 ->selectAlias($alias . '.alt_name', $prefix . 'alt_name')
-			 ->selectAlias($alias . '.description', $prefix . 'description')
-			 ->selectAlias($alias . '.settings', $prefix . 'settings')
-			 ->selectAlias($alias . '.config', $prefix . 'config')
-			 ->selectAlias($alias . '.contact_addressbook', $prefix . 'contact_addressbook')
-			 ->selectAlias($alias . '.contact_groupname', $prefix . 'contact_groupname')
-			 ->selectAlias($alias . '.creation', $prefix . 'creation');
+		$this->selectAlias($alias.'.unique_id', $prefix.'unique_id')
+			 ->selectAlias($alias.'.name', $prefix.'name')
+			 ->selectAlias($alias.'.alt_name', $prefix.'alt_name')
+			 ->selectAlias($alias.'.description', $prefix.'description')
+			 ->selectAlias($alias.'.settings', $prefix.'settings')
+			 ->selectAlias($alias.'.config', $prefix.'config')
+			 ->selectAlias($alias.'.contact_addressbook', $prefix.'contact_addressbook')
+			 ->selectAlias($alias.'.contact_groupname', $prefix.'contact_groupname')
+			 ->selectAlias($alias.'.creation', $prefix.'creation');
 
 		return $this;
 	}
@@ -481,20 +481,20 @@ 
 	 * @return $this
 	 */
 	private function generateMemberSelectAlias(string $alias, string $prefix): self {
-		$this->selectAlias($alias . '.circle_id', $prefix . 'circle_id')
-			 ->selectAlias($alias . '.single_id', $prefix . 'single_id')
-			 ->selectAlias($alias . '.user_id', $prefix . 'user_id')
-			 ->selectAlias($alias . '.user_type', $prefix . 'user_type')
-			 ->selectAlias($alias . '.member_id', $prefix . 'member_id')
-			 ->selectAlias($alias . '.instance', $prefix . 'instance')
-			 ->selectAlias($alias . '.cached_name', $prefix . 'cached_name')
-			 ->selectAlias($alias . '.cached_update', $prefix . 'cached_update')
-			 ->selectAlias($alias . '.status', $prefix . 'status')
-			 ->selectAlias($alias . '.level', $prefix . 'level')
-			 ->selectAlias($alias . '.note', $prefix . 'note')
-			 ->selectAlias($alias . '.contact_id', $prefix . 'contact_id')
-			 ->selectAlias($alias . '.contact_meta', $prefix . 'contact_meta')
-			 ->selectAlias($alias . '.joined', $prefix . 'joined');
+		$this->selectAlias($alias.'.circle_id', $prefix.'circle_id')
+			 ->selectAlias($alias.'.single_id', $prefix.'single_id')
+			 ->selectAlias($alias.'.user_id', $prefix.'user_id')
+			 ->selectAlias($alias.'.user_type', $prefix.'user_type')
+			 ->selectAlias($alias.'.member_id', $prefix.'member_id')
+			 ->selectAlias($alias.'.instance', $prefix.'instance')
+			 ->selectAlias($alias.'.cached_name', $prefix.'cached_name')
+			 ->selectAlias($alias.'.cached_update', $prefix.'cached_update')
+			 ->selectAlias($alias.'.status', $prefix.'status')
+			 ->selectAlias($alias.'.level', $prefix.'level')
+			 ->selectAlias($alias.'.note', $prefix.'note')
+			 ->selectAlias($alias.'.contact_id', $prefix.'contact_id')
+			 ->selectAlias($alias.'.contact_meta', $prefix.'contact_meta')
+			 ->selectAlias($alias.'.joined', $prefix.'joined');
 
 		return $this;
 	}

lib/Service/CircleService.php

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 	 * @param string $name
 	 * @param FederatedUser|null $owner
 	 *
-	 * @return Circle
+	 * @return SimpleDataStore
 	 * @throws FederatedEventException
 	 * @throws InitiatorNotConfirmedException
 	 * @throws InitiatorNotFoundException

lib/Model/Member.php

Spacing +18 added lines, -18 removed lines

@@ -549,29 +549,29 @@ 
 	 * @throws MemberNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
-		if (!array_key_exists($prefix . 'member_id', $data)) {
+		if (!array_key_exists($prefix.'member_id', $data)) {
 			throw new MemberNotFoundException();
 		}
 
-		$this->setId($this->get($prefix . 'member_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setUserId($this->get($prefix . 'user_id', $data));
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setLevel($this->getInt($prefix . 'level', $data));
-		$this->setStatus($this->get($prefix . 'status', $data));
-		$this->setCachedName($this->get($prefix . 'cached_name', $data));
-		$this->setNote($this->get($prefix . 'note', $data));
-		$this->setContactId($this->get($prefix . 'contact_id', $data));
-		$this->setContactMeta($this->get($prefix . 'contact_meta', $data));
-
-		$cachedUpdate = $this->get($prefix . 'cached_update', $data);
+		$this->setId($this->get($prefix.'member_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setUserId($this->get($prefix.'user_id', $data));
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setLevel($this->getInt($prefix.'level', $data));
+		$this->setStatus($this->get($prefix.'status', $data));
+		$this->setCachedName($this->get($prefix.'cached_name', $data));
+		$this->setNote($this->get($prefix.'note', $data));
+		$this->setContactId($this->get($prefix.'contact_id', $data));
+		$this->setContactMeta($this->get($prefix.'contact_meta', $data));
+
+		$cachedUpdate = $this->get($prefix.'cached_update', $data);
 		if ($cachedUpdate !== '') {
 			$this->setCachedUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp());
 		}
 
-		$joined = $this->get($prefix . 'joined', $data);
+		$joined = $this->get($prefix.'joined', $data);
 		if ($joined !== '') {
 			$this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp());
 		}
@@ -600,7 +600,7 @@ 
 
 		if (!$level) {
 			$all = implode(', ', array_values(self::$DEF_LEVEL));
-			throw new MemberLevelException('Available levels: ' . $all);
+			throw new MemberLevelException('Available levels: '.$all);
 		}
 
 		return (int)$level;
@@ -618,7 +618,7 @@ 
 
 		if (!$type) {
 			$all = implode(', ', array_values(self::$DEF_TYPE));
-			throw new UserTypeNotFoundException('Available types: ' . $all);
+			throw new UserTypeNotFoundException('Available types: '.$all);
 		}
 
 		return (int)$type;

lib/Command/CirclesCreate.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 		$owner = $this->federatedUserService->getLocalFederatedUser($ownerId);
 		$outcome = $this->circleService->create($name, $owner);
 
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
 
 		return 0;
 	}

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;