nextcloud / circles

lib/Service/MigrationService.php

Spacing +7 added lines, -7 removed lines

@@ -239,7 +239,7 @@ 
 		$done = [];
 		foreach ($circles as $circle) {
 			$this->outputService->output(
-				'Caching memberships for Members of \'' . $circle->getDisplayName() . '\'',
+				'Caching memberships for Members of \''.$circle->getDisplayName().'\'',
 				true
 			);
 
@@ -287,7 +287,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
 					);
 
@@ -391,7 +391,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
 					);
@@ -506,8 +506,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
 					);
 
@@ -578,7 +578,7 @@ 
 			$addressBook =
 				$this->contactService->getAddressBoxById($cm, $this->get('addressbook-key', $entry));
 
-			$member->setUserId($userId . '/' . $addressBook->getUri() . '/' . $contactId);
+			$member->setUserId($userId.'/'.$addressBook->getUri().'/'.$contactId);
 		}
 	}
 
@@ -613,7 +613,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/Service/MembershipService.php

Spacing +3 added lines, -3 removed lines

@@ -250,7 +250,7 @@ 
 	 */
 	private function getChildrenMembers(string $id, array &$knownIds = []): array {
 		$singleIds = array_map(
-			function (Member $item): string {
+			function(Member $item): string {
 				return $item->getSingleId();
 			}, $this->memberRequest->getMembers($id)
 		);
@@ -274,7 +274,7 @@ 
 	 */
 	private function getChildrenMemberships(string $id, array &$knownIds = []): array {
 		$singleIds = array_map(
-			function (Membership $item): string {
+			function(Membership $item): string {
 				return $item->getSingleId();
 			}, $this->membershipRequest->getInherited($id)
 		);
@@ -320,7 +320,7 @@ 
 	 */
 	private function removeDeprecatedMemberships(array $memberships, array $known): array {
 		$circleIds = array_map(
-			function (Membership $membership): string {
+			function(Membership $membership): string {
 				return $membership->getCircleId();
 			}, $memberships
 		);

lib/Command/CirclesMemberships.php

Spacing +20 added lines, -20 removed lines

@@ -212,10 +212,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:');
@@ -224,14 +224,14 @@ 
 		if ($count === 0) {
 			$output->writeln('(database not updated)');
 		} else {
-			$output->writeln('(' . $count . ' entries generated/updated in the database)');
+			$output->writeln('('.$count.' entries generated/updated in the database)');
 		}
 
 		foreach ($federatedUser->getMemberships() as $membership) {
 			$this->memberships[$membership->getCircleId()] = $membership;
 			$output->writeln(
-				'- <info>' . $membership->getCircleId() . '</info> ('
-				. Member::$DEF_LEVEL[$membership->getLevel()] . ')'
+				'- <info>'.$membership->getCircleId().'</info> ('
+				. Member::$DEF_LEVEL[$membership->getLevel()].')'
 			);
 		}
 
@@ -305,9 +305,9 @@ 
 				if ($lineNumber === 2) {
 					return '';
 				}
-				$line .= '<info>' . $federatedUser->getSingleId() . '</info>';
+				$line .= '<info>'.$federatedUser->getSingleId().'</info>';
 				if (!$this->configService->isLocalInstance($federatedUser->getInstance())) {
-					$line .= '@' . $federatedUser->getInstance();
+					$line .= '@'.$federatedUser->getInstance();
 				}
 
 				return $line;
@@ -319,28 +319,28 @@ 
 				$circle = $member->getCircle();
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
+					$line .= '<info>'.$circle->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
-					$line .= ' (' . ($this->input->getOption('display-name') ?
-							$circle->getDisplayName() : $circle->getName()) . ')';
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
+					$line .= ' ('.($this->input->getOption('display-name') ?
+							$circle->getDisplayName() : $circle->getName()).')';
+					$line .= ' <info>MemberId</info>: '.$member->getId();
+					$line .= ' <info>Level</info>: '.Member::$DEF_LEVEL[$member->getLevel()];
 
 					$knownMembership = $this->memberships[$member->getCircleId()];
 					if ($member->getLevel() !== $knownMembership->getLevel()) {
-						$line .= ' (' . Member::$DEF_LEVEL[$knownMembership->getLevel()] . ')';
+						$line .= ' ('.Member::$DEF_LEVEL[$knownMembership->getLevel()].')';
 					}
 				}
 				if ($lineNumber === 2) {
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance() . ' ';
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance().' ';
 					if ($owner->hasBasedOn()) {
-						$line .= '(' . Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()] . ') ';
+						$line .= '('.Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()].') ';
 					}
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
 				}
 
 				return $line;
@@ -399,6 +399,6 @@ 
 			);
 		}
 
-		$output->writeln($count . ' memberships updated');
+		$output->writeln($count.' memberships updated');
 	}
 }

