nextcloud / circles

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -14,10 +14,10 @@
 	define('PHPUNIT_RUN', 1);
 }
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../../../lib/base.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
-require_once __DIR__ . '/../../../tests/autoload.php';
+require_once __DIR__.'/../../../tests/autoload.php';
 
 Server::get(IAppManager::class)->loadApp('circles');
 

lib/FileSharingTeamResourceProvider.php

Spacing +6 added lines, -6 removed lines

@@ -43,18 +43,18 @@ 
 		}
 
 		$shares = $this->shareByCircleProvider->getSharesToCircle($teamId);
-		usort($shares, function ($a, $b) {
+		usort($shares, function($a, $b) {
 			return (int)($b->getItemType() === 'folder') - (int)($a->getItemType() === 'folder');
 		});
-		return array_map(function (ShareWrapper $shareWrapper) {
+		return array_map(function(ShareWrapper $shareWrapper) {
 			$isFolder = $shareWrapper->getItemType() === 'folder';
 			return new TeamResource(
 				$this,
 				(string)$shareWrapper->getFileSource(),
 				basename($shareWrapper->getFileTarget()),
-				$this->urlGenerator->getAbsoluteURL('/index.php/f/' . $shareWrapper->getFileSource()),
+				$this->urlGenerator->getAbsoluteURL('/index.php/f/'.$shareWrapper->getFileSource()),
 				iconSvg: $isFolder ? '<svg xmlns="http://www.w3.org/2000/svg" id="mdi-folder" viewBox="0 0 24 24"><path d="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z" /></svg>' : null,
-				iconURL: !$isFolder
+				iconURL : !$isFolder
 					? $this->urlGenerator->linkToRouteAbsolute('core.preview.getPreviewByFileId', ['fileId' => $shareWrapper->getFileSource(), 'mimeFallback' => true, ])
 					: null,
 			);
@@ -66,7 +66,7 @@ 
 			return false;
 		}
 
-		return count(array_filter($this->getSharedWith($teamId), function (TeamResource $resource) use ($resourceId) {
+		return count(array_filter($this->getSharedWith($teamId), function(TeamResource $resource) use ($resourceId) {
 			return $resource->getId() === $resourceId;
 		})) !== 0;
 	}
@@ -78,7 +78,7 @@ 
 
 		$shares = $this->shareByCircleProvider->getSharesByFileId((int)$resourceId);
 
-		return array_map(function ($share) {
+		return array_map(function($share) {
 			return $share->getSharedWith();
 		}, $shares);
 	}

lib/Service/MaintenanceService.php

Spacing +7 added lines, -7 removed lines

@@ -44,9 +44,9 @@ 
 	public const TIMEOUT = 18000;
 	public static $DELAY
 		= [
-			1 => 60,    // every minute
-			2 => 300,   // every 5 minutes
-			3 => 3600,  // every hour
+			1 => 60, // every minute
+			2 => 300, // every 5 minutes
+			3 => 3600, // every hour
 			4 => 75400, // every day
 			5 => 432000 // evey week
 		];
@@ -96,7 +96,7 @@ 
 		$this->federatedUserService->bypassCurrentUserCondition(true);
 
 		$this->lockMaintenanceRun();
-		$this->debug('running maintenance (' . $level . ')');
+		$this->debug('running maintenance ('.$level.')');
 
 		switch ($level) {
 			case 1:
@@ -289,14 +289,14 @@ 
 			->includeSystemCircles();
 
 		$circles = array_map(
-			function (Circle $circle) {
+			function(Circle $circle) {
 				return $circle->getSingleId();
 			}, $this->circleRequest->getCircles(null, $probe)
 		);
 
 		$shares = array_unique(
 			array_map(
-				function (ShareWrapper $share) {
+				function(ShareWrapper $share) {
 					return $share->getSharedWith();
 				}, $this->shareWrapperRequest->getShares()
 			)
@@ -438,6 +438,6 @@ 
 	 * @param string $message
 	 */
 	private function output(string $message): void {
-		$this->output?->writeln('- ' . $message);
+		$this->output?->writeln('- '.$message);
 	}
 }

lib/Service/MigrationService.php

Spacing +7 added lines, -7 removed lines

@@ -255,7 +255,7 @@ 
 		$done = [];
 		foreach ($circles as $circle) {
 			$this->outputService->output(
-				'Caching memberships for Members of \'' . $circle->getDisplayName() . '\'',
+				'Caching memberships for Members of \''.$circle->getDisplayName().'\'',
 				true
 			);
 
@@ -289,7 +289,7 @@ 
 				try {
 					$data = new SimpleDataStore($row);
 					$this->outputService->output(
-						'Migrating Circle \'' . $data->g('name') . '\' (' . $data->g('unique_id') . ')',
+						'Migrating Circle \''.$data->g('name').'\' ('.$data->g('unique_id').')',
 						true
 					);
 
@@ -393,7 +393,7 @@ 
 				try {
 					$data = new SimpleDataStore($row);
 					$this->outputService->output(
-						'Migrating Member \'' . $data->g('user_id') . '\' from \'' . $data->g('circle_id')
+						'Migrating Member \''.$data->g('user_id').'\' from \''.$data->g('circle_id')
 						. '\'',
 						true
 					);
@@ -503,8 +503,8 @@ 
 					$federatedUser
 						= $this->federatedUserService->getLocalFederatedUser($data->g('share_with'));
 					$this->outputService->output(
-						'Migrating child share #' . $data->gInt('id') . ' owner: ' . $data->g('share_with')
-						. ' -> ' . $federatedUser->getSingleId(),
+						'Migrating child share #'.$data->gInt('id').' owner: '.$data->g('share_with')
+						. ' -> '.$federatedUser->getSingleId(),
 						true
 					);
 
@@ -574,7 +574,7 @@ 
 			$addressBook
 				= $this->contactService->getAddressBoxById($cm, $this->get('addressbook-key', $entry));
 
-			$member->setUserId($userId . '/' . $addressBook->getUri() . '/' . $contactId);
+			$member->setUserId($userId.'/'.$addressBook->getUri().'/'.$contactId);
 		}
 	}
 
@@ -609,7 +609,7 @@ 
 				try {
 					$data = new SimpleDataStore($row);
 					$this->outputService->output(
-						'Migrating ShareToken \'' . $data->g('token') . '\' for \'' . $data->g('user_id')
+						'Migrating ShareToken \''.$data->g('token').'\' for \''.$data->g('user_id')
 						. '\'',
 						true
 					);

lib/Command/MembersList.php

Spacing +16 added lines, -16 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]));
@@ -237,7 +237,7 @@ 
 						$this->input->getOption('display-name')
 					),
 					($level > 0) ? Member::$DEF_LEVEL[$level]
-						: '(' . strtolower($member->getStatus()) . ')',
+						: '('.strtolower($member->getStatus()).')',
 					($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
 						$member->getInvitedBy(),
 						$this->input->getOption('display-name')
@@ -327,7 +327,7 @@ 
 							$circle = $this->remoteService->getCircleFromInstance(
 								$member->getSingleId(), $member->getInstance(), $data
 							);
-						} catch (CircleNotFoundException|RemoteInstanceException $e) {
+						} catch (CircleNotFoundException | RemoteInstanceException $e) {
 						}
 					} else {
 						$this->federatedUserService->commandLineInitiator(
@@ -403,14 +403,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 +418,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 +431,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/CirclesReport.php

Spacing +3 added lines, -3 removed lines

@@ -200,7 +200,7 @@ 
 	 * @return string[]
 	 */
 	public function fillCommandList(string $source, string $field): array {
-		echo $source . ' ' . $field . "\n";
+		echo $source.' '.$field."\n";
 
 		return ['abcd', 'abdde', 'erfg'];
 	}
@@ -377,7 +377,7 @@ 
 	 * @return string
 	 */
 	private function obfuscateId(string $id): string {
-		return substr($id, 0, 5) . '.' . md5(substr($id, 5));
+		return substr($id, 0, 5).'.'.md5(substr($id, 5));
 	}
 
 
@@ -386,7 +386,7 @@ 
 	 */
 	public function onNewPrompt(NC22InteractiveShellSession $session): void {
 		$prompt
-			= 'Circles Report [<info>' . $this->report->getSource() . '</info>]:<comment>%PATH%</comment>';
+			= 'Circles Report [<info>'.$this->report->getSource().'</info>]:<comment>%PATH%</comment>';
 
 		$commands = [];
 		if ($session->getData()->g('currentStatus') === 'write') {

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), ((string)sizeof($result)) . ' circles');
+			$this->r((sizeof($result) === $expectedSize), ((string)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,19 +937,19 @@ 
 			];
 		}
 
-		$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();
 			$owner = $circle->getOwner();
 			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);
 		}
@@ -960,7 +960,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);
 		}
@@ -986,27 +986,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
 			);
@@ -1025,7 +1025,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.')');
 		}
 	}
 
@@ -1041,7 +1041,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 . ': ' . ((string)$compare) . ' (' . ((string)$expected) . ')');
+			throw new Exception('wrong '.$def.': '.((string)$compare).' ('.((string)$expected).')');
 		}
 	}
 
