nextcloud / circles

lib/Tools/Model/NCSignedRequest.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 	 */
 	public function setBody(string $body): self {
 		$this->body = $body;
-		$this->setDigest('SHA-256=' . base64_encode(hash('sha256', utf8_encode($body), true)));
+		$this->setDigest('SHA-256='.base64_encode(hash('sha256', utf8_encode($body), true)));
 
 		return $this;
 	}

lib/Command/MigrateCustomGroups.php

Spacing +7 added lines, -7 removed lines

@@ -78,18 +78,18 @@ 
 
 			$name = $rowCG['display_name'];
 			while (strlen($name) < 3) {
-				$name = '_' . $name;
+				$name = '_'.$name;
 			}
 
 			// based on owner's userid, we create federateduser and a new circle
-			$this->output->writeln('+ New Team <info>' . $name . '</info>, owner by <info>' . $ownerId . '</info>');
+			$this->output->writeln('+ New Team <info>'.$name.'</info>, owner by <info>'.$ownerId.'</info>');
 			$owner = $this->cachedFed($ownerId);
 
 			$this->circlesManager->startSession($owner);
 			try {
 				$circle = $this->circlesManager->createCircle($name);
 			} catch (\Exception $e) {
-				$this->output->writeln('<error>' . get_class($e) . ' ' . $e->getMessage() . '</error> with data ' . json_encode($rowCG));
+				$this->output->writeln('<error>'.get_class($e).' '.$e->getMessage().'</error> with data '.json_encode($rowCG));
 				$this->logger->log(2, 'error while creating circle', ['exception' => $e]);
 				$this->circlesManager->stopSession();
 				continue;
@@ -116,13 +116,13 @@ 
 						continue; // owner is already in the circles
 					}
 
-					$this->output->writeln(' - new member <info>' . $userId . '</info>');
+					$this->output->writeln(' - new member <info>'.$userId.'</info>');
 					$member = $this->circlesManager->addMember($circle->getSingleId(), $this->cachedFed($userId));
 					if ($rowM['role'] === '1') {
 						$this->circlesManager->levelMember($member->getId(), Member::LEVEL_ADMIN);
 					}
 				} catch (\Exception $e) {
-					$this->output->writeln('<error>' . get_class($e) . ' ' . $e->getMessage() . '</error>');
+					$this->output->writeln('<error>'.get_class($e).' '.$e->getMessage().'</error>');
 					$this->logger->log(2, 'error while migrating custom group member', ['exception' => $e]);
 				}
 			}
@@ -158,7 +158,7 @@ 
 			->where($update->expr()->in('id', $update->createNamedParameter($shareIds, IQueryBuilder::PARAM_INT_ARRAY)));
 
 		$count = $update->executeStatement();
-		$this->output->writeln('> ' . $count . ' shares updated');
+		$this->output->writeln('> '.$count.' shares updated');
 
 		$this->fixShareChildren($shareIds, $memberIds);
 	}
@@ -198,7 +198,7 @@ 
 			$count += $update->executeStatement();
 		}
 
-		$this->output->writeln('> ' . $count . ' children shares updated');
+		$this->output->writeln('> '.$count.' children shares updated');
 	}
 
 

lib/Command/MembersAdd.php

Spacing +6 added lines, -6 removed lines

@@ -109,7 +109,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()
 				);
 			}
 
@@ -148,10 +148,10 @@ 
 		try {
 			$users = $this->retrieveJson($request);
 		} catch (
-			RequestContentException|
-			RequestNetworkException|
-			RequestResultSizeException|
-			RequestServerException|
+			RequestContentException |
+			RequestNetworkException |
+			RequestResultSizeException |
+			RequestServerException |
 			RequestResultNotJsonException $e
 		) {
 			return '';
@@ -169,7 +169,7 @@ 
 				$instance = $host;
 			}
 
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
 		}
 
 		//		if ($userId === '') {

