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/Service/GSUpstreamService.php

Spacing +4 added lines, -4 removed lines

@@ -145,7 +145,7 @@ 
 			}
 		} catch (Exception $e) {
 			$this->miscService->log(
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
 			);
 			throw $e;
 		}
@@ -215,7 +215,7 @@ 
 	 * @throws RequestResultNotJsonException
 	 * @throws GlobalScaleEventException
 	 */
-	public function confirmEvent(GSEvent &$event): void {
+	public function confirmEvent(GSEvent & $event): void {
 		$this->signEvent($event);
 
 		$circle = $event->getDeprecatedCircle();
@@ -229,13 +229,13 @@ 
 		$request->setDataSerialize($event);
 
 		$result = $this->retrieveJson($request);
-		$this->miscService->log('result ' . json_encode($result), 0);
+		$this->miscService->log('result '.json_encode($result), 0);
 		if ($this->getInt('status', $result) === 0) {
 			throw new GlobalScaleEventException($this->get('error', $result));
 		}
 
 		$updatedData = $this->getArray('event', $result);
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData), 0);
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData), 0);
 		if (!empty($updatedData)) {
 			$updated = new GSEvent();
 			try {

lib/Service/RemoteStreamService.php

Spacing +2 added lines, -2 removed lines

@@ -330,7 +330,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;
@@ -571,7 +571,7 @@ 
 	 * @throws RemoteNotFoundException
 	 * @throws RemoteUidException
 	 */
-	public function confirmValidRemote(RemoteInstance $remote, ?RemoteInstance &$stored = null): void {
+	public function confirmValidRemote(RemoteInstance $remote, ?RemoteInstance & $stored = null): void {
 		try {
 			$stored = $this->remoteRequest->getFromHref($remote->getId());
 		} catch (RemoteNotFoundException $e) {

lib/Service/MaintenanceService.php

Spacing +7 added lines, -7 removed lines

@@ -61,9 +61,9 @@ 
 
 	public static $DELAY =
 		[
-			1 => 60,    // every minute
-			2 => 300,   // every 5 minutes
-			3 => 3600,  // every hour
+			1 => 60, // every minute
+			2 => 300, // every 5 minutes
+			3 => 3600, // every hour
 			4 => 75400, // every day
 			5 => 432000 // evey week
 		];
@@ -178,7 +178,7 @@ 
 		$this->federatedUserService->bypassCurrentUserCondition(true);
 
 		$this->lockMaintenanceRun();
-		$this->debug('running maintenance (' . $level . ')');
+		$this->debug('running maintenance ('.$level.')');
 
 		switch ($level) {
 			case 1:
@@ -349,14 +349,14 @@ 
 			  ->includeSystemCircles();
 
 		$circles = array_map(
-			function (Circle $circle) {
+			function(Circle $circle) {
 				return $circle->getSingleId();
 			}, $this->circleRequest->getCircles(null, $probe)
 		);
 
 		$shares = array_unique(
 			array_map(
-				function (ShareWrapper $share) {
+				function(ShareWrapper $share) {
 					return $share->getSharedWith();
 				}, $this->shareWrapperRequest->getShares()
 			)
@@ -501,7 +501,7 @@ 
 	 */
 	private function output(string $message): void {
 		if (!is_null($this->output)) {
-			$this->output->writeln('- ' . $message);
+			$this->output->writeln('- '.$message);
 		}
 	}
 }

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/Search/GlobalScaleUsers.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 			RequestResultNotJsonException $e
 		) {
 			$this->miscService->log(
-				'Issue while search users from lookup: ' . get_class($e) . ' ' . $e->getMessage()
+				'Issue while search users from lookup: '.get_class($e).' '.$e->getMessage()
 			);
 
 			return [];

lib/Db/DeprecatedCirclesRequestBuilder.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))
@@ -280,7 +280,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -293,7 +293,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(DeprecatedMember::LEVEL_OWNER)),
 		   		$expr->eq('o.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER))
 		   	)

lib/Db/DeprecatedRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -346,8 +346,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;
 		}
@@ -376,7 +376,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;
@@ -391,12 +391,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(DeprecatedMember::STATUS_MEMBER)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
 
 		$qb->andWhere($orX);
 	}
@@ -409,8 +409,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)));
 	}
 
 
@@ -421,8 +421,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)));
 	}
 
 
@@ -437,9 +437,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 {
@@ -462,7 +462,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -471,7 +471,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')
 		   );
 	}