lib/Command/CirclesMaintenance.php

Spacing +3 added lines, -3 removed lines

@@ -117,7 +117,7 @@ 
 				'<error>WARNING! You are about to delete all data related to the Circles App!</error>'
 			);
 			$question = new ConfirmationQuestion(
-				'<comment>Do you really want to ' . $action . ' Circles ?</comment> (y/N) ', false,
+				'<comment>Do you really want to '.$action.' Circles ?</comment> (y/N) ', false,
 				'/^(y|Y)/i'
 			);
 
@@ -132,7 +132,7 @@ 
 			$output->writeln('<error>WARNING! This operation is not reversible.</error>');
 
 			$question = new Question(
-				'<comment>Please confirm this destructive operation by typing \'' . $action
+				'<comment>Please confirm this destructive operation by typing \''.$action
 				. '\'</comment>: ', ''
 			);
 
@@ -149,7 +149,7 @@ 
 				$this->coreRequestBuilder->uninstall();
 			}
 
-			$output->writeln('<info>' . $action . ' done</info>');
+			$output->writeln('<info>'.$action.' done</info>');
 
 			return 0;
 		}

lib/Service/FederatedUserService.php

Spacing +5 added lines, -5 removed lines

@@ -478,7 +478,7 @@ 
 		if ($check) {
 			$user = $this->userManager->get($userId);
 			if ($user === null) {
-				throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
+				throw new FederatedUserNotFoundException('user '.$userId.' not found');
 			}
 			$userId = $user->getUID();
 			$displayName = $user->getDisplayName();
@@ -953,7 +953,7 @@ 
 			$prefix = ($federatedUser->getUserType() === Member::TYPE_APP) ? 'app'
 				: Member::$TYPE[$federatedUser->getUserType()];
 
-			$circle->setName($prefix . ':' . $federatedUser->getUserId() . ':' . $id)
+			$circle->setName($prefix.':'.$federatedUser->getUserId().':'.$id)
 				   ->setDisplayName($federatedUser->getDisplayName())
 				   ->setSingleId($id)
 				   ->setSource($source);
@@ -1157,7 +1157,7 @@ 
 		$owner = $this->getCurrentApp();
 
 		$circle = new Circle();
-		$circle->setName('group:' . $groupId)
+		$circle->setName('group:'.$groupId)
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
 			   ->setSingleId($this->token(ManagedModel::ID_LENGTH))
 			   ->setSource(Member::TYPE_GROUP);
@@ -1223,8 +1223,8 @@ 
 	 * @return string
 	 */
 	private function generateCacheKey(FederatedUser $federatedUser): string {
-		return $federatedUser->getInstance() . '#'
-			   . $federatedUser->getUserType() . '#'
+		return $federatedUser->getInstance().'#'
+			   . $federatedUser->getUserType().'#'
 			   . $federatedUser->getUserId();
 	}
 }

lib/Service/ConfigService.php

Spacing +9 added lines, -9 removed lines

@@ -235,7 +235,7 @@ 
 			return $value;
 		}
 
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
 			return $value;
 		}
 
@@ -473,7 +473,7 @@ 
 	 */
 	public function getTrustedDomains(): array {
 		return array_map(
-			function (string $address) {
+			function(string $address) {
 				return strtolower($address);
 			}, $this->config->getSystemValue('trusted_domains', [])
 		);
@@ -509,7 +509,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -548,13 +548,13 @@ 
 			$path = $this->getAppValue(self::LOOPBACK_CLOUD_PATH);
 		}
 
-		$base = $scheme . '://' . $instance . $path;
+		$base = $scheme.'://'.$instance.$path;
 
 		if ($route === '') {
 			return $base;
 		}
 
-		return rtrim($base, '/') . $this->linkToRoute($route, $args);
+		return rtrim($base, '/').$this->linkToRoute($route, $args);
 	}
 
 
