nextcloud / circles

lib/Service/MembersService.php

Spacing +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
 			);
 		}
 
-		$tmpContact = $this->userId . ':' . $ident;
+		$tmpContact = $this->userId.':'.$ident;
 		$result = MiscService::getContactData($tmpContact);
 		if (empty($result)) {
 			throw new NoUserException($this->l10n->t("This contact is not available"));

Doc Comments +9 added lines, -9 removed lines

@@ -143,7 +143,7 @@ 
 	 *
 	 * @param bool $force
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws Exception
 	 */
 	public function addMember($circleUniqueId, $ident, $type, bool $force = false) {
@@ -301,8 +301,8 @@ 
 	/**
 	 * Verify if a local account is valid.
 	 *
-	 * @param $ident
-	 * @param $type
+	 * @param string $ident
+	 * @param integer $type
 	 *
 	 * @throws NoUserException
 	 */
@@ -323,7 +323,7 @@ 
 	 * Verify if a mail have a valid format.
 	 *
 	 * @param $ident
-	 * @param $type
+	 * @param integer $type
 	 *
 	 * @throws EmailAccountInvalidFormatException
 	 */
@@ -351,7 +351,7 @@ 
 	 * Verify if a contact exist in current user address books.
 	 *
 	 * @param $ident
-	 * @param $type
+	 * @param integer $type
 	 *
 	 * @throws NoUserException
 	 * @throws EmailAccountInvalidFormatException
@@ -482,7 +482,7 @@ 
 	 * @param int $level
 	 * @param bool $force
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws CircleDoesNotExistException
 	 * @throws CircleTypeNotValidException
 	 * @throws ConfigNoCircleAvailableException
@@ -523,7 +523,7 @@ 
 	/**
 	 * @param Circle $circle
 	 * @param Member $member
-	 * @param $level
+	 * @param integer $level
 	 * @param bool $force
 	 *
 	 * @throws Exception
@@ -598,10 +598,10 @@ 
 	/**
 	 * @param string $circleUniqueId
 	 * @param string $name
-	 * @param $type
+	 * @param integer $type
 	 * @param bool $force
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws CircleDoesNotExistException
 	 * @throws ConfigNoCircleAvailableException
 	 * @throws MemberDoesNotExistException

lib/Model/BaseCircle.php

Doc Comments +6 added lines, -6 removed lines

@@ -400,7 +400,7 @@ 
 	}
 
 	/**
-	 * @return string
+	 * @return integer
 	 */
 	public function getType() {
 		return $this->type;
@@ -425,7 +425,7 @@ 
 	}
 
 	/**
-	 * @param array $members
+	 * @param Member[] $members
 	 *
 	 * @return BaseCircle
 	 */
@@ -436,7 +436,7 @@ 
 	}
 
 	/**
-	 * @return array
+	 * @return Member[]
 	 */
 	public function getMembers() {
 		return $this->members;
@@ -454,7 +454,7 @@ 
 	}
 
 	/**
-	 * @return array
+	 * @return Member[]
 	 */
 	public function getGroups() {
 		return $this->groups;
@@ -472,7 +472,7 @@ 
 	}
 
 	/**
-	 * @return array
+	 * @return FederatedLink[]
 	 */
 	public function getLinks() {
 		return $this->links;
@@ -508,7 +508,7 @@ 
 //	}
 
 	/**
-	 * @param integer|string $type
+	 * @param string $type
 	 *
 	 * @return integer
 	 */

Spacing +2 added lines, -2 removed lines

@@ -315,7 +315,7 @@ 
 	 * @return BaseCircle
 	 */
 	public function setGroupId($groupId) {
-		$this->groupId = (string) $groupId;
+		$this->groupId = (string)$groupId;
 
 		return $this;
 	}
@@ -324,7 +324,7 @@ 
 	 * @return string
 	 */
 	public function getGroupId() {
-		return (string) $this->groupId;
+		return (string)$this->groupId;
 	}
 
 	/**

appinfo/app.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 use OCA\Circles\AppInfo\Application;
 
 
-require_once __DIR__ . '/autoload.php';
+require_once __DIR__.'/autoload.php';
 
 
 $app = \OC::$server->query(Application::class);

lib/Model/DavCard.php

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 	 * @return string
 	 */
 	public function getUniqueId(): string {
-		return $this->getAddressBookId() . '/' . $this->getCardUri();
+		return $this->getAddressBookId().'/'.$this->getCardUri();
 	}
 
 

lib/Circles/FileSharingBroadcaster.php

Spacing +12 added lines, -12 removed lines

@@ -145,7 +145,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 {
@@ -322,7 +322,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']);
@@ -413,7 +413,7 @@ 
 			);
 		} 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());
 		}
 	}
 
