nextcloud / circles

lib/Service/MembershipService.php

Spacing +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 
 		foreach ($circles as $circle) {
 			$this->outputService->output(
-				'Caching memberships for \'' . $circle->getDisplayName() . '\'',
+				'Caching memberships for \''.$circle->getDisplayName().'\'',
 				true
 			);
 			$this->manageMemberships($circle->getSingleId());

lib/Command/CirclesList.php

Spacing +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
 					Circle::$DEF_SOURCE[$circle->getSource()],
 					$this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40),
 					$this->configService->displayInstance($owner->getInstance()),
-					$circle->getPopulation() . '/' . $this->getInt(
+					$circle->getPopulation().'/'.$this->getInt(
 						'members_limit', $circle->getSettings(), -1
 					)
 				]

lib/Command/MembersList.php

Spacing +14 added lines, -15 removed lines

@@ -189,11 +189,11 @@ 
 			$this->federatedUserService->commandLineInitiator($initiator, $initiatorType, $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(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-			$output->writeln('<info>Config</info>: ' . $type);
+			$output->writeln('<info>Config</info>: '.$type);
 			$output->writeln(' ');
 
 			$tree = new NC22TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -260,8 +260,7 @@ 
 						), 40
 					),
 					$this->configService->displayInstance($member->getInstance()),
-					($level > 0) ? Member::$DEF_LEVEL[$level] :
-						'(' . strtolower($member->getStatus()) . ')',
+					($level > 0) ? Member::$DEF_LEVEL[$level] : '('.strtolower($member->getStatus()).')',
 					($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
 						$member->getInvitedBy(), $this->input->getOption('display-name')
 					) : 'Unknown'
@@ -423,19 +422,19 @@ 
 				$member = $data->gObj('member', Member::class);
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $member->getSingleId() . '</info>';
+					$line .= '<info>'.$member->getSingleId().'</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()].')';
 
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
-					$line .= ' <info>Name</info>: ' . $this->configService->displayFederatedUser(
+					$line .= ' <info>MemberId</info>: '.$member->getId();
+					$line .= ' <info>Name</info>: '.$this->configService->displayFederatedUser(
 							$member,
 							$this->input->getOption('display-name')
 						);
 					$source = ($member->hasBasedOn()) ? $member->getBasedOn()->getSource() : '';
-					$line .= ' <info>Source</info>: ' . Circle::$DEF_SOURCE[$source];
+					$line .= ' <info>Source</info>: '.Circle::$DEF_SOURCE[$source];
 				}
 
 				if ($lineNumber === 2) {
@@ -447,16 +446,16 @@ 
 						return $line;
 					}
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-					$line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : ' <info>Config</info>: '.$type;
 				}
 
 			} else {
 				if ($lineNumber === 1 && !is_null($circle)) {
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
+					$line .= '<info>'.$circle->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
 				}
 			}

lib/Model/ShareWrapper.php

Spacing +18 added lines, -18 removed lines

@@ -622,9 +622,9 @@ 
 
 		$display = $circle->getDisplayName();
 		if ($circle->getSource() === 0) {
-			$display .= ' (Circle owned by ' . $circle->getOwner()->getDisplayName() . ')';
+			$display .= ' (Circle owned by '.$circle->getOwner()->getDisplayName().')';
 		} else {
-			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
+			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')';
 		}
 
 		$share->setSharedWithDisplayName($display);
@@ -713,20 +713,20 @@ 
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
 		$shareTime = new DateTime();
-		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data));
-
-		$this->setId($this->get($prefix . 'id', $data))
-			 ->setShareType($this->getInt($prefix . 'share_type', $data))
-			 ->setPermissions($this->getInt($prefix . 'permissions', $data))
-			 ->setItemType($this->get($prefix . 'item_type', $data))
-			 ->setItemSource($this->getInt($prefix . 'item_source', $data))
-			 ->setItemTarget($this->get($prefix . 'item_target', $data))
-			 ->setFileSource($this->getInt($prefix . 'file_source', $data))
-			 ->setFileTarget($this->get($prefix . 'file_target', $data))
-			 ->setSharedWith($this->get($prefix . 'share_with', $data))
-			 ->setSharedBy($this->get($prefix . 'uid_initiator', $data))
-			 ->setShareOwner($this->get($prefix . 'uid_owner', $data))
-			 ->setToken($this->get($prefix . 'token', $data))
+		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data));
+
+		$this->setId($this->get($prefix.'id', $data))
+			 ->setShareType($this->getInt($prefix.'share_type', $data))
+			 ->setPermissions($this->getInt($prefix.'permissions', $data))
+			 ->setItemType($this->get($prefix.'item_type', $data))
+			 ->setItemSource($this->getInt($prefix.'item_source', $data))
+			 ->setItemTarget($this->get($prefix.'item_target', $data))
+			 ->setFileSource($this->getInt($prefix.'file_source', $data))
+			 ->setFileTarget($this->get($prefix.'file_target', $data))
+			 ->setSharedWith($this->get($prefix.'share_with', $data))
+			 ->setSharedBy($this->get($prefix.'uid_initiator', $data))
+			 ->setShareOwner($this->get($prefix.'uid_owner', $data))
+			 ->setToken($this->get($prefix.'token', $data))
 			 ->setShareTime($shareTime);
 
 //		if (($password = $this->get('personal_password', $data, '')) !== '') {