@@ -659,7 +659,7 @@ 
 	): string {
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
 		if ($federatedUser->getUserType() === Member::TYPE_MAIL) {
-			return $name . ' ' . $this->displayInstance(
+			return $name.' '.$this->displayInstance(
 					$federatedUser->getInstance(),
 					self::DISPLAY_PARENTHESIS
 				);
@@ -669,7 +669,7 @@ 
 			return $name;
 		}
 
-		return $name . $this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
+		return $name.$this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
 	}
 
 	/**
@@ -685,9 +685,9 @@ 
 
 		switch ($type) {
 			case self::DISPLAY_AT:
-				return '@' . $instance;
+				return '@'.$instance;
 			case self::DISPLAY_PARENTHESIS:
-				return '(' . $instance . ')';
+				return '('.$instance.')';
 		}
 
 		return $instance;

tests/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 require_once __DIR__.'/../../../lib/base.php';
 require_once __DIR__.'/../vendor/autoload.php';
 
-\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/unit/', true);
+\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT.'/tests/unit/', true);
 
 \OC_App::loadApp('circles');
 

lib/Command/CirclesSetting.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,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()
 				);
 			}
 

lib/Command/CirclesCheck.php

Spacing +29 added lines, -29 removed lines

@@ -177,7 +177,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);
@@ -235,7 +235,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
@@ -271,8 +271,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);
@@ -345,8 +345,8 @@ 
 		$test = new FederatedEvent(LoopbackTest::class);
 		$this->federatedEventService->newEvent($test);
 		$output->writeln(
-			'<info>' . $test->getWrapperToken() . '</info> ' .
-			'(took ' . (round(microtime(true) * 1000) - $timer) . 'ms)'
+			'<info>'.$test->getWrapperToken().'</info> '.
+			'(took '.(round(microtime(true) * 1000) - $timer).'ms)'
 		);
 
 		$output->writeln('- Waiting for async process to finish (5s)');
@@ -365,18 +365,18 @@ 
 
 		$checkVerify = $wrapper->getEvent()->getData()->gInt('verify');
 		if ($checkVerify === LoopbackTest::VERIFY) {
-			$output->write('<info>verify=' . $checkVerify . '</info> ');
+			$output->write('<info>verify='.$checkVerify.'</info> ');
 		} else {
-			$output->writeln('<error>verify=' . $checkVerify . '</error>');
+			$output->writeln('<error>verify='.$checkVerify.'</error>');
 
 			return false;
 		}
 
 		$checkManage = $wrapper->getResult()->gInt('manage');
 		if ($checkManage === LoopbackTest::MANAGE) {
-			$output->write('<info>manage=' . $checkManage . '</info> ');
+			$output->write('<info>manage='.$checkManage.'</info> ');
 		} else {
-			$output->writeln('<error>manage=' . $checkManage . '</error>');
+			$output->writeln('<error>manage='.$checkManage.'</error>');
 
 			return false;
 		}
@@ -415,7 +415,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>'
 		);
 	}
 
@@ -467,8 +467,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,
@@ -487,9 +487,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: ');
@@ -523,7 +523,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;
@@ -535,7 +535,7 @@ 
 					'Now, 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: ');
@@ -552,9 +552,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;
 				}
@@ -599,7 +599,7 @@ 
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_PATH, $path);
 
 		$output->writeln(
-			'- Address <info>' . $internal . '</info> is now used as <info>internal</info>'
+			'- Address <info>'.$internal.'</info> is now used as <info>internal</info>'
 		);
 	}
 
@@ -652,7 +652,7 @@ 
 				continue;
 			}
 
-			$frontal = rtrim($scheme . '://' . $cloudId . $path, '/');
+			$frontal = rtrim($scheme.'://'.$cloudId.$path, '/');
 			break;
 		}
 
@@ -666,13 +666,13 @@ 
 				'You will need to run this <info>curl</info> command from a remote terminal and paste its result: '
 			);
 			$output->writeln(
-				'     curl ' . $frontal . '/.well-known/webfinger?resource=http://nextcloud.com/'
+				'     curl '.$frontal.'/.well-known/webfinger?resource=http://nextcloud.com/'
 			);
 
 			$question = new Question('result: ', '');
 			$pasteWebfinger = $helper->ask($input, $output, $question);
 
-			echo '__ ' . $pasteWebfinger;
+			echo '__ '.$pasteWebfinger;
 
 			$output->writeln('TESTING !!');
 			$output->writeln('TESTING !!');
@@ -799,7 +799,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);
@@ -810,7 +810,7 @@ 
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+			$output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -834,7 +834,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.'
 		);
 
 		$helper = $this->getHelper('question');
@@ -851,8 +851,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'
 		);
 	}
 
@@ -880,7 +880,7 @@ 
 		$path = rtrim($path, '/');
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . $cloudIdPort;
+			$cloudId = $cloudId.':'.$cloudIdPort;
 		}
 
 		return [$scheme, $cloudId, $path];