nextcloud / circles

lib/CirclesManager.php

Doc Comments -1 removed lines

@@ -83,7 +83,6 @@
 	/**
 	 * CirclesManager constructor.
 	 *
-	 * @param IUserSession $userSession
 	 * @param FederatedUserService $federatedUserService
 	 * @param CircleService $circleService
 	 * @param MemberService $memberService

lib/Service/MaintenanceService.php

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 	 */
 	private function output(string $message): void {
 		if (!is_null($this->output)) {
-			$this->output->writeln('- ' . $message);
+			$this->output->writeln('- '.$message);
 		}
 	}
 

lib/Model/FederatedUser.php

Spacing +6 added lines, -6 removed lines

@@ -400,15 +400,15 @@
 	 * @throws FederatedUserNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new FederatedUserNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setUserId($this->get($prefix . 'user_id', $data));
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setUserId($this->get($prefix.'user_id', $data));
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
 
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
 

lib/Model/Federated/RemoteInstance.php

Spacing +14 added lines, -14 removed lines

@@ -50,11 +50,11 @@ 
 
 	use TArrayTools;
 
-	const TYPE_UNKNOWN = 'Unknown';    // not trusted
-	const TYPE_PASSIVE = 'Passive';    // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
-	const TYPE_EXTERNAL = 'External';  // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
-	const TYPE_TRUSTED = 'Trusted';    // everything about Federated Circles are broadcasted.
-	const TYPE_GLOBALSCALE = 'GlobalScale';  // every Circle is broadcasted,
+	const TYPE_UNKNOWN = 'Unknown'; // not trusted
+	const TYPE_PASSIVE = 'Passive'; // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
+	const TYPE_EXTERNAL = 'External'; // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
+	const TYPE_TRUSTED = 'Trusted'; // everything about Federated Circles are broadcasted.
+	const TYPE_GLOBALSCALE = 'GlobalScale'; // every Circle is broadcasted,
 
 	public static $LIST_TYPE = [
 		self::TYPE_UNKNOWN,
@@ -477,7 +477,7 @@ 
 		];
 
 		if ($this->getAuthSigned() !== '') {
-			$data['auth-signed'] = $this->getAlgorithm() . ':' . $this->getAuthSigned();
+			$data['auth-signed'] = $this->getAlgorithm().':'.$this->getAuthSigned();
 		}
 
 		if (!empty($this->getAliases())) {
@@ -496,17 +496,17 @@ 
 	 * @throws RemoteNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->getInt($prefix . 'id', $data) === 0) {
+		if ($this->getInt($prefix.'id', $data) === 0) {
 			throw new RemoteNotFoundException();
 		}
 
-		$this->setDbId($this->getInt($prefix . 'id', $data));
-		$this->import($this->getArray($prefix . 'item', $data));
-		$this->setOrigData($this->getArray($prefix . 'item', $data));
-		$this->setType($this->get($prefix . 'type', $data));
-		$this->setInterface($this->getInt($prefix . 'interface', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setId($this->get($prefix . 'href', $data));
+		$this->setDbId($this->getInt($prefix.'id', $data));
+		$this->import($this->getArray($prefix.'item', $data));
+		$this->setOrigData($this->getArray($prefix.'item', $data));
+		$this->setType($this->get($prefix.'type', $data));
+		$this->setInterface($this->getInt($prefix.'interface', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setId($this->get($prefix.'href', $data));
 
 		return $this;
 	}

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/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);
 	}
 
 }