nextcloud / circles

lib/Service/ActivityService.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 		$event->setSubject('circle_create', ['circle' => json_encode($circle)]);
 
 		$this->userManager->callForSeenUsers(
-			function ($user) use ($event) {
+			function($user) use ($event) {
 				/** @var IUser $user */
 				$this->publishEvent($event, [$user]);
 			}

lib/Service/SyncService.php

Spacing +4 added lines, -4 removed lines

@@ -246,7 +246,7 @@ 
 	 * @throws SingleCircleNotFoundException
 	 */
 	public function syncNextcloudUser(string $userId): FederatedUser {
-		$this->outputService->output('Syncing Nextcloud Account \'' . $userId . '\'', true);
+		$this->outputService->output('Syncing Nextcloud Account \''.$userId.'\'', true);
 
 		return $this->federatedUserService->getLocalFederatedUser($userId, false, true);
 	}
@@ -290,10 +290,10 @@ 
 	 * @throws RequestBuilderException
 	 */
 	public function syncNextcloudGroup(string $groupId): Circle {
-		$this->outputService->output('Syncing Nextcloud Group \'' . $groupId . '\'', true);
+		$this->outputService->output('Syncing Nextcloud Group \''.$groupId.'\'', true);
 
 		$circle = $this->federatedUserService->getGroupCircle($groupId);
-		$members = array_map(function (Member $member): string {
+		$members = array_map(function(Member $member): string {
 			return $member->getSingleId();
 		}, $this->memberRequest->getMembers($circle->getSingleId()));
 
@@ -371,7 +371,7 @@ 
 	 */
 	public function groupDeleted(string $groupId): void {
 		$circle = new Circle();
-		$circle->setName('group:' . $groupId)
+		$circle->setName('group:'.$groupId)
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
 			   ->setSource(Member::TYPE_GROUP);
 

lib/Service/FederatedUserService.php

Spacing +5 added lines, -5 removed lines

@@ -528,7 +528,7 @@ 
 		if ($check) {
 			$user = $this->userManager->get($userId);
 			if ($user === null) {
-				throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
+				throw new FederatedUserNotFoundException('user '.$userId.' not found');
 			}
 			$displayName = $this->userManager->getDisplayName($userId);
 		} else {
@@ -1043,7 +1043,7 @@ 
 			$prefix = ($federatedUser->getUserType() === Member::TYPE_APP) ? 'app'
 				: Member::$TYPE[$federatedUser->getUserType()];
 
-			$circle->setName($prefix . ':' . $federatedUser->getUserId() . ':' . $id)
+			$circle->setName($prefix.':'.$federatedUser->getUserId().':'.$id)
 				   ->setDisplayName($federatedUser->getDisplayName())
 				   ->setSingleId($id)
 				   ->setSource($source);
@@ -1247,7 +1247,7 @@ 
 		$owner = $this->getCurrentApp();
 
 		$circle = new Circle();
-		$circle->setName('group:' . $groupId)
+		$circle->setName('group:'.$groupId)
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
 			   ->setSingleId($this->token(ManagedModel::ID_LENGTH))
 			   ->setSource(Member::TYPE_GROUP);
@@ -1315,8 +1315,8 @@ 
 	 * @return string
 	 */
 	private function generateCacheKey(FederatedUser $federatedUser): string {
-		return $federatedUser->getInstance() . '#'
-			   . $federatedUser->getUserType() . '#'
+		return $federatedUser->getInstance().'#'
+			   . $federatedUser->getUserType().'#'
 			   . $federatedUser->getUserId();
 	}
 }

lib/Db/CircleRequest.php

Spacing +2 added lines, -2 removed lines

@@ -184,8 +184,8 @@
 		$qb->filterCircles(CoreQueryBuilder::CIRCLE, $probe);
 		if (!is_null($initiator)) {
 			$qb->limitToInitiator(CoreQueryBuilder::CIRCLE, $initiator);
-			$qb->orderBy($qb->generateAlias(CoreQueryBuilder::CIRCLE, CoreQueryBuilder::INITIATOR) . '.level', 'desc');
-			$qb->addOrderBy(CoreQueryBuilder::CIRCLE . '.display_name', 'asc');
+			$qb->orderBy($qb->generateAlias(CoreQueryBuilder::CIRCLE, CoreQueryBuilder::INITIATOR).'.level', 'desc');
+			$qb->addOrderBy(CoreQueryBuilder::CIRCLE.'.display_name', 'asc');
 		}
 		if ($probe->hasFilterMember()) {
 			$qb->limitToDirectMembership(CoreQueryBuilder::CIRCLE, $probe->getFilterMember());

lib/Model/Circle.php

Spacing +35 added lines, -35 removed lines

@@ -90,27 +90,27 @@ 
 	public const FLAGS_LONG = 2;
 
 	// specific value
-	public const CFG_CIRCLE = 0;        // only for code readability. Circle is locked by default.
-	public const CFG_SINGLE = 1;        // Circle with only one single member.
-	public const CFG_PERSONAL = 2;      // Personal circle, only the owner can see it.
+	public const CFG_CIRCLE = 0; // only for code readability. Circle is locked by default.
+	public const CFG_SINGLE = 1; // Circle with only one single member.
+	public const CFG_PERSONAL = 2; // Personal circle, only the owner can see it.
 
 	// bitwise
-	public const CFG_SYSTEM = 4;            // System Circle (not managed by the official front-end). Meaning some config are limited
-	public const CFG_VISIBLE = 8;           // Visible to everyone, if not visible, people have to know its name to be able to find it
-	public const CFG_OPEN = 16;             // Circle is open, people can join
-	public const CFG_INVITE = 32;           // Adding a member generate an invitation that needs to be accepted
-	public const CFG_REQUEST = 64;          // Request to join Circles needs to be confirmed by a moderator
-	public const CFG_FRIEND = 128;          // Members of the circle can invite their friends
-	public const CFG_PROTECTED = 256;       // Password protected to join/request
-	public const CFG_NO_OWNER = 512;        // no owner, only members
-	public const CFG_HIDDEN = 1024;         // hidden from listing, but available as a share entity
-	public const CFG_BACKEND = 2048;            // Fully hidden, only backend Circles
-	public const CFG_LOCAL = 4096;              // Local even on GlobalScale
-	public const CFG_ROOT = 8192;               // Circle cannot be inside another Circle
-	public const CFG_CIRCLE_INVITE = 16384;     // Circle must confirm when invited in another circle
-	public const CFG_FEDERATED = 32768;         // Federated
-	public const CFG_MOUNTPOINT = 65536;        // Generate a Files folder for this Circle
-	public const CFG_APP = 131072;          // Some features are not available to the OCS API (ie. destroying Circle)
+	public const CFG_SYSTEM = 4; // System Circle (not managed by the official front-end). Meaning some config are limited
+	public const CFG_VISIBLE = 8; // Visible to everyone, if not visible, people have to know its name to be able to find it
+	public const CFG_OPEN = 16; // Circle is open, people can join
+	public const CFG_INVITE = 32; // Adding a member generate an invitation that needs to be accepted
+	public const CFG_REQUEST = 64; // Request to join Circles needs to be confirmed by a moderator
+	public const CFG_FRIEND = 128; // Members of the circle can invite their friends
+	public const CFG_PROTECTED = 256; // Password protected to join/request
+	public const CFG_NO_OWNER = 512; // no owner, only members
+	public const CFG_HIDDEN = 1024; // hidden from listing, but available as a share entity
+	public const CFG_BACKEND = 2048; // Fully hidden, only backend Circles
+	public const CFG_LOCAL = 4096; // Local even on GlobalScale
+	public const CFG_ROOT = 8192; // Circle cannot be inside another Circle
+	public const CFG_CIRCLE_INVITE = 16384; // Circle must confirm when invited in another circle
+	public const CFG_FEDERATED = 32768; // Federated
+	public const CFG_MOUNTPOINT = 65536; // Generate a Files folder for this Circle
+	public const CFG_APP = 131072; // Some features are not available to the OCS API (ie. destroying Circle)
 	public static $DEF_CFG_MAX = 262143;
 
 
@@ -479,7 +479,7 @@ 
 	 */
 	public function addInheritedMembers(array $members): self {
 		$knownIds = array_map(
-			function (Member $member): string {
+			function(Member $member): string {
 				return $member->getId();
 			}, $this->inheritedMembers
 		);
@@ -893,25 +893,25 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'unique_id', $data) === '') {
+		if ($this->get($prefix.'unique_id', $data) === '') {
 			throw new CircleNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'unique_id', $data))
-			 ->setName($this->get($prefix . 'name', $data))
-			 ->setDisplayName($this->get($prefix . 'display_name', $data))
-			 ->setSanitizedName($this->get($prefix . 'sanitized_name', $data))
-			 ->setConfig($this->getInt($prefix . 'config', $data))
-			 ->setSource($this->getInt($prefix . 'source', $data))
-			 ->setInstance($this->get($prefix . 'instance', $data))
-			 ->setSettings($this->getArray($prefix . 'settings', $data))
-			 ->setContactAddressBook($this->getInt($prefix . 'contact_addressbook', $data))
-			 ->setContactGroupName($this->get($prefix . 'contact_groupname', $data))
-			 ->setDescription($this->get($prefix . 'description', $data));
-
-		$creation = $this->get($prefix . 'creation', $data);
+		$this->setSingleId($this->get($prefix.'unique_id', $data))
+			 ->setName($this->get($prefix.'name', $data))
+			 ->setDisplayName($this->get($prefix.'display_name', $data))
+			 ->setSanitizedName($this->get($prefix.'sanitized_name', $data))
+			 ->setConfig($this->getInt($prefix.'config', $data))
+			 ->setSource($this->getInt($prefix.'source', $data))
+			 ->setInstance($this->get($prefix.'instance', $data))
+			 ->setSettings($this->getArray($prefix.'settings', $data))
+			 ->setContactAddressBook($this->getInt($prefix.'contact_addressbook', $data))
+			 ->setContactGroupName($this->get($prefix.'contact_groupname', $data))
+			 ->setDescription($this->get($prefix.'description', $data));
+
+		$creation = $this->get($prefix.'creation', $data);
 		$dateTime = DateTime::createFromFormat('Y-m-d H:i:s', $creation);
-		$timestamp = $dateTime ? $dateTime->getTimestamp() : (int) strtotime($creation);
+		$timestamp = $dateTime ? $dateTime->getTimestamp() : (int)strtotime($creation);
 		$this->setCreation($timestamp);
 
 		$this->setPopulation($this->getInt('population', $this->getSettings()));

lib/Db/CoreQueryBuilder.php

Spacing +83 added lines, -83 removed lines

@@ -398,8 +398,8 @@ 
 			foreach (explode(' ', $circle->getDisplayName()) as $word) {
 				$andX->add(
 					$expr->iLike(
-						$this->getDefaultSelectAlias() . '.' . 'display_name',
-						$this->createNamedParameter('%' . $word . '%')
+						$this->getDefaultSelectAlias().'.'.'display_name',
+						$this->createNamedParameter('%'.$word.'%')
 					)
 				);
 			}
@@ -430,7 +430,7 @@ 
 			$this->generateRemoteInstanceSelectAlias($aliasRemoteInstance)
 				 ->leftJoin(
 				 	$alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance,
-				 	$expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance')
+				 	$expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance')
 				 );
 		} catch (RequestBuilderException $e) {
 		}
@@ -482,7 +482,7 @@ 
 		$expr = $this->expr();
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote,
-			$expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance()))
+			$expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance()))
 		);
 	}
 
