nextcloud / circles

lib/Service/GSUpstreamService.php

Spacing +4 added lines, -4 removed lines

@@ -145,7 +145,7 @@ 
 			}
 		} catch (Exception $e) {
 			$this->miscService->log(
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
 			);
 			throw $e;
 		}
@@ -215,7 +215,7 @@ 
 	 * @throws RequestResultNotJsonException
 	 * @throws GlobalScaleEventException
 	 */
-	public function confirmEvent(GSEvent &$event): void {
+	public function confirmEvent(GSEvent & $event): void {
 		$this->signEvent($event);
 
 		$circle = $event->getDeprecatedCircle();
@@ -229,13 +229,13 @@ 
 		$request->setDataSerialize($event);
 
 		$result = $this->retrieveJson($request);
-		$this->miscService->log('result ' . json_encode($result), 0);
+		$this->miscService->log('result '.json_encode($result), 0);
 		if ($this->getInt('status', $result) === 0) {
 			throw new GlobalScaleEventException($this->get('error', $result));
 		}
 
 		$updatedData = $this->getArray('event', $result);
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData), 0);
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData), 0);
 		if (!empty($updatedData)) {
 			$updated = new GSEvent();
 			try {

lib/Service/RemoteStreamService.php

Spacing +2 added lines, -2 removed lines

@@ -330,7 +330,7 @@ 
 	public function getCachedRemoteInstance(string $instance): RemoteInstance {
 		$remoteInstance = $this->remoteRequest->getFromInstance($instance);
 		if ($remoteInstance->getType() === RemoteInstance::TYPE_UNKNOWN) {
-			throw new UnknownRemoteException($instance . ' is set as \'unknown\' in database');
+			throw new UnknownRemoteException($instance.' is set as \'unknown\' in database');
 		}
 
 		return $remoteInstance;
@@ -571,7 +571,7 @@ 
 	 * @throws RemoteNotFoundException
 	 * @throws RemoteUidException
 	 */
-	public function confirmValidRemote(RemoteInstance $remote, ?RemoteInstance &$stored = null): void {
+	public function confirmValidRemote(RemoteInstance $remote, ?RemoteInstance & $stored = null): void {
 		try {
 			$stored = $this->remoteRequest->getFromHref($remote->getId());
 		} catch (RemoteNotFoundException $e) {

lib/Db/ShareWrapperRequest.php

Spacing +2 added lines, -2 removed lines

@@ -438,7 +438,7 @@ 
 		}
 
 		$ids = array_map(
-			function (ShareWrapper $share): string {
+			function(ShareWrapper $share): string {
 				return $share->getId();
 			},
 			$this->getItemsFromRequest($qb)
@@ -453,7 +453,7 @@ 
 		$expr = $qb->expr();
 		$qb->leftJoin(
 			CoreQueryBuilder::SHARE, CoreRequestBuilder::TABLE_SHARE, 'p',
-			$expr->andX($expr->eq('p.id', CoreQueryBuilder::SHARE . '.parent'))
+			$expr->andX($expr->eq('p.id', CoreQueryBuilder::SHARE.'.parent'))
 		);
 
 		$qb->filterNull('parent');

lib/Service/MaintenanceService.php

Spacing +7 added lines, -7 removed lines

@@ -61,9 +61,9 @@ 
 
 	public static $DELAY =
 		[
-			1 => 60,    // every minute
-			2 => 300,   // every 5 minutes
-			3 => 3600,  // every hour
+			1 => 60, // every minute
+			2 => 300, // every 5 minutes
+			3 => 3600, // every hour
 			4 => 75400, // every day
 			5 => 432000 // evey week
 		];
@@ -178,7 +178,7 @@ 
 		$this->federatedUserService->bypassCurrentUserCondition(true);
 
 		$this->lockMaintenanceRun();
-		$this->debug('running maintenance (' . $level . ')');
+		$this->debug('running maintenance ('.$level.')');
 
 		switch ($level) {
 			case 1:
@@ -349,14 +349,14 @@ 
 			  ->includeSystemCircles();
 
 		$circles = array_map(
-			function (Circle $circle) {
+			function(Circle $circle) {
 				return $circle->getSingleId();
 			}, $this->circleRequest->getCircles(null, $probe)
 		);
 
 		$shares = array_unique(
 			array_map(
-				function (ShareWrapper $share) {
+				function(ShareWrapper $share) {
 					return $share->getSharedWith();
 				}, $this->shareWrapperRequest->getShares()
 			)
@@ -501,7 +501,7 @@ 
 	 */
 	private function output(string $message): void {
 		if (!is_null($this->output)) {
-			$this->output->writeln('- ' . $message);
+			$this->output->writeln('- '.$message);
 		}
 	}
 }

lib/Model/ShareWrapper.php

Spacing +19 added lines, -19 removed lines

@@ -403,9 +403,9 @@ 
 
 		$display = $circle->getDisplayName();
 		if ($circle->getSource() === Member::TYPE_CIRCLE) {
-			$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);
@@ -502,20 +502,20 @@ 
 
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
 		$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, '')) !== '') {
@@ -524,9 +524,9 @@ 
 //			$share->setPassword($this->get('password', $data, ''));
 //		}
 
-		$this->setChildId($this->getInt($prefix . 'child_id', $data))
-			 ->setChildFileTarget($this->get($prefix . 'child_file_target', $data))
-			 ->setChildPermissions($this->getInt($prefix . 'child_permissions', $data))
+		$this->setChildId($this->getInt($prefix.'child_id', $data))
+			 ->setChildFileTarget($this->get($prefix.'child_file_target', $data))
+			 ->setChildPermissions($this->getInt($prefix.'child_permissions', $data))
 			 ->setProviderId(ShareByCircleProvider::IDENTIFIER)
 			 ->setStatus(Ishare::STATUS_ACCEPTED);
 

lib/Db/CoreQueryBuilder.php

Spacing +81 added lines, -81 removed lines

@@ -392,7 +392,7 @@ 
 		}
 
 		if ($circle->getDisplayName() !== '') {
-			$this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%');
+			$this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%');
 		}
 		if ($circle->getSource() > 0) {
 			$this->limitInt('source', $circle->getSource());
@@ -414,7 +414,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) {
 		}
@@ -466,7 +466,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()))
 		);
 	}
 
@@ -494,12 +494,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))
 			)
 		);
 	}
