nextcloud / circles

lib/Listeners/Files/RemovingMember.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 		$singleIds = array_merge(
 			[$circle->getSingleId()],
 			array_map(
-				function (Membership $membership) {
+				function(Membership $membership) {
 					return $membership->getCircleId();
 				}, $circle->getMemberships()
 			)
@@ -152,7 +152,7 @@ 
 			try {
 				$this->shareWrapperService->deleteUserSharesToCircle($singleId, $member->getUserId());
 			} catch (\Exception $e) {
-				$this->logger->notice('issue while deleting user shares: ' . $e->getMessage());
+				$this->logger->notice('issue while deleting user shares: '.$e->getMessage());
 			}
 		}
 	}

lib/Db/EventWrapperRequest.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 				$qb->exprLimitInt('status', EventWrapper::STATUS_FAILED),
 				$expr->andX(
 					$qb->exprLimitInt('status', EventWrapper::STATUS_INIT),
-					$qb->exprGt('creation', time() - 86400),  // only freshly created; less than 3 hours
+					$qb->exprGt('creation', time() - 86400), // only freshly created; less than 3 hours
 					$qb->exprLt('creation', time() - 900)     // but not too fresh, at least 15 minutes
 				)
 			)

lib/Service/ConfigService.php

Spacing +10 added lines, -10 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;
 		}
 
@@ -498,7 +498,7 @@ 
 	 */
 	public function getTrustedDomains(): array {
 		return array_map(
-			function (string $address) {
+			function(string $address) {
 				return strtolower($address);
 			}, $this->config->getSystemValue('trusted_domains', [])
 		);
@@ -534,7 +534,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -573,13 +573,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);
 	}
 
 
@@ -684,7 +684,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
 			);
@@ -694,7 +694,7 @@ 
 			return $name;
 		}
 