@@ -510,12 +510,12 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember,
 			$expr->andX(
-				$expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'),
+				$expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'),
 				$expr->eq(
-					$aliasRemoteMember . '.instance',
+					$aliasRemoteMember.'.instance',
 					$this->createNamedParameter($remoteInstance->getInstance())
 				),
-				$expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 	}
@@ -547,21 +547,21 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle,
 			$expr->andX(
-				$expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'),
-				$expr->emptyString($aliasRemoteCircle . '.instance'),
-				$expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'),
+				$expr->emptyString($aliasRemoteCircle.'.instance'),
+				$expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner,
 			$expr->andX(
-				$expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'),
+				$expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'),
 				$expr->eq(
-					$aliasRemoteCircleOwner . '.instance',
+					$aliasRemoteCircleOwner.'.instance',
 					$this->createNamedParameter($remoteInstance->getInstance())
 				),
 				$expr->eq(
-					$aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)
+					$aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)
 				)
 			)
 		);
@@ -594,16 +594,16 @@ 
 		$expr = $this->expr();
 		$orX = $expr->orX();
 		$orX->add(
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
 		);
 
 		$orExtOrPassive = $expr->orX();
 		$orExtOrPassive->add(
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
 		);
 		if (!$sensitive) {
 			$orExtOrPassive->add(
-				$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+				$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 			);
 		} else {
 			if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) {
@@ -612,8 +612,8 @@ 
 		}
 
 		$orInstance = $expr->orX();