@@ -531,21 +531,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)
 				)
 			)
 		);
@@ -578,16 +578,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) {
@@ -596,8 +596,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);
@@ -606,13 +606,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);
@@ -639,7 +639,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);
@@ -664,12 +664,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())
 			)
 		);
@@ -690,19 +690,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()))
 			);
 		}
 
@@ -711,7 +711,7 @@ 
 		if ($member->getLevel() > 0) {
 			$andX->add(
 				$expr->gte(
-					$aliasMember . '.level',
+					$aliasMember.'.level',
 					$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -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')
 				 )
 			 );
 	}
@@ -1068,7 +1068,7 @@ 
 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken,
-			$expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field)
+			$expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field)
 		);
 	}
 
@@ -1110,14 +1110,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) {
 		}
@@ -1155,7 +1155,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)
 			)
 		);
 
@@ -1174,11 +1174,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'
 						)
 					);
 				},
@@ -1210,7 +1210,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) {
@@ -1224,8 +1224,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')
 				)
 			);
 
@@ -1233,8 +1233,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')
 				)
 			);
 
@@ -1285,7 +1285,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))
 				)
 			);
 		}
@@ -1295,10 +1295,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)
 					)
 				);
@@ -1388,21 +1388,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)
 			)
 		);
@@ -1439,11 +1439,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')
 			 );
 	}
 
@@ -1465,8 +1465,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')
 			)
 		);
 
@@ -1516,13 +1516,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');
 	}
 
 
@@ -1626,10 +1626,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)) {
@@ -1638,15 +1638,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;
 	}
 
 
@@ -1666,7 +1666,7 @@ 
 			} else {
 				$k = $arr;
 			}
-			$path[$k] = $prefix . '_' . $k . '_';
+			$path[$k] = $prefix.'_'.$k.'_';
 		}
 
 		return $path;

lib/Model/SharedItemLock.php

Spacing +3 added lines, -3 removed lines

@@ -133,12 +133,12 @@
 	 * @throws ShareTokenNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'token', $data) === '') {
+		if ($this->get($prefix.'token', $data) === '') {
 			throw new ShareTokenNotFoundException();
 		}
 
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
 
 		return $this;
 	}

lib/Model/SharedItem.php

Spacing +7 added lines, -7 removed lines

@@ -226,16 +226,16 @@
 	 * @throws ShareTokenNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new ShareTokenNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setAppId($this->get($prefix . 'app_id', $data));
-		$this->setItemType($this->get($prefix . 'item_type', $data));
-		$this->setItemId($this->get($prefix . 'item_id', $data));
-		$this->setChecksum($this->get($prefix . 'checksum', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setAppId($this->get($prefix.'app_id', $data));
+		$this->setItemType($this->get($prefix.'item_type', $data));
+		$this->setItemId($this->get($prefix.'item_id', $data));
+		$this->setChecksum($this->get($prefix.'checksum', $data));
 
 		return $this;
 	}

lib/Model/UpdateLock.php

Spacing +5 added lines, -5 removed lines

@@ -222,14 +222,14 @@
 	 * @throws ShareTokenNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'token', $data) === '') {
+		if ($this->get($prefix.'token', $data) === '') {
 			throw new ShareTokenNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setUpdateType($this->get($prefix . 'update_type', $data));
-		$this->setUpdateTypeId($this->get($prefix . 'update_type_id', $data));
-		$this->setChecksum($this->get($prefix . 'checksum', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setUpdateType($this->get($prefix.'update_type', $data));
+		$this->setUpdateTypeId($this->get($prefix.'update_type_id', $data));
+		$this->setChecksum($this->get($prefix.'checksum', $data));
 
 		return $this;
 	}