nextcloud / circles

lib/Db/DeprecatedRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -348,8 +348,8 @@ 
 		$expr = $qb->expr();
 
 		if ($pf === '') {
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
 
 			return;
 		}
@@ -378,7 +378,7 @@ 
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
 				continue;
 			}
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
 		}
 
 		return $orX;
@@ -393,12 +393,12 @@ 
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
 		$orX = $expr->orX();
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
 
 		$qb->andWhere($orX);
 	}
@@ -411,8 +411,8 @@ 
 	 */
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -423,8 +423,8 @@ 
 	 */
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -439,9 +439,9 @@ 
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
 		if ($userId !== '') {
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
 		} else {
@@ -464,7 +464,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -473,7 +473,7 @@ 
 		   ->selectAlias('lc.settings', 'circle_settings')
 		   ->leftJoin(
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
 		   );
 	}
 

lib/Db/CirclesRequestBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -245,7 +245,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = '' . $this->default_select_alias . '.';
+		$pf = ''.$this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -259,7 +259,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_MEMBERS, 'u',
 			   $expr->andX(
-				   $expr->eq('u.circle_id', $pf . 'unique_id'),
+				   $expr->eq('u.circle_id', $pf.'unique_id'),
 				   $expr->eq('u.user_id', $qb->createNamedParameter($userId)),
 				   $expr->eq('u.instance', $qb->createNamedParameter($instanceId)),
 				   $expr->eq('u.user_type', $qb->createNamedParameter($type))
@@ -281,7 +281,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -294,7 +294,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_MEMBERS, 'o',
 			   $expr->andX(
-				   $expr->eq('o.circle_id', $pf . 'unique_id'),
+				   $expr->eq('o.circle_id', $pf.'unique_id'),
 				   $expr->eq('o.level', $qb->createNamedParameter(Member::LEVEL_OWNER)),
 				   $expr->eq('o.user_type', $qb->createNamedParameter(Member::TYPE_USER))
 			   )

lib/Model/AppService.php

Spacing +1 added lines, -1 removed lines

@@ -259,7 +259,7 @@
 		];
 
 		if ($this->getAuthSigned() !== '') {
-			$data['auth-signed'] = $this->getAlgorithm() . ':' . $this->getAuthSigned();
+			$data['auth-signed'] = $this->getAlgorithm().':'.$this->getAuthSigned();
 		}
 
 		return array_filter(array_merge($data, parent::jsonSerialize()));

lib/Service/ConfigService.php

Spacing +6 added lines, -6 removed lines

@@ -251,7 +251,7 @@ 
 		if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
 			&& strpos($remote, 'https://') !== 0
 		) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
 		return rtrim($remote, '/');
@@ -509,7 +509,7 @@ 
 				return false;
 			}
 
-			throw new GSStatusException('GS and lookup are not configured : ' . $lookup . ', ' . $enabled);
+			throw new GSStatusException('GS and lookup are not configured : '.$lookup.', '.$enabled);
 		}
 
 		$clef = $this->config->getSystemValue('gss.jwt.key', '');
@@ -573,7 +573,7 @@ 
 			}
 
 			if (array_key_exists('port', $local)) {
-				return $local['host'] . ':' . $local['port'];
+				return $local['host'].':'.$local['port'];
 			} else {
 				return $local['host'];
 			}
