nextcloud / circles

tests/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 require_once __DIR__.'/../../../lib/base.php';
 require_once __DIR__.'/../vendor/autoload.php';
 
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+\OC::$loader->addValidRoot(OC::$SERVERROOT.'/tests');
 \OC_App::loadApp('circles');

tests/unit/lib/Api/CirclesTest.php

Spacing +2 added lines, -2 removed lines

@@ -327,7 +327,7 @@ 
 			} catch (Exception $e) {
 				$this->assertSame(
 					true, false,
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
 				);
 			}
 
@@ -341,7 +341,7 @@ 
 			} catch (Exception $e) {
 				$this->assertSame(
 					true, false,
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
 				);
 			}
 		}

lib/Command/CirclesRemote.php

Spacing +30 added lines, -30 removed lines

@@ -173,19 +173,19 @@ 
 
 		$webfinger = $this->getWebfinger($host, Application::APP_SUBJECT);
 		if ($this->input->getOption('all')) {
-			$this->output->writeln('- Webfinger on <info>' . $host . '</info>');
+			$this->output->writeln('- Webfinger on <info>'.$host.'</info>');
 			$this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$this->output->writeln('');
 		}
 
 		if ($this->input->getOption('all')) {
 			$circleLink = $this->extractLink(Application::APP_REL, $webfinger);
-			$this->output->writeln('- Information about Circles app on <info>' . $host . '</info>');
+			$this->output->writeln('- Information about Circles app on <info>'.$host.'</info>');
 			$this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$this->output->writeln('');
 		}
 
-		$this->output->writeln('- Available services on <info>' . $host . '</info>');
+		$this->output->writeln('- Available services on <info>'.$host.'</info>');
 		foreach ($webfinger->getLinks() as $link) {
 			$app = $link->getProperty('name');
 			$ver = $link->getProperty('version');
@@ -193,14 +193,14 @@ 
 				$app .= ' ';
 			}
 			if ($ver !== '') {
-				$ver = 'v' . $ver;
+				$ver = 'v'.$ver;
 			}
 
-			$this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver);
+			$this->output->writeln(' * '.$link->getRel().' '.$app.$ver);
 		}
 		$this->output->writeln('');
 
-		$this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>');
+		$this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>');
 		$resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL);
 		$this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 		$this->output->writeln('');
@@ -208,7 +208,7 @@ 
 
 		$tempUid = $resource->g('uid');
 		$this->output->writeln(
-			'- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>'
+			'- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>'
 		);
 
 		try {
@@ -217,15 +217,15 @@ 
 			$this->output->writeln(' * No SignatureException: <info>Identity authed</info>');
 		} catch (SignatureException $e) {
 			$this->output->writeln(
-				'<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>'
+				'<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>'
 			);
 
 			return;
 		}
 
-		$this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>');
+		$this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>');
 		if ($remoteSignatory->getUid(true) !== $tempUid) {
-			$this->output->writeln('<error>looks like ' . $host . ' is faking its identity');
+			$this->output->writeln('<error>looks like '.$host.' is faking its identity');
 
 			return;
 		}
@@ -233,7 +233,7 @@ 
 		$this->output->writeln('');
 
 		$testUrl = $resource->g('test');
-		$this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>');
+		$this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>');
 
 		try {
 			$localSignatory = $this->remoteStreamService->getAppSignatory();
@@ -255,18 +255,18 @@ 
 		$this->output->writeln('');
 
 		$this->output->writeln(' * Clear Signature: ');
-		$this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>');
+		$this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>');
 		$this->output->writeln('');
 
 		$this->output->writeln(' * Signed Signature (base64 encoded): ');
 		$this->output->writeln(
-			'<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>'
+			'<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>'
 		);
 		$this->output->writeln('');
 
 		$result = $signedRequest->getOutgoingRequest()->getResult();
 		$code = $result->getStatusCode();
-		$this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code));
+		$this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.$code.'</info>' : $code));
 		$this->output->writeln(
 			json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
 		);
@@ -288,7 +288,7 @@ 
 				$stored = new RemoteInstance();
 				$this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored);
 				$this->output->writeln(
-					'<info>The remote instance ' . $host
+					'<info>The remote instance '.$host
 					. ' is already known with this current identity</info>'
 				);
 