-		$orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance'));
-		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance'));
+		$orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance'));
+		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance'));
 
 		$andExternal = $expr->andX();
 		$andExternal->add($orExtOrPassive);
@@ -622,13 +622,13 @@ 
 		$orExtOrTrusted = $expr->orX();
 		$orExtOrTrusted->add($andExternal);
 		$orExtOrTrusted->add(
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
 		);
 
 		$andTrusted = $expr->andX();
 		$andTrusted->add($orExtOrTrusted);
 		$andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle));
-		$andTrusted->add($expr->emptyString($aliasOwner . '.instance'));
+		$andTrusted->add($expr->emptyString($aliasOwner.'.instance'));
 		$orX->add($andTrusted);
 
 		$this->andWhere($orX);
@@ -655,7 +655,7 @@ 
 		}
 		$this->innerJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
-			$expr->eq($aliasMember . '.circle_id', $alias . '.unique_id')
+			$expr->eq($aliasMember.'.circle_id', $alias.'.unique_id')
 		);
 
 		$this->filterDirectMembership($aliasMember, $member);
@@ -680,12 +680,12 @@ 
 			$aliasCircle,
 			'circles_membership',
 			$aliasMembership,
-			$this->expr()->eq($aliasCircle . '.unique_id', $aliasMembership . '.circle_id')
+			$this->expr()->eq($aliasCircle.'.unique_id', $aliasMembership.'.circle_id')
 		);
 
 		$this->andWhere(
 			$this->expr()->eq(
-				$aliasMembership . '.single_id',
+				$aliasMembership.'.single_id',
 				$this->createNamedParameter($federatedUser->getSingleId())
 			)
 		);
@@ -706,19 +706,19 @@ 
 
 		if ($member->getUserId() !== '') {
 			$andX->add(
-				$expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId()))
+				$expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId()))
 			);
 		}
 
 		if ($member->getSingleId() !== '') {
 			$andX->add(
-				$expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId()))
+				$expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId()))
 			);
 		}
 
 		if ($member->getUserType() > 0) {
 			$andX->add(
-				$expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType()))
+				$expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType()))
 			);
 		}
 
@@ -727,7 +727,7 @@ 
 		if ($member->getLevel() > 0) {
 			$andX->add(
 				$expr->gte(
-					$aliasMember . '.level',
+					$aliasMember.'.level',
 					$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -768,7 +768,7 @@ 
 			$helperAlias,
 			CoreRequestBuilder::TABLE_CIRCLE,
 			$aliasCircle,
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
 		);
 
 		if (!is_null($initiator)) {
@@ -799,7 +799,7 @@ 
 		$this->generateCircleSelectAlias($aliasInvitedBy)
 			 ->leftJoin(
 			 	$aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy,
-			 	$expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id')
+			 	$expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id')
 			 );
 
 		$this->leftJoinOwner($aliasInvitedBy);
@@ -830,7 +830,7 @@ 
 		$this->generateCircleSelectAlias($aliasBasedOn)
 			 ->leftJoin(
 			 	$aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn,
-			 	$expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id')
+			 	$expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id')
 			 );
 
 		if (!is_null($initiator)) {
@@ -863,9 +863,9 @@ 
 			 ->leftJoin(
 			 	$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
 			 	$expr->andX(
-			 		$expr->eq($aliasMember . '.circle_id', $alias . '.' . $field),
+			 		$expr->eq($aliasMember.'.circle_id', $alias.'.'.$field),
 			 		$expr->eq(
-			 			$aliasMember . '.level',
+			 			$aliasMember.'.level',
 			 			$this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT)
 			 		)
 			 	)
@@ -897,7 +897,7 @@ 
 
 		$expr = $this->expr();
 
-		$on = $expr->andX($expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field));
+		$on = $expr->andX($expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field));
 
 		// limit on membership level if requested
 		$minLevel = $probe->getMinimumLevel();
@@ -938,8 +938,8 @@ 
 			 ->leftJoin(
 			 	$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
 			 	$expr->andX(
-			 		$expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId),
-			 		$expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId),
+			 		$expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId),
+			 		$expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId),
 			 		$this->exprGt('level', Member::LEVEL_MEMBER, true, $aliasMember)
 			 	)
 			 );
@@ -971,7 +971,7 @@ 
 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
-			$expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field)
+			$expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field)
 		);
 
 		//		if (!$this->getBool('getData', $options, false)) {
@@ -985,8 +985,8 @@ 
 			 ->leftJoin(
 			 	$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
 			 	$expr->andX(
-			 		$expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'),
-			 		$expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id')
+			 		$expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'),
+			 		$expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id')
 			 	)
 			 );
 
@@ -1003,12 +1003,12 @@ 
 		$aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options);
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership,
-			$expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId))
+			$expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId))
 		);
 
 		$orX = $expr->orX(
-			$expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field),
-			$expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId))
+			$expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field),
+			$expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId))
 		);
 
 		$this->andWhere($orX);
@@ -1029,11 +1029,11 @@ 
 
 		$expr = $this->expr();
 		$aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS);