lib/Command/MembersList.php

Spacing +16 added lines, -17 removed lines

@@ -167,11 +167,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 TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -236,8 +236,7 @@ 
 						$member,
 						$this->input->getOption('display-name')
 					),
-					($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')
@@ -327,7 +326,7 @@ 
 							$circle = $this->remoteService->getCircleFromInstance(
 								$member->getSingleId(), $member->getInstance(), $data
 							);
-						} catch (CircleNotFoundException|RemoteInstanceException $e) {
+						} catch (CircleNotFoundException | RemoteInstanceException $e) {
 						}
 					} else {
 						$this->federatedUserService->commandLineInitiator(
@@ -403,14 +402,14 @@ 
 				$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')
 					);
@@ -418,7 +417,7 @@ 
 						$line .= ' <info>Source</info>: '
 								 . Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()];
 					} else {
-						$line .= ' <info>Type</info>: ' . Member::$TYPE[$member->getUserType()];
+						$line .= ' <info>Type</info>: '.Member::$TYPE[$member->getUserType()];
 					}
 				}
 
@@ -431,21 +430,21 @@ 
 						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();
 					}
 				}
 			}
 
 			return $line;
-		} catch (InvalidItemException|ItemNotFoundException|UnknownTypeException $e) {
+		} catch (InvalidItemException | ItemNotFoundException | UnknownTypeException $e) {
 		}
 
 		return '';

lib/Command/CirclesTest.php

Spacing +66 added lines, -66 removed lines

@@ -183,7 +183,7 @@ 
 
 		// get the singleId of a Group
 		$federatedUser = $circlesManager->getFederatedUser('testGroup', Member::TYPE_GROUP);
-		echo 'singleId: ' . $federatedUser->getSingleId() . "\n";
+		echo 'singleId: '.$federatedUser->getSingleId()."\n";
 
 		//		$federatedUser->getMemberships();
 
