nextcloud / circles

lib/Service/FederatedUserService.php

Spacing +5 added lines, -5 removed lines

@@ -508,7 +508,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');
 			}
 			$displayName = $this->userManager->getDisplayName($userId);
 		} else {
@@ -1023,7 +1023,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);
@@ -1227,7 +1227,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);
@@ -1295,8 +1295,8 @@ 
 	 * @return string
 	 */
 	private function generateCacheKey(FederatedUser $federatedUser): string {
-		return $federatedUser->getInstance() . '#'
-			   . $federatedUser->getUserType() . '#'
+		return $federatedUser->getInstance().'#'
+			   . $federatedUser->getUserType().'#'
 			   . $federatedUser->getUserId();
 	}
 }

lib/Service/RemoteStreamService.php

Spacing +4 added lines, -4 removed lines

@@ -266,7 +266,7 @@ 
 			//		$app->setAlgorithm(NCSignatory::SHA512);
 			$signedRequest = $this->signOutgoingRequest($request, $app);
 			$this->doRequest($signedRequest->getOutgoingRequest(), false);
-		} catch (RequestNetworkException|SignatoryException $e) {
+		} catch (RequestNetworkException | SignatoryException $e) {
 			throw new RemoteInstanceException($e->getMessage());
 		}
 
@@ -310,7 +310,7 @@ 
 	public function getCachedRemoteInstance(string $instance): RemoteInstance {
 		$remoteInstance = $this->remoteRequest->getFromInstance($instance);
 		if ($remoteInstance->getType() === RemoteInstance::TYPE_UNKNOWN) {
-			throw new UnknownRemoteException($instance . ' is set as \'unknown\' in database');
+			throw new UnknownRemoteException($instance.' is set as \'unknown\' in database');
 		}
 
 		return $remoteInstance;
@@ -499,7 +499,7 @@ 
 			$test = new ReflectionClass($class);
 			$this->confirmFederatedItemExceptionFromClass($test);
 			$e = $class;
-		} catch (ReflectionException|FederatedItemException $_e) {
+		} catch (ReflectionException | FederatedItemException $_e) {
 			$e = $this->getFederatedItemExceptionFromStatus($result->getStatusCode());
 		}
 
@@ -553,7 +553,7 @@ 
 	 * @throws RemoteNotFoundException
 	 * @throws RemoteUidException
 	 */
