nextcloud / circles

lib/Service/ConfigService.php

Spacing +9 added lines, -9 removed lines

@@ -244,7 +244,7 @@ 
 			return $value;
 		}
 
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
 			return $value;
 		}
 
@@ -478,7 +478,7 @@ 
 	 */
 	public function getTrustedDomains(): array {
 		return array_map(
-			function (string $address) {
+			function(string $address) {
 				return strtolower($address);
 			}, $this->config->getSystemValue('trusted_domains', [])
 		);
@@ -514,7 +514,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -553,13 +553,13 @@ 
 			$path = $this->getAppValue(self::LOOPBACK_CLOUD_PATH);
 		}
 
-		$base = $scheme . '://' . $instance . $path;
+		$base = $scheme.'://'.$instance.$path;
 
 		if ($route === '') {
 			return $base;
 		}
 
-		return rtrim($base, '/') . $this->linkToRoute($route, $args);
+		return rtrim($base, '/').$this->linkToRoute($route, $args);
 	}
 
 
@@ -664,7 +664,7 @@ 
 	): string {
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
 		if ($federatedUser->getUserType() === Member::TYPE_MAIL) {
-			return $name . ' ' . $this->displayInstance(
+			return $name.' '.$this->displayInstance(
 				$federatedUser->getInstance(),
 				self::DISPLAY_PARENTHESIS
 			);
@@ -674,7 +674,7 @@ 
 			return $name;
 		}
 
-		return $name . $this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
+		return $name.$this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
 	}
 
 	/**
@@ -690,9 +690,9 @@ 
 
 		switch ($type) {
 			case self::DISPLAY_AT:
-				return '@' . $instance;
+				return '@'.$instance;
 			case self::DISPLAY_PARENTHESIS:
-				return '(' . $instance . ')';
+				return '('.$instance.')';
 		}
 
 		return $instance;

lib/Tools/Model/Request.php

Spacing +10 added lines, -10 removed lines

@@ -257,7 +257,7 @@ 
 	public function getInstance(): string {
 		$instance = $this->getHost();
 		if ($this->getPort() > 0) {
-			$instance .= ':' . $this->getPort();
+			$instance .= ':'.$this->getPort();
 		}
 
 		return $instance;
@@ -281,7 +281,7 @@ 
 		if ($protocol === null) {
 			if (strpos($url, '/') > -1) {
 				[$address, $baseUrl] = explode('/', $url, 2);
-				$this->setBaseUrl('/' . $baseUrl);
+				$this->setBaseUrl('/'.$baseUrl);
 			} else {
 				$address = $url;
 			}
@@ -391,7 +391,7 @@ 
 				continue;
 			}
 
-			$url = str_replace(':' . $k, $this->data[$k], $url);
+			$url = str_replace(':'.$k, $this->data[$k], $url);
 		}
 
 		return $url;
@@ -408,7 +408,7 @@ 
 				continue;
 			}
 
-			$url = str_replace(':' . $k, $this->params[$k], $url);
+			$url = str_replace(':'.$k, $this->params[$k], $url);
 		}
 
 		return $url;
@@ -419,7 +419,7 @@ 
 	 * @return string
 	 */
 	public function getPath(): string {
-		return $this->baseUrl . $this->url;
+		return $this->baseUrl.$this->url;
 	}
 
 
@@ -436,9 +436,9 @@ 
 	 * @return string
 	 */
 	public function getCompleteUrl(): string {
-		$port = ($this->getPort() > 0) ? ':' . $this->getPort() : '';
+		$port = ($this->getPort() > 0) ? ':'.$this->getPort() : '';
 
-		return $this->getUsedProtocol() . '://' . $this->getHost() . $port . $this->getParametersUrl();
+		return $this->getUsedProtocol().'://'.$this->getHost().$port.$this->getParametersUrl();
 	}
 
 
@@ -453,7 +453,7 @@ 
 	public function addHeader($key, $value): Request {
 		$header = $this->get($key, $this->headers);
 		if ($header !== '') {
-			$header .= ', ' . $value;
+			$header .= ', '.$value;
 		} else {
 			$header = $value;
 		}
@@ -683,11 +683,11 @@ 
 
 		switch ($this->getQueryStringType()) {
 			case self::QS_VAR_ARRAY:
-				return '?' . http_build_query($this->getParams());
+				return '?'.http_build_query($this->getParams());
 
 			case self::QS_VAR_DUPLICATE:
 			default:
-				return '?' . preg_replace(
+				return '?'.preg_replace(
 					'/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', http_build_query($this->getParams())
 				);
 		}

lib/Search/GlobalScaleUsers.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 			RequestResultNotJsonException $e
 		) {
 			$this->miscService->log(
-				'Issue while search users from lookup: ' . get_class($e) . ' ' . $e->getMessage()
+				'Issue while search users from lookup: '.get_class($e).' '.$e->getMessage()
 			);
 
 			return [];

lib/Db/DeprecatedCirclesRequestBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -245,7 +245,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = '' . $this->default_select_alias . '.';
+		$pf = ''.$this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -259,7 +259,7 @@ 
 		   ->leftJoin(
 		   	$this->default_select_alias, DeprecatedRequestBuilder::TABLE_MEMBERS, 'u',
 		   	$expr->andX(
-		   		$expr->eq('u.circle_id', $pf . 'unique_id'),
+		   		$expr->eq('u.circle_id', $pf.'unique_id'),
 		   		$expr->eq('u.user_id', $qb->createNamedParameter($userId)),
 		   		$expr->eq('u.instance', $qb->createNamedParameter($instanceId)),
 		   		$expr->eq('u.user_type', $qb->createNamedParameter($type))
@@ -280,7 +280,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -293,7 +293,7 @@ 
 		   ->leftJoin(
 		   	$this->default_select_alias, DeprecatedRequestBuilder::TABLE_MEMBERS, 'o',
 		   	$expr->andX(
-		   		$expr->eq('o.circle_id', $pf . 'unique_id'),
+		   		$expr->eq('o.circle_id', $pf.'unique_id'),
 		   		$expr->eq('o.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_OWNER)),
 		   		$expr->eq('o.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER))
 		   	)

lib/Db/DeprecatedRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -346,8 +346,8 @@ 
 		$expr = $qb->expr();
 
 		if ($pf === '') {
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
 
 			return;
 		}
@@ -376,7 +376,7 @@ 
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
 				continue;
 			}
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
 		}
 
 		return $orX;
@@ -391,12 +391,12 @@ 
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
 		$orX = $expr->orX();
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
 
 		$qb->andWhere($orX);
 	}
@@ -409,8 +409,8 @@ 
 	 */
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -421,8 +421,8 @@ 
 	 */
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -437,9 +437,9 @@ 
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
 		if ($userId !== '') {
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
 		} else {
@@ -462,7 +462,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -471,7 +471,7 @@ 
 		   ->selectAlias('lc.settings', 'circle_settings')
 		   ->leftJoin(
 		   	$this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
-		   	$expr->eq($pf . 'circle_id', 'lc.unique_id')
+		   	$expr->eq($pf.'circle_id', 'lc.unique_id')
 		   );
 	}
 

lib/Command/MembersList.php

Spacing +14 added lines, -15 removed lines

@@ -187,11 +187,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 TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -256,8 +256,7 @@ 
 						$member,
 						$this->input->getOption('display-name')
 					),
-					($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')
@@ -423,14 +422,14 @@ 
 				$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')
 					);
@@ -438,7 +437,7 @@ 
 						$line .= ' <info>Source</info>: '
 								 . Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()];
 					} else {
-						$line .= ' <info>Type</info>: ' . Member::$TYPE[$member->getUserType()];
+						$line .= ' <info>Type</info>: '.Member::$TYPE[$member->getUserType()];
 					}
 				}
 
@@ -451,15 +450,15 @@ 
 						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/Db/CoreQueryBuilder.php

Spacing +86 added lines, -86 removed lines

@@ -396,8 +396,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.'%')
 					)
 				);
 			}