-		$this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId)));
+		$this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId)));
 		if ($level > 1) {
 			$this->andWhere(
 				$expr->gte(
-					$aliasMembership . '.level',
+					$aliasMembership.'.level',
 					$this->createNamedParameter($level, IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -1061,8 +1061,8 @@ 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
 			$expr->andX(
-				$expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field),
-				$expr->eq($aliasMembership . '.single_id', $alias . '.single_id')
+				$expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field),
+				$expr->eq($aliasMembership.'.single_id', $alias.'.single_id')
 			)
 		);
 
@@ -1075,8 +1075,8 @@ 
 			 ->leftJoin(
 			 	$aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom,
 			 	$expr->andX(
-			 		$expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'),
-			 		$expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id')
+			 		$expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'),
+			 		$expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id')
 			 	)
 			 );
 	}
@@ -1116,7 +1116,7 @@ 
 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken,
-			$expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field)
+			$expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field)
 		);
 	}
 
@@ -1158,14 +1158,14 @@ 
 		try {
 			$aliasConfig = $this->generateAlias($alias, self::CONFIG, $options);
 			$this->selectAlias(
-				$aliasConfig . '.config',
-				(($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'circle_config'
+				$aliasConfig.'.config',
+				(($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'circle_config'
 			);
 			$this->leftJoin(
 				$alias,
 				CoreRequestBuilder::TABLE_CIRCLE,
 				$aliasConfig,
-				$expr->eq($alias . '.circle_id', $aliasConfig . '.unique_id')
+				$expr->eq($alias.'.circle_id', $aliasConfig.'.unique_id')
 			);
 		} catch (RequestBuilderException $e) {
 		}
@@ -1203,7 +1203,7 @@ 
 			$aliasMembership,
 			$expr->andX(
 				$this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership),
-				$expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field)
+				$expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field)
 			)
 		);
 
@@ -1222,11 +1222,11 @@ 
 			$aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options);
 			$orXMembershipCircle = $expr->orX();
 			array_map(
-				function (string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) {
+				function(string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) {
 					$orXMembershipCircle->add(
 						$this->expr()->eq(
-							$alias . '.circle_id',
-							$aliasMembershipCircle . '.unique_id'
+							$alias.'.circle_id',
+							$aliasMembershipCircle.'.unique_id'
 						)
 					);
 				},
@@ -1258,7 +1258,7 @@ 
 					 	$aliasDirectInitiator,
 					 	$expr->andX(
 					 		$this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator),
-					 		$expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field)
+					 		$expr->eq($aliasDirectInitiator.'.circle_id', $helperAlias.'.'.$field)
 					 	)
 					 );
 			} catch (RequestBuilderException $e) {
@@ -1272,8 +1272,8 @@ 
 			$this->leftJoin(
 				$aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
 				$expr->andX(
-					$expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'),
-					$expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id')
+					$expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'),
+					$expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id')
 				)
 			);
 
@@ -1281,8 +1281,8 @@ 
 			$this->leftJoin(
 				$aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
 				$expr->andX(
-					$expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'),
-					$expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id')
+					$expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'),
+					$expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id')
 				)
 			);
 
@@ -1327,7 +1327,7 @@ 
 			 ->leftJoin(
 			 	$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
 			 	$expr->andX(
-			 		$expr->eq($aliasInitiator . '.circle_id', $helperAlias . '.' . $field),
+			 		$expr->eq($aliasInitiator.'.circle_id', $helperAlias.'.'.$field),
 			 		$this->exprLimitInt('level', Member::LEVEL_OWNER, $aliasInitiator)
 			 	)
 			 );
@@ -1365,7 +1365,7 @@ 
 			$orX->add(
 				$expr->andX(
 					$this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle),
-					$expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+					$expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 				)
 			);
 		}
@@ -1375,10 +1375,10 @@ 
 		$orXLevelCheck = $expr->orX();
 
 		array_map(
-			function (string $alias) use ($orXLevelCheck, $minimumLevel) {
+			function(string $alias) use ($orXLevelCheck, $minimumLevel) {
 				$orXLevelCheck->add(
 					$this->expr()->gte(
-						$alias . '.level',
+						$alias.'.level',
 						$this->createNamedParameter($minimumLevel, self::PARAM_INT)
 					)
 				);
@@ -1459,21 +1459,21 @@ 
 		$expr = $this->expr();
 		$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')
 		);
 		// TODO: do we need this ? (display members from the local instance)
 		$orMemberOrLevel->add(
-			$expr->emptyString($this->getDefaultSelectAlias() . '.instance')
+			$expr->emptyString($this->getDefaultSelectAlias().'.instance')
 		);
 
 		$orMemberOrLevel->add(
 			$expr->eq(
-				$this->getDefaultSelectAlias() . '.level',
+				$this->getDefaultSelectAlias().'.level',
 				$this->createNamedParameter(Member::LEVEL_OWNER)
 			)
 		);
@@ -1510,11 +1510,11 @@ 
 			 )
 			 ->leftJoin(
 			 	$aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache,
-			 	$expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid')
+			 	$expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid')
 			 )
 			 ->leftJoin(
 			 	$aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages,
-			 	$expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id')
+			 	$expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id')
 			 );
 	}
 
@@ -1536,8 +1536,8 @@ 
 		$this->leftJoin(
 			$aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild,
 			$expr->andX(
-				$expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'),
-				$expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id')
+				$expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'),
+				$expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id')
 			)
 		);
 
@@ -1595,13 +1595,13 @@ 
 		$this->leftJoin(
 			$aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint,
 			$expr->andX(
-				$expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'),
-				$expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id')
+				$expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'),
+				$expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id')
 			)
 		);
 
-		$this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint');
-		$this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash');
+		$this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint');
+		$this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash');
 	}
 
 
