nextcloud / circles

lib/Command/CirclesSync.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
 		if (($userId = $input->getOption('user')) !== '') {
 			$federatedUser = $this->syncService->syncNextcloudUser($userId);
 			$output->writeln(
-				'- Nextcloud User <info>' . $userId . '</info>/<info>' . $federatedUser->getSingleId()
+				'- Nextcloud User <info>'.$userId.'</info>/<info>'.$federatedUser->getSingleId()
 				. '</info> synced'
 			);
 		}
@@ -136,7 +136,7 @@ 
 		if (($groupId = $input->getOption('group')) !== '') {
 			$circle = $this->syncService->syncNextcloudGroup($groupId);
 			$output->writeln(
-				'- Nextcloud Group <info>' . $groupId . '</info>/<info>' . $circle->getSingleId()
+				'- Nextcloud Group <info>'.$groupId.'</info>/<info>'.$circle->getSingleId()
 				. '</info> synced'
 			);
 		}

lib/Command/CirclesConfig.php

Spacing +3 added lines, -3 removed lines

@@ -144,7 +144,7 @@ 
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
 				);
 			}
 
@@ -176,8 +176,8 @@ 
 			$value = array_search(strtoupper($item), $valid);
 			if (!$value) {
 				throw new InvalidArgumentException(
-					'Invalid config \'' . $item . '\'. Available values: '
-					. implode(', ', array_values($valid)) . '. '
+					'Invalid config \''.$item.'\'. Available values: '
+					. implode(', ', array_values($valid)).'. '
 					. 'To disable a config, start the value with an underscore'
 				);
 			}

lib/Command/SharesFiles.php

Spacing +5 added lines, -5 removed lines

@@ -222,7 +222,7 @@ 
 				$recipient = $share->getInitiator();
 				$sharedTo = $recipient->getDisplayName();
 				if (!$this->configService->isLocalInstance($recipient->getInstance())) {
-					$sharedTo .= '@' . $recipient->getInstance();
+					$sharedTo .= '@'.$recipient->getInstance();
 				}
 			}
 			$circle = $share->getCircle();
@@ -232,15 +232,15 @@ 
 				$share->getShareOwner(),
 				$share->getFileTarget(),
 				$share->getSharedBy(),
-				$circle->getDisplayName() . ' (' . $share->getSharedWith()
-				. ', ' . Circle::$DEF_SOURCE[$circle->getSource()] . ')'
+				$circle->getDisplayName().' ('.$share->getSharedWith()
+				. ', '.Circle::$DEF_SOURCE[$circle->getSource()].')'
 			];
 
 			if (!$filterRecipient) {
 				$row = array_merge(
 					$row, [
-							$sharedTo . ' (' . $recipient->getSingleId() . ', '
-							. Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()] . ')',
+							$sharedTo.' ('.$recipient->getSingleId().', '
+							. Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()].')',
 							(($share->getChildId() > 0) ? $share->getChildFileTarget(
 							) : $share->getFileTarget()),
 						]

lib/Command/CirclesMemberships.php

Spacing +20 added lines, -20 removed lines

@@ -213,10 +213,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:');
@@ -225,14 +225,14 @@ 
 		if ($count === 0) {
 			$output->writeln('(database not updated)');
 		} else {
-			$output->writeln('(' . $count . ' entries generated/updated in the database)');
+			$output->writeln('('.$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()].')'
 			);
 		}
 
@@ -305,9 +305,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;
@@ -319,28 +319,28 @@ 
 				$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;
@@ -397,7 +397,7 @@ 
 			);
 		}
 
-		$output->writeln($count . ' memberships updated');
+		$output->writeln($count.' memberships updated');
 	}
 
 }

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

Indentation +1 added lines, -1 removed lines

@@ -453,7 +453,7 @@
 
 
 	/**
- 	 * @NoAdminRequired
+	 * @NoAdminRequired
 	 *
 	 * @param string $circleId
 	 * @param int $value

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