nextcloud / circles

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/ShareWrapperRequest.php

Spacing +3 added lines, -3 removed lines

@@ -382,7 +382,7 @@ 
 		if ($shallow) {
 			$qb->limitInt('parent', $node->getId(), $aliasFileCache);
 		} else {
-			$qb->like('path', $node->getInternalPath() . '/%', $aliasFileCache);
+			$qb->like('path', $node->getInternalPath().'/%', $aliasFileCache);
 		}
 		$qb->limitNull('parent', false);
 
@@ -442,7 +442,7 @@ 
 		}
 
 		$ids = array_map(
-			function (ShareWrapper $share): string {
+			function(ShareWrapper $share): string {
 				return $share->getId();
 			},
 			$this->getItemsFromRequest($qb)
@@ -457,7 +457,7 @@ 
 		$expr = $qb->expr();
 		$qb->leftJoin(
 			CoreQueryBuilder::SHARE, CoreRequestBuilder::TABLE_SHARE, 'p',
-			$expr->andX($expr->eq('p.id', CoreQueryBuilder::SHARE . '.parent'))
+			$expr->andX($expr->eq('p.id', CoreQueryBuilder::SHARE.'.parent'))
 		);
 
 		$qb->filterNull('parent');

Indentation +21 added lines, -21 removed lines

@@ -96,7 +96,7 @@ 
 	 */
 	public function update(ShareWrapper $shareWrapper): void {
 		$qb = $this->getShareUpdateSql();
-        $shareAttributes = $this->formatShareAttributes($shareWrapper->getAttributes());
+		$shareAttributes = $this->formatShareAttributes($shareWrapper->getAttributes());
 
 		$qb->set('file_target', $qb->createNamedParameter($shareWrapper->getFileTarget()))
 		   ->set('share_with', $qb->createNamedParameter($shareWrapper->getSharedWith()))
@@ -104,7 +104,7 @@ 
 		   ->set('uid_initiator', $qb->createNamedParameter($shareWrapper->getSharedBy()))
 		   ->set('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED))
 		   ->set('permissions', $qb->createNamedParameter($shareWrapper->getPermissions()))
-            ->set('attributes', $qb->createNamedParameter($shareAttributes));
+			->set('attributes', $qb->createNamedParameter($shareAttributes));
 
 
 		$qb->limitToId((int)$shareWrapper->getId());
@@ -493,23 +493,23 @@ 
 	}
 
 
-    /**
-     * Format IAttributes to database format (JSON string)
-     * based on OC\Share20\DefaultShareProvider::formatShareAttributes();
-     */
-    private function formatShareAttributes(?IAttributes $attributes): ?string {
-        if ($attributes === null || empty($attributes->toArray())) {
-            return null;
-        }
-
-        $compressedAttributes = [];
-        foreach ($attributes->toArray() as $attribute) {
-            $compressedAttributes[] = [
-                0 => $attribute['scope'],
-                1 => $attribute['key'],
-                2 => $attribute['enabled']
-            ];
-        }
-        return \json_encode($compressedAttributes);
-    }
+	/**
+	 * Format IAttributes to database format (JSON string)
+	 * based on OC\Share20\DefaultShareProvider::formatShareAttributes();
+	 */
+	private function formatShareAttributes(?IAttributes $attributes): ?string {
+		if ($attributes === null || empty($attributes->toArray())) {
+			return null;
+		}
+
+		$compressedAttributes = [];
+		foreach ($attributes->toArray() as $attribute) {
+			$compressedAttributes[] = [
+				0 => $attribute['scope'],
+				1 => $attribute['key'],
+				2 => $attribute['enabled']
+			];
+		}
+		return \json_encode($compressedAttributes);
+	}
 }

lib/Tools/Db/ExtendedQueryBuilder.php

Spacing +31 added lines, -31 removed lines

@@ -215,7 +215,7 @@ 
 	 */
 	public function limitToCreation(int $delay = 0): self {
 		$date = new DateTime('now');
-		$date->sub(new DateInterval('PT' . $delay . 'M'));
+		$date->sub(new DateInterval('PT'.$delay.'M'));
 
 		$this->limitToDBFieldDateTime('creation', $date, true);
 
@@ -232,7 +232,7 @@ 
 		$expr = $this->expr();
 		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias()
 																. '.' : '';
-		$field = $pf . $field;
+		$field = $pf.$field;
 
 		$orX = $expr->orX();
 		$orX->add(
@@ -262,8 +262,8 @@ 
 		}
 
 		$expr = $this->expr();
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
-		$field = $pf . $field;
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
+		$field = $pf.$field;
 
 		$orX = $expr->orX();
 		$orX->add(
@@ -281,8 +281,8 @@ 
 	public function searchInDBField(string $field, string $value): void {
 		$expr = $this->expr();
 
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
-		$field = $pf . $field;
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
+		$field = $pf.$field;
 
 		$this->andWhere($expr->iLike($field, $this->createNamedParameter($value)));
 	}
@@ -404,7 +404,7 @@ 
 	 */
 	public function exprLike(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -417,7 +417,7 @@ 
 
 	public function exprLimit(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -435,7 +435,7 @@ 
 
 	public function exprLimitInt(string $field, int $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -453,7 +453,7 @@ 
 	 */
 	public function exprLimitBool(string $field, bool $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -474,7 +474,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -500,7 +500,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -529,7 +529,7 @@ 
 		bool $cs = true
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$andX = $this->expr()->andX();
@@ -554,7 +554,7 @@ 
 	 */
 	public function exprLimitInArray(string $field, array $values, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -572,7 +572,7 @@ 
 	 */
 	public function exprLimitBitwise(string $field, int $flag, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -594,7 +594,7 @@ 
 	 */
 	public function exprLt(string $field, int $value, bool $lte = false, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -616,7 +616,7 @@ 
 	 */
 	public function exprGt(string $field, int $value, bool $gte = false, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -725,7 +725,7 @@ 
 	 */
 	public function exprUnlike(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -749,7 +749,7 @@ 
 	 */
 	public function exprFilter(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -775,7 +775,7 @@ 
 	 */
 	public function exprFilterInt(string $field, int $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -793,7 +793,7 @@ 
 	 */
 	public function exprFilterBool(string $field, bool $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -814,7 +814,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -840,7 +840,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -869,7 +869,7 @@ 
 		bool $cs = true
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$orX = $this->expr()->orX();
@@ -894,7 +894,7 @@ 
 	 */
 	public function exprFilterInArray(string $field, array $values, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -912,7 +912,7 @@ 
 	 */
 	public function exprFilterBitwise(string $field, int $flag, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -1073,12 +1073,12 @@ 
 		string $alias = ''
 	): self {
 		$selectFields = array_map(
-			function (string $item) use ($alias) {
+			function(string $item) use ($alias) {
 				if ($alias === '') {
 					return $item;
 				}
 
-				return $alias . '.' . $item;
+				return $alias.'.'.$item;
 			}, $fields
 		);
 
@@ -1104,13 +1104,13 @@ 
 		string $prefix,
 		array $default = []
 	): self {
-		$prefix = trim($prefix) . '_';
+		$prefix = trim($prefix).'_';
 		foreach ($default as $k => $v) {
-			$this->addDefaultValue($prefix . $k, (string)$v);
+			$this->addDefaultValue($prefix.$k, (string)$v);
 		}
 
 		foreach ($fields as $field) {
-			$this->selectAlias($alias . '.' . $field, $prefix . $field);
+			$this->selectAlias($alias.'.'.$field, $prefix.$field);
 		}
 
 		return $this;

lib/Service/SyncService.php

Spacing +3 added lines, -3 removed lines

@@ -246,7 +246,7 @@ 
 	 * @throws SingleCircleNotFoundException
 	 */
 	public function syncNextcloudUser(string $userId): FederatedUser {
-		$this->outputService->output('Syncing Nextcloud Account \'' . $userId . '\'', true);
+		$this->outputService->output('Syncing Nextcloud Account \''.$userId.'\'', true);
 
 		return $this->federatedUserService->getLocalFederatedUser($userId);
 	}
@@ -290,7 +290,7 @@ 
 	 * @throws RequestBuilderException
 	 */
 	public function syncNextcloudGroup(string $groupId): Circle {
-		$this->outputService->output('Syncing Nextcloud Group \'' . $groupId . '\'', true);
+		$this->outputService->output('Syncing Nextcloud Group \''.$groupId.'\'', true);
 
 		$circle = $this->federatedUserService->getGroupCircle($groupId);
 		$group = $this->groupManager->get($groupId);
@@ -363,7 +363,7 @@ 
 	 */
 	public function groupDeleted(string $groupId): void {
 		$circle = new Circle();
-		$circle->setName('group:' . $groupId)
+		$circle->setName('group:'.$groupId)
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
 			   ->setSource(Member::TYPE_GROUP);
 

lib/Service/CircleService.php

Spacing +3 added lines, -3 removed lines

@@ -580,7 +580,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testDisplayName = $baseDisplayName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testDisplayName = $baseDisplayName.(($i > 1) ? ' ('.$i.')' : '');
 			$test = new Circle();
 			$test->setDisplayName($testDisplayName);
 
@@ -613,7 +613,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testSanitizedName = $baseSanitizedName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testSanitizedName = $baseSanitizedName.(($i > 1) ? ' ('.$i.')' : '');
 
 			$test = new Circle();
 			$test->setSanitizedName($testSanitizedName);
@@ -755,7 +755,7 @@ 
 
 
 	private function generateGetCirclesCacheKey(FederatedUser $federatedUser, string $probeSum): string {
-		return $federatedUser->getSingleId() . '#' . $probeSum;
+		return $federatedUser->getSingleId().'#'.$probeSum;
 	}
 
 

lib/ShareByCircleProvider.php

Spacing +4 added lines, -4 removed lines

@@ -446,7 +446,7 @@ 
 
 		return array_filter(
 			array_map(
-				function (ShareWrapper $wrapper) {
+				function(ShareWrapper $wrapper) {
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
 				}, $wrappedShares
 			)
@@ -498,7 +498,7 @@ 
 
 		return array_filter(
 			array_map(
-				function (ShareWrapper $wrapper) {
+				function(ShareWrapper $wrapper) {
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
 				}, $wrappedShares
 			)
@@ -547,7 +547,7 @@ 
 
 		return array_filter(
 			array_map(
-				function (ShareWrapper $wrapper) {
+				function(ShareWrapper $wrapper) {
 					return $wrapper->getShare(
 						$this->rootFolder, $this->userManager, $this->urlGenerator, true
 					);
@@ -578,7 +578,7 @@ 
 
 		$share = $wrappedShare->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
 		if ($share->getPassword() !== '') {
-			$this->logger->notice('share is protected by a password, hash: ' . $share->getPassword());
+			$this->logger->notice('share is protected by a password, hash: '.$share->getPassword());
 		}
 
 		return $share;

Indentation +3 added lines, -3 removed lines

@@ -225,9 +225,9 @@
 	public function update(IShare $share): IShare {
 		$wrappedShare = $this->shareWrapperService->getShareById((int)$share->getId());
 		$wrappedShare->setPermissions($share->getPermissions())
-            ->setShareOwner($share->getShareOwner())
-            ->setAttributes($share->getAttributes())
-            ->setSharedBy($share->getSharedBy());
+			->setShareOwner($share->getShareOwner())
+			->setAttributes($share->getAttributes())
+			->setSharedBy($share->getSharedBy());
 
 		$this->shareWrapperService->update($wrappedShare);
 

lib/Command/CirclesCheck.php

Spacing +37 added lines, -37 removed lines

@@ -177,7 +177,7 @@ 
 			throw new Exception('Please specify a --type for the test');
 		}
 		if ($test !== '' && !in_array($type, self::$checks)) {
-			throw new Exception('Unknown type: ' . implode(', ', self::$checks));
+			throw new Exception('Unknown type: '.implode(', ', self::$checks));
 		}
 
 //		$this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test);
@@ -235,7 +235,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
@@ -271,8 +271,8 @@ 
 				continue;
 			}
 
-			$loopback = rtrim($scheme . '://' . $cloudId . $path, '/');
-			$output->writeln('* testing address: ' . $loopback . ' ');
+			$loopback = rtrim($scheme.'://'.$cloudId.$path, '/');
+			$output->writeln('* testing address: '.$loopback.' ');
 
 			try {
 				$this->setupLoopback($input, $output, $loopback);
@@ -345,8 +345,8 @@ 
 		$test = new FederatedEvent(LoopbackTest::class);
 		$this->federatedEventService->newEvent($test);
 		$output->writeln(
-			'<info>' . $test->getWrapperToken() . '</info> ' .
-			'(took ' . (round(microtime(true) * 1000) - $timer) . 'ms)'
+			'<info>'.$test->getWrapperToken().'</info> '.
+			'(took '.(round(microtime(true) * 1000) - $timer).'ms)'
 		);
 
 		$output->writeln('- Waiting for async process to finish (5s)');
@@ -365,18 +365,18 @@ 
 
 		$checkVerify = $wrapper->getEvent()->getData()->gInt('verify');
 		if ($checkVerify === LoopbackTest::VERIFY) {
-			$output->write('<info>verify=' . $checkVerify . '</info> ');
+			$output->write('<info>verify='.$checkVerify.'</info> ');
 		} else {
-			$output->writeln('<error>verify=' . $checkVerify . '</error>');
+			$output->writeln('<error>verify='.$checkVerify.'</error>');
 
 			return false;
 		}
 
 		$checkManage = $wrapper->getResult()->gInt('manage');
 		if ($checkManage === LoopbackTest::MANAGE) {
-			$output->write('<info>manage=' . $checkManage . '</info> ');
+			$output->write('<info>manage='.$checkManage.'</info> ');
 		} else {
-			$output->writeln('<error>manage=' . $checkManage . '</error>');
+			$output->writeln('<error>manage='.$checkManage.'</error>');
 
 			return false;
 		}
@@ -415,7 +415,7 @@ 
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_PATH, $path);
 		$output->writeln(
-			'- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>'
+			'- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>'
 		);
 	}
 
@@ -467,8 +467,8 @@ 
 				continue;
 			}
 
-			$internal = rtrim($scheme . '://' . $cloudId, '/');
-			$fullInternal = rtrim($scheme . '://' . $cloudId . $path, '/');
+			$internal = rtrim($scheme.'://'.$cloudId, '/');
+			$fullInternal = rtrim($scheme.'://'.$cloudId.$path, '/');
 
 			$question = new ConfirmationQuestion(
 				'<comment>Do you want to check the validity of this internal address?</comment> (Y/n) ', true,
@@ -487,9 +487,9 @@ 
 					'You will need to run this <info>curl</info> command from a terminal on your local network and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $internal
+					'     curl -L "'.$internal
 					. '/.well-known/webfinger?resource=http://nextcloud.com/&test='
-					. $testToken . '"'
+					. $testToken.'"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -523,7 +523,7 @@ 
 
 				if ($pastedHref !== $href) {
 					$output->writeln(
-						'<error>The returned data (' . $pastedHref . ') are not the one expected: </error>'
+						'<error>The returned data ('.$pastedHref.') are not the one expected: </error>'
 						. $href
 					);
 					continue;
@@ -535,7 +535,7 @@ 
 					'Next step, please run this <info>curl</info> command from a terminal on your local network and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"'
+					'     curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -552,9 +552,9 @@ 
 					|| $appSignatory->getRoot() !== $pastedSignatory->g('root')) {
 					$output->writeln(
 						'<error>The returned data ('
-						. $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root')
+						. $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root')
 						. ') are not the one expected: </error>'
-						. $appSignatory->getUid(true) . '/' . $appSignatory->getRoot()
+						. $appSignatory->getUid(true).'/'.$appSignatory->getRoot()
 					);
 					continue;
 				}
@@ -581,7 +581,7 @@ 
 
 		$output->writeln('');
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>' . $internal
+			'- Do you want to save <info>'.$internal
 			. '</info> as your <info>internal</info> address ? (y/N) ',
 			false, '/^(y|Y)/i'
 		);
@@ -597,7 +597,7 @@ 
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_PATH, $path);
 
-		$output->writeln('- Address <info>' . $internal . '</info> is now used as <info>internal</info>');
+		$output->writeln('- Address <info>'.$internal.'</info> is now used as <info>internal</info>');
 	}
 
 
@@ -649,8 +649,8 @@ 
 				continue;
 			}
 
-			$frontal = rtrim($scheme . '://' . $cloudId, '/');
-			$fullFrontal = rtrim($scheme . '://' . $cloudId . $path, '/');
+			$frontal = rtrim($scheme.'://'.$cloudId, '/');
+			$fullFrontal = rtrim($scheme.'://'.$cloudId.$path, '/');
 
 			$question = new ConfirmationQuestion(
 				'<comment>Do you want to check the validity of this frontal address?</comment> (y/N) ', false,
@@ -669,9 +669,9 @@ 
 					'You will need to run this <info>curl</info> command from a remote terminal and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $frontal
+					'     curl -L "'.$frontal
 					. '/.well-known/webfinger?resource=http://nextcloud.com/&test='
-					. $testToken . '"'
+					. $testToken.'"'
 				);
 
 
@@ -706,7 +706,7 @@ 
 
 				if ($pastedHref !== $href) {
 					$output->writeln(
-						'<error>The returned data (' . $pastedHref . ') are not the one expected: </error>'
+						'<error>The returned data ('.$pastedHref.') are not the one expected: </error>'
 						. $href
 					);
 					continue;
@@ -718,7 +718,7 @@ 
 					'Next step, please run this <info>curl</info> command from a remote terminal and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"'
+					'     curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -736,9 +736,9 @@ 
 					|| $appSignatory->getRoot() !== $pastedSignatory->g('root')) {
 					$output->writeln(
 						'<error>The returned data ('
-						. $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root')
+						. $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root')
 						. ') are not the one expected: </error>'
-						. $appSignatory->getUid(true) . '/' . $appSignatory->getRoot()
+						. $appSignatory->getUid(true).'/'.$appSignatory->getRoot()
 					);
 					continue;
 				}
@@ -765,7 +765,7 @@ 
 
 		$output->writeln('');
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>' . $frontal
+			'- Do you want to save <info>'.$frontal
 			. '</info> as your <info>frontal</info> address ? (y/N) ',
 			false, '/^(y|Y)/i'
 		);
@@ -781,7 +781,7 @@ 
 		$this->configService->setAppValue(ConfigService::FRONTAL_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::FRONTAL_CLOUD_PATH, $path);
 
-		$output->writeln('- Address <info>' . $frontal . '</info> is now used as <info>frontal</info>');
+		$output->writeln('- Address <info>'.$frontal.'</info> is now used as <info>frontal</info>');
 	}
 
 
@@ -807,7 +807,7 @@ 
 			$request->setDataSerialize(new SimpleDataStore(['empty' => 1]));
 		}
 
-		$output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
+		$output->write('- '.$type.' request on '.$request->getCompleteUrl().': ');
 
 		try {
 			$this->doRequest($request);
@@ -818,7 +818,7 @@ 
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+			$output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -842,7 +842,7 @@ 
 
 		$output->writeln('');
 		$output->writeln(
-			'The address <info>' . $address . '</info> seems to reach your local Nextcloud.'
+			'The address <info>'.$address.'</info> seems to reach your local Nextcloud.'
 		);
 
 		$helper = $this->getHelper('question');
@@ -859,8 +859,8 @@ 
 
 		$this->configService->setAppValue(ConfigService::FORCE_NC_BASE, $address);
 		$output->writeln(
-			'New configuration <info>' . Application::APP_ID . '.' . ConfigService::FORCE_NC_BASE . '=\''
-			. $address . '\'</info> stored in database'
+			'New configuration <info>'.Application::APP_ID.'.'.ConfigService::FORCE_NC_BASE.'=\''
+			. $address.'\'</info> stored in database'
 		);
 	}
 
@@ -888,7 +888,7 @@ 
 		$path = rtrim($path, '/');
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . $cloudIdPort;
+			$cloudId = $cloudId.':'.$cloudIdPort;
 		}
 
 		return [$scheme, $cloudId, $path];