@@ -735,8 +735,8 @@ 
 //			$share->setPassword($this->get('password', $data, ''));
 //		}
 
-		$this->setChildId($this->getInt($prefix . 'child_id', $data))
-			 ->setChildFileTarget($this->get($prefix . 'child_file_target', $data))
+		$this->setChildId($this->getInt($prefix.'child_id', $data))
+			 ->setChildFileTarget($this->get($prefix.'child_file_target', $data))
 			 ->setProviderId(ShareByCircleProvider::IDENTIFIER)
 			 ->setStatus(Ishare::STATUS_ACCEPTED);
 

lib/Db/CoreQueryBuilder.php

Spacing +79 added lines, -79 removed lines

@@ -391,7 +391,7 @@ 
 		}
 
 		if ($circle->getDisplayName() !== '') {
-			$this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%');
+			$this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%');
 		}
 		if ($circle->getConfig() > 0) {
 			$this->limitBitwise('config', $circle->getConfig());
@@ -410,7 +410,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) {
 		}
@@ -463,7 +463,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()))
 		);
 	}
 
@@ -491,12 +491,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))
 			)
 		);
 	}
@@ -528,21 +528,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)
 				)
 			)
 		);
@@ -575,16 +575,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) {
@@ -593,8 +593,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);
@@ -603,13 +603,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);
@@ -636,7 +636,7 @@ 
 		}
 		$this->leftJoin(
 			$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);
@@ -657,30 +657,30 @@ 
 
 		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()))
 			);
 		}
 
 		$andX->add(
-			$expr->eq($aliasMember . '.instance', $this->createNamedParameter($this->getInstance($member)))
+			$expr->eq($aliasMember.'.instance', $this->createNamedParameter($this->getInstance($member)))
 		);
 
 		if ($member->getLevel() > 0) {
 			$andX->add(
 				$expr->gte(
-					$aliasMember . '.level',
+					$aliasMember.'.level',
 					$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -711,12 +711,12 @@ 
 
 		$expr = $this->expr();
 		$this->selectAlias(
-			$this->createFunction('COUNT(`' . $aliasMemberCount . '`.`member_id`)'),
-			(($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'population'
+			$this->createFunction('COUNT(`'.$aliasMemberCount.'`.`member_id`)'),
+			(($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'population'
 		);
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMemberCount,
-			$expr->eq($alias . '.unique_id', $aliasMemberCount . '.circle_id')
+			$expr->eq($alias.'.unique_id', $aliasMemberCount.'.circle_id')
 		);
 	}
 
@@ -752,7 +752,7 @@ 
 			$helperAlias,
 			CoreRequestBuilder::TABLE_CIRCLE,
 			$aliasCircle,
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
 		);
 
 		if (!is_null($initiator)) {
@@ -783,7 +783,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);
@@ -814,7 +814,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)) {
@@ -847,9 +847,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)
 					 )
 				 )
@@ -887,10 +887,10 @@ 
 			 ->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),
 					 $expr->gte(
-						 $aliasMember . '.level',
+						 $aliasMember.'.level',
 						 $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT)
 					 )
 				 )
@@ -923,7 +923,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)) {
@@ -937,8 +937,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')
 				 )
 			 );
 
@@ -955,12 +955,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);
@@ -981,11 +981,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)
 				)
 			);
@@ -1013,8 +1013,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')
 			)
 		);
 
@@ -1027,8 +1027,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')
 				 )
 			 );
 	}
@@ -1071,14 +1071,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) {
 		}
@@ -1116,7 +1116,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)
 			)
 		);
 
@@ -1126,7 +1126,7 @@ 
 				$aliasMembership,
 				CoreRequestBuilder::TABLE_CIRCLE,
 				$aliasMembershipCircle,
-				$expr->eq($aliasMembership . '.circle_id', $aliasMembershipCircle . '.unique_id')
+				$expr->eq($aliasMembership.'.circle_id', $aliasMembershipCircle.'.unique_id')
 			);
 		} catch (RequestBuilderException $e) {
 		}
@@ -1140,8 +1140,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')
 				)
 			);
 
@@ -1149,8 +1149,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')
 				)
 			);
 