@@ -298,7 +298,7 @@ 
 
 				if ($remoteSignatory->getType() !== $stored->getType()) {
 					$this->output->writeln(
-						'- updating type from ' . $stored->getType() . ' to '
+						'- updating type from '.$stored->getType().' to '
 						. $remoteSignatory->getType()
 					);
 					$this->remoteStreamService->update(
@@ -308,7 +308,7 @@ 
 
 				if ($remoteSignatory->getInstance() !== $stored->getInstance()) {
 					$this->output->writeln(
-						'- updating host from ' . $stored->getInstance() . ' to '
+						'- updating host from '.$stored->getInstance().' to '
 						. $remoteSignatory->getInstance()
 					);
 					$this->remoteStreamService->update(
@@ -317,7 +317,7 @@ 
 				}
 				if ($remoteSignatory->getId() !== $stored->getId()) {
 					$this->output->writeln(
-						'- updating href/Id from ' . $stored->getId() . ' to '
+						'- updating href/Id from '.$stored->getId().' to '
 						. $remoteSignatory->getId()
 					);
 					$this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF);
@@ -341,10 +341,10 @@ 
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(
-			'The remote instance <info>' . $remoteSignatory->getInstance() . '</info> looks good.'
+			'The remote instance <info>'.$remoteSignatory->getInstance().'</info> looks good.'
 		);
 		$question = new ConfirmationQuestion(
-			'Would you like to identify this remote instance as \'<comment>' . $remoteSignatory->getType()
+			'Would you like to identify this remote instance as \'<comment>'.$remoteSignatory->getType()
 			. '</comment>\' using interface \'<comment>'
 			. InterfaceService::$LIST_IFACE[$remoteSignatory->getInterface()]
 			. '</comment>\' ? (y/N) ',
@@ -372,7 +372,7 @@ 
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(
-			'The remote instance <info>' . $remoteSignatory->getInstance()
+			'The remote instance <info>'.$remoteSignatory->getInstance()
 			. '</info> is known but <error>its identity has changed.</error>'
 		);
 		$this->output->writeln(
@@ -430,7 +430,7 @@ 
 	private function verifyGSInstances(): void {
 		$instances = $this->globalScaleService->getGlobalScaleInstances();
 		$known = array_map(
-			function (RemoteInstance $instance): string {
+			function(RemoteInstance $instance): string {
 				return $instance->getInstance();
 			}, $this->remoteRequest->getFromType(RemoteInstance::TYPE_GLOBALSCALE)
 		);
@@ -450,7 +450,7 @@ 
 			return;
 		}
 
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
+		$this->output->write('Adding <comment>'.$instance.'</comment>: ');
 		try {
 			$this->remoteStreamService->addRemoteInstance(
 				$instance,
@@ -460,8 +460,8 @@ 
 			);
 			$this->output->writeln('<info>ok</info>');
 		} catch (Exception $e) {
-			$msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')';
-			$this->output->writeln('<error>' . get_class($e) . $msg . '</error>');
+			$msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')';
+			$this->output->writeln('<error>'.get_class($e).$msg.'</error>');
 		}
 	}
 
@@ -479,12 +479,12 @@ 
 			try {
 				$current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance());
 				if ($current->getUid(true) === $instance->getUid(true)) {
-					$currentUid = '<info>' . $current->getUid(true) . '</info>';
+					$currentUid = '<info>'.$current->getUid(true).'</info>';
 				} else {
-					$currentUid = '<error>' . $current->getUid(true) . '</error>';
+					$currentUid = '<error>'.$current->getUid(true).'</error>';
 				}
 			} catch (Exception $e) {
-				$currentUid = '<error>' . $e->getMessage() . '</error>';
+				$currentUid = '<error>'.$e->getMessage().'</error>';
 			}
 
 			$table->appendRow(
@@ -511,7 +511,7 @@ 
 			}
 		}
 
-		throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE));
+		throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE));
 	}
 
 	/**
@@ -524,6 +524,6 @@ 
 			}
 		}
 
-		throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE));
+		throw new Exception('Unknown interface: '.implode(', ', InterfaceService::$LIST_IFACE));
 	}
 }

lib/Command/CirclesTest.php

Spacing +63 added lines, -63 removed lines

@@ -155,7 +155,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;
 				}
@@ -239,7 +239,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');
 
@@ -272,22 +272,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();
 			}
@@ -321,7 +321,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();
@@ -334,7 +334,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');
@@ -385,12 +385,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) {
@@ -409,12 +409,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();
@@ -432,7 +432,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);
@@ -469,8 +469,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();
@@ -494,7 +494,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);
@@ -511,12 +511,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();
 		}
@@ -530,7 +530,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 */
@@ -565,7 +565,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;
@@ -597,7 +597,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);
@@ -606,9 +606,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 */
@@ -661,11 +661,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);
@@ -685,11 +685,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);
@@ -783,13 +783,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();
@@ -799,7 +799,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);
 			}
@@ -812,7 +812,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);
 			}
@@ -839,27 +839,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
 			);
@@ -878,7 +878,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.')');
 		}
 	}
 
@@ -894,7 +894,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.')');
 		}
 	}
 
@@ -930,7 +930,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');
 	}
 
 
@@ -948,7 +948,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract \'' . $name . '\' from the list of generated Circles'
+			'cannot extract \''.$name.'\' from the list of generated Circles'
 		);
 	}
 
@@ -968,7 +968,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract  \'' . $name . '\' from the list of provided Circles'
+			'cannot extract  \''.$name.'\' from the list of provided Circles'
 		);
 	}
 
@@ -1013,7 +1013,7 @@ 
 			}
 		}
 
-		throw new ItemNotFoundException($instance . ' not found');
+		throw new ItemNotFoundException($instance.' not found');
 	}
 
 
