nextcloud / circles

lib/Command/CirclesList.php

Spacing +2 added lines, -2 removed lines

@@ -257,9 +257,9 @@
 					Circle::$DEF_SOURCE[$circle->getSource()],
 					$this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40),
 					$this->configService->displayInstance($owner->getInstance()),
-					$circle->getPopulation() . '/'
+					$circle->getPopulation().'/'
 					. $this->getInt('members_limit', $circle->getSettings(), -1)
-					. ' (' . $circle->getPopulationInherited() . ')'
+					. ' ('.$circle->getPopulationInherited().')'
 				]
 			);
 		}

lib/Command/CirclesCreate.php

Spacing +4 added lines, -4 removed lines

@@ -124,7 +124,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()
 				);
 			}
 
@@ -136,9 +136,9 @@ 
 		} elseif (strtolower($input->getOption('output')) !== 'none') {
 			/** @var Circle $circle */
 			$circle = $this->deserialize($outcome, Circle::class);
-			$output->writeln('Id: <info>' . $circle->getSingleId() . '</info>');
-			$output->writeln('Name: <info>' . $circle->getDisplayName() . '</info>');
-			$output->writeln('Owner: <info>' . $circle->getOwner()->getDisplayName() . '</info>');
+			$output->writeln('Id: <info>'.$circle->getSingleId().'</info>');
+			$output->writeln('Name: <info>'.$circle->getDisplayName().'</info>');
+			$output->writeln('Owner: <info>'.$circle->getOwner()->getDisplayName().'</info>');
 		}
 
 		return 0;

lib/Tools/Model/Request.php

Spacing +10 added lines, -10 removed lines

@@ -257,7 +257,7 @@ 
 	public function getInstance(): string {
 		$instance = $this->getHost();
 		if ($this->getPort() > 0) {
-			$instance .= ':' . $this->getPort();
+			$instance .= ':'.$this->getPort();
 		}
 
 		return $instance;
@@ -281,7 +281,7 @@ 
 		if ($protocol === null) {
 			if (strpos($url, '/') > -1) {
 				[$address, $baseUrl] = explode('/', $url, 2);
-				$this->setBaseUrl('/' . $baseUrl);
+				$this->setBaseUrl('/'.$baseUrl);
 			} else {
 				$address = $url;
 			}
@@ -391,7 +391,7 @@ 
 				continue;
 			}
 
-			$url = str_replace(':' . $k, $this->data[$k], $url);
+			$url = str_replace(':'.$k, $this->data[$k], $url);
 		}
 
 		return $url;
@@ -408,7 +408,7 @@ 
 				continue;
 			}
 
-			$url = str_replace(':' . $k, $this->params[$k], $url);
+			$url = str_replace(':'.$k, $this->params[$k], $url);
 		}
 
 		return $url;
@@ -419,7 +419,7 @@ 
 	 * @return string
 	 */
 	public function getPath(): string {
-		return $this->baseUrl . $this->url;
+		return $this->baseUrl.$this->url;
 	}
 
 
@@ -436,9 +436,9 @@ 
 	 * @return string
 	 */
 	public function getCompleteUrl(): string {
-		$port = ($this->getPort() > 0) ? ':' . $this->getPort() : '';
+		$port = ($this->getPort() > 0) ? ':'.$this->getPort() : '';
 
-		return $this->getUsedProtocol() . '://' . $this->getHost() . $port . $this->getParametersUrl();
+		return $this->getUsedProtocol().'://'.$this->getHost().$port.$this->getParametersUrl();
 	}
 
 
