nextcloud / circles

lib/Command/CirclesMemberships.php

Spacing +21 added lines, -21 removed lines

@@ -192,10 +192,10 @@ 
 		//			return 0;
 		//		}
 
-		$output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>');
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
-		$output->writeln('Type: <info>' . Member::$TYPE[$federatedUser->getUserType()] . '</info>');
-		$output->writeln('SingleId: <info>' . $federatedUser->getSingleId() . '</info>');
+		$output->writeln('Id: <info>'.$federatedUser->getUserId().'</info>');
+		$output->writeln('Instance: <info>'.$federatedUser->getInstance().'</info>');
+		$output->writeln('Type: <info>'.Member::$TYPE[$federatedUser->getUserType()].'</info>');
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
 
 		$output->writeln('');
 		$output->writeln('Memberships:');
@@ -204,14 +204,14 @@ 
 		if ($count === 0) {
 			$output->writeln('(database not updated)');
 		} else {
-			$output->writeln('(' . ((string)$count) . ' entries generated/updated in the database)');
+			$output->writeln('('.((string)$count).' entries generated/updated in the database)');
 		}
 
 		foreach ($federatedUser->getMemberships() as $membership) {
 			$this->memberships[$membership->getCircleId()] = $membership;
 			$output->writeln(
-				'- <info>' . $membership->getCircleId() . '</info> ('
-				. Member::$DEF_LEVEL[$membership->getLevel()] . ')'
+				'- <info>'.$membership->getCircleId().'</info> ('
+				. Member::$DEF_LEVEL[$membership->getLevel()].')'
 			);
 		}
 
@@ -285,9 +285,9 @@ 
 				if ($lineNumber === 2) {
 					return '';
 				}
-				$line .= '<info>' . $federatedUser->getSingleId() . '</info>';
+				$line .= '<info>'.$federatedUser->getSingleId().'</info>';
 				if (!$this->configService->isLocalInstance($federatedUser->getInstance())) {
-					$line .= '@' . $federatedUser->getInstance();
+					$line .= '@'.$federatedUser->getInstance();
 				}
 
 				return $line;
@@ -299,33 +299,33 @@ 
 				$circle = $member->getCircle();
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
+					$line .= '<info>'.$circle->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
-					$line .= ' (' . ($this->input->getOption('display-name') ?
-							$circle->getDisplayName() : $circle->getName()) . ')';
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
+					$line .= ' ('.($this->input->getOption('display-name') ?
+							$circle->getDisplayName() : $circle->getName()).')';
+					$line .= ' <info>MemberId</info>: '.$member->getId();
+					$line .= ' <info>Level</info>: '.Member::$DEF_LEVEL[$member->getLevel()];
 
 					$knownMembership = $this->memberships[$member->getCircleId()];
 					if ($member->getLevel() !== $knownMembership->getLevel()) {
-						$line .= ' (' . Member::$DEF_LEVEL[$knownMembership->getLevel()] . ')';
+						$line .= ' ('.Member::$DEF_LEVEL[$knownMembership->getLevel()].')';
 					}
 				}
 				if ($lineNumber === 2) {
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance() . ' ';
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance().' ';
 					if ($owner->hasBasedOn()) {
-						$line .= '(' . Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()] . ') ';
+						$line .= '('.Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()].') ';
 					}
 					$type = implode(', ', Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
 				}
 
 				return $line;
 			}
-		} catch (InvalidItemException|ItemNotFoundException|UnknownTypeException $e) {
+		} catch (InvalidItemException | ItemNotFoundException | UnknownTypeException $e) {
 		}
 
 		return '';
@@ -379,6 +379,6 @@ 
 			);
 		}
 
-		$output->writeln(((string)$count) . ' memberships updated');
+		$output->writeln(((string)$count).' memberships updated');
 	}
 }

lib/Command/CirclesJoin.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/CirclesLeave.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/CirclesSetting.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/CirclesEdit.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/MembersLevel.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/CirclesDestroy.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Db/DeprecatedRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -344,8 +344,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;
 		}
@@ -374,7 +374,7 @@ 
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
 				continue;
 			}
-			$orX[] = $expr->gte($p . '.level', $qb->createNamedParameter($level));
+			$orX[] = $expr->gte($p.'.level', $qb->createNamedParameter($level));
 		}
 
 		return $expr->orX(...$orX);
@@ -389,12 +389,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.'.' : '';
 
 		$qb->andWhere($expr->orX(
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)),
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)),
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)),
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)),
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)),
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)),
 		));
 	}
 
@@ -406,8 +406,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)));
 	}
 
 
@@ -418,8 +418,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)));
 	}
 
 
@@ -434,9 +434,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 {
@@ -459,7 +459,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -468,7 +468,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/Db/RemoteRequest.php

Spacing +4 added lines, -4 removed lines

@@ -173,10 +173,10 @@ 
 			$qb->leftJoin(
 				CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember,
 				$expr->andX(
-					$expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())),
-					$expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'),
+					$expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())),
+					$expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'),
 					$expr->gte(
-						$aliasMember . '.level',
+						$aliasMember.'.level',
 						$qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT)
 					)
 				)
@@ -184,7 +184,7 @@ 
 
 			$orX[] = $expr->andX(
 				$qb->exprLimit('type', RemoteInstance::TYPE_EXTERNAL, '', false),
-				$expr->isNotNull($aliasMember . '.instance'),
+				$expr->isNotNull($aliasMember.'.instance'),
 			);
 		}