nextcloud / circles

lib/Db/MemberRequest.php

Spacing +6 added lines, -6 removed lines

@@ -253,8 +253,8 @@ 
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $probe->getFilterMember());
 		}
 
-		$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);
 	}
@@ -279,7 +279,7 @@ 
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId, $level);
 
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc');
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -347,10 +347,10 @@ 
 		$qb = $this->getMemberSelectSql();
 		$qb->limitToCircleId($circleId);
 
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
 
 		return array_map(
-			function (Member $member): string {
+			function(Member $member): string {
 				return $member->getInstance();
 			}, $this->getItemsFromRequest($qb)
 		);
@@ -400,7 +400,7 @@ 
 	 */
 	public function searchFederatedUsers(string $needle): array {
 		$qb = $this->getMemberSelectSql();
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
 
 		return $this->getItemsFromRequest($qb, true);
 	}

lib/Db/CircleRequestBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		$qb->generateSelect(self::TABLE_CIRCLE, self::$tables[self::TABLE_CIRCLE], $alias);
 
 		if (!$single) {
-			$qb->orderBy($alias . '.creation', 'asc');
+			$qb->orderBy($alias.'.creation', 'asc');
 		}
 
 		return $qb;

lib/Tools/Traits/TNCRequest.php

Spacing +2 added lines, -2 removed lines

@@ -169,10 +169,10 @@
 				return $client->delete($request->getCompleteUrl(), $request->getClientOptions());
 			case Request::TYPE_GET:
 				return $client->get(
-					$request->getCompleteUrl() . $request->getQueryString(), $request->getClientOptions()
+					$request->getCompleteUrl().$request->getQueryString(), $request->getClientOptions()
 				);
 			default:
-				throw new Exception('unknown request type ' . json_encode($request));
+				throw new Exception('unknown request type '.json_encode($request));
 		}
 	}
 }

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);