@@ -1709,10 +1709,10 @@ 
 	 */
 	public function generateAlias(string $base, string $extension, ?array &$options = []): string {
 		$search = str_replace('_', '.', $base);
-		$path = $search . '.' . $extension;
+		$path = $search.'.'.$extension;
 		if (!$this->validKey($path, $this->getSqlPath())
 			&& !in_array($extension, $this->getArray($search, $this->getSqlPath()))) {
-			throw new RequestBuilderException($extension . ' not found in ' . $search);
+			throw new RequestBuilderException($extension.' not found in '.$search);
 		}
 
 		if (!is_array($options)) {
@@ -1721,15 +1721,15 @@ 
 
 		$optionPath = '';
 		foreach (explode('.', $path) as $p) {
-			$optionPath = trim($optionPath . '.' . $p, '.');
+			$optionPath = trim($optionPath.'.'.$p, '.');
 			$options = array_merge(
 				$options,
-				$this->getArray($optionPath . '.' . self::OPTIONS, $this->getSqlPath()),
-				$this->getArray($optionPath . '.' . self::OPTIONS, $this->options)
+				$this->getArray($optionPath.'.'.self::OPTIONS, $this->getSqlPath()),
+				$this->getArray($optionPath.'.'.self::OPTIONS, $this->options)
 			);
 		}
 
-		return $base . '_' . $extension;
+		return $base.'_'.$extension;
 	}
 
 
@@ -1749,7 +1749,7 @@ 
 			} else {
 				$k = $arr;
 			}
-			$path[$k] = $prefix . '_' . $k . '_';
+			$path[$k] = $prefix.'_'.$k.'_';
 		}
 
 		return $path;

lib/Command/MembersAdd.php

Spacing +2 added lines, -2 removed lines

@@ -129,7 +129,7 @@ 
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
 				);
 			}
 
@@ -189,7 +189,7 @@ 
 				$instance = $host;
 			}
 
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
 		}
 
 		//		if ($userId === '') {

lib/Command/CirclesMemberships.php

Spacing +20 added lines, -20 removed lines

@@ -212,10 +212,10 @@ 
 		//			return 0;
 		//		}
 
-		$output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>');
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
-		$output->writeln('Type: <info>' . Member::$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::$TYPE[$federatedUser->getUserType()].'</info>');
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
 
 		$output->writeln('');
 		$output->writeln('Memberships:');
@@ -224,14 +224,14 @@ 
 		if ($count === 0) {
 			$output->writeln('(database not updated)');
 		} else {
-			$output->writeln('(' . $count . ' entries generated/updated in the database)');
+			$output->writeln('('.$count.' entries generated/updated in the database)');
 		}
 
 		foreach ($federatedUser->getMemberships() as $membership) {
 			$this->memberships[$membership->getCircleId()] = $membership;
 			$output->writeln(
-				'- <info>' . $membership->getCircleId() . '</info> ('
-				. Member::$DEF_LEVEL[$membership->getLevel()] . ')'
+				'- <info>'.$membership->getCircleId().'</info> ('
+				. Member::$DEF_LEVEL[$membership->getLevel()].')'
 			);
 		}
 
@@ -305,9 +305,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;
@@ -319,28 +319,28 @@ 
 				$circle = $member->getCircle();
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
+					$line .= '<info>'.$circle->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
-					$line .= ' (' . ($this->input->getOption('display-name') ?
-							$circle->getDisplayName() : $circle->getName()) . ')';
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
+					$line .= ' ('.($this->input->getOption('display-name') ?
+							$circle->getDisplayName() : $circle->getName()).')';
+					$line .= ' <info>MemberId</info>: '.$member->getId();
+					$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().' ';
 					if ($owner->hasBasedOn()) {
-						$line .= '(' . Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()] . ') ';
+						$line .= '('.Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()].') ';
 					}
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
 				}
 
 				return $line;
@@ -399,6 +399,6 @@ 
 			);
 		}
 
-		$output->writeln($count . ' memberships updated');
+		$output->writeln($count.' memberships updated');
 	}
 }

lib/Command/CirclesTest.php

Spacing +66 added lines, -66 removed lines

@@ -203,7 +203,7 @@ 
 
 		// get the singleId of a Group
 		$federatedUser = $circlesManager->getFederatedUser('testGroup', Member::TYPE_GROUP);
-		echo 'singleId: ' . $federatedUser->getSingleId() . "\n";
+		echo 'singleId: '.$federatedUser->getSingleId()."\n";
 
 		//		$federatedUser->getMemberships();
 
