nextcloud / circles

lib/Service/GSDownstreamService.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 			$gs = $this->globalScaleService->getGlobalScaleEvent($event);
 			$gs->manage($event);
 		} catch (Exception $e) {
-			$this->miscService->log('issue onNewEvent: ' . json_encode($event) . ' - ' . $e->getMessage());
+			$this->miscService->log('issue onNewEvent: '.json_encode($event).' - '.$e->getMessage());
 		}
 	}
 

lib/Command/SyncContact.php

Spacing +5 added lines, -5 removed lines

@@ -119,9 +119,9 @@ 
 		$tCards = $tBooks = 0;
 		$knownBooks = [];
 		foreach ($users as $user) {
-			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/' . $user->getUID());
+			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/'.$user->getUID());
 			$output->writeln(
-				'- User <info>' . $user->getUID() . '</info> have ' . sizeof($books) . ' address books:'
+				'- User <info>'.$user->getUID().'</info> have '.sizeof($books).' address books:'
 			);
 
 			$tBooks += sizeof($books);
@@ -137,11 +137,11 @@ 
 
 				$shared = '';
 				if ($owner !== $user->getUID()) {
-					$shared = ' (shared by <info>' . $owner . '</info>)';
+					$shared = ' (shared by <info>'.$owner.'</info>)';
 				}
 
 				$output->writeln(
-					'  <comment>*</comment> book #' . $bookId . $shared . ' contains '
+					'  <comment>*</comment> book #'.$bookId.$shared.' contains '
 					. sizeof($cards)
 					. ' entries'
 				);
@@ -151,7 +151,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('with a total of ' . $tBooks . ' address books and ' . $tCards . ' contact entries');
+		$output->writeln('with a total of '.$tBooks.' address books and '.$tCards.' contact entries');
 	}
 
 

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

@@ -179,7 +179,6 @@ 
 	/**
 	 * @param GSEvent $event
 	 * @param string $instance
-	 * @param string $protocol
 	 *
 	 * @throws RequestContentException
 	 * @throws RequestNetworkException
@@ -328,7 +327,7 @@ 
 
 
 	/**
-	 * @param array $sync
+	 * @param DeprecatedCircle[] $sync
 	 */
 	public function synchronize(array $sync) {
 		if (!$this->configService->isGSAvailable()) {

lib/Circles/FileSharingBroadcaster.php

Doc Comments +6 added lines, -6 removed lines

@@ -427,7 +427,7 @@ 
 	 * @param $fileName
 	 * @param string $link
 	 * @param string $author
-	 * @param $circleName
+	 * @param string $circleName
 	 * @param string $email
 	 *
 	 * @throws Exception
@@ -464,7 +464,7 @@ 
 	 * @param string $circleName
 	 * @param string $email
 	 *
-	 * @param $password
+	 * @param string $password
 	 *
 	 * @throws NotFoundException
 	 * @throws Exception
@@ -546,7 +546,7 @@ 
 	 * @param $subject
 	 * @param $text
 	 * @param $fileName
-	 * @param $link
+	 * @param string $link
 	 * @param string $author
 	 * @param string $circleName
 	 *
@@ -714,7 +714,7 @@ 
 
 
 	/**
-	 * @param $author
+	 * @param string $author
 	 * @param string $circleName
 	 *
 	 * @return IEMailTemplate
@@ -757,8 +757,8 @@ 
 
 	/**
 	 * @param IEMailTemplate $emailTemplate
-	 * @param $author
-	 * @param $recipient
+	 * @param string $author
+	 * @param string $recipient
 	 *
 	 * @throws Exception
 	 */

Spacing +12 added lines, -12 removed lines

@@ -132,7 +132,7 @@ 
 			$this->miscService = OC::$server->query(MiscService::class);
 		} catch (QueryException $e) {
 			OC::$server->getLogger()
-					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage());
+					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage());
 		}
 
 		try {
@@ -325,7 +325,7 @@ 
 	 * @throws IllegalIDChangeException
 	 */
 	private function generateShare($data): IShare {
-		$this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data));
+		$this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data));
 
 		$share = new Share($this->rootFolder, $this->userManager);
 		$share->setId($data['id']);
@@ -418,7 +418,7 @@ 
 			$this->sendPasswordByMail($share, $displayName, $email, $password);
 		} catch (Exception $e) {
 			OC::$server->getLogger()
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
 		}
 	}
 
@@ -436,8 +436,8 @@ 
 		$message = $this->mailer->createMessage();
 
 		$this->logger->log(
-			0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
-			   . ' - link: ' . $link
+			0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
+			   . ' - link: '.$link
 		);
 
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -476,7 +476,7 @@ 
 
 		$message = $this->mailer->createMessage();
 
-		$this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email);
+		$this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email);
 
 		$filename = $share->getNode()
 						  ->getName();
@@ -531,7 +531,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($initiatorEmailAddress !== null) {
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}
@@ -566,7 +566,7 @@ 
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($subject, false);
 		$emailTemplate->addBodyText(
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
 				$this->l10n->t('Click the button below to open it.')
 			), $text
 		);
@@ -612,7 +612,7 @@ 
 			$this->sendMailExistingShares($template, $author->getCachedName(), $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage());
+			$this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -635,7 +635,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->logger->log(0, "Sending password mail about existing files to '" . $email . "'");
+		$this->logger->log(0, "Sending password mail about existing files to '".$email."'");
 
 		$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",
@@ -677,7 +677,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();
 		}
@@ -722,7 +722,7 @@ 
 	 */
 	protected function generateMailExitingShares($author, $circleName) {
 		$this->logger->log(
-			0, "Generating mail about existing share mail from '" . $author . "' in "
+			0, "Generating mail about existing share mail from '".$author."' in "
 			   . $circleName
 		);
 

lib/Search/GlobalScaleUsers.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,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 [];