nextcloud / circles

lib/Tools/Traits/TArrayTools.php

Spacing +2 added lines, -2 removed lines

@@ -404,7 +404,7 @@ 
 		foreach ($keys as $key) {
 			if (!array_key_exists($key, $arr)) {
 				throw new MalformedArrayException(
-					'source: ' . json_encode($arr) . ' - missing key: ' . $key
+					'source: '.json_encode($arr).' - missing key: '.$key
 				);
 			}
 		}
@@ -417,7 +417,7 @@ 
 	protected function cleanArray(array &$arr) {
 		$arr = array_filter(
 			$arr,
-			function ($v) {
+			function($v) {
 				if (is_string($v)) {
 					return ($v !== '');
 				}

lib/Tools/Traits/TNCSignatory.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 			$this->updateSignatory($signatory, $this->retrieveJson($request), $keyId);
 		} catch (RequestNetworkException $e) {
 			$this->debug('network issue while downloading Signatory', ['request' => $request]);
-			throw new SignatoryException('network issue: ' . $e->getMessage());
+			throw new SignatoryException('network issue: '.$e->getMessage());
 		}
 	}
 
@@ -141,7 +141,7 @@ 
 			return $host;
 		}
 
-		throw new InvalidOriginException('cannot retrieve origin from ' . $keyId);
+		throw new InvalidOriginException('cannot retrieve origin from '.$keyId);
 	}
 
 

lib/Tools/Traits/TAsync.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 		echo($result);
 
 		$size = ob_get_length();
-		header('Content-Length: ' . $size);
+		header('Content-Length: '.$size);
 		ob_end_flush();
 		flush();
 	}

lib/Tools/Traits/TNCLogger.php

Spacing +6 added lines, -6 removed lines

