nextcloud / circles

lib/Model/SyncedItem.php

Spacing +9 added lines, -9 removed lines

@@ -260,18 +260,18 @@
 	 * @throws SyncedItemNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new SyncedItemNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setInstance($this->get($prefix . 'instance', $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->setDeleted($this->getBool($prefix . 'deleted', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setInstance($this->get($prefix.'instance', $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->setDeleted($this->getBool($prefix.'deleted', $data));
 
 		if ($this->getInstance() === '') {
 			$this->setInstance($this->getManager()->getLocalInstance());

lib/Model/SyncedShare.php

Spacing +3 added lines, -3 removed lines

@@ -133,12 +133,12 @@
 	 * @throws SyncedShareNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new SyncedShareNotFoundException();
 		}
 
-		$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/Tools/Model/ReferencedDataStore.php

Spacing +2 added lines, -2 removed lines

@@ -234,7 +234,7 @@ 
 		try {
 			$reflection = new ReflectionClass($class);
 		} catch (ReflectionException $e) {
-			throw new InvalidItemException('reflection issue with ' . $class);
+			throw new InvalidItemException('reflection issue with '.$class);
 		}
 
 		if (!$reflection->implementsInterface(IDeserializable::class)) {
@@ -354,7 +354,7 @@ 
 	 * @return string
 	 */
 	private function getRef(string $key, string $ref): string {
-		return $this->get($key . '.' . $ref, $this->ref);
+		return $this->get($key.'.'.$ref, $this->ref);
 	}
 
 	/**

lib/Model/Debug.php

Spacing +7 added lines, -7 removed lines

@@ -242,16 +242,16 @@
 	 * @throws InvalidItemException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if (empty($this->getArray($prefix . 'debug', $data))) {
+		if (empty($this->getArray($prefix.'debug', $data))) {
 			throw new InvalidItemException();
 		}
 
-		$this->setId($this->getInt($prefix . 'id', $data));
-		$this->setThread($this->get($prefix . 'thread', $data));
-		$this->setType($this->get($prefix . 'type', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setTime($this->getInt($prefix . 'time', $data));
+		$this->setId($this->getInt($prefix.'id', $data));
+		$this->setThread($this->get($prefix.'thread', $data));
+		$this->setType($this->get($prefix.'type', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setTime($this->getInt($prefix.'time', $data));
 
 		/** @var ReferencedDataStore $store */
 		$store = $this->deserialize($this->getArray('debug', $data), ReferencedDataStore::class);

lib/Service/DebugService.php

Spacing +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 
 		$msg = $e->getMessage();
 		$store = new ReferencedDataStore();
-		$store->s(self::ACTION, '{?' . self::E_CLASS . '}' . (($msg !== '') ? ' (' . $msg . ')' : ''));
+		$store->s(self::ACTION, '{?'.self::E_CLASS.'}'.(($msg !== '') ? ' ('.$msg.')' : ''));
 		$store->s(self::E_CLASS, get_class($e));
 		$store->s(self::EXCEPTION, $e->getMessage());
 		$store->sArray(self::E_TRACE, debug_backtrace());

lib/Service/SignedControllerService.php

Spacing +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
 	 */
 	public function extractObjectFromRequest(
 		string $class,
-		?NCSignedRequest &$signed = null
+		?NCSignedRequest & $signed = null
 	): IDeserializable {
 		$signed = $this->remoteStreamService->incomingSignedRequest();
 		$this->confirmRemoteInstance($signed);

lib/Service/FederatedSyncShareService.php

Spacing +2 added lines, -2 removed lines

@@ -285,7 +285,7 @@ 
 	public function confirmRemoteInstanceAccess(string $syncedId, string $instance): void {
 		$circleIds = array_values(
 			array_map(
-				function (SyncedShare $share): string {
+				function(SyncedShare $share): string {
 					return $share->getCircleId();
 				},
 				$this->syncedShareRequest->getShares($syncedId)
@@ -297,7 +297,7 @@ 
 		// federated circles only works as root, so sub-circles cannot spread on multiple instances.
 		$links = $this->memberRequest->getLinksWithInstance($instance, $circleIds);
 		$this->debugService->info(
-			'SyncedItem {singleId} is shared to ' . count($circleIds) . ' circles', '',
+			'SyncedItem {singleId} is shared to '.count($circleIds).' circles', '',
 			[
 				'syncedId' => $syncedId,
 				'circleIds' => $circleIds,

lib/Db/CoreQueryBuilder.php

Spacing +84 added lines, -86 removed lines

@@ -416,7 +416,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());
@@ -438,7 +438,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) {
 		}
@@ -490,7 +490,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()))
 		);
 	}
 
@@ -518,12 +518,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))
 			)
 		);
 	}
@@ -555,21 +555,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)
 				)
 			)
 		);