-		return $name . $this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
+		return $name.$this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
 	}
 
 	/**
@@ -710,9 +710,9 @@ 
 
 		switch ($type) {
 			case self::DISPLAY_AT:
-				return '@' . $instance;
+				return '@'.$instance;
 			case self::DISPLAY_PARENTHESIS:
-				return '(' . $instance . ')';
+				return '('.$instance.')';
 		}
 
 		return $instance;
@@ -764,7 +764,7 @@ 
 			// when running from the occ command, /index.php is not removed by itself
 			if (str_starts_with($path, '/index.php/')
 				&& $this->config->getSystemValueString('htaccess.RewriteBase', '') !== '') {
-				$path = $this->config->getSystemValueString('htaccess.RewriteBase', '/') . substr($path, 11);
+				$path = $this->config->getSystemValueString('htaccess.RewriteBase', '/').substr($path, 11);
 			}
 
 			$knownPath = parse_url($this->config->getSystemValue('overwrite.cli.url'), PHP_URL_PATH);

lib/Command/CirclesRemote.php

Spacing +30 added lines, -30 removed lines

@@ -173,19 +173,19 @@ 
 
 		$webfinger = $this->getWebfinger($host, Application::APP_SUBJECT);
 		if ($this->input->getOption('all')) {
-			$this->output->writeln('- Webfinger on <info>' . $host . '</info>');
+			$this->output->writeln('- Webfinger on <info>'.$host.'</info>');
 			$this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$this->output->writeln('');
 		}
 
 		if ($this->input->getOption('all')) {
 			$circleLink = $this->extractLink(Application::APP_REL, $webfinger);
-			$this->output->writeln('- Information about Circles app on <info>' . $host . '</info>');
+			$this->output->writeln('- Information about Circles app on <info>'.$host.'</info>');
 			$this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$this->output->writeln('');
 		}
 
-		$this->output->writeln('- Available services on <info>' . $host . '</info>');
+		$this->output->writeln('- Available services on <info>'.$host.'</info>');
 		foreach ($webfinger->getLinks() as $link) {
 			$app = $link->getProperty('name');
 			$ver = $link->getProperty('version');
@@ -193,14 +193,14 @@ 
 				$app .= ' ';
 			}
 			if ($ver !== '') {
-				$ver = 'v' . $ver;
+				$ver = 'v'.$ver;
 			}
 
-			$this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver);
+			$this->output->writeln(' * '.$link->getRel().' '.$app.$ver);
 		}
 		$this->output->writeln('');
 
-		$this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>');
+		$this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>');
 		$resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL);
 		$this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 		$this->output->writeln('');
@@ -208,7 +208,7 @@ 
 
 		$tempUid = $resource->g('uid');
 		$this->output->writeln(
-			'- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>'
+			'- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>'
 		);
 
 		try {
@@ -217,15 +217,15 @@ 
 			$this->output->writeln(' * No SignatureException: <info>Identity authed</info>');
 		} catch (SignatureException $e) {
 			$this->output->writeln(
-				'<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>'
+				'<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>'
 			);
 
 			return;
 		}
 
-		$this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>');
+		$this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>');
 		if ($remoteSignatory->getUid(true) !== $tempUid) {
-			$this->output->writeln('<error>looks like ' . $host . ' is faking its identity');
+			$this->output->writeln('<error>looks like '.$host.' is faking its identity');
 
 			return;
 		}
@@ -233,7 +233,7 @@ 
 		$this->output->writeln('');
 
 		$testUrl = $resource->g('test');
-		$this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>');
+		$this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>');
 
 		try {
 			$localSignatory = $this->remoteStreamService->getAppSignatory();
@@ -255,18 +255,18 @@ 
 		$this->output->writeln('');
 
 		$this->output->writeln(' * Clear Signature: ');
-		$this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>');
+		$this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>');
 		$this->output->writeln('');
 
 		$this->output->writeln(' * Signed Signature (base64 encoded): ');
 		$this->output->writeln(
-			'<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>'
+			'<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>'
 		);
 		$this->output->writeln('');
 
 		$result = $signedRequest->getOutgoingRequest()->getResult();
 		$code = $result->getStatusCode();
-		$this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code));
+		$this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.$code.'</info>' : $code));
 		$this->output->writeln(
 			json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
 		);
@@ -288,7 +288,7 @@ 
 				$stored = new RemoteInstance();
 				$this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored);
 				$this->output->writeln(
-					'<info>The remote instance ' . $host
+					'<info>The remote instance '.$host
 					. ' is already known with this current identity</info>'
 				);
 
@@ -298,7 +298,7 @@ 
 
 				if ($remoteSignatory->getType() !== $stored->getType()) {
 					$this->output->writeln(
-						'- updating type from ' . $stored->getType() . ' to '
+						'- updating type from '.$stored->getType().' to '
 						. $remoteSignatory->getType()
 					);
 					$this->remoteStreamService->update(
@@ -308,7 +308,7 @@ 
 
 				if ($remoteSignatory->getInstance() !== $stored->getInstance()) {
 					$this->output->writeln(
-						'- updating host from ' . $stored->getInstance() . ' to '
+						'- updating host from '.$stored->getInstance().' to '
 						. $remoteSignatory->getInstance()
 					);
 					$this->remoteStreamService->update(
@@ -317,7 +317,7 @@ 
 				}
 				if ($remoteSignatory->getId() !== $stored->getId()) {
 					$this->output->writeln(
-						'- updating href/Id from ' . $stored->getId() . ' to '
+						'- updating href/Id from '.$stored->getId().' to '
 						. $remoteSignatory->getId()
 					);
 					$this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF);
@@ -341,10 +341,10 @@ 
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(
-			'The remote instance <info>' . $remoteSignatory->getInstance() . '</info> looks good.'
+			'The remote instance <info>'.$remoteSignatory->getInstance().'</info> looks good.'
 		);
 		$question = new ConfirmationQuestion(
-			'Would you like to identify this remote instance as \'<comment>' . $remoteSignatory->getType()
+			'Would you like to identify this remote instance as \'<comment>'.$remoteSignatory->getType()
 			. '</comment>\' using interface \'<comment>'
 			. InterfaceService::$LIST_IFACE[$remoteSignatory->getInterface()]
 			. '</comment>\' ? (y/N) ',
@@ -372,7 +372,7 @@ 
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(
-			'The remote instance <info>' . $remoteSignatory->getInstance()
+			'The remote instance <info>'.$remoteSignatory->getInstance()
 			. '</info> is known but <error>its identity has changed.</error>'
 		);
 		$this->output->writeln(
@@ -434,7 +434,7 @@ 
 	private function verifyGSInstances(): void {
 		$instances = $this->globalScaleService->getGlobalScaleInstances();
 		$known = array_map(
-			function (RemoteInstance $instance): string {
+			function(RemoteInstance $instance): string {
 				return $instance->getInstance();
 			}, $this->remoteRequest->getFromType(RemoteInstance::TYPE_GLOBALSCALE)
 		);
@@ -450,7 +450,7 @@ 
 	 * @param string $instance
 	 */
 	private function syncGSInstance(string $instance): void {
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
+		$this->output->write('Adding <comment>'.$instance.'</comment>: ');
 		if ($this->configService->isLocalInstance($instance)) {
 			$this->output->writeln('<comment>instance is local</comment>');
 			return;
@@ -465,8 +465,8 @@ 
 			);
 			$this->output->writeln('<info>ok</info>');
 		} catch (Exception $e) {
-			$msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')';
-			$this->output->writeln('<error>' . get_class($e) . $msg . '</error>');
+			$msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')';
+			$this->output->writeln('<error>'.get_class($e).$msg.'</error>');
 		}
 	}
 