-	public function confirmValidRemote(RemoteInstance $remote, ?RemoteInstance &$stored = null): void {
+	public function confirmValidRemote(RemoteInstance $remote, ?RemoteInstance & $stored = null): void {
 		try {
 			$stored = $this->remoteRequest->getFromHref($remote->getId());
 		} catch (RemoteNotFoundException $e) {

lib/Service/ShareWrapperService.php

Spacing +2 added lines, -2 removed lines

@@ -324,8 +324,8 @@
 		int $nodeId,
 		string $probeSum,
 	): string {
-		return $federatedUser->getSingleId() . '#'
-			   . $nodeId . '#'
+		return $federatedUser->getSingleId().'#'
+			   . $nodeId.'#'
 			   . $probeSum;
 	}
 }

lib/Service/MembershipService.php

Spacing +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
 
 		try {
 			$this->circleRequest->getFederatedUserBySingleId($singleId);
-		} catch (FederatedUserNotFoundException|OwnerNotFoundException $e) {
+		} catch (FederatedUserNotFoundException | OwnerNotFoundException $e) {
 			$this->membershipRequest->removeBySingleId($singleId);
 		}
 
@@ -242,7 +242,7 @@ 
 	 */
 	private function getChildrenMembers(string $id, array &$knownIds = []): array {
 		$singleIds = array_map(
-			function (Member $item): string {
+			function(Member $item): string {
 				return $item->getSingleId();
 			}, $this->memberRequest->getMembers($id)
 		);
@@ -266,7 +266,7 @@ 
 	 */
 	private function getChildrenMemberships(string $id, array &$knownIds = []): array {
 		$singleIds = array_map(
-			function (Membership $item): string {
+			function(Membership $item): string {
 				return $item->getSingleId();
 			}, $this->membershipRequest->getInherited($id)
 		);
@@ -320,7 +320,7 @@ 
 	 */
 	private function removeDeprecatedMemberships(array $memberships, array $known): array {
 		$circleIds = array_map(
-			function (Membership $membership): string {
+			function(Membership $membership): string {
 				return $membership->getCircleId();
 			}, $memberships
 		);

lib/Controller/RemoteController.php

Spacing +3 added lines, -3 removed lines

@@ -449,21 +449,21 @@
 			/** @var FederatedUser $initiator */
 			$initiator = $store->gObj('initiator', FederatedUser::class);
 			$this->federatedUserService->setCurrentUser($initiator);
-		} catch (InvalidItemException|ItemNotFoundException $e) {
+		} catch (InvalidItemException | ItemNotFoundException $e) {
 		}
 
 		try {
 			/** @var FederatedUser $initiator */
 			$filterMember = $store->gObj('filterMember', Member::class);
 			$data->aObj('filterMember', $filterMember);
-		} catch (InvalidItemException|ItemNotFoundException $e) {
+		} catch (InvalidItemException | ItemNotFoundException $e) {
 		}
 
 		try {
 			/** @var FederatedUser $initiator */
 			$filterCircle = $store->gObj('filterCircle', Circle::class);
 			$data->aObj('filterCircle', $filterCircle);
-		} catch (InvalidItemException|ItemNotFoundException $e) {
+		} catch (InvalidItemException | ItemNotFoundException $e) {
 		}
 
 		return $data;

lib/Db/MemberRequestBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 			self::$tables[self::TABLE_MEMBER],
 			CoreQueryBuilder::MEMBER
 		)
-			->orderBy(CoreQueryBuilder::MEMBER . '.joined');
+			->orderBy(CoreQueryBuilder::MEMBER.'.joined');
 
 		if ($getBasedOn) {
 			$qb->leftJoinBasedOn(CoreQueryBuilder::MEMBER, $initiator);

lib/Search/GlobalScaleUsers.php

Spacing +2 added lines, -2 removed lines

@@ -66,11 +66,11 @@
 		try {
 			$users = $this->retrieveJson($request);
 		} catch (
-			RequestNetworkException|
+			RequestNetworkException |
 			RequestResultNotJsonException $e
 		) {
 			$this->miscService->log(
-				'Issue while search users from lookup: ' . get_class($e) . ' ' . $e->getMessage()
+				'Issue while search users from lookup: '.get_class($e).' '.$e->getMessage()
 			);
 
 			return [];

lib/Model/ShareWrapper.php

Spacing +18 added lines, -18 removed lines

@@ -437,7 +437,7 @@ 
 			$l10n = \OCP\Server::get(IFactory::class)->get('circles');
 			$display = $l10n->t('%s (Team owned by %s)', [$display, $circle->getOwner()->getDisplayName()]);
 		} else {
-			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
+			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')';
 		}
 
 		$share->setSharedWithDisplayName($display);
@@ -524,20 +524,20 @@ 
 
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
 		$shareTime = new DateTime();
-		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data));
-
-		$this->setId($this->get($prefix . 'id', $data))
-			->setShareType($this->getInt($prefix . 'share_type', $data))
-			->setPermissions($this->getInt($prefix . 'permissions', $data))
-			->setItemType($this->get($prefix . 'item_type', $data))
-			->setItemSource($this->getInt($prefix . 'item_source', $data))
-			->setItemTarget($this->get($prefix . 'item_target', $data))
-			->setFileSource($this->getInt($prefix . 'file_source', $data))
-			->setFileTarget($this->get($prefix . 'file_target', $data))
-			->setSharedWith($this->get($prefix . 'share_with', $data))
-			->setSharedBy($this->get($prefix . 'uid_initiator', $data))
-			->setShareOwner($this->get($prefix . 'uid_owner', $data))
-			->setToken($this->get($prefix . 'token', $data))
+		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data));
+
+		$this->setId($this->get($prefix.'id', $data))
+			->setShareType($this->getInt($prefix.'share_type', $data))
+			->setPermissions($this->getInt($prefix.'permissions', $data))
+			->setItemType($this->get($prefix.'item_type', $data))
+			->setItemSource($this->getInt($prefix.'item_source', $data))
+			->setItemTarget($this->get($prefix.'item_target', $data))
+			->setFileSource($this->getInt($prefix.'file_source', $data))
+			->setFileTarget($this->get($prefix.'file_target', $data))
+			->setSharedWith($this->get($prefix.'share_with', $data))
+			->setSharedBy($this->get($prefix.'uid_initiator', $data))
+			->setShareOwner($this->get($prefix.'uid_owner', $data))
+			->setToken($this->get($prefix.'token', $data))
 			->setShareTime($shareTime);
 
 		$this->importAttributesFromDatabase($this->get('attributes', $data));
@@ -548,9 +548,9 @@ 
 		//			$share->setPassword($this->get('password', $data, ''));
 		//		}
 
-		$this->setChildId($this->getInt($prefix . 'child_id', $data))
-			->setChildFileTarget($this->get($prefix . 'child_file_target', $data))
-			->setChildPermissions($this->getInt($prefix . 'child_permissions', $data))
+		$this->setChildId($this->getInt($prefix.'child_id', $data))
+			->setChildFileTarget($this->get($prefix.'child_file_target', $data))
+			->setChildPermissions($this->getInt($prefix.'child_permissions', $data))
 			->setProviderId(ShareByCircleProvider::IDENTIFIER)
 			->setStatus(Ishare::STATUS_ACCEPTED);
 

lib/Model/Circle.php

Spacing +35 added lines, -35 removed lines

@@ -70,27 +70,27 @@ 
 	public const FLAGS_LONG = 2;
 
 	// specific value
-	public const CFG_CIRCLE = 0;        // only for code readability. Circle is locked by default.
-	public const CFG_SINGLE = 1;        // Circle with only one single member.
-	public const CFG_PERSONAL = 2;      // Personal circle, only the owner can see it.
+	public const CFG_CIRCLE = 0; // only for code readability. Circle is locked by default.
+	public const CFG_SINGLE = 1; // Circle with only one single member.
+	public const CFG_PERSONAL = 2; // Personal circle, only the owner can see it.
 
 	// bitwise
-	public const CFG_SYSTEM = 4;            // System Circle (not managed by the official front-end). Meaning some config are limited
-	public const CFG_VISIBLE = 8;           // Visible to everyone, if not visible, people have to know its name to be able to find it
-	public const CFG_OPEN = 16;             // Circle is open, people can join
-	public const CFG_INVITE = 32;           // Adding a member generate an invitation that needs to be accepted
-	public const CFG_REQUEST = 64;          // Request to join Circles needs to be confirmed by a moderator
-	public const CFG_FRIEND = 128;          // Members of the circle can invite their friends
-	public const CFG_PROTECTED = 256;       // Password protected to join/request
-	public const CFG_NO_OWNER = 512;        // no owner, only members
-	public const CFG_HIDDEN = 1024;         // hidden from listing, but available as a share entity
-	public const CFG_BACKEND = 2048;            // Fully hidden, only backend Circles
-	public const CFG_LOCAL = 4096;              // Local even on GlobalScale
-	public const CFG_ROOT = 8192;               // Circle cannot be inside another Circle
-	public const CFG_CIRCLE_INVITE = 16384;     // Circle must confirm when invited in another circle
-	public const CFG_FEDERATED = 32768;         // Federated
-	public const CFG_MOUNTPOINT = 65536;        // Generate a Files folder for this Circle
-	public const CFG_APP = 131072;          // Some features are not available to the OCS API (ie. destroying Circle)
+	public const CFG_SYSTEM = 4; // System Circle (not managed by the official front-end). Meaning some config are limited
+	public const CFG_VISIBLE = 8; // Visible to everyone, if not visible, people have to know its name to be able to find it
+	public const CFG_OPEN = 16; // Circle is open, people can join
+	public const CFG_INVITE = 32; // Adding a member generate an invitation that needs to be accepted
+	public const CFG_REQUEST = 64; // Request to join Circles needs to be confirmed by a moderator
+	public const CFG_FRIEND = 128; // Members of the circle can invite their friends
+	public const CFG_PROTECTED = 256; // Password protected to join/request
+	public const CFG_NO_OWNER = 512; // no owner, only members
+	public const CFG_HIDDEN = 1024; // hidden from listing, but available as a share entity
+	public const CFG_BACKEND = 2048; // Fully hidden, only backend Circles
+	public const CFG_LOCAL = 4096; // Local even on GlobalScale
+	public const CFG_ROOT = 8192; // Circle cannot be inside another Circle
+	public const CFG_CIRCLE_INVITE = 16384; // Circle must confirm when invited in another circle
+	public const CFG_FEDERATED = 32768; // Federated
+	public const CFG_MOUNTPOINT = 65536; // Generate a Files folder for this Circle
+	public const CFG_APP = 131072; // Some features are not available to the OCS API (ie. destroying Circle)
 	public static $DEF_CFG_MAX = 262143;
 
 
@@ -459,7 +459,7 @@ 
 	 */
 	public function addInheritedMembers(array $members): self {
 		$knownIds = array_map(
-			function (Member $member): string {
+			function(Member $member): string {
 				return $member->getId();
 			}, $this->inheritedMembers
 		);
@@ -857,7 +857,7 @@ 
 			try {
 				$initiatorHelper->mustBeAdmin();
 				$arr['settings'] = $this->getSettings();
-			} catch (MemberHelperException|MemberLevelException $e) {
+			} catch (MemberHelperException | MemberLevelException $e) {
 			}
 		}
 
@@ -873,23 +873,23 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		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))
-			->setSanitizedName($this->get($prefix . 'sanitized_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))
+			->setSanitizedName($this->get($prefix.'sanitized_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);
 		$dateTime = DateTime::createFromFormat('Y-m-d H:i:s', $creation);
 		$timestamp = $dateTime ? $dateTime->getTimestamp() : (int)strtotime($creation);
 		$this->setCreation($timestamp);