nextcloud / circles

lib/Command/CirclesTest.php

Spacing +67 added lines, -67 removed lines

@@ -159,7 +159,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;
 				}
@@ -243,7 +243,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');
 
@@ -276,22 +276,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();
 			}
@@ -326,7 +326,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();
@@ -339,7 +339,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');
@@ -390,12 +390,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) {
@@ -414,12 +414,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();
@@ -437,7 +437,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);
@@ -474,8 +474,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();
@@ -499,7 +499,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);
@@ -516,12 +516,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();
 		}
@@ -535,7 +535,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 */
@@ -570,11 +570,11 @@ 
 		$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;
-		$this->r(true, $createdCircle->getSingleId());;
+		$this->r(true, $createdCircle->getSingleId()); ;
 
 		$this->p('Comparing data returned at creation');
 		if ($createdCircle->getSingleId() === '' || $createdCircle->getOwner()->getId() === '') {
@@ -601,7 +601,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);
@@ -610,9 +610,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 */
@@ -646,7 +646,7 @@ 
 		$member = $this->getInstanceUsers($instanceId)[2];
 
 		$addedMember = $this->processMemberAdd($instanceId, $circleName, $member, 'user');
-		$this->r(true, $addedMember->getId());;
+		$this->r(true, $addedMember->getId()); ;
 
 		// check test2
 	}
@@ -664,15 +664,15 @@ 
 		$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);
-		$this->r(true, $addedMember->getId());;
+		$this->r(true, $addedMember->getId()); ;
 
 		// check test6
 	}
@@ -687,15 +687,15 @@ 
 
 		$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);
-		$this->r(true, $addedMember->getId());;
+		$this->r(true, $addedMember->getId()); ;
 	}
 
 	private function levelLocalMemberToModerator() {
@@ -785,13 +785,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();
@@ -801,7 +801,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);
 			}
@@ -814,7 +814,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);
 			}
@@ -841,27 +841,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
 			);
@@ -880,7 +880,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.')');
 		}
 	}
 
@@ -896,7 +896,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.')');
 		}
 	}
 
@@ -932,7 +932,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');
 	}
 
 
@@ -950,7 +950,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract \'' . $name . '\' from the list of generated Circles'
+			'cannot extract \''.$name.'\' from the list of generated Circles'
 		);
 	}
 
@@ -970,7 +970,7 @@ 
 		}
 
 		throw new CircleNotFoundException(
-			'cannot extract  \'' . $name . '\' from the list of provided Circles'
+			'cannot extract  \''.$name.'\' from the list of provided Circles'
 		);
 	}
 
@@ -1015,7 +1015,7 @@ 
 			}
 		}
 
-		throw new ItemNotFoundException($instance . ' not found');
+		throw new ItemNotFoundException($instance.' not found');
 	}
 
 
@@ -1050,7 +1050,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) {
@@ -1060,7 +1060,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);
@@ -1083,7 +1083,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('');
 	}
 
@@ -1092,14 +1092,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.' ');
 	}
 
 	/**
@@ -1109,9 +1109,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>');
 		}
 	}
 
@@ -1133,16 +1133,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/Model/Circle.php

Doc Comments +2 added lines, -2 removed lines

@@ -358,7 +358,7 @@ 
 
 
 	/**
-	 * @param ?Member $owner
+	 * @param Member $owner
 	 *
 	 * @return self
 	 */
@@ -414,7 +414,7 @@ 
 
 
 	/**
-	 * @param array $members
+	 * @param Member[] $members
 	 * @param bool $detailed
 	 *
 	 * @return self

lib/Command/CirclesReport.php

Spacing +3 added lines, -3 removed lines

@@ -202,7 +202,7 @@ 
 
 		$interactiveShell->setCommands($commands);
 		$interactiveShell->run(
-			'Circles Report [<info>' . $report->getSource() . '</info>]:<comment>%PATH%</comment>$'
+			'Circles Report [<info>'.$report->getSource().'</info>]:<comment>%PATH%</comment>$'
 		);
 	}
 
@@ -214,7 +214,7 @@ 
 	 * @return string[]
 	 */
 	public function fillCommandList(string $source, string $field): array {
-		echo $source . ' ' . $field . "\n";
+		echo $source.' '.$field."\n";
 
 		return ['abcd', 'abdde', 'erfg'];
 	}
@@ -390,7 +390,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));
 	}
 
 }