nextcloud / circles

lib/Service/FederatedUserService.php

Spacing +3 added lines, -3 removed lines

@@ -394,7 +394,7 @@ 
 		if ($check) {
 			$user = $this->userManager->get($userId);
 			if ($user === null) {
-				throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
+				throw new FederatedUserNotFoundException('user '.$userId.' not found');
 			}
 			$userId = $user->getUID();
 			$displayName = $user->getDisplayName();
@@ -852,7 +852,7 @@ 
 			$prefix = ($federatedUser->getUserType() === Member::TYPE_APP) ? 'app'
 				: Member::$TYPE[$federatedUser->getUserType()];
 
-			$circle->setName($prefix . ':' . $federatedUser->getUserId() . ':' . $id)
+			$circle->setName($prefix.':'.$federatedUser->getUserId().':'.$id)
 				   ->setDisplayName($federatedUser->getDisplayName())
 				   ->setSingleId($id)
 				   ->setSource($source);
@@ -976,7 +976,7 @@ 
 		$owner = $this->getCurrentApp();
 
 		$circle = new Circle();
-		$circle->setName('group:' . $groupId)
+		$circle->setName('group:'.$groupId)
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
 			   ->setSingleId($this->token(ManagedModel::ID_LENGTH))
 			   ->setSource(Member::TYPE_GROUP);

lib/FederatedItems/SingleMemberAdd.php

Spacing +5 added lines, -5 removed lines

@@ -336,11 +336,11 @@ 
 	protected function generateMember(FederatedEvent $event, Circle $circle, Member $member): Member {
 		try {
 			if ($member->getSingleId() !== '') {
-				$userId = $member->getSingleId() . '@' . $member->getInstance();
+				$userId = $member->getSingleId().'@'.$member->getInstance();
 				$federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE);
 
 			} else {
-				$userId = $member->getUserId() . '@' . $member->getInstance();
+				$userId = $member->getUserId().'@'.$member->getInstance();
 				$federatedUser = $this->federatedUserService->getFederatedUser(
 					$userId,
 					$member->getUserType()
@@ -642,7 +642,7 @@ 
 			$this->sendMailExistingShares($template, $author, $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -794,7 +794,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n",
@@ -836,7 +836,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}

lib/Command/CirclesMaintenance.php

Spacing +3 added lines, -3 removed lines

@@ -108,7 +108,7 @@ 
 				'<error>WARNING! You are about to delete all data related to the Circles App!</error>'
 			);
 			$question = new ConfirmationQuestion(
-				'<comment>Do you really want to ' . $action . ' Circles ?</comment> (y/N) ', false, '/^(y|Y)/i'
+				'<comment>Do you really want to '.$action.' Circles ?</comment> (y/N) ', false, '/^(y|Y)/i'
 			);
 
 			$helper = $this->getHelper('question');
@@ -123,7 +123,7 @@ 
 
 
 			$question = new Question(
-				'<comment>Please confirm this destructive operation by typing \'' . $action
+				'<comment>Please confirm this destructive operation by typing \''.$action
 				. '\'</comment>: ', ''
 			);
 
@@ -140,7 +140,7 @@ 
 				$this->coreQueryBuilder->uninstall();
 			}
 
-			$output->writeln('<info>' . $action . ' done</info>');
+			$output->writeln('<info>'.$action.' done</info>');
 
 			return 0;
 		}

lib/Service/CircleService.php

Spacing +2 added lines, -2 removed lines

@@ -496,7 +496,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testDisplayName = $baseDisplayName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testDisplayName = $baseDisplayName.(($i > 1) ? ' ('.$i.')' : '');
 			$test = new Circle();
 			$test->setDisplayName($testDisplayName);
 
@@ -529,7 +529,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testSanitizedName = $baseSanitizedName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testSanitizedName = $baseSanitizedName.(($i > 1) ? ' ('.$i.')' : '');
 
 			$test = new Circle();
 			$test->setSanitizedName($testSanitizedName);

lib/Listeners/Examples/ExampleAddingCircleMember.php

Spacing +11 added lines, -11 removed lines

@@ -89,12 +89,12 @@ 
 
 		$eventType = ($event->getType() === CircleGenericEvent::INVITED) ? 'invited' : 'joined';
 
-		$info = 'A new member have been added (' . $eventType . ') to a Circle. ';
+		$info = 'A new member have been added ('.$eventType.') to a Circle. ';
 
-		$info .= 'userId: ' . $member->getUserId() . '; userType: ' . Member::$TYPE[$member->getUserType()]
-				 . '; singleId: ' . $member->getSingleId() . '; memberId: ' . $member->getId()
-				 . '; isLocal: ' . json_encode($member->isLocal()) . '; level: '
-				 . Member::$DEF_LEVEL[$member->getLevel()] . '; ';
+		$info .= 'userId: '.$member->getUserId().'; userType: '.Member::$TYPE[$member->getUserType()]
+				 . '; singleId: '.$member->getSingleId().'; memberId: '.$member->getId()
+				 . '; isLocal: '.json_encode($member->isLocal()).'; level: '
+				 . Member::$DEF_LEVEL[$member->getLevel()].'; ';
 
 		$memberships = array_map(
 			function(Membership $membership) {
@@ -103,22 +103,22 @@ 
 		);
 
 		$listMemberships = (count($memberships) > 0) ? implode(', ', $memberships) : 'none';
-		$info .= 'circleName: ' . $circle->getDisplayName() . '; circleId: ' . $circle->getSingleId()
-				 . '; Circle memberships: ' . $listMemberships . '.';
+		$info .= 'circleName: '.$circle->getDisplayName().'; circleId: '.$circle->getSingleId()
+				 . '; Circle memberships: '.$listMemberships.'.';
 
 		if ($member->getUserType() === Member::TYPE_CIRCLE) {
 			$basedOn = $member->getBasedOn();
 			$members = array_map(
 				function(Member $member) {
-					return $member->getUserId() . ' (' . Member::$TYPE[$member->getUserType()] . ')';
+					return $member->getUserId().' ('.Member::$TYPE[$member->getUserType()].')';
 				}, $basedOn->getInheritedMembers()
 			);
 
-			$info .= ' Member is a Circle (singleId: ' . $basedOn->getSingleId()
-					 . ') that contains those inherited members: ' . implode(', ', $members);
+			$info .= ' Member is a Circle (singleId: '.$basedOn->getSingleId()
+					 . ') that contains those inherited members: '.implode(', ', $members);
 		}
 
-		$this->log(3, $prefix . $info);
+		$this->log(3, $prefix.$info);
 	}
 
 }