@@ -242,8 +242,8 @@ 
 
 
 		$members = array_map(
-			function (Member $member): string {
-				return $member->getUserId() . ' ' . $member->getSingleId() . '   - ' . $member->getUserType();
+			function(Member $member): string {
+				return $member->getUserId().' '.$member->getSingleId().'   - '.$member->getUserType();
 			}, $circle->getInheritedMembers()
 		);
 
@@ -329,7 +329,7 @@ 
 			} catch (Exception $e) {
 				if ($this->pOn) {
 					$message = ($e->getMessage() !== '') ? $e->getMessage() : get_class($e);
-					$this->output->writeln('<error>' . $message . '</error>');
+					$this->output->writeln('<error>'.$message.'</error>');
 				} else {
 					throw $e;
 				}
@@ -413,7 +413,7 @@ 
 	 */
 	private function loadConfiguration() {
 		$this->p('Loading configuration');
-		$configuration = file_get_contents(__DIR__ . '/../../testConfiguration.json');
+		$configuration = file_get_contents(__DIR__.'/../../testConfiguration.json');
 		$this->config = json_decode($configuration, true);
 		$this->r(true, 'testConfiguration.json');
 
@@ -446,22 +446,22 @@ 
 		$this->r();
 
 		foreach ($this->getInstances() as $instance) {
-			$this->p('Creating users on ' . $instance);
+			$this->p('Creating users on '.$instance);
 			foreach ($this->getConfigArray($instance, 'users') as $userId) {
 				$this->pm($userId);
 				$this->occ(
-					$instance, 'user:add --password-from-env ' . $userId, false, false,
+					$instance, 'user:add --password-from-env '.$userId, false, false,
 					['OC_PASS' => 'testtest']
 				);
 			}
 			$this->r();
 
 			foreach ($this->getConfigArray($instance, 'groups') as $groupId => $users) {
-				$this->p('Creating group <info>' . $groupId . '</info> on <info>' . $instance . '</info>');
-				$this->occ($instance, 'group:add ' . $groupId, false, false);
+				$this->p('Creating group <info>'.$groupId.'</info> on <info>'.$instance.'</info>');
+				$this->occ($instance, 'group:add '.$groupId, false, false);
 				foreach ($users as $userId) {
 					$this->pm($userId);
-					$this->occ($instance, 'group:adduser ' . $groupId . ' ' . $userId, true, false);
+					$this->occ($instance, 'group:adduser '.$groupId.' '.$userId, true, false);
 				}
 				$this->r();
 			}
@@ -495,7 +495,7 @@ 
 		foreach ($this->getInstances(true) as $instance) {
 			$this->pm($instance);
 			foreach ($this->getConfigArray($instance, 'config') as $k => $v) {
-				$this->occ($instance, 'config:app:set --value ' . $v . ' circles ' . $k, true, false);
+				$this->occ($instance, 'config:app:set --value '.$v.' circles '.$k, true, false);
 			}
 		}
 		$this->r();
@@ -508,7 +508,7 @@ 
 	 */
 	private function confirmVersion() {
 		$version = $this->configService->getAppValue('installed_version');
-		$this->p('Confirming version <info>' . $version . '</info>');
+		$this->p('Confirming version <info>'.$version.'</info>');
 		foreach ($this->getInstances(false) as $instance) {
 			$this->pm($instance);
 			$capabilities = $this->occ($instance, 'circles:check --capabilities');
@@ -559,12 +559,12 @@ 
 	 */
 	private function statusFreshInstances() {
 		foreach ($this->getInstances() as $instanceId) {
-			$this->p('Circles on ' . $instanceId);
+			$this->p('Circles on '.$instanceId);
 			$result = $this->occ($instanceId, 'circles:manage:list --all');
 			$expectedSize = sizeof($this->getConfigArray($instanceId, 'groups'))
 							+ sizeof($this->getConfigArray($instanceId, 'users'))
 							+ 1;
-			$this->r((sizeof($result) === $expectedSize), sizeof($result) . ' circles');
+			$this->r((sizeof($result) === $expectedSize), sizeof($result).' circles');
 
 			$membersList = $groupsList = [];
 			foreach ($result as $item) {
@@ -583,12 +583,12 @@ 
 			$instance = $this->getConfig($instanceId, 'config.frontal_cloud_id');
 
 			foreach ($this->getConfigArray($instanceId, 'users') as $userId) {
-				$this->p('Checking Single Circle for <comment>' . $userId . '@' . $instance . '</comment>');
+				$this->p('Checking Single Circle for <comment>'.$userId.'@'.$instance.'</comment>');
 				$circle = $this->getSingleCircleForMember($membersList, $userId, $instance);
 
 				$compareToOwnerBasedOn = new Circle();
 				$compareToOwnerBasedOn->setConfig(Circle::CFG_SINGLE)
-									  ->setName('user:' . $userId . ':{CIRCLEID}')
+									  ->setName('user:'.$userId.':{CIRCLEID}')
 									  ->setDisplayName($userId);
 
 				$compareToOwner = new Member();
@@ -606,7 +606,7 @@ 
 				$compareTo = new Circle();
 				$compareTo->setOwner($compareToOwner)
 						  ->setConfig(Circle::CFG_SINGLE)
-						  ->setName('user:' . $userId . ':{CIRCLEID}')
+						  ->setName('user:'.$userId.':{CIRCLEID}')
 						  ->setDisplayName($userId);
 
 				$this->confirmCircleData($circle, $compareTo);
@@ -643,8 +643,8 @@ 
 			$this->r(true, $circle->getSingleId());
 
 			foreach ($this->getConfigArray($instanceId, 'groups') as $groupId => $members) {
-				$this->p('Checking Circle for <comment>' . $groupId . '@' . $instance . '</comment>');
-				$circle = $this->getCircleFromList($groupsList, 'group:' . $groupId);
+				$this->p('Checking Circle for <comment>'.$groupId.'@'.$instance.'</comment>');
+				$circle = $this->getCircleFromList($groupsList, 'group:'.$groupId);
 
 				$appCircle = $this->getSingleCircleForMember($membersList, 'circles', $instance);
 				$appOwner = $appCircle->getOwner();
@@ -668,7 +668,7 @@ 
 				$compareTo = new Circle();
 				$compareTo->setOwner($compareToOwner)
 						  ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
-						  ->setName('group:' . $groupId)
+						  ->setName('group:'.$groupId)
 						  ->setDisplayName($groupId);
 
 				$this->confirmCircleData($circle, $compareTo);
@@ -685,12 +685,12 @@ 
 	 */
 	private function createRemoteLink() {
 		foreach ($this->getInstances() as $instanceId) {
-			$this->p('Init remote link from ' . $instanceId);
+			$this->p('Init remote link from '.$instanceId);
 			$links = $this->getConfigArray($instanceId, 'remote');
 			foreach ($links as $link => $type) {
 				$remote = $this->getConfig($link, 'config.frontal_cloud_id');
-				$this->pm($remote . '(' . $type . ')');
-				$this->occ($instanceId, 'circles:remote ' . $remote . ' --type ' . $type . ' --yes');
+				$this->pm($remote.'('.$type.')');
+				$this->occ($instanceId, 'circles:remote '.$remote.' --type '.$type.' --yes');
 			}
 			$this->r();
 		}
@@ -704,7 +704,7 @@ 
 	private function buildingLocalDatabase() {
 		$this->circles = $this->federatedUsers = [];
 		foreach ($this->getInstances() as $instanceId) {
-			$this->p('Retrieving Circles from ' . $instanceId);
+			$this->p('Retrieving Circles from '.$instanceId);
 			$circles = $this->occ($instanceId, 'circles:manage:list --all');
 			foreach ($circles as $item) {
 				/** @var Circle $circle */
@@ -739,7 +739,7 @@ 
 		$name = self::$TEST_CIRCLES[0];
 		$owner = $this->getInstanceUsers($localInstanceId)[1];
 		$dataCreatedCircle001 =
-			$this->occ($localInstanceId, 'circles:manage:create --type user ' . $owner . ' ' . $name);
+			$this->occ($localInstanceId, 'circles:manage:create --type user '.$owner.' '.$name);
 		/** @var Circle $createdCircle */
 		$createdCircle = $this->deserialize($dataCreatedCircle001, Circle::class);
 		$this->circles[$localInstanceId][$createdCircle->getName()] = $createdCircle;
@@ -771,7 +771,7 @@ 
 
 
 		$this->p('Comparing local stored data');
-		$dataCircle = $this->occ($localInstanceId, 'circle:manage:details ' . $createdCircle->getSingleId());
+		$dataCircle = $this->occ($localInstanceId, 'circle:manage:details '.$createdCircle->getSingleId());
 
 		/** @var Circle $tmpCircle */
 		$tmpCircle = $this->deserialize($dataCircle, Circle::class);
@@ -780,9 +780,9 @@ 
 
 		$links = $this->getConfigArray('global-scale-1', 'remote');
 		foreach ($this->getInstances(false) as $instanceId) {
-			$this->p('Comparing data stored on ' . $instanceId);
+			$this->p('Comparing data stored on '.$instanceId);
 			$dataCircle =
-				$this->occ($instanceId, 'circle:manage:details ' . $createdCircle->getSingleId(), false);
+				$this->occ($instanceId, 'circle:manage:details '.$createdCircle->getSingleId(), false);
 
 			if ($instanceId === $localInstanceId || $links[$instanceId] === 'GlobalScale') {
 				/** @var Circle $tmpCircle */
@@ -835,11 +835,11 @@ 
 		$name = self::$TEST_CIRCLES[0];
 		$circle = $this->getCircleByName($localInstanceId, $name);
 		$userId = $this->getInstanceUsers($localInstanceId)[6];
-		$userCircle = $this->getCircleByName($localInstanceId, 'user:' . $userId);
+		$userCircle = $this->getCircleByName($localInstanceId, 'user:'.$userId);
 		$user = $userCircle->getOwner();
 		$dataAddedMember =
 			$this->occ(
-				$localInstanceId, 'circles:members:add ' . $circle->getSingleId() . ' ' . $user->getSingleId()
+				$localInstanceId, 'circles:members:add '.$circle->getSingleId().' '.$user->getSingleId()
 			);
 		/** @var Member $addedMember */
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
@@ -859,11 +859,11 @@ 
 
 		$circle = $this->getCircleByName($localInstanceId, $circleName);
 		$userId = $this->getInstanceUsers($localInstanceId)[6];
-		$userCircle = $this->getCircleByName($localInstanceId, 'user:' . $userId);
+		$userCircle = $this->getCircleByName($localInstanceId, 'user:'.$userId);
 		$user = $userCircle->getOwner();
 		$dataAddedMember =
 			$this->occ(
-				$localInstanceId, 'circles:members:add ' . $circle->getSingleId() . ' ' . $user->getSingleId()
+				$localInstanceId, 'circles:members:add '.$circle->getSingleId().' '.$user->getSingleId()
 			);
 		/** @var Member $addedMember */
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
@@ -957,13 +957,13 @@ 
 			];
 		}
 
-		$this->compare($compareTo->getSingleId(), $circle->getSingleId(), $prefix . '.id', $params);
-		$this->compare($compareTo->getName(), $circle->getName(), $prefix . '.name', $params);
+		$this->compare($compareTo->getSingleId(), $circle->getSingleId(), $prefix.'.id', $params);
+		$this->compare($compareTo->getName(), $circle->getName(), $prefix.'.name', $params);
 		$this->compare(
-			$compareTo->getDisplayName(), $circle->getDisplayName(), $prefix . '.displayName', $params
+			$compareTo->getDisplayName(), $circle->getDisplayName(), $prefix.'.displayName', $params
 		);
-		$this->compareInt($compareTo->getConfig(), $circle->getConfig(), $prefix . '.config', true);
-		$this->compareInt($compareTo->getSource(), $circle->getSource(), $prefix . '.source');
+		$this->compareInt($compareTo->getConfig(), $circle->getConfig(), $prefix.'.config', true);
+		$this->compareInt($compareTo->getSource(), $circle->getSource(), $prefix.'.source');
 
 		if ($compareTo->hasOwner()) {
 			$compareToOwner = $compareTo->getOwner();
@@ -973,7 +973,7 @@ 
 					throw new Exception('empty owner');
 				}
 				if ($owner->getCircleId() !== $circle->getSingleId()) {
-					throw new Exception($prefix . '.owner.circleId is different than ' . $prefix . '.id');
+					throw new Exception($prefix.'.owner.circleId is different than '.$prefix.'.id');
 				}
 				$this->confirmMemberData($owner, $compareToOwner, 'owner', false, $params);
 			}
@@ -986,7 +986,7 @@ 
 				}
 				$initiator = $circle->getInitiator();
 				if ($initiator->getCircleId() !== $circle->getSingleId()) {
-					throw new Exception($prefix . '.initiator.circleId is different than ' . $prefix . '.id');
+					throw new Exception($prefix.'.initiator.circleId is different than '.$prefix.'.id');
 				}
 				$this->confirmMemberData($initiator, $compareToInitiator, 'owner', false, $params);
 			}
@@ -1013,27 +1013,27 @@ 
 		bool $versa = false,
 		array $params = []
 	) {
-		$this->compare($compareTo->getId(), $member->getId(), $prefix . '.id', $params);
-		$this->compare($compareTo->getCircleId(), $member->getCircleId(), $prefix . '.circleId', $params);
-		$this->compare($compareTo->getSingleId(), $member->getSingleId(), $prefix . '.singleId', $params);
-		$this->compare($compareTo->getUserId(), $member->getUserId(), $prefix . '.userId', $params);
+		$this->compare($compareTo->getId(), $member->getId(), $prefix.'.id', $params);
+		$this->compare($compareTo->getCircleId(), $member->getCircleId(), $prefix.'.circleId', $params);
+		$this->compare($compareTo->getSingleId(), $member->getSingleId(), $prefix.'.singleId', $params);
+		$this->compare($compareTo->getUserId(), $member->getUserId(), $prefix.'.userId', $params);
 		$this->compare(
-			$compareTo->getDisplayName(), $member->getDisplayName(), $prefix . '.displayName', $params
+			$compareTo->getDisplayName(), $member->getDisplayName(), $prefix.'.displayName', $params
 		);
-		$this->compareInt($compareTo->getUserType(), $member->getUserType(), $prefix . '.userType');
-		$this->compare($compareTo->getInstance(), $member->getInstance(), $prefix . '.instance', $params);
-		$this->compareInt($compareTo->getLevel(), $member->getLevel(), $prefix . '.level', true);
-		$this->compare($compareTo->getStatus(), $member->getStatus(), $prefix . '.status', $params);
+		$this->compareInt($compareTo->getUserType(), $member->getUserType(), $prefix.'.userType');
+		$this->compare($compareTo->getInstance(), $member->getInstance(), $prefix.'.instance', $params);
+		$this->compareInt($compareTo->getLevel(), $member->getLevel(), $prefix.'.level', true);
+		$this->compare($compareTo->getStatus(), $member->getStatus(), $prefix.'.status', $params);
 
 		if ($compareTo->hasBasedOn()) {
 			if (!$member->hasBasedOn()) {
-				throw new Exception('empty ' . $prefix . '.basedOn');
+				throw new Exception('empty '.$prefix.'.basedOn');
 			}
 			$basedOn = $member->getBasedOn();
 			$this->confirmCircleData(
 				$basedOn,
 				$compareTo->getBasedOn(),
-				$prefix . '.basedOn',
+				$prefix.'.basedOn',
 				false,
 				$params
 			);
@@ -1052,7 +1052,7 @@ 
 	private function compare(string $expected, string $compare, string $def, array $params) {
 		if ($expected !== ''
 			&& $this->feedStringWithParams($expected, $params) !== $compare) {
-			throw new Exception($def . ': ' . $compare . ' (' . $expected . ')');
+			throw new Exception($def.': '.$compare.' ('.$expected.')');
 		}
 	}
 
@@ -1068,7 +1068,7 @@ 
 	private function compareInt(int $expected, int $compare, string $def, bool $force = false) {
 		if (($expected > 0 || ($force && $expected >= 0))
 			&& $expected !== $compare) {
-			throw new Exception('wrong ' . $def . ': ' . $compare . ' (' . $expected . ')');
+			throw new Exception('wrong '.$def.': '.$compare.' ('.$expected.')');
 		}
 	}
 
@@ -1104,7 +1104,7 @@ 
 			}
 		}
 
-		throw new CircleNotFoundException('cannot find ' . $userId . ' in the list of Single Circle');
+		throw new CircleNotFoundException('cannot find '.$userId.' in the list of Single Circle');
 	}
 
 
@@ -1122,7 +1122,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract \'' . $name . '\' from the list of generated Circles'
+			'cannot extract \''.$name.'\' from the list of generated Circles'
 		);
 	}
 
@@ -1142,7 +1142,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract  \'' . $name . '\' from the list of provided Circles'
+			'cannot extract  \''.$name.'\' from the list of provided Circles'
 		);
 	}
 
@@ -1187,7 +1187,7 @@ 
 			}
 		}
 
-		throw new ItemNotFoundException($instance . ' not found');
+		throw new ItemNotFoundException($instance.' not found');
 	}
 
 
@@ -1222,7 +1222,7 @@ 
 	): ?array {
 		$configInstance = $this->getConfigInstance($instance);
 		$path = $this->get('path', $configInstance);
-		$occ = rtrim($path, '/') . '/occ';
+		$occ = rtrim($path, '/').'/occ';
 
 		$command = array_merge([$occ], explode(' ', $cmd));
 		if ($jsonAsOutput) {
@@ -1232,7 +1232,7 @@ 
 		$process->run(null, $env);
 
 		if ($exceptionOnFail && !$process->isSuccessful()) {
-			throw new Exception(implode(' ', $command) . ' failed');
+			throw new Exception(implode(' ', $command).' failed');
 		}
 
 		$output = json_decode($process->getOutput(), true);
@@ -1255,7 +1255,7 @@ 
 	 */
 	private function t(string $title): void {
 		$this->output->writeln('');
-		$this->output->writeln('<comment>### ' . $title . '</comment>');
+		$this->output->writeln('<comment>### '.$title.'</comment>');
 		$this->output->writeln('');
 	}
 
@@ -1264,14 +1264,14 @@ 
 	 */
 	private function p(string $processing): void {
 		$this->pOn = true;
-		$this->output->write('- ' . $processing . ': ');
+		$this->output->write('- '.$processing.': ');
 	}
 
 	/**
 	 * @param string $more
 	 */
 	private function pm(string $more): void {
-		$this->output->write($more . ' ');
+		$this->output->write($more.' ');
 	}
 
 	/**
@@ -1281,9 +1281,9 @@ 
 	private function r(bool $result = true, string $info = ''): void {
 		$this->pOn = false;
 		if ($result) {
-			$this->output->writeln('<info>' . (($info !== '') ? $info : 'done') . '</info>');
+			$this->output->writeln('<info>'.(($info !== '') ? $info : 'done').'</info>');
 		} else {
-			$this->output->writeln('<error>' . (($info !== '') ? $info : 'done') . '</error>');
+			$this->output->writeln('<error>'.(($info !== '') ? $info : 'done').'</error>');
 		}
 	}
 
@@ -1305,16 +1305,16 @@ 
 		$dataAddedMember =
 			$this->occ(
 				$instanceId,
-				'circles:members:add ' . $circle->getSingleId() . ' ' . $userId . ' --type ' . $type
+				'circles:members:add '.$circle->getSingleId().' '.$userId.' --type '.$type
 			);
 		/** @var Member $addedMember */
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
 
 
-		echo 'ADDEDMEMBER: ' . json_encode($addedMember, JSON_PRETTY_PRINT) . "\n";
+		echo 'ADDEDMEMBER: '.json_encode($addedMember, JSON_PRETTY_PRINT)."\n";
 
 		$federatedUser = $this->federatedUsers[$instanceId][$userId];
-		echo 'FEDERATEDUER: ' . json_encode($federatedUser, JSON_PRETTY_PRINT) . "\n";
+		echo 'FEDERATEDUER: '.json_encode($federatedUser, JSON_PRETTY_PRINT)."\n";
 
 		return $addedMember;
 	}