nextcloud / circles

lib/Db/CirclesRequest.php

Spacing +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
 		$cursor->closeCursor();
 
 		if ($data === false) {
-			throw new CircleDoesNotExistException($this->l10n->t('Circle not found ' . $circleUniqueId));
+			throw new CircleDoesNotExistException($this->l10n->t('Circle not found '.$circleUniqueId));
 		}
 
 		$circle = $this->parseCirclesSelectSql($data);

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(Member::LEVEL_MEMBER)));
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(Member::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(Member::LEVEL_MEMBER)));
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(Member::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(Member::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(Member::LEVEL_MEMBER)));
+		$andX->add($expr->eq($aliasM.'.user_id', 'ncgu.gid'));
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(Member::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(Member::LEVEL_MEMBER)));
 
 		return $andX;
 	}

lib/Db/MembersRequest.php

Doc Comments +4 added lines, -1 removed lines

@@ -316,7 +316,7 @@ 
 	 * returns the index of a specific UserID in a Members List
 	 *
 	 * @param array $members
-	 * @param $userId
+	 * @param string $userId
 	 *
 	 * @return int
 	 */
@@ -656,6 +656,9 @@ 
 	}
 
 
+	/**
+	 * @param string $groupId
+	 */
 	public function unlinkAllFromGroup($groupId) {
 		$qb = $this->getMembersDeleteSql();
 

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/Controller/GlobalScaleController.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 			$wrappers = $this->gsUpstreamService->getEventsByToken($token);
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'exception during async: ' . ['token' => $token, 'error' => $e->getMessage()]
+				'exception during async: '.['token' => $token, 'error' => $e->getMessage()]
 			);
 
 			return $this->fail(['token' => $token, 'error' => $e->getMessage()]);

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, -3 removed lines

@@ -160,7 +160,6 @@ 
 
 	/**
 	 * @param GSWrapper $wrapper
-	 * @param string $protocol
 	 */
 	public function broadcastWrapper(GSWrapper $wrapper): void {
 		$status = GSWrapper::STATUS_FAILED;
@@ -184,7 +183,6 @@ 
 	/**
 	 * @param GSEvent $event
 	 * @param string $instance
-	 * @param string $protocol
 	 *
 	 * @throws RequestContentException
 	 * @throws RequestNetworkException
@@ -333,7 +331,7 @@ 
 
 
 	/**
-	 * @param array $sync
+	 * @param Circle[] $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