@@ -595,13 +595,13 @@ 
 	 * @return string
 	 */
 	public function getRemotePath(string $route = 'circles.Navigation.navigate', array $args = []): string {
-		$base = $this->getAppValue(self::LOCAL_CLOUD_SCHEME) . '://' . $this->getLocalInstance();
+		$base = $this->getAppValue(self::LOCAL_CLOUD_SCHEME).'://'.$this->getLocalInstance();
 
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}
 
 	/**
@@ -702,7 +702,7 @@ 
 			$ncBase = substr($ncBase, 0, -strlen($forcedPath));
 		}
 
-		return rtrim($ncBase, '/') . $link;
+		return rtrim($ncBase, '/').$link;
 	}
 
 }

lib/Service/CirclesService.php

Spacing +5 added lines, -5 removed lines

@@ -569,24 +569,24 @@
 		switch ($type) {
 			case Circle::CIRCLES_PERSONAL:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_ID, 'personal' . $ext)
+					$urlGen->imagePath(Application::APP_ID, 'personal'.$ext)
 				);
 			case Circle::CIRCLES_CLOSED:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_ID, 'closed' . $ext)
+					$urlGen->imagePath(Application::APP_ID, 'closed'.$ext)
 				);
 			case Circle::CIRCLES_SECRET:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_ID, 'secret' . $ext)
+					$urlGen->imagePath(Application::APP_ID, 'secret'.$ext)
 				);
 			case Circle::CIRCLES_PUBLIC:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext)
+					$urlGen->imagePath(Application::APP_ID, 'black_circle'.$ext)
 				);
 		}
 
 		return $urlGen->getAbsoluteURL(
-			$urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext)
+			$urlGen->imagePath(Application::APP_ID, 'black_circle'.$ext)
 		);
 	}
 

lib/Command/CirclesRemoteInit.php

Spacing +6 added lines, -6 removed lines

@@ -106,7 +106,7 @@ 
 			$output->writeln('Looks like Federated Circles is already enabled:');
 			$output->writeln('');
 			$output->writeln(
-				'<info>' . json_encode($signatory, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+				'<info>'.json_encode($signatory, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
 				. '</info>'
 			);
 
@@ -194,10 +194,10 @@ 
 
 		$currInstance = $this->configService->getLocalInstance();
 		$output->writeln('');
-		$output->writeln('The domain name of your instance is: <info>' . $currInstance . '</info>');
+		$output->writeln('The domain name of your instance is: <info>'.$currInstance.'</info>');
 		$helper = $this->getHelper('question');
 		$question =
-			new Question('<info>Change your domain name:</info> (' . $currInstance . ') ', $currInstance);
+			new Question('<info>Change your domain name:</info> ('.$currInstance.') ', $currInstance);
 
 		$newInstance = $helper->ask($input, $output, $question);
 
@@ -208,9 +208,9 @@ 
 
 		$output->writeln('');
 		$currScheme = $this->configService->getAppValue(ConfigService::LOCAL_CLOUD_SCHEME);
-		$output->writeln('Current protocol is <info>' . strtoupper($currScheme) . '</info>');
+		$output->writeln('Current protocol is <info>'.strtoupper($currScheme).'</info>');
 		$question =
-			new Question('<info>Change the used protocol:</info> (' . $currScheme . ') ', $currScheme);
+			new Question('<info>Change the used protocol:</info> ('.$currScheme.') ', $currScheme);
 		$newScheme = strtolower($helper->ask($input, $output, $question));
 
 		if ($newScheme !== $currScheme) {
@@ -231,7 +231,7 @@ 
 		$app = $this->remoteService->getAppSignatory(true);
 
 		$output->writeln(
-			'<info>' . json_encode($app, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . '</info>'
+			'<info>'.json_encode($app, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).'</info>'
 		);
 		$output->writeln('');
 	}

lib/Command/CirclesRemote.php

Spacing +19 added lines, -19 removed lines

@@ -104,19 +104,19 @@ 
 
 		$webfinger = $this->getWebfinger($host, Application::APP_SUBJECT);
 		if ($input->getOption('all')) {
-			$output->writeln('- Webfinger on <info>' . $host . '</info>');
+			$output->writeln('- Webfinger on <info>'.$host.'</info>');
 			$output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$output->writeln('');
 		}
 
 		if ($input->getOption('all')) {
 			$circleLink = $this->extractLink(Application::APP_REL, $webfinger);
-			$output->writeln('- Information about Circles app on <info>' . $host . '</info>');
+			$output->writeln('- Information about Circles app on <info>'.$host.'</info>');
 			$output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$output->writeln('');
 		}
 
-		$output->writeln('- Available services on <info>' . $host . '</info>');
+		$output->writeln('- Available services on <info>'.$host.'</info>');
 		foreach ($webfinger->getLinks() as $link) {
 			$app = $link->getProperty('name');
 			$ver = $link->getProperty('version');
@@ -124,14 +124,14 @@ 
 				$app .= ' ';
 			}
 			if ($ver !== '') {
-				$ver = 'v' . $ver;
+				$ver = 'v'.$ver;
 			}
 
-			$output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver);
+			$output->writeln(' * '.$link->getRel().' '.$app.$ver);
 		}
 		$output->writeln('');
 
-		$output->writeln('- Resources related to Circles on <info>' . $host . '</info>');
+		$output->writeln('- Resources related to Circles on <info>'.$host.'</info>');
 		$resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL);
 		$output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 		$output->writeln('');
@@ -139,7 +139,7 @@ 
 
 		$tempUid = $resource->g('uid');
 		$output->writeln(
-			'- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>'
+			'- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>'
 		);
 
 		try {
@@ -147,15 +147,15 @@ 
 			$output->writeln(' * No SignatureException: <info>Identity authed</info>');
 		} catch (SignatureException $e) {
 			$output->writeln(
-				'<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>'
+				'<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>'
 			);
 
 			return 0;
 		}
 
-		$output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>');
+		$output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>');
 		if ($remoteSignatory->getUid(true) !== $tempUid) {
-			$output->writeln('<error>looks like ' . $host . ' is faking its identity');
+			$output->writeln('<error>looks like '.$host.' is faking its identity');
 
 			return 0;
 		}
@@ -163,7 +163,7 @@ 
 		$output->writeln('');
 
 		$testUrl = $resource->g('test');
-		$output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>');
+		$output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>');
 
 		try {
 			$localSignatory = $this->remoteService->getAppSignatory();
@@ -185,16 +185,16 @@ 
 		$output->writeln('');
 
 		$output->writeln(' * Clear Signature: ');
-		$output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>');
+		$output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>');
 		$output->writeln('');
 
 		$output->writeln(' * Signed Signature (base64 encoded): ');
-		$output->writeln('<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>');
+		$output->writeln('<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>');
 		$output->writeln('');
 
 		$result = $signedRequest->getOutgoingRequest()->getResult();
 		$code = $result->getStatusCode();
-		$output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code));
+		$output->writeln(' * Result: '.(($code === 200) ? '<info>'.$code.'</info>' : $code));
 		$output->writeln(
 			json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
 		);
@@ -213,20 +213,20 @@ 
 				$stored = new AppService();
 				$this->remoteService->confirmValidRemote($remoteSignatory, $stored);
 				$output->writeln(
-					'<info>The remote instance ' . $host
+					'<info>The remote instance '.$host
 					. ' is already known with this current identity</info>'
 				);
 
 				if ($remoteSignatory->getInstance() !== $stored->getInstance()) {
 					$output->writeln(
-						'- updating host from ' . $stored->getInstance() . ' to '
+						'- updating host from '.$stored->getInstance().' to '
 						. $remoteSignatory->getInstance()
 					);
 					$this->remoteService->update($remoteSignatory, RemoteService::UPDATE_INSTANCE);
 				}
 				if ($remoteSignatory->getId() !== $stored->getId()) {
 					$output->writeln(
-						'- updating href/Id from ' . $stored->getId() . ' to '
+						'- updating href/Id from '.$stored->getId().' to '
 						. $remoteSignatory->getId()
 					);
 					$this->remoteService->update($remoteSignatory, RemoteService::UPDATE_HREF);
@@ -253,7 +253,7 @@ 
 		$helper = $this->getHelper('question');
 
 		$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 allow the sharing of your circles with this remote instance ? (y/N) ',
@@ -279,7 +279,7 @@ 
 		$helper = $this->getHelper('question');
 
 		$output->writeln(
-			'The remote instance <info>' . $remoteSignatory->getInstance()
+			'The remote instance <info>'.$remoteSignatory->getInstance()
 			. '</info> is known but <error>its identity has changed.</error>'
 		);
 		$output->writeln(

lib/Command/CirclesTest.php

Spacing +8 added lines, -8 removed lines

@@ -141,9 +141,9 @@ 
 		$test->setAsync(true);
 		$token = $this->gsUpstreamService->newEvent($test);
 
-		$output->writeln('- Async request is sent, now waiting ' . $this->delay . ' seconds');
+		$output->writeln('- Async request is sent, now waiting '.$this->delay.' seconds');
 		sleep($this->delay);
-		$output->writeln('- Pause is over, checking results for ' . $token);
+		$output->writeln('- Pause is over, checking results for '.$token);
 
 		$wrappers = $this->gsUpstreamService->getEventsByToken($token);
 
@@ -155,7 +155,7 @@ 
 
 		$localLooksGood = false;
 		foreach ($instances as $instance) {
-			$output->write($instance . ' ');
+			$output->write($instance.' ');
 			if (array_key_exists($instance, $result)
 				&& $result[$instance]->getResult()
 									 ->gInt('status') === 1) {
@@ -192,7 +192,7 @@ 
 		$this->configService->configureRequest($request, $route, $args);
 		$request->setFollowLocation(false);
 
-		$o->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
+		$o->write('- '.$type.' request on '.$request->getCompleteUrl().': ');
 		$this->doRequest($request);
 
 		$color = 'error';
@@ -201,7 +201,7 @@ 
 			$color = 'info';
 		}
 
-		$o->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+		$o->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>');
 
 		if ($result->getStatusCode() === 200) {
 			return true;
@@ -223,7 +223,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');
@@ -240,8 +240,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'
 		);
 	}
 

lib/Command/Groups.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	 */
 	private function listLinkedGroups(InputInterface $input, OutputInterface $output) {
 		if ($input->getOption('list') !== true) {
-			return ;
+			return;
 		}
 
 		throw new FakeException();