@@ -484,12 +484,12 @@ 
 			try {
 				$current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance());
 				if ($current->getUid(true) === $instance->getUid(true)) {
-					$currentUid = '<info>' . $current->getUid(true) . '</info>';
+					$currentUid = '<info>'.$current->getUid(true).'</info>';
 				} else {
-					$currentUid = '<error>' . $current->getUid(true) . '</error>';
+					$currentUid = '<error>'.$current->getUid(true).'</error>';
 				}
 			} catch (Exception $e) {
-				$currentUid = '<error>' . $e->getMessage() . '</error>';
+				$currentUid = '<error>'.$e->getMessage().'</error>';
 			}
 
 			$table->appendRow(
@@ -516,7 +516,7 @@ 
 			}
 		}
 
-		throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE));
+		throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE));
 	}
 
 	/**
@@ -529,6 +529,6 @@ 
 			}
 		}
 
-		throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE));
+		throw new Exception('Unknown interface: '.implode(', ', InterfaceService::$LIST_IFACE));
 	}
 }

lib/Api/v1/Circles.php

Spacing +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 			try {
 				$circleService->getCircle($uniqueId); // checking current user have access to said circle
 				$files = array_map(
-					function (ShareWrapper $wrapper): int {
+					function(ShareWrapper $wrapper): int {
 						return $wrapper->getFileSource();
 					}, $shareWrapperService->getSharesToCircle($uniqueId)
 				);

lib/Db/CoreQueryBuilder.php

Spacing +83 added lines, -83 removed lines

@@ -398,8 +398,8 @@ 
 			foreach (explode(' ', $circle->getDisplayName()) as $word) {
 				$andX->add(
 					$expr->iLike(
-						$this->getDefaultSelectAlias() . '.' . 'display_name',
-						$this->createNamedParameter('%' . $word . '%')
+						$this->getDefaultSelectAlias().'.'.'display_name',
+						$this->createNamedParameter('%'.$word.'%')
 					)
 				);
 			}
@@ -430,7 +430,7 @@ 
 			$this->generateRemoteInstanceSelectAlias($aliasRemoteInstance)
 				 ->leftJoin(
 				 	$alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance,
-				 	$expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance')
+				 	$expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance')
 				 );
 		} catch (RequestBuilderException $e) {
 		}
@@ -482,7 +482,7 @@ 
 		$expr = $this->expr();
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote,
-			$expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance()))
+			$expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance()))
 		);
 	}
 
@@ -510,12 +510,12 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember,
 			$expr->andX(
-				$expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'),
+				$expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'),
 				$expr->eq(
-					$aliasRemoteMember . '.instance',
+					$aliasRemoteMember.'.instance',
 					$this->createNamedParameter($remoteInstance->getInstance())
 				),
-				$expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 	}
@@ -547,21 +547,21 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle,
 			$expr->andX(
-				$expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'),
-				$expr->emptyString($aliasRemoteCircle . '.instance'),
-				$expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'),
+				$expr->emptyString($aliasRemoteCircle.'.instance'),
+				$expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner,
 			$expr->andX(
-				$expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'),
+				$expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'),
 				$expr->eq(
-					$aliasRemoteCircleOwner . '.instance',
+					$aliasRemoteCircleOwner.'.instance',
 					$this->createNamedParameter($remoteInstance->getInstance())
 				),
 				$expr->eq(
-					$aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)
+					$aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)
 				)
 			)
 		);
@@ -594,16 +594,16 @@ 
 		$expr = $this->expr();
 		$orX = $expr->orX();
 		$orX->add(
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
 		);
 
 		$orExtOrPassive = $expr->orX();
 		$orExtOrPassive->add(
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
 		);
 		if (!$sensitive) {
 			$orExtOrPassive->add(
-				$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+				$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 			);
 		} else {
 			if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) {
@@ -612,8 +612,8 @@ 
 		}
 
 		$orInstance = $expr->orX();
-		$orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance'));
-		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance'));
+		$orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance'));
+		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance'));
 
 		$andExternal = $expr->andX();
 		$andExternal->add($orExtOrPassive);
@@ -622,13 +622,13 @@ 
 		$orExtOrTrusted = $expr->orX();
 		$orExtOrTrusted->add($andExternal);
 		$orExtOrTrusted->add(
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
 		);
 
 		$andTrusted = $expr->andX();
 		$andTrusted->add($orExtOrTrusted);
 		$andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle));
-		$andTrusted->add($expr->emptyString($aliasOwner . '.instance'));
+		$andTrusted->add($expr->emptyString($aliasOwner.'.instance'));
 		$orX->add($andTrusted);
 
 		$this->andWhere($orX);
@@ -655,7 +655,7 @@ 
 		}
 		$this->innerJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
-			$expr->eq($aliasMember . '.circle_id', $alias . '.unique_id')
+			$expr->eq($aliasMember.'.circle_id', $alias.'.unique_id')
 		);
 
 		$this->filterDirectMembership($aliasMember, $member);
@@ -680,12 +680,12 @@ 
 			$aliasCircle,
 			'circles_membership',
 			$aliasMembership,
-			$this->expr()->eq($aliasCircle . '.unique_id', $aliasMembership . '.circle_id')
+			$this->expr()->eq($aliasCircle.'.unique_id', $aliasMembership.'.circle_id')
 		);
 
 		$this->andWhere(
 			$this->expr()->eq(
-				$aliasMembership . '.single_id',
+				$aliasMembership.'.single_id',
 				$this->createNamedParameter($federatedUser->getSingleId())
 			)
 		);
@@ -706,19 +706,19 @@ 
 
 		if ($member->getUserId() !== '') {
 			$andX->add(
-				$expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId()))
+				$expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId()))
 			);
 		}
 
 		if ($member->getSingleId() !== '') {
 			$andX->add(
-				$expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId()))
+				$expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId()))
 			);
 		}
 
 		if ($member->getUserType() > 0) {
 			$andX->add(
-				$expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType()))
+				$expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType()))
 			);
 		}
 
@@ -727,7 +727,7 @@ 
 		if ($member->getLevel() > 0) {
 			$andX->add(
 				$expr->gte(
-					$aliasMember . '.level',
+					$aliasMember.'.level',
 					$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -768,7 +768,7 @@ 
 			$helperAlias,
 			CoreRequestBuilder::TABLE_CIRCLE,
 			$aliasCircle,
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
 		);
 
 		if (!is_null($initiator)) {
@@ -799,7 +799,7 @@ 
 		$this->generateCircleSelectAlias($aliasInvitedBy)
 			 ->leftJoin(
 			 	$aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy,
-			 	$expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id')
+			 	$expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id')
 			 );
 
 		$this->leftJoinOwner($aliasInvitedBy);
@@ -830,7 +830,7 @@ 
 		$this->generateCircleSelectAlias($aliasBasedOn)
 			 ->leftJoin(
 			 	$aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn,
-			 	$expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id')
+			 	$expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id')
 			 );
 
 		if (!is_null($initiator)) {
@@ -863,9 +863,9 @@ 
 			 ->leftJoin(
 			 	$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
 			 	$expr->andX(
-			 		$expr->eq($aliasMember . '.circle_id', $alias . '.' . $field),
+			 		$expr->eq($aliasMember.'.circle_id', $alias.'.'.$field),
 			 		$expr->eq(
-			 			$aliasMember . '.level',
+			 			$aliasMember.'.level',
 			 			$this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT)
 			 		)
 			 	)
@@ -897,7 +897,7 @@ 
 
 		$expr = $this->expr();
 
-		$on = $expr->andX($expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field));
+		$on = $expr->andX($expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field));
 
 		// limit on membership level if requested
 		$minLevel = $probe->getMinimumLevel();
@@ -938,8 +938,8 @@ 
 			 ->leftJoin(
 			 	$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
 			 	$expr->andX(
-			 		$expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId),
-			 		$expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId),
+			 		$expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId),
+			 		$expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId),
 			 		$this->exprGt('level', Member::LEVEL_MEMBER, true, $aliasMember)
 			 	)
 			 );
@@ -971,7 +971,7 @@ 
 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
-			$expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field)
+			$expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field)
 		);
 
 //		if (!$this->getBool('getData', $options, false)) {
@@ -985,8 +985,8 @@ 
 			 ->leftJoin(
 			 	$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
 			 	$expr->andX(
-			 		$expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'),
-			 		$expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id')
+			 		$expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'),
+			 		$expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id')
 			 	)
 			 );
 
@@ -1003,12 +1003,12 @@ 
 		$aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options);
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership,
-			$expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId))
+			$expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId))
 		);
 
 		$orX = $expr->orX(
-			$expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field),
-			$expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId))
+			$expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field),
+			$expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId))
 		);
 
 		$this->andWhere($orX);
@@ -1029,11 +1029,11 @@ 
 
 		$expr = $this->expr();
 		$aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS);
-		$this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId)));
+		$this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId)));
 		if ($level > 1) {
 			$this->andWhere(
 				$expr->gte(
-					$aliasMembership . '.level',
+					$aliasMembership.'.level',
 					$this->createNamedParameter($level, IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -1061,8 +1061,8 @@ 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
 			$expr->andX(
-				$expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field),
-				$expr->eq($aliasMembership . '.single_id', $alias . '.single_id')
+				$expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field),
+				$expr->eq($aliasMembership.'.single_id', $alias.'.single_id')
 			)
 		);
 
@@ -1075,8 +1075,8 @@ 
 			 ->leftJoin(
 			 	$aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom,
 			 	$expr->andX(
-			 		$expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'),
-			 		$expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id')
+			 		$expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'),
+			 		$expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id')
 			 	)
 			 );
 	}
@@ -1116,7 +1116,7 @@ 
 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken,
-			$expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field)
+			$expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field)
 		);
 	}
 
@@ -1158,14 +1158,14 @@ 
 		try {
 			$aliasConfig = $this->generateAlias($alias, self::CONFIG, $options);
 			$this->selectAlias(
-				$aliasConfig . '.config',
-				(($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'circle_config'
+				$aliasConfig.'.config',
+				(($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'circle_config'
 			);
 			$this->leftJoin(
 				$alias,
 				CoreRequestBuilder::TABLE_CIRCLE,
 				$aliasConfig,
-				$expr->eq($alias . '.circle_id', $aliasConfig . '.unique_id')
+				$expr->eq($alias.'.circle_id', $aliasConfig.'.unique_id')
 			);
 		} catch (RequestBuilderException $e) {
 		}
@@ -1203,7 +1203,7 @@ 
 			$aliasMembership,
 			$expr->andX(
 				$this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership),
-				$expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field)
+				$expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field)
 			)
 		);
 
@@ -1222,11 +1222,11 @@ 
 			$aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options);
 			$orXMembershipCircle = $expr->orX();
 			array_map(
-				function (string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) {
+				function(string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) {
 					$orXMembershipCircle->add(
 						$this->expr()->eq(
-							$alias . '.circle_id',
-							$aliasMembershipCircle . '.unique_id'
+							$alias.'.circle_id',
+							$aliasMembershipCircle.'.unique_id'
 						)
 					);
 				},
@@ -1258,7 +1258,7 @@ 
 					 	$aliasDirectInitiator,
 					 	$expr->andX(
 					 		$this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator),
-					 		$expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field)
+					 		$expr->eq($aliasDirectInitiator.'.circle_id', $helperAlias.'.'.$field)
 					 	)
 					 );
 			} catch (RequestBuilderException $e) {
@@ -1272,8 +1272,8 @@ 
 			$this->leftJoin(
 				$aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
 				$expr->andX(
-					$expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'),
-					$expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id')
+					$expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'),
+					$expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id')
 				)
 			);
 
@@ -1281,8 +1281,8 @@ 
 			$this->leftJoin(
 				$aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
 				$expr->andX(
-					$expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'),
-					$expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id')
+					$expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'),
+					$expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id')
 				)
 			);
 
@@ -1327,7 +1327,7 @@ 
 			 ->leftJoin(
 			 	$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
 			 	$expr->andX(
-			 		$expr->eq($aliasInitiator . '.circle_id', $helperAlias . '.' . $field),
+			 		$expr->eq($aliasInitiator.'.circle_id', $helperAlias.'.'.$field),
 			 		$this->exprLimitInt('level', Member::LEVEL_OWNER, $aliasInitiator)
 			 	)
 			 );
@@ -1363,7 +1363,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))
 				)
 			);
 		}
@@ -1373,10 +1373,10 @@ 
 		$orXLevelCheck = $expr->orX();
 
 		array_map(
-			function (string $alias) use ($orXLevelCheck, $minimumLevel) {
+			function(string $alias) use ($orXLevelCheck, $minimumLevel) {
 				$orXLevelCheck->add(
 					$this->expr()->gte(
-						$alias . '.level',
+						$alias.'.level',
 						$this->createNamedParameter($minimumLevel, self::PARAM_INT)
 					)
 				);
@@ -1466,21 +1466,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)
 			)
 		);
@@ -1517,11 +1517,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')
 			 );
 	}
 
@@ -1543,8 +1543,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')
 			)
 		);
 
@@ -1594,13 +1594,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');
 	}
 
 
@@ -1708,10 +1708,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)) {
@@ -1720,15 +1720,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;
 	}
 
 
@@ -1748,7 +1748,7 @@ 
 			} else {
 				$k = $arr;
 			}
-			$path[$k] = $prefix . '_' . $k . '_';
+			$path[$k] = $prefix.'_'.$k.'_';
 		}
 
 		return $path;

lib/AppInfo/Application.php

Spacing +2 added lines, -2 removed lines

@@ -230,7 +230,7 @@ 
 		$eventDispatcher = $container->getEventDispatcher();
 		$eventDispatcher->addListener(
 			'OCA\Files::loadAdditionalScripts',
-			function () {
+			function() {
 				Util::addScript('circles', 'files/circles.files.app');
 				Util::addScript('circles', 'files/circles.files.list');
 
@@ -246,7 +246,7 @@ 
 	public function registerFilesNavigation() {
 		$appManager = FilesApp::getNavigationManager();
 		$appManager->add(
-			function () {
+			function() {
 				$l = OC::$server->getL10N('circles');
 
 				return [

lib/Listeners/AccountUpdated.php

Indentation +34 added lines, -34 removed lines

@@ -45,12 +45,12 @@ 
 class AccountUpdated implements IEventListener {
 
 	public function __construct(
-        private CircleRequest $circleRequest,
-        private CircleService $circleService,
-        private FederatedEventService $federatedEventService,
-        private FederatedUserService $federatedUserService,
-        private LoggerInterface $logger
-    ) {
+		private CircleRequest $circleRequest,
+		private CircleService $circleService,
+		private FederatedEventService $federatedEventService,
+		private FederatedUserService $federatedUserService,
+		private LoggerInterface $logger
+	) {
 	}
 
 
@@ -62,39 +62,39 @@ 
 			return;
 		}
 
-        try {
-            $user = $event->getUser();
-            $federatedUser = $this->federatedUserService->getLocalFederatedUser($user->getUID());
+		try {
+			$user = $event->getUser();
+			$federatedUser = $this->federatedUserService->getLocalFederatedUser($user->getUID());
 
-            $this->circleRequest->updateDisplayName($federatedUser->getSingleId(), $user->getDisplayName());
-            $this->federatedUserService->setCurrentUser($federatedUser);
+			$this->circleRequest->updateDisplayName($federatedUser->getSingleId(), $user->getDisplayName());
+			$this->federatedUserService->setCurrentUser($federatedUser);
 
-            $probe = new CircleProbe();
-            $probe->includeSystemCircles()
-                ->mustBeMember()
-                ->canBeRequestingMembership();
+			$probe = new CircleProbe();
+			$probe->includeSystemCircles()
+				->mustBeMember()
+				->canBeRequestingMembership();
 
-            // cannot use probeCircles() as we also want to update name on almost-members (invited/requesting)
-            $circles = $this->circleService->getCircles($probe);
+			// cannot use probeCircles() as we also want to update name on almost-members (invited/requesting)
+			$circles = $this->circleService->getCircles($probe);
 
-            foreach ($circles as $circle) {
-                // we are only interested in direct membership
-                if ($circle->getInitiator()->getSingleId() !== $federatedUser->getSingleId()) {
-                    continue;
-                }
+			foreach ($circles as $circle) {
+				// we are only interested in direct membership
+				if ($circle->getInitiator()->getSingleId() !== $federatedUser->getSingleId()) {
+					continue;
+				}
 
-                $event = new FederatedEvent(MemberDisplayName::class);
-                $event->setCircle($circle);
-                $event->getParams()->s('displayName', $user->getDisplayName());
+				$event = new FederatedEvent(MemberDisplayName::class);
+				$event->setCircle($circle);
+				$event->getParams()->s('displayName', $user->getDisplayName());
 
-                try {
-                    $this->federatedEventService->newEvent($event);
-                } catch (Exception $e) {
-                    $this->logger->warning('issue on sync circle on user update', ['exception' => $e, 'event' => $event]);
-                }
-            }
-        } catch (Exception $e) {
-            $this->logger->warning('issue on sync circles data on user update', ['exception' => $e]);
-        }
+				try {
+					$this->federatedEventService->newEvent($event);
+				} catch (Exception $e) {
+					$this->logger->warning('issue on sync circle on user update', ['exception' => $e, 'event' => $event]);
+				}
+			}
+		} catch (Exception $e) {
+			$this->logger->warning('issue on sync circles data on user update', ['exception' => $e]);
+		}
 	}
 }