@@ -222,8 +222,8 @@ 
 
 
 		$members = array_map(
-			function (Member $member): string {
-				return $member->getUserId() . ' ' . $member->getSingleId() . '   - ' . $member->getUserType();
+			function(Member $member): string {
+				return $member->getUserId().' '.$member->getSingleId().'   - '.$member->getUserType();
 			}, $circle->getInheritedMembers()
 		);
 
@@ -309,7 +309,7 @@ 
 			} catch (Exception $e) {
 				if ($this->pOn) {
 					$message = ($e->getMessage() !== '') ? $e->getMessage() : get_class($e);
-					$this->output->writeln('<error>' . $message . '</error>');
+					$this->output->writeln('<error>'.$message.'</error>');
 				} else {
 					throw $e;
 				}
@@ -393,7 +393,7 @@ 
 	 */
 	private function loadConfiguration() {
 		$this->p('Loading configuration');
-		$configuration = file_get_contents(__DIR__ . '/../../testConfiguration.json');
+		$configuration = file_get_contents(__DIR__.'/../../testConfiguration.json');
 		$this->config = json_decode($configuration, true);
 		$this->r(true, 'testConfiguration.json');
 
@@ -426,22 +426,22 @@ 
 		$this->r();
 
 		foreach ($this->getInstances() as $instance) {
-			$this->p('Creating users on ' . $instance);
+			$this->p('Creating users on '.$instance);
 			foreach ($this->getConfigArray($instance, 'users') as $userId) {
 				$this->pm($userId);
 				$this->occ(
-					$instance, 'user:add --password-from-env ' . $userId, false, false,
+					$instance, 'user:add --password-from-env '.$userId, false, false,
 					['OC_PASS' => 'testtest']
 				);
 			}
 			$this->r();
 
 			foreach ($this->getConfigArray($instance, 'groups') as $groupId => $users) {
-				$this->p('Creating group <info>' . $groupId . '</info> on <info>' . $instance . '</info>');
-				$this->occ($instance, 'group:add ' . $groupId, false, false);
+				$this->p('Creating group <info>'.$groupId.'</info> on <info>'.$instance.'</info>');
+				$this->occ($instance, 'group:add '.$groupId, false, false);
 				foreach ($users as $userId) {
 					$this->pm($userId);
-					$this->occ($instance, 'group:adduser ' . $groupId . ' ' . $userId, true, false);
+					$this->occ($instance, 'group:adduser '.$groupId.' '.$userId, true, false);
 				}
 				$this->r();
 			}
@@ -475,7 +475,7 @@ 
 		foreach ($this->getInstances(true) as $instance) {
 			$this->pm($instance);
 			foreach ($this->getConfigArray($instance, 'config') as $k => $v) {
-				$this->occ($instance, 'config:app:set --value ' . $v . ' circles ' . $k, true, false);
+				$this->occ($instance, 'config:app:set --value '.$v.' circles '.$k, true, false);
 			}
 		}
 		$this->r();
@@ -488,7 +488,7 @@ 
 	 */
 	private function confirmVersion() {
 		$version = $this->configService->getAppValue('installed_version');
-		$this->p('Confirming version <info>' . $version . '</info>');
+		$this->p('Confirming version <info>'.$version.'</info>');
 		foreach ($this->getInstances(false) as $instance) {
 			$this->pm($instance);
 			$capabilities = $this->occ($instance, 'circles:check --capabilities');
@@ -539,12 +539,12 @@ 
 	 */
 	private function statusFreshInstances() {
 		foreach ($this->getInstances() as $instanceId) {
-			$this->p('Circles on ' . $instanceId);
+			$this->p('Circles on '.$instanceId);
 			$result = $this->occ($instanceId, 'circles:manage:list --all');
 			$expectedSize = sizeof($this->getConfigArray($instanceId, 'groups'))
 							+ sizeof($this->getConfigArray($instanceId, 'users'))
 							+ 1;
-			$this->r((sizeof($result) === $expectedSize), sizeof($result) . ' circles');
+			$this->r((sizeof($result) === $expectedSize), sizeof($result).' circles');
 
 			$membersList = $groupsList = [];
 			foreach ($result as $item) {
@@ -563,12 +563,12 @@ 
 			$instance = $this->getConfig($instanceId, 'config.frontal_cloud_id');
 
 			foreach ($this->getConfigArray($instanceId, 'users') as $userId) {
-				$this->p('Checking Single Circle for <comment>' . $userId . '@' . $instance . '</comment>');
+				$this->p('Checking Single Circle for <comment>'.$userId.'@'.$instance.'</comment>');
 				$circle = $this->getSingleCircleForMember($membersList, $userId, $instance);
 
 				$compareToOwnerBasedOn = new Circle();
 				$compareToOwnerBasedOn->setConfig(Circle::CFG_SINGLE)
-					->setName('user:' . $userId . ':{CIRCLEID}')
+					->setName('user:'.$userId.':{CIRCLEID}')
 					->setDisplayName($userId);
 
 				$compareToOwner = new Member();
@@ -586,7 +586,7 @@ 
 				$compareTo = new Circle();
 				$compareTo->setOwner($compareToOwner)
 					->setConfig(Circle::CFG_SINGLE)
-					->setName('user:' . $userId . ':{CIRCLEID}')
+					->setName('user:'.$userId.':{CIRCLEID}')
 					->setDisplayName($userId);
 
 				$this->confirmCircleData($circle, $compareTo);
@@ -623,8 +623,8 @@ 
 			$this->r(true, $circle->getSingleId());
 
 			foreach ($this->getConfigArray($instanceId, 'groups') as $groupId => $members) {
-				$this->p('Checking Circle for <comment>' . $groupId . '@' . $instance . '</comment>');
-				$circle = $this->getCircleFromList($groupsList, 'group:' . $groupId);
+				$this->p('Checking Circle for <comment>'.$groupId.'@'.$instance.'</comment>');
+				$circle = $this->getCircleFromList($groupsList, 'group:'.$groupId);
 
 				$appCircle = $this->getSingleCircleForMember($membersList, 'circles', $instance);
 				$appOwner = $appCircle->getOwner();
@@ -648,7 +648,7 @@ 
 				$compareTo = new Circle();
 				$compareTo->setOwner($compareToOwner)
 					->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
-					->setName('group:' . $groupId)
+					->setName('group:'.$groupId)
 					->setDisplayName($groupId);
 
 				$this->confirmCircleData($circle, $compareTo);
@@ -665,12 +665,12 @@ 
 	 */
 	private function createRemoteLink() {
 		foreach ($this->getInstances() as $instanceId) {
-			$this->p('Init remote link from ' . $instanceId);
+			$this->p('Init remote link from '.$instanceId);
 			$links = $this->getConfigArray($instanceId, 'remote');
 			foreach ($links as $link => $type) {
 				$remote = $this->getConfig($link, 'config.frontal_cloud_id');
-				$this->pm($remote . '(' . $type . ')');
-				$this->occ($instanceId, 'circles:remote ' . $remote . ' --type ' . $type . ' --yes');
+				$this->pm($remote.'('.$type.')');
+				$this->occ($instanceId, 'circles:remote '.$remote.' --type '.$type.' --yes');
 			}
 			$this->r();
 		}
@@ -684,7 +684,7 @@ 
 	private function buildingLocalDatabase() {
 		$this->circles = $this->federatedUsers = [];
 		foreach ($this->getInstances() as $instanceId) {
-			$this->p('Retrieving Circles from ' . $instanceId);
+			$this->p('Retrieving Circles from '.$instanceId);
 			$circles = $this->occ($instanceId, 'circles:manage:list --all');
 			foreach ($circles as $item) {
 				/** @var Circle $circle */
@@ -719,7 +719,7 @@ 
 		$name = self::$TEST_CIRCLES[0];
 		$owner = $this->getInstanceUsers($localInstanceId)[1];
 		$dataCreatedCircle001 =
-			$this->occ($localInstanceId, 'circles:manage:create --type user ' . $owner . ' ' . $name);
+			$this->occ($localInstanceId, 'circles:manage:create --type user '.$owner.' '.$name);
 		/** @var Circle $createdCircle */
 		$createdCircle = $this->deserialize($dataCreatedCircle001, Circle::class);
 		$this->circles[$localInstanceId][$createdCircle->getName()] = $createdCircle;
@@ -751,7 +751,7 @@ 
 
 
 		$this->p('Comparing local stored data');
-		$dataCircle = $this->occ($localInstanceId, 'circle:manage:details ' . $createdCircle->getSingleId());
+		$dataCircle = $this->occ($localInstanceId, 'circle:manage:details '.$createdCircle->getSingleId());
 
 		/** @var Circle $tmpCircle */
 		$tmpCircle = $this->deserialize($dataCircle, Circle::class);
@@ -760,9 +760,9 @@ 
 
 		$links = $this->getConfigArray('global-scale-1', 'remote');
 		foreach ($this->getInstances(false) as $instanceId) {
-			$this->p('Comparing data stored on ' . $instanceId);
+			$this->p('Comparing data stored on '.$instanceId);
 			$dataCircle =
-				$this->occ($instanceId, 'circle:manage:details ' . $createdCircle->getSingleId(), false);
+				$this->occ($instanceId, 'circle:manage:details '.$createdCircle->getSingleId(), false);
 
 			if ($instanceId === $localInstanceId || $links[$instanceId] === 'GlobalScale') {
 				/** @var Circle $tmpCircle */
@@ -815,11 +815,11 @@ 
 		$name = self::$TEST_CIRCLES[0];
 		$circle = $this->getCircleByName($localInstanceId, $name);
 		$userId = $this->getInstanceUsers($localInstanceId)[6];
-		$userCircle = $this->getCircleByName($localInstanceId, 'user:' . $userId);
+		$userCircle = $this->getCircleByName($localInstanceId, 'user:'.$userId);
 		$user = $userCircle->getOwner();
 		$dataAddedMember =
 			$this->occ(
-				$localInstanceId, 'circles:members:add ' . $circle->getSingleId() . ' ' . $user->getSingleId()
+				$localInstanceId, 'circles:members:add '.$circle->getSingleId().' '.$user->getSingleId()
 			);
 		/** @var Member $addedMember */
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
@@ -839,11 +839,11 @@ 
 
 		$circle = $this->getCircleByName($localInstanceId, $circleName);
 		$userId = $this->getInstanceUsers($localInstanceId)[6];
-		$userCircle = $this->getCircleByName($localInstanceId, 'user:' . $userId);
+		$userCircle = $this->getCircleByName($localInstanceId, 'user:'.$userId);
 		$user = $userCircle->getOwner();
 		$dataAddedMember =
 			$this->occ(
-				$localInstanceId, 'circles:members:add ' . $circle->getSingleId() . ' ' . $user->getSingleId()
+				$localInstanceId, 'circles:members:add '.$circle->getSingleId().' '.$user->getSingleId()
 			);
 		/** @var Member $addedMember */
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
@@ -937,13 +937,13 @@ 
 			];
 		}
 
-		$this->compare($compareTo->getSingleId(), $circle->getSingleId(), $prefix . '.id', $params);
-		$this->compare($compareTo->getName(), $circle->getName(), $prefix . '.name', $params);
+		$this->compare($compareTo->getSingleId(), $circle->getSingleId(), $prefix.'.id', $params);
+		$this->compare($compareTo->getName(), $circle->getName(), $prefix.'.name', $params);
 		$this->compare(
-			$compareTo->getDisplayName(), $circle->getDisplayName(), $prefix . '.displayName', $params
+			$compareTo->getDisplayName(), $circle->getDisplayName(), $prefix.'.displayName', $params
 		);
-		$this->compareInt($compareTo->getConfig(), $circle->getConfig(), $prefix . '.config', true);
-		$this->compareInt($compareTo->getSource(), $circle->getSource(), $prefix . '.source');
+		$this->compareInt($compareTo->getConfig(), $circle->getConfig(), $prefix.'.config', true);
+		$this->compareInt($compareTo->getSource(), $circle->getSource(), $prefix.'.source');
 
 		if ($compareTo->hasOwner()) {
 			$compareToOwner = $compareTo->getOwner();
@@ -953,7 +953,7 @@ 
 					throw new Exception('empty owner');
 				}
 				if ($owner->getCircleId() !== $circle->getSingleId()) {
-					throw new Exception($prefix . '.owner.circleId is different than ' . $prefix . '.id');
+					throw new Exception($prefix.'.owner.circleId is different than '.$prefix.'.id');
 				}
 				$this->confirmMemberData($owner, $compareToOwner, 'owner', false, $params);
 			}
@@ -966,7 +966,7 @@ 
 				}
 				$initiator = $circle->getInitiator();
 				if ($initiator->getCircleId() !== $circle->getSingleId()) {
-					throw new Exception($prefix . '.initiator.circleId is different than ' . $prefix . '.id');
+					throw new Exception($prefix.'.initiator.circleId is different than '.$prefix.'.id');
 				}
 				$this->confirmMemberData($initiator, $compareToInitiator, 'owner', false, $params);
 			}
@@ -993,27 +993,27 @@ 
 		bool $versa = false,
 		array $params = [],
 	) {
-		$this->compare($compareTo->getId(), $member->getId(), $prefix . '.id', $params);
-		$this->compare($compareTo->getCircleId(), $member->getCircleId(), $prefix . '.circleId', $params);
-		$this->compare($compareTo->getSingleId(), $member->getSingleId(), $prefix . '.singleId', $params);
-		$this->compare($compareTo->getUserId(), $member->getUserId(), $prefix . '.userId', $params);
+		$this->compare($compareTo->getId(), $member->getId(), $prefix.'.id', $params);
+		$this->compare($compareTo->getCircleId(), $member->getCircleId(), $prefix.'.circleId', $params);
+		$this->compare($compareTo->getSingleId(), $member->getSingleId(), $prefix.'.singleId', $params);
+		$this->compare($compareTo->getUserId(), $member->getUserId(), $prefix.'.userId', $params);
 		$this->compare(
-			$compareTo->getDisplayName(), $member->getDisplayName(), $prefix . '.displayName', $params
+			$compareTo->getDisplayName(), $member->getDisplayName(), $prefix.'.displayName', $params
 		);
-		$this->compareInt($compareTo->getUserType(), $member->getUserType(), $prefix . '.userType');
-		$this->compare($compareTo->getInstance(), $member->getInstance(), $prefix . '.instance', $params);
-		$this->compareInt($compareTo->getLevel(), $member->getLevel(), $prefix . '.level', true);
-		$this->compare($compareTo->getStatus(), $member->getStatus(), $prefix . '.status', $params);
+		$this->compareInt($compareTo->getUserType(), $member->getUserType(), $prefix.'.userType');
+		$this->compare($compareTo->getInstance(), $member->getInstance(), $prefix.'.instance', $params);
+		$this->compareInt($compareTo->getLevel(), $member->getLevel(), $prefix.'.level', true);
+		$this->compare($compareTo->getStatus(), $member->getStatus(), $prefix.'.status', $params);
 
 		if ($compareTo->hasBasedOn()) {
 			if (!$member->hasBasedOn()) {
-				throw new Exception('empty ' . $prefix . '.basedOn');
+				throw new Exception('empty '.$prefix.'.basedOn');
 			}
 			$basedOn = $member->getBasedOn();
 			$this->confirmCircleData(
 				$basedOn,
 				$compareTo->getBasedOn(),
-				$prefix . '.basedOn',
+				$prefix.'.basedOn',
 				false,
 				$params
 			);
@@ -1032,7 +1032,7 @@ 
 	private function compare(string $expected, string $compare, string $def, array $params) {
 		if ($expected !== ''
 			&& $this->feedStringWithParams($expected, $params) !== $compare) {
-			throw new Exception($def . ': ' . $compare . ' (' . $expected . ')');
+			throw new Exception($def.': '.$compare.' ('.$expected.')');
 		}
 	}
 
@@ -1048,7 +1048,7 @@ 
 	private function compareInt(int $expected, int $compare, string $def, bool $force = false) {
 		if (($expected > 0 || ($force && $expected >= 0))
 			&& $expected !== $compare) {
-			throw new Exception('wrong ' . $def . ': ' . $compare . ' (' . $expected . ')');
+			throw new Exception('wrong '.$def.': '.$compare.' ('.$expected.')');
 		}
 	}
 
@@ -1084,7 +1084,7 @@ 
 			}
 		}
 
-		throw new CircleNotFoundException('cannot find ' . $userId . ' in the list of Single Circle');
+		throw new CircleNotFoundException('cannot find '.$userId.' in the list of Single Circle');
 	}
 
 
@@ -1102,7 +1102,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract \'' . $name . '\' from the list of generated Circles'
+			'cannot extract \''.$name.'\' from the list of generated Circles'
 		);
 	}
 
@@ -1122,7 +1122,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract  \'' . $name . '\' from the list of provided Circles'
+			'cannot extract  \''.$name.'\' from the list of provided Circles'
 		);
 	}
 
@@ -1167,7 +1167,7 @@ 
 			}
 		}
 
-		throw new ItemNotFoundException($instance . ' not found');
+		throw new ItemNotFoundException($instance.' not found');
 	}
 
 
@@ -1202,7 +1202,7 @@ 
 	): ?array {
 		$configInstance = $this->getConfigInstance($instance);
 		$path = $this->get('path', $configInstance);
-		$occ = rtrim($path, '/') . '/occ';
+		$occ = rtrim($path, '/').'/occ';
 
 		$command = array_merge([$occ], explode(' ', $cmd));
 		if ($jsonAsOutput) {
@@ -1212,7 +1212,7 @@ 
 		$process->run(null, $env);
 
 		if ($exceptionOnFail && !$process->isSuccessful()) {
-			throw new Exception(implode(' ', $command) . ' failed');
+			throw new Exception(implode(' ', $command).' failed');
 		}
 
 		$output = json_decode($process->getOutput(), true);
@@ -1235,7 +1235,7 @@ 
 	 */
 	private function t(string $title): void {
 		$this->output->writeln('');
-		$this->output->writeln('<comment>### ' . $title . '</comment>');
+		$this->output->writeln('<comment>### '.$title.'</comment>');
 		$this->output->writeln('');
 	}
 
@@ -1244,14 +1244,14 @@ 
 	 */
 	private function p(string $processing): void {
 		$this->pOn = true;
-		$this->output->write('- ' . $processing . ': ');
+		$this->output->write('- '.$processing.': ');
 	}
 
 	/**
 	 * @param string $more
 	 */
 	private function pm(string $more): void {
-		$this->output->write($more . ' ');
+		$this->output->write($more.' ');
 	}
 
 	/**
@@ -1261,9 +1261,9 @@ 
 	private function r(bool $result = true, string $info = ''): void {
 		$this->pOn = false;
 		if ($result) {
-			$this->output->writeln('<info>' . (($info !== '') ? $info : 'done') . '</info>');
+			$this->output->writeln('<info>'.(($info !== '') ? $info : 'done').'</info>');
 		} else {
-			$this->output->writeln('<error>' . (($info !== '') ? $info : 'done') . '</error>');
+			$this->output->writeln('<error>'.(($info !== '') ? $info : 'done').'</error>');
 		}
 	}
 
@@ -1285,16 +1285,16 @@ 
 		$dataAddedMember =
 			$this->occ(
 				$instanceId,
-				'circles:members:add ' . $circle->getSingleId() . ' ' . $userId . ' --type ' . $type
+				'circles:members:add '.$circle->getSingleId().' '.$userId.' --type '.$type
 			);
 		/** @var Member $addedMember */
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
 
 
-		echo 'ADDEDMEMBER: ' . json_encode($addedMember, JSON_PRETTY_PRINT) . "\n";
+		echo 'ADDEDMEMBER: '.json_encode($addedMember, JSON_PRETTY_PRINT)."\n";
 
 		$federatedUser = $this->federatedUsers[$instanceId][$userId];
-		echo 'FEDERATEDUER: ' . json_encode($federatedUser, JSON_PRETTY_PRINT) . "\n";
+		echo 'FEDERATEDUER: '.json_encode($federatedUser, JSON_PRETTY_PRINT)."\n";
 
 		return $addedMember;
 	}

lib/Command/CirclesMemberships.php

Spacing +21 added lines, -21 removed lines

@@ -192,10 +192,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:');
@@ -204,14 +204,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()].')'
 			);
 		}
 
@@ -285,9 +285,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;
@@ -299,33 +299,33 @@ 
 				$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;
 			}
-		} catch (InvalidItemException|ItemNotFoundException|UnknownTypeException $e) {
+		} catch (InvalidItemException | ItemNotFoundException | UnknownTypeException $e) {
 		}
 
 		return '';
@@ -379,6 +379,6 @@ 
 			);
 		}
 
-		$output->writeln($count . ' memberships updated');
+		$output->writeln($count.' memberships updated');
 	}
 }

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