@@ -1048,7 +1048,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) {
@@ -1058,7 +1058,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);
@@ -1081,7 +1081,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('');
 	}
 
@@ -1090,14 +1090,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.' ');
 	}
 
 	/**
@@ -1107,9 +1107,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>');
 		}
 	}
 
@@ -1131,16 +1131,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/CirclesConfig.php

Spacing +4 added lines, -4 removed lines

@@ -155,7 +155,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()
 				);
 			}
 
@@ -189,8 +189,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'
 				);
 			}
@@ -219,7 +219,7 @@ 
 
 		array_walk(
 			$listing,
-			function (string &$v): void {
+			function(string &$v): void {
 				[, $long] = explode('|', $v);
 				$v = strtoupper(str_replace(' ', '', $long));
 			}

lib/Command/SharesFiles.php

Spacing +5 added lines, -5 removed lines

@@ -219,7 +219,7 @@ 
 				$recipient = $share->getInitiator();
 				$sharedTo = $recipient->getDisplayName();
 				if (!$this->configService->isLocalInstance($recipient->getInstance())) {
-					$sharedTo .= '@' . $recipient->getInstance();
+					$sharedTo .= '@'.$recipient->getInstance();
 				}
 			}
 			$circle = $share->getCircle();
@@ -229,15 +229,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/Activity/ProviderParser.php

Spacing +4 added lines, -4 removed lines

@@ -137,7 +137,7 @@ 
 				continue;
 			}
 
-			$replace['{' . $k . '}'] = $data[$k]['_parsed'];
+			$replace['{'.$k.'}'] = $data[$k]['_parsed'];
 		}
 
 		$line = strtr($line, $replace);
@@ -301,7 +301,7 @@ 
 		return [
 			'type' => $member->getTypeName(),
 			'id' => $member->getUserId(),
-			'name' => $member->getCachedName() . ' (' . $member->getTypeString() . ')',
+			'name' => $member->getCachedName().' ('.$member->getTypeString().')',
 			'_parsed' => $member->getCachedName()
 		];
 	}
@@ -336,8 +336,8 @@ 
 		return [
 			'type' => 'circle',
 			'id' => $link->getUniqueId(),
-			'name' => $link->getToken() . '@' . $link->getAddress(),
-			'_parsed' => $link->getToken() . '@' . $link->getAddress()
+			'name' => $link->getToken().'@'.$link->getAddress(),
+			'_parsed' => $link->getToken().'@'.$link->getAddress()
 		];
 	}
 

lib/Service/ConfigService.php

Spacing +7 added lines, -7 removed lines

@@ -193,7 +193,7 @@ 
 			return $value;
 		}
 
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
 			return $value;
 		}
 
@@ -412,7 +412,7 @@ 
 	 */
 	public function getTrustedDomains(): array {
 		return array_map(
-			function (string $address) {
+			function(string $address) {
 				return strtolower($address);
 			}, $this->config->getSystemValue('trusted_domains', [])
 		);
@@ -448,7 +448,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -477,12 +477,12 @@ 
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
 		}
 
-		$base = $scheme . '://' . $instance;
+		$base = $scheme.'://'.$instance;
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}
 
 
@@ -582,7 +582,7 @@ 
 	public function displayFederatedUser(IFederatedUser $federatedUser, bool $displayName = false): string {
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
 
-		return $name . $this->displayInstance($federatedUser->getInstance(), true);
+		return $name.$this->displayInstance($federatedUser->getInstance(), true);
 	}
 
 	/**
@@ -596,7 +596,7 @@ 
 			return '';
 		}
 
-		return (($showAt) ? '@' : '') . $instance;
+		return (($showAt) ? '@' : '').$instance;
 	}
 
 

lib/Service/FederatedEventService.php

Spacing +5 added lines, -5 removed lines

@@ -245,16 +245,16 @@ 
 		try {
 			$test = new ReflectionClass($class);
 		} catch (ReflectionException $e) {
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
 		}
 
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
 		}
 
 		$item = OC::$server->get($class);
 		if (!($item instanceof IFederatedItem)) {
-			throw new FederatedEventException($class . ' not an IFederatedItem');
+			throw new FederatedEventException($class.' not an IFederatedItem');
 		}
 
 		if ($item instanceof IFederatedItemHighSeverity) {
@@ -450,7 +450,7 @@ 
 			$knownInstances = $this->memberRequest->getMemberInstances($circle->getSingleId());
 			$instances = array_filter(
 				array_map(
-					function (RemoteInstance $instance) use ($knownInstances) {
+					function(RemoteInstance $instance) use ($knownInstances) {
 						if (!in_array($instance->getInstance(), $knownInstances)) {
 							return null;
 						}
@@ -465,7 +465,7 @@ 
 		if ($event->hasMember()
 			&& !$this->configService->isLocalInstance($event->getMember()->getInstance())) {
 			$currentInstances = array_map(
-				function (RemoteInstance $instance): string {
+				function(RemoteInstance $instance): string {
 					return $instance->getInstance();
 				}, $instances
 			);