@@ -431,8 +431,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]);
@@ -471,7 +471,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();
@@ -526,7 +526,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();
 		}
@@ -561,7 +561,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
 		);
@@ -606,7 +606,7 @@ 
 			$this->sendMailExistingShares($template, $author, $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());
 		}
 	}
 
@@ -630,7 +630,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",
@@ -672,7 +672,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();
 		}
@@ -719,7 +719,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
 		);
 

Doc Comments +9 added lines, -9 removed lines

@@ -344,7 +344,7 @@ 
 	 * @param Circle $circle
 	 * @param IShare $share
 	 * @param string $address
-	 * @param string $token
+	 * @param SharesToken $token
 	 *
 	 * @return bool
 	 */
@@ -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
 	 *
@@ -618,10 +618,10 @@ 
 
 
 	/**
-	 * @param $author
+	 * @param string $author
 	 * @param string $email
 	 *
-	 * @param $password
+	 * @param string $password
 	 *
 	 * @throws Exception
 	 */
@@ -715,7 +715,7 @@ 
 
 
 	/**
-	 * @param $author
+	 * @param string $author
 	 * @param string $circleName
 	 *
 	 * @return IEMailTemplate
@@ -758,8 +758,8 @@ 
 
 	/**
 	 * @param IEMailTemplate $emailTemplate
-	 * @param $author
-	 * @param $recipient
+	 * @param string $author
+	 * @param string $recipient
 	 *
 	 * @throws Exception
 	 */

lib/Service/DavService.php

Spacing +5 added lines, -5 removed lines

@@ -158,7 +158,7 @@ 
 	public function onDeleteCard(GenericEvent $event) {
 		$davCard = $this->generateDavCard($event, true);
 
-		$this->miscService->log('Deleting Card: ' . json_encode($davCard), 1);
+		$this->miscService->log('Deleting Card: '.json_encode($davCard), 1);
 		$this->membersRequest->removeMembersByContactId($davCard->getUniqueId(), Member::TYPE_USER);
 		$this->manageDeprecatedCircles($davCard->getAddressBookId());
 		$this->manageDeprecatedMembers($davCard);
@@ -214,7 +214,7 @@ 
 	 *
 	 */
 	private function manageDavCard(DavCard $davCard) {
-		$this->miscService->log('Updating Card: ' . json_encode($davCard), 1);
+		$this->miscService->log('Updating Card: '.json_encode($davCard), 1);
 		$this->manageCircles($davCard);
 		$this->manageContact($davCard);
 	}
@@ -332,7 +332,7 @@ 
 			}
 		}
 
-		$davCard->setUserId($davCard->getOwner() . ':' . $davCard->getContactId());
+		$davCard->setUserId($davCard->getOwner().':'.$davCard->getContactId());
 
 		return DavCard::TYPE_CONTACT;
 	}
@@ -391,7 +391,7 @@ 
 			}
 
 			$user = $this->userManager->get($davCard->getOwner());
-			$circle = new Circle($this->configService->contactsBackendType(), $group . ' - ' . $user->getDisplayName());
+			$circle = new Circle($this->configService->contactsBackendType(), $group.' - '.$user->getDisplayName());
 			$circle->setContactAddressBook($davCard->getAddressBookId());
 			$circle->setContactGroupName($group);
 
@@ -490,7 +490,7 @@ 
 		$this->manageDeprecatedCircles();
 		$users = $this->userManager->search('');
 		foreach ($users as $user) {
-			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/' . $user->getUID());
+			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/'.$user->getUID());
 			foreach ($books as $book) {
 				$this->migrateBook($book['id']);
 			}

lib/Migration/Version0017Date20200202112903.php

Spacing +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
 			}
 
 			$ak = array_keys($default);
-			foreach($ak as $k) {
+			foreach ($ak as $k) {
 //				if (!array_key_exists($k, $row)) {
 					$copy->setValue($k, $copy->createNamedParameter($default[$k]));
 //				}

lib/Controller/SharesController.php

Spacing +3 added lines, -3 removed lines

@@ -131,7 +131,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);
@@ -139,7 +139,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(
 				[
 					'circle_id' => $circleUniqueId,
@@ -151,7 +151,7 @@ 
 			);
 		}
 
-		$this->miscService->log('Created circle: share ' . $circleUniqueId, 0);
+		$this->miscService->log('Created circle: share '.$circleUniqueId, 0);
 
 		return $this->success(
 			[

lib/Command/CirclesDetails.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
 		$circle = $this->circlesRequest->forceGetCircle($circleId);
 
-		echo json_encode($circle, JSON_PRETTY_PRINT) . "\n";
+		echo json_encode($circle, JSON_PRETTY_PRINT)."\n";
 
 		return 0;
 	}