@@ -408,8 +408,8 @@ 
 			foreach (explode(' ', $circle->getDescription()) as $word) {
 				$orDescription->add(
 					$expr->iLike(
-						$this->getDefaultSelectAlias() . '.' . 'description',
-						$this->createNamedParameter('%' . $word . '%')
+						$this->getDefaultSelectAlias().'.'.'description',
+						$this->createNamedParameter('%'.$word.'%')
 					)
 				);
 			}
@@ -439,7 +439,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) {
 		}
@@ -491,7 +491,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()))
 		);
 	}
 
@@ -519,12 +519,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))
 			)
 		);
 	}
@@ -556,21 +556,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)
 				)
 			)
 		);
@@ -603,16 +603,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) {
@@ -621,8 +621,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);
@@ -631,13 +631,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);
@@ -664,7 +664,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);
@@ -689,12 +689,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())
 			)
 		);
@@ -715,19 +715,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()))
 			);
 		}
 
@@ -736,7 +736,7 @@ 
 		if ($member->getLevel() > 0) {
 			$andX->add(
 				$expr->gte(
-					$aliasMember . '.level',
+					$aliasMember.'.level',
 					$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -777,7 +777,7 @@ 
 			$helperAlias,
 			CoreRequestBuilder::TABLE_CIRCLE,
 			$aliasCircle,
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
 		);
 
 		if (!is_null($initiator)) {
@@ -808,7 +808,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);
@@ -839,7 +839,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)) {
@@ -872,9 +872,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)
 			 		)
 			 	)