@@ -130,7 +130,7 @@ 
 	 * @param array $serializable
 	 */
 	public function emergency(string $message, bool $trace = false, array $serializable = []): void {
-		$this->log(self::$EMERGENCY, '[emergency] ' . $message, $trace, $serializable);
+		$this->log(self::$EMERGENCY, '[emergency] '.$message, $trace, $serializable);
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 * @param array $serializable
 	 */
 	public function alert(string $message, bool $trace = false, array $serializable = []): void {
-		$this->log(self::$ALERT, '[alert] ' . $message, $trace, $serializable);
+		$this->log(self::$ALERT, '[alert] '.$message, $trace, $serializable);
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 * @param array $serializable
 	 */
 	public function warning(string $message, bool $trace = false, array $serializable = []): void {
-		$this->log(self::$WARNING, '[warning] ' . $message, $trace, $serializable);
+		$this->log(self::$WARNING, '[warning] '.$message, $trace, $serializable);
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 * @param array $serializable
 	 */
 	public function notice(string $message, bool $trace = false, array $serializable = []): void {
-		$this->log(self::$NOTICE, '[notice] ' . $message, $trace, $serializable);
+		$this->log(self::$NOTICE, '[notice] '.$message, $trace, $serializable);
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 * @param array $serializable
 	 */
 	public function debug(string $message, array $serializable = []): void {
-		$message = '[debug] ' . $message;
+		$message = '[debug] '.$message;
 		$debugLevel = (int)$this->appConfig('debug_level');
 		$this->log($debugLevel, $message, ($this->appConfig('debug_trace') === '1'), $serializable);
 	}
@@ -182,7 +182,7 @@ 
 		if ($trace) {
 			$opts['exception'] = new HintException($message, json_encode($serializable));
 		} elseif (!empty($serializable)) {
-			$message .= ' -- ' . json_encode($serializable);
+			$message .= ' -- '.json_encode($serializable);
 		}
 
 		$this->logger()

lib/Tools/Traits/TDeserialize.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	 */
 	public function deserialize(array $data, string $class): IDeserializable {
 		if ($class instanceof IDeserializable) {
-			throw new InvalidItemException(get_class($class) . ' does not implement IDeserializable');
+			throw new InvalidItemException(get_class($class).' does not implement IDeserializable');
 		}
 
 		/** @var IDeserializable $item */

lib/Tools/ActivityPub/NCSignature.php

Spacing +9 added lines, -9 removed lines

@@ -219,8 +219,8 @@ 
 			throw new SignatureException('missing elements in \'headers\'');
 		}
 
-		$target = strtolower($request->getMethod()) . " " . $request->getRequestUri();
-		$estimated = ['(request-target): ' . $target];
+		$target = strtolower($request->getMethod())." ".$request->getRequestUri();
+		$estimated = ['(request-target): '.$target];
 
 		foreach ($headers as $key) {
 			$value = $request->getHeader($key);
@@ -231,7 +231,7 @@ 
 				throw new SignatureException('empty elements in \'headers\'');
 			}
 
-			$estimated[] = $key . ': ' . $value;
+			$estimated[] = $key.': '.$value;
 		}
 		$signedRequest->setClearSignature(implode("\n", $estimated));
 	}
@@ -303,7 +303,7 @@ 
 		$request = $signedRequest->getOutgoingRequest();
 
 		$data = new SimpleDataStore();
-		$data->s('(request-target)', NCRequest::method($request->getType()) . ' ' . $request->getPath())
+		$data->s('(request-target)', NCRequest::method($request->getType()).' '.$request->getPath())
 			 ->sInt('content-length', strlen($signedRequest->getBody()))
 			 ->s('date', gmdate($this->dateHeader))
 			 ->s('digest', $signedRequest->getDigest())
@@ -322,7 +322,7 @@ 
 		foreach ($data->keys() as $element) {
 			try {
 				$value = $data->gItem($element);
-				$signing[] = $element . ': ' . $value;
+				$signing[] = $element.': '.$value;
 				if ($element !== '(request-target)') {
 					$signedRequest->getOutgoingRequest()->addHeader($element, $value);
 				}
@@ -355,10 +355,10 @@ 
 		$headers = array_diff($signedRequest->getSignatureHeader()->keys(), ['(request-target)']);
 		$signatory = $signedRequest->getSignatory();
 		$signatureElements = [
-			'keyId="' . $signatory->getKeyId() . '"',
-			'algorithm="' . $this->getChosenEncryption($signatory) . '"',
-			'headers="' . implode(' ', $headers) . '"',
-			'signature="' . $signedRequest->getSignedSignature() . '"'
+			'keyId="'.$signatory->getKeyId().'"',
+			'algorithm="'.$this->getChosenEncryption($signatory).'"',
+			'headers="'.implode(' ', $headers).'"',
+			'signature="'.$signedRequest->getSignedSignature().'"'
 		];
 
 		$signedRequest->getOutgoingRequest()->addHeader('Signature', implode(',', $signatureElements));

lib/Tools/Db/ExtendedQueryBuilder.php

Spacing +31 added lines, -31 removed lines

@@ -215,7 +215,7 @@ 
 	 */
 	public function limitToCreation(int $delay = 0): self {
 		$date = new DateTime('now');
-		$date->sub(new DateInterval('PT' . $delay . 'M'));
+		$date->sub(new DateInterval('PT'.$delay.'M'));
 
 		$this->limitToDBFieldDateTime('creation', $date, true);
 
@@ -232,7 +232,7 @@ 
 		$expr = $this->expr();
 		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias()
 																. '.' : '';
-		$field = $pf . $field;
+		$field = $pf.$field;
 
 		$orX = $expr->orX();
 		$orX->add(
@@ -262,8 +262,8 @@ 
 		}
 
 		$expr = $this->expr();
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
-		$field = $pf . $field;
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
+		$field = $pf.$field;
 
 		$orX = $expr->orX();
 		$orX->add(
@@ -281,8 +281,8 @@ 
 	public function searchInDBField(string $field, string $value): void {
 		$expr = $this->expr();
 
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
-		$field = $pf . $field;
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
+		$field = $pf.$field;
 
 		$this->andWhere($expr->iLike($field, $this->createNamedParameter($value)));
 	}
@@ -404,7 +404,7 @@ 
 	 */
 	public function exprLike(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -426,7 +426,7 @@ 
 	 */
 	public function exprLimit(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -452,7 +452,7 @@ 
 	 */
 	public function exprLimitInt(string $field, int $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -470,7 +470,7 @@ 
 	 */
 	public function exprLimitBool(string $field, bool $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -491,7 +491,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -517,7 +517,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -546,7 +546,7 @@ 
 		bool $cs = true
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$andX = $this->expr()->andX();
@@ -571,7 +571,7 @@ 
 	 */
 	public function exprLimitInArray(string $field, array $values, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -589,7 +589,7 @@ 
 	 */
 	public function exprLimitBitwise(string $field, int $flag, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -611,7 +611,7 @@ 
 	 */
 	public function exprLt(string $field, int $value, bool $lte = false, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -633,7 +633,7 @@ 
 	 */
 	public function exprGt(string $field, int $value, bool $gte = false, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -742,7 +742,7 @@ 
 	 */
 	public function exprUnlike(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -766,7 +766,7 @@ 
 	 */
 	public function exprFilter(string $field, string $value, string $alias = '', bool $cs = true): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -792,7 +792,7 @@ 
 	 */
 	public function exprFilterInt(string $field, int $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -810,7 +810,7 @@ 
 	 */
 	public function exprFilterBool(string $field, bool $value, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -831,7 +831,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -857,7 +857,7 @@ 
 		string $alias = ''
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -886,7 +886,7 @@ 
 		bool $cs = true
 	): ICompositeExpression {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$orX = $this->expr()->orX();
@@ -911,7 +911,7 @@ 
 	 */
 	public function exprFilterInArray(string $field, array $values, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -929,7 +929,7 @@ 
 	 */
 	public function exprFilterBitwise(string $field, int $flag, string $alias = ''): string {
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
 		}
 
 		$expr = $this->expr();
@@ -1090,12 +1090,12 @@ 
 		string $alias = ''
 	): self {
 		$selectFields = array_map(
-			function (string $item) use ($alias) {
+			function(string $item) use ($alias) {
 				if ($alias === '') {
 					return $item;
 				}
 
-				return $alias . '.' . $item;
+				return $alias.'.'.$item;
 			}, $fields
 		);
 
@@ -1121,13 +1121,13 @@ 
 		string $prefix,
 		array $default = []
 	): self {
-		$prefix = trim($prefix) . '_';
+		$prefix = trim($prefix).'_';
 		foreach ($default as $k => $v) {
-			$this->addDefaultValue($prefix . $k, (string)$v);
+			$this->addDefaultValue($prefix.$k, (string)$v);
 		}
 
 		foreach ($fields as $field) {
-			$this->selectAlias($alias . '.' . $field, $prefix . $field);
+			$this->selectAlias($alias.'.'.$field, $prefix.$field);
 		}
 
 		return $this;

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;