@@ -1077,7 +1077,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');
 	}
 
 
@@ -1095,7 +1095,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract \'' . $name . '\' from the list of generated Circles'
+			'cannot extract \''.$name.'\' from the list of generated Circles'
 		);
 	}
 
@@ -1115,7 +1115,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract  \'' . $name . '\' from the list of provided Circles'
+			'cannot extract  \''.$name.'\' from the list of provided Circles'
 		);
 	}
 
@@ -1160,7 +1160,7 @@ 
 			}
 		}
 
-		throw new ItemNotFoundException($instance . ' not found');
+		throw new ItemNotFoundException($instance.' not found');
 	}
 
 
@@ -1195,7 +1195,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) {
@@ -1205,7 +1205,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);
@@ -1228,7 +1228,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('');
 	}
 
@@ -1237,14 +1237,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.' ');
 	}
 
 	/**
@@ -1254,9 +1254,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>');
 		}
 	}
 
@@ -1278,16 +1278,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/CirclesCheck.php

Spacing +37 added lines, -37 removed lines

@@ -109,7 +109,7 @@ 
 			throw new Exception('Please specify a --type for the test');
 		}
 		if ($test !== '' && !in_array($type, self::$checks)) {
-			throw new Exception('Unknown type: ' . implode(', ', self::$checks));
+			throw new Exception('Unknown type: '.implode(', ', self::$checks));
 		}
 
 		//		$this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test);
@@ -165,7 +165,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
@@ -200,8 +200,8 @@ 
 				continue;
 			}
 
-			$loopback = rtrim($scheme . '://' . $cloudId . $path, '/');
-			$output->writeln('* testing address: ' . $loopback . ' ');
+			$loopback = rtrim($scheme.'://'.$cloudId.$path, '/');
+			$output->writeln('* testing address: '.$loopback.' ');
 
 			try {
 				$this->setupLoopback($input, $output, $loopback);
@@ -272,8 +272,8 @@ 
 		$test = new FederatedEvent(LoopbackTest::class);
 		$this->federatedEventService->newEvent($test);
 		$output->writeln(
-			'<info>' . $test->getWrapperToken() . '</info> '
-			. '(took ' . ((string)(round(microtime(true) * 1000.0) - $timer)) . 'ms)'
+			'<info>'.$test->getWrapperToken().'</info> '
+			. '(took '.((string)(round(microtime(true) * 1000.0) - $timer)).'ms)'
 		);
 
 		$output->writeln('- Waiting for async process to finish (5s)');
@@ -292,18 +292,18 @@ 
 
 		$checkVerify = $wrapper->getEvent()->getData()->gInt('verify');
 		if ($checkVerify === LoopbackTest::VERIFY) {
-			$output->write('<info>verify=' . ((string)$checkVerify) . '</info> ');
+			$output->write('<info>verify='.((string)$checkVerify).'</info> ');
 		} else {
-			$output->writeln('<error>verify=' . ((string)$checkVerify) . '</error>');
+			$output->writeln('<error>verify='.((string)$checkVerify).'</error>');
 
 			return false;
 		}
 
 		$checkManage = $wrapper->getResult()->gInt('manage');
 		if ($checkManage === LoopbackTest::MANAGE) {
-			$output->write('<info>manage=' . ((string)$checkManage) . '</info> ');
+			$output->write('<info>manage='.((string)$checkManage).'</info> ');
 		} else {
-			$output->writeln('<error>manage=' . ((string)$checkManage) . '</error>');
+			$output->writeln('<error>manage='.((string)$checkManage).'</error>');
 
 			return false;
 		}
@@ -342,7 +342,7 @@ 
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_PATH, $path);
 		$output->writeln(
-			'- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>'
+			'- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>'
 		);
 	}
 
@@ -395,8 +395,8 @@ 
 				continue;
 			}
 
-			$internal = rtrim($scheme . '://' . $cloudId, '/');
-			$fullInternal = rtrim($scheme . '://' . $cloudId . $path, '/');
+			$internal = rtrim($scheme.'://'.$cloudId, '/');
+			$fullInternal = rtrim($scheme.'://'.$cloudId.$path, '/');
 
 			$question = new ConfirmationQuestion(
 				'<comment>Do you want to check the validity of this internal address?</comment> (Y/n) ', true,
@@ -415,9 +415,9 @@ 
 					'You will need to run this <info>curl</info> command from a terminal on your local network and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $internal
+					'     curl -L "'.$internal
 					. '/.well-known/webfinger?resource=http://nextcloud.com/&test='
-					. $testToken . '"'
+					. $testToken.'"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -451,7 +451,7 @@ 
 
 				if ($pastedHref !== $href) {
 					$output->writeln(
-						'<error>The returned data (' . $pastedHref . ') are not the one expected: </error>'
+						'<error>The returned data ('.$pastedHref.') are not the one expected: </error>'
 						. $href
 					);
 					continue;
@@ -463,7 +463,7 @@ 
 					'Next step, please run this <info>curl</info> command from a terminal on your local network and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"'
+					'     curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -479,9 +479,9 @@ 
 					|| $appSignatory->getRoot() !== $pastedSignatory->g('root')) {
 					$output->writeln(
 						'<error>The returned data ('
-						. $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root')
+						. $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root')
 						. ') are not the one expected: </error>'
-						. $appSignatory->getUid(true) . '/' . $appSignatory->getRoot()
+						. $appSignatory->getUid(true).'/'.$appSignatory->getRoot()
 					);
 					continue;
 				}
@@ -507,7 +507,7 @@ 
 
 		$output->writeln('');
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>' . $internal
+			'- Do you want to save <info>'.$internal
 			. '</info> as your <info>internal</info> address ? (y/N) ',
 			false, '/^(y|Y)/i'
 		);
@@ -524,7 +524,7 @@ 
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_PATH, $path);
 
-		$output->writeln('- Address <info>' . $internal . '</info> is now used as <info>internal</info>');
+		$output->writeln('- Address <info>'.$internal.'</info> is now used as <info>internal</info>');
 	}
 
 	/**
@@ -575,8 +575,8 @@ 
 				continue;
 			}
 
-			$frontal = rtrim($scheme . '://' . $cloudId, '/');
-			$fullFrontal = rtrim($scheme . '://' . $cloudId . $path, '/');
+			$frontal = rtrim($scheme.'://'.$cloudId, '/');
+			$fullFrontal = rtrim($scheme.'://'.$cloudId.$path, '/');
 
 			$question = new ConfirmationQuestion(
 				'<comment>Do you want to check the validity of this frontal address?</comment> (y/N) ', false,
@@ -595,9 +595,9 @@ 
 					'You will need to run this <info>curl</info> command from a remote terminal and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $frontal
+					'     curl -L "'.$frontal
 					. '/.well-known/webfinger?resource=http://nextcloud.com/&test='
-					. $testToken . '"'
+					. $testToken.'"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -631,7 +631,7 @@ 
 
 				if ($pastedHref !== $href) {
 					$output->writeln(
-						'<error>The returned data (' . $pastedHref . ') are not the one expected: </error>'
+						'<error>The returned data ('.$pastedHref.') are not the one expected: </error>'
 						. $href
 					);
 					continue;
@@ -643,7 +643,7 @@ 
 					'Next step, please run this <info>curl</info> command from a remote terminal and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"'
+					'     curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -659,9 +659,9 @@ 
 					|| $appSignatory->getRoot() !== $pastedSignatory->g('root')) {
 					$output->writeln(
 						'<error>The returned data ('
-						. $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root')
+						. $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root')
 						. ') are not the one expected: </error>'
-						. $appSignatory->getUid(true) . '/' . $appSignatory->getRoot()
+						. $appSignatory->getUid(true).'/'.$appSignatory->getRoot()
 					);
 					continue;
 				}
@@ -687,7 +687,7 @@ 
 
 		$output->writeln('');
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>' . $frontal
+			'- Do you want to save <info>'.$frontal
 			. '</info> as your <info>frontal</info> address ? (y/N) ',
 			false, '/^(y|Y)/i'
 		);
@@ -704,7 +704,7 @@ 
 		$this->configService->setAppValue(ConfigService::FRONTAL_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::FRONTAL_CLOUD_PATH, $path);
 
-		$output->writeln('- Address <info>' . $frontal . '</info> is now used as <info>frontal</info>');
+		$output->writeln('- Address <info>'.$frontal.'</info> is now used as <info>frontal</info>');
 	}
 
 	/**
@@ -729,7 +729,7 @@ 
 			$request->setDataSerialize(new SimpleDataStore(['empty' => 1]));
 		}
 
-		$output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
+		$output->write('- '.$type.' request on '.$request->getCompleteUrl().': ');
 
 		try {
 			$this->doRequest($request);
@@ -740,7 +740,7 @@ 
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . ((string)$result->getStatusCode()) . '</' . $color . '>');
+			$output->writeln('<'.$color.'>'.((string)$result->getStatusCode()).'</'.$color.'>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -763,7 +763,7 @@ 
 
 		$output->writeln('');
 		$output->writeln(
-			'The address <info>' . $address . '</info> seems to reach your local Nextcloud.'
+			'The address <info>'.$address.'</info> seems to reach your local Nextcloud.'
 		);
 
 		/** @var QuestionHelper $helper */
@@ -781,8 +781,8 @@ 
 
 		$this->configService->setAppValue(ConfigService::FORCE_NC_BASE, $address);
 		$output->writeln(
-			'New configuration <info>' . Application::APP_ID . '.' . ConfigService::FORCE_NC_BASE . '=\''
-			. $address . '\'</info> stored in database'
+			'New configuration <info>'.Application::APP_ID.'.'.ConfigService::FORCE_NC_BASE.'=\''
+			. $address.'\'</info> stored in database'
 		);
 	}
 
@@ -809,7 +809,7 @@ 
 		$path = rtrim($path, '/');
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . ((string)$cloudIdPort);
+			$cloudId = $cloudId.':'.((string)$cloudIdPort);
 		}
 
 		return [$scheme, $cloudId, $path];

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('(' . ((string)$count) . ' entries generated/updated in the database)');
+			$output->writeln('('.((string)$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(((string)$count) . ' memberships updated');
+		$output->writeln(((string)$count).' memberships updated');
 	}
 }