nextcloud / circles

lib/Db/MemberRequest.php

Spacing +5 added lines, -5 removed lines

@@ -216,8 +216,8 @@ 
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter);
 		}
 
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -241,7 +241,7 @@ 
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId);
 
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc');
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc');
 //		$qb->groupBy(CoreQueryBuilder::MEMBER . '.single_id');
 
 		return $this->getItemsFromRequest($qb);
@@ -278,7 +278,7 @@ 
 		$qb = $this->getMemberSelectSql();
 		$qb->limitToCircleId($circleId);
 
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
 //		$qb->groupBy(CoreQueryBuilder::MEMBER . '.instance');
 
 		return array_map(
@@ -334,7 +334,7 @@ 
 	 */
 	public function searchFederatedUsers(string $needle): array {
 		$qb = $this->getMemberSelectSql();
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
 //		$qb->groupBy('single_id');
 
 		return $this->getItemsFromRequest($qb, true);

lib/Db/CircleRequestBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		$qb = $this->getQueryBuilder();
 		$qb->generateSelect(self::TABLE_CIRCLE, self::$tables[self::TABLE_CIRCLE], $alias, true)
 		   ->generateGroupBy(self::$tables[self::TABLE_CIRCLE], $alias)
-		   ->orderBy($alias . '.creation', 'asc');
+		   ->orderBy($alias.'.creation', 'asc');
 
 		return $qb;
 	}

lib/Db/RemoteRequest.php

Spacing +4 added lines, -4 removed lines

@@ -182,10 +182,10 @@ 
 			$qb->leftJoin(
 				CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember,
 				$expr->andX(
-					$expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())),
-					$expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'),
+					$expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())),
+					$expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'),
 					$expr->gte(
-						$aliasMember . '.level',
+						$aliasMember.'.level',
 						$qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT)
 					)
 				)
@@ -193,7 +193,7 @@ 
 
 			$external = $expr->andX();
 			$external->add($qb->exprLimitToDBField('type', RemoteInstance::TYPE_EXTERNAL, true, false));
-			$external->add($expr->isNotNull($aliasMember . '.instance'));
+			$external->add($expr->isNotNull($aliasMember.'.instance'));
 			$orX->add($external);
 		}
 

lib/Db/MemberRequestBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 			CoreQueryBuilder::MEMBER
 		)
 		   ->generateGroupBy(self::$tables[self::TABLE_MEMBER], CoreQueryBuilder::MEMBER)
-		   ->orderBy(CoreQueryBuilder::MEMBER . '.joined');
+		   ->orderBy(CoreQueryBuilder::MEMBER.'.joined');
 
 		if ($getBasedOn) {
 			$qb->leftJoinBasedOn(CoreQueryBuilder::MEMBER, $initiator);

lib/Command/CirclesReport.php

Spacing +3 added lines, -3 removed lines

@@ -218,7 +218,7 @@ 
 	 * @return string[]
 	 */
 	public function fillCommandList(string $source, string $field): array {
-		echo $source . ' ' . $field . "\n";
+		echo $source.' '.$field."\n";
 
 		return ['abcd', 'abdde', 'erfg'];
 	}
@@ -394,7 +394,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));
 	}
 
 
@@ -403,7 +403,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/CirclesCheck.php

Doc Comments +1 added lines, -2 removed lines

@@ -110,7 +110,7 @@ 
 	 * CirclesCheck constructor.
 	 *
 	 * @param Capabilities $capabilities
-	 * @param FederatedEvent $federatedEventService
+	 * @param FederatedEventService $federatedEventService
 	 * @param RemoteService $remoteService
 	 * @param RemoteStreamService $remoteStreamService
 	 * @param RemoteUpstreamService $remoteUpstreamService
@@ -619,7 +619,6 @@ 
 
 
 	/**
-	 * @param OutputInterface $o
 	 * @param string $type
 	 * @param string $route
 	 * @param array $args

Spacing +15 added lines, -15 removed lines

@@ -172,7 +172,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);
@@ -274,14 +274,14 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
 			$output->writeln('* <info>Loopback</info> address looks good');
 			$output->writeln('saving');
 		} catch (Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 		}
 
 		$output->writeln('- You do not have a valid <info>loopback</info> address setup right now.');
@@ -305,8 +305,8 @@ 
 				continue;
 			}
 
-			$loopback = $scheme . '://' . $cloudId;
-			$output->write('* testing address: ' . $loopback . ' ');
+			$loopback = $scheme.'://'.$cloudId;
+			$output->write('* testing address: '.$loopback.' ');
 
 			if ($this->testLoopback($input, $output, $loopback)) {
 				$output->writeln('<info>ok</info>');
@@ -314,7 +314,7 @@ 
 				$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_SCHEME, $scheme);
 				$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId);
 				$output->writeln(
-					'- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>'
+					'- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>'
 				);
 
 				return;
@@ -493,7 +493,7 @@ 
 				continue;
 			}
 
-			$frontal = $scheme . '://' . $cloudId;
+			$frontal = $scheme.'://'.$cloudId;
 			break;
 		}
 
@@ -507,13 +507,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 !!');
@@ -637,7 +637,7 @@ 
 		$this->configService->configureLoopbackRequest($request, $route, $args);
 		$request->setFollowLocation(false);
 
-		$output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
+		$output->write('- '.$type.' request on '.$request->getCompleteUrl().': ');
 		$this->doRequest($request);
 
 		$color = 'error';
@@ -646,7 +646,7 @@ 
 			$color = 'info';
 		}
 
-		$output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+		$output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>');
 
 		if ($result->getStatusCode() === 200) {
 			return true;
@@ -668,7 +668,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');
@@ -685,8 +685,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'
 		);
 	}
 
@@ -707,7 +707,7 @@ 
 		}
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . $cloudIdPort;
+			$cloudId = $cloudId.':'.$cloudIdPort;
 		}
 
 		return [$scheme, $cloudId];

lib/Service/RemoteStreamService.php

Unused Use Statements -1 removed lines

@@ -61,7 +61,6 @@
 use OCP\AppFramework\Http;
 use OCP\IURLGenerator;
 use ReflectionClass;
-use ReflectionException;
 
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -315,7 +315,7 @@
 	public function getCachedRemoteInstance(string $instance): RemoteInstance {
 		$remoteInstance = $this->remoteRequest->getFromInstance($instance);
 		if ($remoteInstance->getType() === RemoteInstance::TYPE_UNKNOWN) {
-			throw new UnknownRemoteException($instance . ' is set as \'unknown\' in database');
+			throw new UnknownRemoteException($instance.' is set as \'unknown\' in database');
 		}
 
 		return $remoteInstance;

lib/Service/InterfaceService.php

Spacing +2 added lines, -2 removed lines

@@ -230,13 +230,13 @@
 			throw new UnknownInterfaceException('misconfigured scheme');
 		}
 
-		$base = $scheme . '://' . $this->getCloudInstance();
+		$base = $scheme.'://'.$this->getCloudInstance();
 
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}
 
 

lib/Service/ConfigService.php

Spacing +4 added lines, -4 removed lines

@@ -161,7 +161,7 @@ 
 			return $value;
 		}
 
-		if (($value = $this->config->getSystemValue('circles.' . $key, '')) !== '') {
+		if (($value = $this->config->getSystemValue('circles.'.$key, '')) !== '') {
 			return $value;
 		}
 
@@ -415,7 +415,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -444,12 +444,12 @@ 
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
 		}
 
-		$base = $scheme . '://' . $instance;
+		$base = $scheme.'://'.$instance;
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}