nextcloud / circles

lib/Model/Circle.php

Spacing +35 added lines, -35 removed lines

@@ -71,27 +71,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;
 
 
@@ -463,7 +463,7 @@ 
 	 */
 	public function addInheritedMembers(array $members): self {
 		$knownIds = array_map(
-			function (Member $member): string {
+			function(Member $member): string {
 				return $member->getId();
 			}, $this->inheritedMembers
 		);
@@ -879,7 +879,7 @@ 
 				$initiatorHelper->mustBeAdmin();
 				$arr['settings'] = $this->getSettings();
 				$arr['invitationCode'] = $this->getCircleInvitation()?->getInvitationCode();
-			} catch (MemberHelperException|MemberLevelException $e) {
+			} catch (MemberHelperException | MemberLevelException $e) {
 			}
 		}
 
@@ -895,23 +895,23 @@ 
 	 * @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);
 		$this->setCreation($timestamp);

lib/Db/CircleRequest.php

Spacing +3 added lines, -3 removed lines

@@ -165,8 +165,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');
 			$qb->leftJoinCircleInvitation(CoreQueryBuilder::CIRCLE);
 		}
 		if ($probe->hasFilterMember()) {
@@ -259,7 +259,7 @@ 
 		$qb->completeProbeWithInitiator(CoreQueryBuilder::CIRCLE, 'single_id', $aliasMembership);
 		$qb->andWhere(
 			$limit,
-			$qb->expr()->in(CoreQueryBuilder::CIRCLE . '.unique_id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_STR_ARRAY))
+			$qb->expr()->in(CoreQueryBuilder::CIRCLE.'.unique_id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_STR_ARRAY))
 		);
 		$qb->resetSqlPath();
 

lib/Db/CoreQueryBuilder.php

Spacing +85 added lines, -85 removed lines

@@ -378,8 +378,8 @@ 
 			$andX = [];
 			foreach (explode(' ', $circle->getDisplayName()) as $word) {
 				$andX[] = $expr->iLike(
-					$this->getDefaultSelectAlias() . '.' . 'display_name',
-					$this->createNamedParameter('%' . $word . '%')
+					$this->getDefaultSelectAlias().'.'.'display_name',
+					$this->createNamedParameter('%'.$word.'%')
 				);
 			}
 		}
@@ -408,7 +408,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) {
 		}
@@ -460,7 +460,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()))
 		);
 	}
 
@@ -488,12 +488,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))
 			)
 		);
 	}
@@ -525,21 +525,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)
 				)
 			)
 		);
@@ -570,11 +570,11 @@ 
 		$aliasRemoteCircleOwner = $this->generateAlias($aliasRemoteCircle, self::OWNER);
 
 		$expr = $this->expr();
-		$orX = [$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))];
+		$orX = [$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))];
 
-		$orExtOrPassive = [$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))];
+		$orExtOrPassive = [$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))];
 		if (!$sensitive) {
-			$orExtOrPassive[] = $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE));
+			$orExtOrPassive[] = $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE));
 		} else {
 			if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) {
 				$orExtOrPassive[] = $this->limitRemoteVisibility_Sensitive_Members($aliasRemote);
@@ -582,8 +582,8 @@ 
 		}
 
 		$orInstance = $expr->orX(
-			$expr->isNotNull($aliasRemoteMember . '.instance'),
-			$expr->isNotNull($aliasRemoteCircleOwner . '.instance'),
+			$expr->isNotNull($aliasRemoteMember.'.instance'),
+			$expr->isNotNull($aliasRemoteCircleOwner.'.instance'),
 		);
 
 		$andExternal = $expr->andX(
@@ -593,13 +593,13 @@ 
 
 		$orExtOrTrusted = $expr->orX(
 			$andExternal,
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)),
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)),
 		);
 
 		$orX[] = $expr->andX(
 			$orExtOrTrusted,
 			$this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle),
-			$expr->emptyString($aliasOwner . '.instance'),
+			$expr->emptyString($aliasOwner.'.instance'),
 		);
 
 		$this->andWhere($expr->orX(...$orX));
@@ -626,7 +626,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);
@@ -651,12 +651,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())
 			)
 		);
@@ -676,22 +676,22 @@ 
 		$andX = [];
 
 		if ($member->getUserId() !== '') {
-			$andX[] = $expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId()));
+			$andX[] = $expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId()));
 		}
 
 		if ($member->getSingleId() !== '') {
-			$andX[] = $expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId()));
+			$andX[] = $expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId()));
 		}
 
 		if ($member->getUserType() > 0) {
-			$andX[] = $expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType()));
+			$andX[] = $expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType()));
 		}
 
 		$this->limitToInstance($this->getInstance($member));
 
 		if ($member->getLevel() > 0) {
 			$andX[] = $expr->gte(
-				$aliasMember . '.level',
+				$aliasMember.'.level',
 				$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
 			);
 		}
@@ -731,7 +731,7 @@ 
 			$helperAlias,
 			CoreRequestBuilder::TABLE_CIRCLE,
 			$aliasCircle,
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
 		);
 
 		if (!is_null($initiator)) {
@@ -762,7 +762,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);
@@ -793,7 +793,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)) {
@@ -826,9 +826,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)
 					)
 				)