@@ -453,7 +453,7 @@ 
 	public function addHeader($key, $value): Request {
 		$header = $this->get($key, $this->headers);
 		if ($header !== '') {
-			$header .= ', ' . $value;
+			$header .= ', '.$value;
 		} else {
 			$header = $value;
 		}
@@ -683,11 +683,11 @@ 
 
 		switch ($this->getQueryStringType()) {
 			case self::QS_VAR_ARRAY:
-				return '?' . http_build_query($this->getParams());
+				return '?'.http_build_query($this->getParams());
 
 			case self::QS_VAR_DUPLICATE:
 			default:
-				return '?' . preg_replace(
+				return '?'.preg_replace(
 					'/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', http_build_query($this->getParams())
 				);
 		}

lib/Db/ShareWrapperRequest.php

Spacing +3 added lines, -3 removed lines

@@ -382,7 +382,7 @@ 
 		if ($shallow) {
 			$qb->limitInt('parent', $node->getId(), $aliasFileCache);
 		} else {
-			$qb->like('path', $node->getInternalPath() . '/%', $aliasFileCache);
+			$qb->like('path', $node->getInternalPath().'/%', $aliasFileCache);
 		}
 		$qb->limitNull('parent', false);
 
@@ -442,7 +442,7 @@ 
 		}
 
 		$ids = array_map(
-			function (ShareWrapper $share): string {
+			function(ShareWrapper $share): string {
 				return $share->getId();
 			},
 			$this->getItemsFromRequest($qb)
@@ -457,7 +457,7 @@ 
 		$expr = $qb->expr();
 		$qb->leftJoin(
 			CoreQueryBuilder::SHARE, CoreRequestBuilder::TABLE_SHARE, 'p',
-			$expr->andX($expr->eq('p.id', CoreQueryBuilder::SHARE . '.parent'))
+			$expr->andX($expr->eq('p.id', CoreQueryBuilder::SHARE.'.parent'))
 		);
 
 		$qb->filterNull('parent');

lib/Service/CircleService.php

Spacing +3 added lines, -3 removed lines

@@ -580,7 +580,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testDisplayName = $baseDisplayName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testDisplayName = $baseDisplayName.(($i > 1) ? ' ('.$i.')' : '');
 			$test = new Circle();
 			$test->setDisplayName($testDisplayName);
 
@@ -613,7 +613,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testSanitizedName = $baseSanitizedName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testSanitizedName = $baseSanitizedName.(($i > 1) ? ' ('.$i.')' : '');
 
 			$test = new Circle();
 			$test->setSanitizedName($testSanitizedName);
@@ -755,7 +755,7 @@ 
 
 
 	private function generateGetCirclesCacheKey(FederatedUser $federatedUser, string $probeSum): string {
-		return $federatedUser->getSingleId() . '#' . $probeSum;
+		return $federatedUser->getSingleId().'#'.$probeSum;
 	}
 
 

lib/Listeners/Files/RemovingMember.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 		$singleIds = array_merge(
 			[$circle->getSingleId()],
 			array_map(
-				function (Membership $membership) {
+				function(Membership $membership) {
 					return $membership->getCircleId();
 				}, $circle->getMemberships()
 			)
@@ -152,7 +152,7 @@ 
 			try {
 				$this->shareWrapperService->deleteUserSharesToCircle($singleId, $member->getUserId());
 			} catch (\Exception $e) {
-				$this->logger->notice('issue while deleting user shares: ' . $e->getMessage());
+				$this->logger->notice('issue while deleting user shares: '.$e->getMessage());
 			}
 		}
 	}

lib/Db/EventWrapperRequest.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 				$qb->exprLimitInt('status', EventWrapper::STATUS_FAILED),
 				$expr->andX(
 					$qb->exprLimitInt('status', EventWrapper::STATUS_INIT),
-					$qb->exprGt('creation', time() - 86400),  // only freshly created; less than 3 hours
+					$qb->exprGt('creation', time() - 86400), // only freshly created; less than 3 hours
 					$qb->exprLt('creation', time() - 900)     // but not too fresh, at least 15 minutes
 				)
 			)

lib/Service/ConfigService.php

Spacing +10 added lines, -10 removed lines

@@ -244,7 +244,7 @@ 
 			return $value;
 		}
 
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
 			return $value;
 		}
 
@@ -498,7 +498,7 @@ 
 	 */
 	public function getTrustedDomains(): array {
 		return array_map(
-			function (string $address) {
+			function(string $address) {
 				return strtolower($address);
 			}, $this->config->getSystemValue('trusted_domains', [])
 		);
@@ -534,7 +534,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -573,13 +573,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);
 	}
 
 
@@ -684,7 +684,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
 			);
@@ -694,7 +694,7 @@ 
 			return $name;
 		}
 
-		return $name . $this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
+		return $name.$this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
 	}
 
 	/**
@@ -710,9 +710,9 @@ 
 
 		switch ($type) {
 			case self::DISPLAY_AT:
-				return '@' . $instance;
+				return '@'.$instance;
 			case self::DISPLAY_PARENTHESIS:
-				return '(' . $instance . ')';
+				return '('.$instance.')';
 		}
 
 		return $instance;
@@ -764,7 +764,7 @@ 
 			// when running from the occ command, /index.php is not removed by itself
 			if (str_starts_with($path, '/index.php/')
 				&& $this->config->getSystemValueString('htaccess.RewriteBase', '') !== '') {
-				$path = $this->config->getSystemValueString('htaccess.RewriteBase', '/') . substr($path, 11);
+				$path = $this->config->getSystemValueString('htaccess.RewriteBase', '/').substr($path, 11);
 			}
 
 			$knownPath = parse_url($this->config->getSystemValue('overwrite.cli.url'), PHP_URL_PATH);

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(
@@ -434,7 +434,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 @@ 
 	 * @param string $instance
 	 */
 	private function syncGSInstance(string $instance): void {
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
+		$this->output->write('Adding <comment>'.$instance.'</comment>: ');
 		if ($this->configService->isLocalInstance($instance)) {
 			$this->output->writeln('<comment>instance is local</comment>');
 			return;
@@ -465,8 +465,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>');
 		}
 	}
 
@@ -484,12 +484,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(
@@ -516,7 +516,7 @@ 
 			}
 		}
 
-		throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE));
+		throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE));
 	}
 
 	/**
@@ -529,6 +529,6 @@ 
 			}
 		}
 
-		throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE));
+		throw new Exception('Unknown interface: '.implode(', ', InterfaceService::$LIST_IFACE));
 	}
 }