nextcloud / circles

lib/Service/SyncService.php

Spacing +1 added lines, -1 removed lines

@@ -280,7 +280,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/FederatedUserService.php

Spacing +3 added lines, -3 removed lines

@@ -320,7 +320,7 @@ 
 	public function getLocalFederatedUser(string $userId): FederatedUser {
 		$user = $this->userManager->get($userId);
 		if ($user === null) {
-			throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
+			throw new FederatedUserNotFoundException('user '.$userId.' not found');
 		}
 
 		$federatedUser = new FederatedUser();
@@ -721,7 +721,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($this->getLocalDisplayName($federatedUser))
 				   ->setSingleId($id)
 				   ->setSource($source);
@@ -851,7 +851,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/Controller/LocalController.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 					throw new OCSException('works only from local instance', 404);
 				}
 
-				$userId = $currentUser->getUserId() . '/' . $userId;
+				$userId = $currentUser->getUserId().'/'.$userId;
 			}
 
 			$federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type);

lib/Listeners/Files/MemberAdded.php

Spacing +2 added lines, -2 removed lines

@@ -74,8 +74,8 @@
 			$result[$instance] = $item->gData('files');
 		}
 
-		\OC::$server->getLogger()->log(3, 'FILES: ' . json_encode($result));
-		\OC::$server->getLogger()->log(3, 'MAILS: ' . json_encode($federatedUsers));
+		\OC::$server->getLogger()->log(3, 'FILES: '.json_encode($result));
+		\OC::$server->getLogger()->log(3, 'MAILS: '.json_encode($federatedUsers));
 	}
 
 }

lib/MountManager/CircleMountManager.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	 * @return string
 	 */
 	protected function stripPath($path) {
-		$prefix = '/' . $this->userId . '/files';
+		$prefix = '/'.$this->userId.'/files';
 
 		return rtrim(substr($path, strlen($prefix)), '/');
 	}

lib/FederatedItems/SingleMemberAdd.php

Spacing +5 added lines, -5 removed lines

@@ -325,10 +325,10 @@ 
 	protected function generateMember(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());
 			}
@@ -601,7 +601,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());
 		}
 	}
 
@@ -753,7 +753,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 mail with a link to access them.\n",
@@ -795,7 +795,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/Model/FederatedUser.php

Spacing +5 added lines, -5 removed lines

@@ -394,14 +394,14 @@
 	 * @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->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->setInstance($this->get($prefix.'instance', $data));
 
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
 

lib/Model/Mount.php

Spacing +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
 			return $this->mountPoint;
 		}
 