@@ -602,16 +602,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) {
@@ -620,8 +620,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);
@@ -630,13 +630,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);
@@ -663,7 +663,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);
@@ -688,12 +688,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())
 			)
 		);
@@ -714,19 +714,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()))
 			);
 		}
 
@@ -735,7 +735,7 @@ 
 		if ($member->getLevel() > 0) {
 			$andX->add(
 				$expr->gte(
-					$aliasMember . '.level',
+					$aliasMember.'.level',
 					$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -776,7 +776,7 @@ 
 			$helperAlias,
 			CoreRequestBuilder::TABLE_CIRCLE,
 			$aliasCircle,
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
 		);
 
 		if (!is_null($initiator)) {
@@ -807,7 +807,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);
@@ -838,7 +838,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)) {
@@ -871,9 +871,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)
 					 )
 				 )
@@ -911,10 +911,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)
 					 )
 				 )
@@ -947,7 +947,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)) {
@@ -961,8 +961,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')
 				 )
 			 );
 
@@ -979,12 +979,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);
@@ -1005,11 +1005,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)
 				)
 			);
@@ -1037,8 +1037,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')
 			)
 		);
 
@@ -1051,8 +1051,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')
 				 )
 			 );
 	}
@@ -1092,7 +1092,7 @@ 
 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken,
-			$expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field)
+			$expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field)
 		);
 	}
 
@@ -1136,14 +1136,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) {
 		}
@@ -1173,7 +1173,7 @@ 
 		}
 
 		if (!empty($helperMoreFields)) {
-			$helperMoreFields[] = $helperAlias . '.' . $field;
+			$helperMoreFields[] = $helperAlias.'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -1184,7 +1184,7 @@ 
 
 		$orXMembershipFields = $expr->orX();
 		foreach ($helperMoreFields as $f) {
-			$orXMembershipFields->add($expr->eq($aliasMembership . '.circle_id', $f));
+			$orXMembershipFields->add($expr->eq($aliasMembership.'.circle_id', $f));
 		}
 
 		$this->leftJoin(
@@ -1194,8 +1194,7 @@ 
 			$expr->andX(
 				$this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership),
 				(empty($helperMoreFields)) ?
-					$expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field) :
-					$orXMembershipFields
+					$expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field) : $orXMembershipFields
 			)
 		);
 
@@ -1214,11 +1213,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'
 						)
 					);
 				},
@@ -1246,7 +1245,7 @@ 
 
 				$orXDirectFields = $expr->orX();
 				foreach ($helperMoreFields as $f) {
-					$orXDirectFields->add($expr->eq($aliasMembership . '.circle_id', $f));
+					$orXDirectFields->add($expr->eq($aliasMembership.'.circle_id', $f));
 				}
 
 				$this->generateMemberSelectAlias($aliasDirect)
@@ -1257,8 +1256,7 @@ 
 						 $expr->andX(
 							 $this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirect),
 							 (empty($helperMoreFields)) ?
-								 $expr->eq($aliasDirect . '.circle_id', $helperAlias . '.' . $field) :
-								 $orXDirectFields
+								 $expr->eq($aliasDirect.'.circle_id', $helperAlias.'.'.$field) : $orXDirectFields
 						 )
 					 );
 			} catch (RequestBuilderException $e) {
@@ -1272,8 +1270,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 +1279,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')
 				)
 			);
 
@@ -1333,7 +1331,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))
 				)
 			);
 		}
@@ -1343,10 +1341,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)
 					)
 				);
@@ -1436,21 +1434,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)
 			)
 		);