@@ -906,9 +906,9 @@ 
 			 ->innerJoin(
 			 	$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
 			 	$expr->andX(
-			 		$expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field),
+			 		$expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field),
 			 		$expr->eq(
-			 			$aliasMembership . '.level',
+			 			$aliasMembership.'.level',
 			 			$this->createNamedParameter(
 			 				Member::LEVEL_MEMBER,
 			 				self::PARAM_INT
@@ -949,10 +949,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)
 			 		)
 			 	)
@@ -985,7 +985,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)) {
@@ -999,8 +999,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')
 			 	)
 			 );
 
@@ -1017,12 +1017,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);
@@ -1043,11 +1043,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)
 				)
 			);
@@ -1075,8 +1075,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')
 			)
 		);
 
@@ -1089,8 +1089,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')
 			 	)
 			 );
 	}
@@ -1130,7 +1130,7 @@ 
 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken,
-			$expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field)
+			$expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field)
 		);
 	}
 
@@ -1172,14 +1172,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) {
 		}
@@ -1217,7 +1217,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)
 			)
 		);
 
@@ -1236,11 +1236,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'
 						)
 					);
 				},
@@ -1272,7 +1272,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) {
@@ -1286,8 +1286,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')
 				)
 			);
 
@@ -1295,8 +1295,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')
 				)
 			);
 
@@ -1347,7 +1347,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))
 				)
 			);
 		}
@@ -1357,10 +1357,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)
 					)
 				);
@@ -1450,21 +1450,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)
 			)
 		);
@@ -1501,11 +1501,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')
 			 );
 	}
 
@@ -1527,8 +1527,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')
 			)
 		);
 
@@ -1578,13 +1578,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');
 	}
 
 
@@ -1692,10 +1692,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)) {
@@ -1704,15 +1704,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;
 	}
 
 
@@ -1732,7 +1732,7 @@ 
 			} else {
 				$k = $arr;
 			}
-			$path[$k] = $prefix . '_' . $k . '_';
+			$path[$k] = $prefix.'_'.$k.'_';
 		}
 
 		return $path;