@@ -1197,14 +1197,14 @@ 
 			$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))
 				)
 			);
 		}
 
 		$andXMember = $expr->andX();
 		$andXMember->add(
-			$expr->gte($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+			$expr->gte($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 		);
 		if ($filterPersonalCircle) {
 			$andXMember->add(
@@ -1219,7 +1219,7 @@ 
 		if ($this->getBool('canBeVisitor', $options, false)) {
 			// TODO: should find a better way, also filter on remote initiator on non-federated ?
 			$andXVisitor = $expr->andX();
-			$andXVisitor->add($expr->gte($alias . '.config', $this->createNamedParameter(0)));
+			$andXVisitor->add($expr->gte($alias.'.config', $this->createNamedParameter(0)));
 			if ($filterPersonalCircle) {
 				$andXVisitor->add(
 					$this->exprFilterBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle)
@@ -1293,21 +1293,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)
 			)
 		);
@@ -1344,11 +1344,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')
 			 );
 	}
 
@@ -1370,8 +1370,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')
 			)
 		);
 
@@ -1421,13 +1421,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');
 	}
 
 
@@ -1531,10 +1531,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, self::$SQL_PATH)
 			&& !in_array($extension, $this->getArray($search, self::$SQL_PATH))) {
-			throw new RequestBuilderException($extension . ' not found in ' . $search);
+			throw new RequestBuilderException($extension.' not found in '.$search);
 		}
 
 		if (!is_array($options)) {
@@ -1543,15 +1543,15 @@ 
 
 		$optionPath = '';
 		foreach (explode('.', $path) as $p) {
-			$optionPath = trim($optionPath . '.' . $p, '.');
+			$optionPath = trim($optionPath.'.'.$p, '.');
 			$options = array_merge(
 				$options,
-				$this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH),
-				$this->getArray($optionPath . '.' . self::OPTIONS, $this->options)
+				$this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH),
+				$this->getArray($optionPath.'.'.self::OPTIONS, $this->options)
 			);
 		}
 
-		return $base . '_' . $extension;
+		return $base.'_'.$extension;
 	}
 
 
@@ -1571,7 +1571,7 @@ 
 			} else {
 				$k = $arr;
 			}
-			$path[$k] = $prefix . '_' . $k . '_';
+			$path[$k] = $prefix.'_'.$k.'_';
 		}
 
 		return $path;

lib/Command/CirclesMaintenance.php

Spacing +3 added lines, -3 removed lines

@@ -118,7 +118,7 @@ 
 				'<error>WARNING! You are about to delete all data related to the Circles App!</error>'
 			);
 			$question = new ConfirmationQuestion(
-				'<comment>Do you really want to ' . $action . ' Circles ?</comment> (y/N) ', false,
+				'<comment>Do you really want to '.$action.' Circles ?</comment> (y/N) ', false,
 				'/^(y|Y)/i'
 			);
 
@@ -133,7 +133,7 @@ 
 			$output->writeln('<error>WARNING! This operation is not reversible.</error>');
 			
 			$question = new Question(
-				'<comment>Please confirm this destructive operation by typing \'' . $action
+				'<comment>Please confirm this destructive operation by typing \''.$action
 				. '\'</comment>: ', ''
 			);
 
@@ -150,7 +150,7 @@ 
 				$this->coreQueryBuilder->uninstall();
 			}
 
-			$output->writeln('<info>' . $action . ' done</info>');
+			$output->writeln('<info>'.$action.' done</info>');
 
 			return 0;
 		}

lib/Model/Membership.php

Spacing +9 added lines, -9 removed lines

@@ -305,18 +305,18 @@
 	 * @throws MembershipNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new MembershipNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setLevel($this->getInt($prefix . 'level', $data));
-		$this->setCircleConfig($this->getInt($prefix . 'circle_config', $data));
-		$this->setInheritanceFirst($this->get($prefix . 'inheritance_first', $data));
-		$this->setInheritanceLast($this->get($prefix . 'inheritance_last', $data));
-		$this->setInheritancePath($this->getArray($prefix . 'inheritance_path', $data));
-		$this->setInheritanceDepth($this->getInt($prefix . 'inheritance_depth', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setLevel($this->getInt($prefix.'level', $data));
+		$this->setCircleConfig($this->getInt($prefix.'circle_config', $data));
+		$this->setInheritanceFirst($this->get($prefix.'inheritance_first', $data));
+		$this->setInheritanceLast($this->get($prefix.'inheritance_last', $data));
+		$this->setInheritancePath($this->getArray($prefix.'inheritance_path', $data));
+		$this->setInheritanceDepth($this->getInt($prefix.'inheritance_depth', $data));
 
 		return $this;
 	}

lib/Controller/AdminController.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 					throw new OCSException('works only from local instance', 404);
 				}
 
-				$userId = $currentUser->getUserId() . '/' . $userId;
+				$userId = $currentUser->getUserId().'/'.$userId;
 			}
 
 			$federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type);