nextcloud / circles

lib/Search/LocalUsers.php

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 
 
 	/**
-	 * @param $search
+	 * @param string $search
 	 *
 	 * @return array
 	 */

lib/Db/CircleProviderRequestBuilder.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 	 * limit the request to the children of a share
 	 *
 	 * @param IQueryBuilder $qb
-	 * @param $userId
+	 * @param string $userId
 	 * @param int $parentId
 	 */
 	protected function limitToShareChildren(IQueryBuilder $qb, $userId, $parentId = -1) {

Spacing +18 added lines, -18 removed lines

@@ -77,7 +77,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'share_with',
+				$pf.'share_with',
 				$qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY)
 			)
 		);
@@ -94,7 +94,7 @@ 
 		$expr = $qb->expr();
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
 	}
 
 
@@ -142,8 +142,8 @@ 
 
 		$qb->andWhere(
 			$expr->orX(
-				$expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
-				$expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
+				$expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
+				$expr->eq($pf.'id', $qb->createNamedParameter($circleId))
 			)
 		);
 	}
@@ -165,7 +165,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'file_source',
+				$pf.'file_source',
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
 			)
 		);
@@ -198,12 +198,12 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
 		if ($reShares === false) {
-			$qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
+			$qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
 		} else {
 			$qb->andWhere(
 				$expr->orX(
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
 				)
 			);
 		}
@@ -298,11 +298,11 @@ 
 		$expr = $qb->expr();
 		$andX = $expr->andX();
 
-		$andX->add($expr->eq($aliasM . '.user_id', $qb->createNamedParameter($userId)));
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER)));
+		$andX->add($expr->eq($aliasM.'.user_id', $qb->createNamedParameter($userId)));
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER)));
 
 		return $andX;
 	}
@@ -330,11 +330,11 @@ 
 
 		$andX = $expr->andX();
 
-		$andX->add($expr->eq($aliasM . '.user_id', 'ncgu.gid'));
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_GROUP)));
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
+		$andX->add($expr->eq($aliasM.'.user_id', 'ncgu.gid'));
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_GROUP)));
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
 
 		return $andX;
 	}

lib/GlobalScale/MemberAdd.php

Spacing +3 added lines, -3 removed lines

@@ -177,7 +177,7 @@ 
 			$this->sendMailExistingShares($template, $author, $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -327,7 +327,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -369,7 +369,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}

lib/GlobalScale/GlobalSync.php

Spacing +3 added lines, -3 removed lines