lib/Listeners/Examples/ExampleRequestingCircleMember.php

Spacing +4 added lines, -4 removed lines

@@ -91,11 +91,11 @@
 
 		$circle = $event->getCircle();
 		$member = $event->getMember();
-		$info .= 'circleId: ' . $circle->getSingleId() . '; userId: ' . $member->getUserId() . '; userType: '
-				 . Member::$TYPE[$member->getUserType()] . '; singleId: ' . $member->getSingleId()
-				 . '; memberId: ' . $member->getId() . '; isLocal: ' . json_encode($member->isLocal()) . '; ';
+		$info .= 'circleId: '.$circle->getSingleId().'; userId: '.$member->getUserId().'; userType: '
+				 . Member::$TYPE[$member->getUserType()].'; singleId: '.$member->getSingleId()
+				 . '; memberId: '.$member->getId().'; isLocal: '.json_encode($member->isLocal()).'; ';
 
-		$this->log(3, $prefix . $info);
+		$this->log(3, $prefix.$info);
 	}
 
 }

lib/Db/MemberRequest.php

Spacing +6 added lines, -6 removed lines

@@ -239,8 +239,8 @@ 
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter);
 		}
 
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -265,8 +265,8 @@ 
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId, $level);
 
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc')
-		   ->addGroupBy($aliasMembership . '.inheritance_depth');
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc')
+		   ->addGroupBy($aliasMembership.'.inheritance_depth');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -308,7 +308,7 @@ 
 		$qb = $this->getMemberSelectSql();
 		$qb->limitToCircleId($circleId);
 
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
 
 		return array_map(
 			function(Member $member): string {
@@ -361,7 +361,7 @@ 
 	 */
 	public function searchFederatedUsers(string $needle): array {
 		$qb = $this->getMemberSelectSql();
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
 
 		return $this->getItemsFromRequest($qb, true);
 	}

lib/Service/ConfigService.php

Spacing +6 added lines, -6 removed lines

@@ -186,7 +186,7 @@ 
 			return $value;
 		}
 
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
 			return $value;
 		}
 
@@ -440,7 +440,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -469,12 +469,12 @@ 
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
 		}
 
-		$base = $scheme . '://' . $instance;
+		$base = $scheme.'://'.$instance;
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}
 
 
@@ -574,7 +574,7 @@ 
 	public function displayFederatedUser(IFederatedUser $federatedUser, bool $displayName = false): string {
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
 
-		return $name . $this->displayInstance($federatedUser->getInstance(), true);
+		return $name.$this->displayInstance($federatedUser->getInstance(), true);
 	}
 
 	/**
@@ -588,7 +588,7 @@ 
 			return '';
 		}
 
-		return (($showAt) ? '@' : '') . $instance;
+		return (($showAt) ? '@' : '').$instance;
 	}
 
 

lib/Command/MembersList.php

Spacing +14 added lines, -15 removed lines

@@ -186,11 +186,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 NC22TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -255,8 +255,7 @@ 
 						$member, $this->input->getOption('display-name')
 					),
 					$this->configService->displayInstance($member->getInstance()),
-					($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')
 					) : 'Unknown'
@@ -418,19 +417,19 @@ 
 				$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')
 						);
 					$source = ($member->hasBasedOn()) ? $member->getBasedOn()->getSource() : '';
-					$line .= ' <info>Source</info>: ' . Circle::$DEF_SOURCE[$source];
+					$line .= ' <info>Source</info>: '.Circle::$DEF_SOURCE[$source];
 				}
 
 				if ($lineNumber === 2) {
@@ -442,16 +441,16 @@ 
 						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();
 					}
 				}
 			}