@@ -859,7 +859,7 @@ 
 		$this->generateCircleInvitationSelectAlias($aliasInvitation)
 			->leftJoin(
 				$alias, CoreRequestBuilder::TABLE_INVITATIONS, $aliasInvitation,
-				$expr->eq($aliasInvitation . '.circle_id', $alias . '.' . $field),
+				$expr->eq($aliasInvitation.'.circle_id', $alias.'.'.$field),
 			);
 	}
 
@@ -885,7 +885,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() ?? 0;
@@ -926,8 +926,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)
 				)
 			);
@@ -959,7 +959,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)) {
@@ -973,8 +973,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')
 				)
 			);
 
@@ -991,12 +991,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);
@@ -1017,11 +1017,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)
 				)
 			);
@@ -1049,8 +1049,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')
 			)
 		);
 
@@ -1063,8 +1063,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')
 				)
 			);
 	}
@@ -1104,7 +1104,7 @@ 
 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken,
-			$expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field)
+			$expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field)
 		);
 	}
 
@@ -1146,14 +1146,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) {
 		}
@@ -1191,7 +1191,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)
 			)
 		);
 
@@ -1209,10 +1209,10 @@ 
 		try {
 			$aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options);
 			$orXMembershipCircle = $expr->orX(...array_map(
-				function (string $alias) use ($aliasMembershipCircle) {
+				function(string $alias) use ($aliasMembershipCircle) {
 					return $this->expr()->eq(
-						$alias . '.circle_id',
-						$aliasMembershipCircle . '.unique_id'
+						$alias.'.circle_id',
+						$aliasMembershipCircle.'.unique_id'
 					);
 				},
 				$listMembershipCircleAlias
@@ -1243,7 +1243,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) {
@@ -1257,8 +1257,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')
 				)
 			);
 
@@ -1266,8 +1266,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')
 				)
 			);
 
@@ -1312,8 +1312,8 @@ 
 			->leftJoin(
 				$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
 				$expr->andX(
-					$expr->eq($aliasInitiator . '.circle_id', $alias . '.unique_id'),
-					$expr->eq($aliasInitiator . '.' . $field, $helperAlias . '.inheritance_first'),
+					$expr->eq($aliasInitiator.'.circle_id', $alias.'.unique_id'),
+					$expr->eq($aliasInitiator.'.'.$field, $helperAlias.'.inheritance_first'),
 				)
 			);
 		//
@@ -1349,15 +1349,15 @@ 
 		if (!$this->getBool('filterPersonalCircles', $options, false)) {
 			$orX[] = $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))
 			);
 		}
 
 		$minimumLevel = $this->getInt('minimumLevel', $options);
 		$orXLevelCheck = $expr->orX(...array_map(
-			function (string $alias) use ($minimumLevel) {
+			function(string $alias) use ($minimumLevel) {
 				return $this->expr()->gte(
-					$alias . '.level',
+					$alias.'.level',
 					$this->createNamedParameter($minimumLevel, self::PARAM_INT)
 				);
 			},
@@ -1437,13 +1437,13 @@ 
 	private function limitRemoteVisibility_Sensitive_Members(string $alias): ICompositeExpression {
 		$expr = $this->expr();
 		return $expr->andX(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)),
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)),
 			$expr->orX(
-				$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)
-				$expr->emptyString($this->getDefaultSelectAlias() . '.instance'),
+				$expr->emptyString($this->getDefaultSelectAlias().'.instance'),
 				$expr->eq(
-					$this->getDefaultSelectAlias() . '.level',
+					$this->getDefaultSelectAlias().'.level',
 					$this->createNamedParameter(Member::LEVEL_OWNER)
 				),
 			),
@@ -1478,11 +1478,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')
 			);
 	}
 
@@ -1504,8 +1504,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')
 			)
 		);
 
@@ -1563,13 +1563,13 @@ 
 		$this->leftJoin(
 			$aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint,
 			$expr->andX(
-				$expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'),
-				$expr->eq($aliasMountpoint . '.single_id', $this->createNamedParameter($federatedUser->getSingleId()))
+				$expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'),
+				$expr->eq($aliasMountpoint.'.single_id', $this->createNamedParameter($federatedUser->getSingleId()))
 			)
 		);
 
-		$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');
 	}
 
 
@@ -1694,10 +1694,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)) {
@@ -1706,15 +1706,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;
 	}
 
 
@@ -1734,7 +1734,7 @@ 
 			} else {
 				$k = $arr;
 			}
-			$path[$k] = $prefix . '_' . $k . '_';
+			$path[$k] = $prefix.'_'.$k.'_';
 		}
 
 		return $path;

lib/Model/CircleInvitation.php

Spacing +5 added lines, -5 removed lines

@@ -174,15 +174,15 @@
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if (!$this->get($prefix . 'circle_id', $data)) {
+		if (!$this->get($prefix.'circle_id', $data)) {
 			throw new CircleInvitationNotFoundException();
 		}
 
-		$this->setCircleId($this->get($prefix . 'circle_id', $data))
-			->setInvitationCode($this->get($prefix . 'invitation_code', $data))
-			->setCreatedBy($this->get($prefix . 'created_by', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data))
+			->setInvitationCode($this->get($prefix.'invitation_code', $data))
+			->setCreatedBy($this->get($prefix.'created_by', $data));
 
-		$created = $this->get($prefix . 'created', $data);
+		$created = $this->get($prefix.'created', $data);
 		$dateTime = \DateTime::createFromFormat('Y-m-d H:i:s', $created);
 		$timestamp = $dateTime ? $dateTime->getTimestamp() : (int)strtotime($created);
 		$this->setCreated($timestamp);