-		return '/' . $this->getInitiator()->getUserId() . '/files/' . ltrim($this->mountPoint, '/');
+		return '/'.$this->getInitiator()->getUserId().'/files/'.ltrim($this->mountPoint, '/');
 	}
 
 	/**

lib/Model/Circle.php

Spacing +31 added lines, -31 removed lines

@@ -84,26 +84,26 @@ 
 
 
 	// specific value
-	const CFG_CIRCLE = 0;        // only for code readability. Circle is locked by default.
-	const CFG_SINGLE = 1;        // Circle with only one single member.
-	const CFG_PERSONAL = 2;      // Personal circle, only the owner can see it.
+	const CFG_CIRCLE = 0; // only for code readability. Circle is locked by default.
+	const CFG_SINGLE = 1; // Circle with only one single member.
+	const CFG_PERSONAL = 2; // Personal circle, only the owner can see it.
 
 	// bitwise
-	const CFG_SYSTEM = 4;            // System Circle (not managed by the official front-end). Meaning some config are limited
-	const CFG_VISIBLE = 8;           // Visible to everyone, if not visible, people have to know its name to be able to find it
-	const CFG_OPEN = 16;             // Circle is open, people can join
-	const CFG_INVITE = 32;           // Adding a member generate an invitation that needs to be accepted
-	const CFG_REQUEST = 64;          // Request to join Circles needs to be confirmed by a moderator
-	const CFG_FRIEND = 128;          // Members of the circle can invite their friends
-	const CFG_PROTECTED = 256;       // Password protected to join/request
-	const CFG_NO_OWNER = 512;        // no owner, only members
-	const CFG_HIDDEN = 1024;         // hidden from listing, but available as a share entity
-	const CFG_BACKEND = 2048;        // Fully hidden, only backend Circles
-	const CFG_LOCAL = 4096;         // Local even on GlobalScale
-	const CFG_ROOT = 8192;           // Circle cannot be inside another Circle
-	const CFG_CIRCLE_INVITE = 16384;  // Circle must confirm when invited in another circle
-	const CFG_FEDERATED = 32768;     // Federated
-	const CFG_MOUNTPOINT = 65536;         // Generate a Files folder for this Circle
+	const CFG_SYSTEM = 4; // System Circle (not managed by the official front-end). Meaning some config are limited
+	const CFG_VISIBLE = 8; // Visible to everyone, if not visible, people have to know its name to be able to find it
+	const CFG_OPEN = 16; // Circle is open, people can join
+	const CFG_INVITE = 32; // Adding a member generate an invitation that needs to be accepted
+	const CFG_REQUEST = 64; // Request to join Circles needs to be confirmed by a moderator
+	const CFG_FRIEND = 128; // Members of the circle can invite their friends
+	const CFG_PROTECTED = 256; // Password protected to join/request
+	const CFG_NO_OWNER = 512; // no owner, only members
+	const CFG_HIDDEN = 1024; // hidden from listing, but available as a share entity
+	const CFG_BACKEND = 2048; // Fully hidden, only backend Circles
+	const CFG_LOCAL = 4096; // Local even on GlobalScale
+	const CFG_ROOT = 8192; // Circle cannot be inside another Circle
+	const CFG_CIRCLE_INVITE = 16384; // Circle must confirm when invited in another circle
+	const CFG_FEDERATED = 32768; // Federated
+	const CFG_MOUNTPOINT = 65536; // Generate a Files folder for this Circle
 
 	public static $DEF_CFG_MAX = 131071;
 
@@ -717,22 +717,22 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->get($prefix . 'unique_id', $data) === '') {
+		if ($this->get($prefix.'unique_id', $data) === '') {
 			throw new CircleNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'unique_id', $data))
-			 ->setName($this->get($prefix . 'name', $data))
-			 ->setDisplayName($this->get($prefix . 'display_name', $data))
-			 ->setConfig($this->getInt($prefix . 'config', $data))
-			 ->setSource($this->getInt($prefix . 'source', $data))
-			 ->setInstance($this->get($prefix . 'instance', $data))
-			 ->setSettings($this->getArray($prefix . 'settings', $data))
-			 ->setContactAddressBook($this->getInt($prefix . 'contact_addressbook', $data))
-			 ->setContactGroupName($this->get($prefix . 'contact_groupname', $data))
-			 ->setDescription($this->get($prefix . 'description', $data));
-
-		$creation = $this->get($prefix . 'creation', $data);
+		$this->setSingleId($this->get($prefix.'unique_id', $data))
+			 ->setName($this->get($prefix.'name', $data))
+			 ->setDisplayName($this->get($prefix.'display_name', $data))
+			 ->setConfig($this->getInt($prefix.'config', $data))
+			 ->setSource($this->getInt($prefix.'source', $data))
+			 ->setInstance($this->get($prefix.'instance', $data))
+			 ->setSettings($this->getArray($prefix.'settings', $data))
+			 ->setContactAddressBook($this->getInt($prefix.'contact_addressbook', $data))
+			 ->setContactGroupName($this->get($prefix.'contact_groupname', $data))
+			 ->setDescription($this->get($prefix.'description', $data));
+
+		$creation = $this->get($prefix.'creation', $data);
 		$this->setCreation(DateTime::createFromFormat('Y-m-d H:i:s', $creation)->getTimestamp());
 
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);

Doc Comments +2 added lines, -2 removed lines

@@ -358,7 +358,7 @@ 
 
 
 	/**
-	 * @param ?Member $owner
+	 * @param Member $owner
 	 *
 	 * @return self
 	 */
@@ -414,7 +414,7 @@ 
 
 
 	/**
-	 * @param array $members
+	 * @param Member[] $members
 	 * @param bool $detailed
 	 *
 	 * @return self