@@ -1487,11 +1485,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')
 			 );
 	}
 
@@ -1513,8 +1511,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')
 			)
 		);
 
@@ -1564,13 +1562,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');
 	}
 
 
@@ -1674,10 +1672,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)) {
@@ -1686,15 +1684,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;
 	}
 
 
@@ -1714,7 +1712,7 @@ 
 			} else {
 				$k = $arr;
 			}
-			$path[$k] = $prefix . '_' . $k . '_';
+			$path[$k] = $prefix.'_'.$k.'_';
 		}
 
 		return $path;

lib/Command/CirclesDebug.php

Spacing +13 added lines, -13 removed lines

@@ -137,7 +137,7 @@ 
 		stream_set_blocking(STDIN, false);
 		readline_callback_handler_install(
 			'',
-			function () {
+			function() {
 			}
 		);
 
@@ -203,8 +203,8 @@ 
 
 		for ($i = 0; $i < $this->bottomLeftPanel->getMaxLines(); $i++) {
 			$lines[] = '<fg=white>│</>'
-					   . $this->incrementString($i, 'bottomLeftPanelCurrentLine', '%') . ' '
-					   . $this->incrementString($i, 'lineBL', ':42s%') . ' </>'
+					   . $this->incrementString($i, 'bottomLeftPanelCurrentLine', '%').' '
+					   . $this->incrementString($i, 'lineBL', ':42s%').' </>'
 					   . '<fg=white>│</> '
 					   . $this->incrementString($i, 'lineBR', '%');
 
@@ -215,8 +215,8 @@ 
 
 		$more = ['  Thread', '    Type', 'CircleId', 'Instance', '    Time'];
 		for ($j = 0; $j < count($more); $j++) {
-			$lines[] = '<fg=white>│ ' . strtolower($more[$j]) . ':</> %curr'
-					   . trim($more[$j]) . ':-32s% <fg=white>│</> '
+			$lines[] = '<fg=white>│ '.strtolower($more[$j]).':</> %curr'
+					   . trim($more[$j]).':-32s% <fg=white>│</> '
 					   . $this->incrementString($i + $j, 'lineBR', '%');
 			$this->update($this->incrementString($i + $j, 'lineBR'), '');
 		}
@@ -225,7 +225,7 @@ 
 		$this->setCurr();
 
 //		$this->display->clear();
-		$this->display->setFormat(implode("\n", $lines) . "\n");
+		$this->display->setFormat(implode("\n", $lines)."\n");
 		$this->display->start();
 	}
 
@@ -279,12 +279,12 @@ 
 				$instance = ($this->configService->isLocalInstance($item->getInstance())) ?
 					$this->localDisplayName : $item->getInstance();
 
-				$instanceColor = $this->configService->getAppValue('debug_instance.' . $instance);
+				$instanceColor = $this->configService->getAppValue('debug_instance.'.$instance);
 				if ($instanceColor === '') {
 					$instanceColor = 'white';
 				}
 
-				$line = '<fg=' . $instanceColor . '>' . $instance . '</> - ';
+				$line = '<fg='.$instanceColor.'>'.$instance.'</> - ';
 				$action = $debug->g(DebugService::ACTION);
 
 				preg_match_all('/{((?:[^{}]*|(?R))*)}/x', $action, $match);
@@ -313,8 +313,8 @@ 
 					}
 
 					$action = str_replace(
-						'{' . $entry . '}',
-						'<' . $color . '>' . $value . '</>',
+						'{'.$entry.'}',
+						'<'.$color.'>'.$value.'</>',
 						$action
 					);
 				}
@@ -569,7 +569,7 @@ 
 
 				$this->update(
 					$this->incrementString($i, 'lineBL'),
-					($i + 1) . '. ' . $name . ' (' . $type . ')'
+					($i + 1).'. '.$name.' ('.$type.')'
 				);
 			}
 		}
@@ -675,10 +675,10 @@ 
 		}
 
 		if ($wrapper !== '') {
-			$prefix = '%' . $prefix;
+			$prefix = '%'.$prefix;
 		}
 
-		return $prefix . $result . $wrapper;
+		return $prefix.$result.$wrapper;
 	}
 
 	private function setCurr(?Debug $debug = null) {