@@ -116,13 +116,13 @@ 
 				}
 
 				$this->miscService->log(
-					'updating member :' . json_encode($member) . ' from ' . json_encode($knownMember), 2
+					'updating member :'.json_encode($member).' from '.json_encode($knownMember), 2
 				);
 				$this->membersRequest->updateMemberLevel($member);
 			} catch (MemberDoesNotExistException $e) {
 				try {
 					$this->miscService->log(
-						'creating member :' . json_encode($member), 2
+						'creating member :'.json_encode($member), 2
 					);
 					$this->membersRequest->createMember($member);
 				} catch (MemberAlreadyExistsException $e) {
@@ -140,7 +140,7 @@ 
 			try {
 				$this->getMember($knownItem, $circle->getMembers(), $source);
 			} catch (MemberDoesNotExistException $e) {
-				$this->miscService->log('removing deprecated member :' . json_encode($knownItem), 2);
+				$this->miscService->log('removing deprecated member :'.json_encode($knownItem), 2);
 				$this->membersRequest->removeMember($knownItem);
 				$this->gsSharesRequest->removeGSSharesFromMember($knownItem);
 			}

lib/Service/GSUpstreamService.php

Spacing +3 added lines, -3 removed lines

@@ -150,7 +150,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;
 		}
@@ -246,13 +246,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 {

Doc Comments +1 added lines, -2 removed lines

@@ -180,7 +180,6 @@ 
 	/**
 	 * @param GSEvent $event
 	 * @param string $instance
-	 * @param string $protocol
 	 *
 	 * @throws RequestContentException
 	 * @throws RequestNetworkException
@@ -329,7 +328,7 @@ 
 
 
 	/**
-	 * @param array $sync
+	 * @param DeprecatedCircle[] $sync
 	 *
 	 * @throws GSStatusException
 	 */

lib/Service/ConfigService.php

Doc Comments +1 added lines, -1 removed lines

@@ -467,7 +467,7 @@
 	/**
 	 * @param string $type
 	 *
-	 * @return array|bool|mixed
+	 * @return string
 	 * @throws GSStatusException
 	 */
 	public function getGSStatus(string $type = '') {

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/FederatedLinkCreationService.php

Doc Comments +3 added lines, -3 removed lines

@@ -249,8 +249,8 @@ 
 
 
 	/**
-	 * @param $circleUniqueId
-	 * @param $remote
+	 * @param string $circleUniqueId
+	 * @param string $remote
 	 *
 	 * @return FederatedLink
 	 * @throws Exception
@@ -342,7 +342,7 @@ 
 	 *
 	 * Will parse the error reason returned by requestLink() and throw an Exception
 	 *
-	 * @param $reason
+	 * @param string $reason
 	 *
 	 * @throws Exception
 	 * @throws FederatedRemoteDoesNotAllowException

lib/Controller/SharesController.php

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
 	 */
 	public function create($circleUniqueId, $source, $type, $payload) {
 
-		$this->miscService->log('Creating circle share: ' . $circleUniqueId, 0);
+		$this->miscService->log('Creating circle share: '.$circleUniqueId, 0);
 
 		try {
 			$share = new SharingFrame($source, $type);
@@ -140,7 +140,7 @@ 
 
 			$this->sharingFrameService->createFrame($circleUniqueId, $share);
 		} catch (\Exception $e) {
-			$this->miscService->log('Failed to create circle - ' . $e->getMessage(), 3);
+			$this->miscService->log('Failed to create circle - '.$e->getMessage(), 3);
 
 			return $this->fail(
 				[
@@ -153,7 +153,7 @@ 
 			);
 		}
 
-		$this->miscService->log('Created circle: share ' . $circleUniqueId, 0);
+		$this->miscService->log('Created circle: share '.$circleUniqueId, 0);
 
 		return $this->success(
 			[

lib/Service/SharingFrameService.php

Spacing +5 added lines, -5 removed lines

@@ -153,7 +153,7 @@ 
 	public function createFrame($circleUniqueId, SharingFrame $frame, $broadcast = null) {
 
 		$this->miscService->log(
-			'Create frame with payload ' . json_encode($frame->getPayload()) . ' as ' . $this->userId, 0
+			'Create frame with payload '.json_encode($frame->getPayload()).' as '.$this->userId, 0
 		);
 		try {
 			$circle = $this->circlesRequest->getCircle($circleUniqueId, $this->userId);
@@ -168,7 +168,7 @@ 
 			$this->initiateShare($circle->getUniqueId(), $frame->getUniqueId());
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to create frame for circle ' . $circleUniqueId . ' - ' . $e->getMessage()
+				'fail to create frame for circle '.$circleUniqueId.' - '.$e->getMessage()
 			);
 			throw $e;
 		}
@@ -318,7 +318,7 @@ 
 			return true;
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to initialise circle share with request ' . json_encode($request) . ' - '
+				'fail to initialise circle share with request '.json_encode($request).' - '
 				. $e->getMessage(), 3
 			);
 			throw $e;
@@ -332,7 +332,7 @@ 
 	 * @return string
 	 */
 	private function generatePayloadDeliveryURL($remote) {
-		return $this->configService->generateRemoteHost($remote) .
+		return $this->configService->generateRemoteHost($remote).
 			   $this->urlGenerator->linkToRoute('circles.Shares.initShareDelivery');
 	}
 
@@ -407,7 +407,7 @@ 
 
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to send frame to ' . $link->getAddress() . ' - ' . $e->getMessage()
+				'fail to send frame to '.$link->getAddress().' - '.$e->getMessage()
 			);
 		}
 	}

Doc Comments +2 added lines, -2 removed lines

@@ -181,7 +181,7 @@ 
 	 *
 	 * @param SharingFrame $frame
 	 * @param DeprecatedCircle $circle
-	 * @param $broadcast
+	 * @param string|null $broadcast
 	 */
 	private function generateHeaders(SharingFrame $frame, DeprecatedCircle $circle, $broadcast) {
 
@@ -220,7 +220,7 @@ 
 	 * Please use getFrameFromCircle();
 	 *
 	 * @param string $circleUniqueId
-	 * @param $viewerId
+	 * @param string $viewerId
 	 *
 	 * @return SharingFrame[]
 	 * @throws CircleDoesNotExistException