nextcloud / circles

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
 	 */

lib/Db/MembersRequest.php

Doc Comments +4 added lines, -3 removed lines

@@ -232,7 +232,7 @@ 
 	 * returns the index of a specific UserID in a Members List
 	 *
 	 * @param array $members
-	 * @param $userId
+	 * @param string $userId
 	 *
 	 * @return int
 	 */
@@ -545,6 +545,9 @@ 
 	}
 
 
+	/**
+	 * @param string $groupId
+	 */
 	public function unlinkAllFromGroup($groupId) {
 		$qb = $this->getGroupsDeleteSql($groupId);
 		$qb->execute();
@@ -575,8 +578,6 @@ 
 	/**
 	 * @param string $circleId
 	 * @param string $contactId
-	 * @param string $userId
-	 * @param int $type
 	 *
 	 * @return Member
 	 * @throws MemberDoesNotExistException

lib/Service/DavService.php

Doc Comments -1 removed lines

@@ -486,7 +486,6 @@
 
 
 	/**
-	 * @param DavCard $davCard
 	 */
 	private function manageDeprecatedContacts() {
 		$contacts = $this->membersRequest->getMembersByContactId();

Spacing +5 added lines, -5 removed lines

@@ -152,7 +152,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);
 	}
 
@@ -206,7 +206,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);
 	}
@@ -320,7 +320,7 @@ 
 			}
 		}
 
-		$davCard->setUserId($davCard->getOwner() . ':' . $davCard->getContactId());
+		$davCard->setUserId($davCard->getOwner().':'.$davCard->getContactId());
 
 		return DavCard::TYPE_CONTACT;
 	}
@@ -378,7 +378,7 @@ 
 				continue;
 			}
 
-			$circle = new Circle(Circle::CIRCLES_PUBLIC, $group . ' - ' . $this->uuid(5));
+			$circle = new Circle(Circle::CIRCLES_PUBLIC, $group.' - '.$this->uuid(5));
 			$circle->setContactAddressBook($davCard->getAddressBookId());
 			$circle->setContactGroupName($group);
 
@@ -477,7 +477,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']);
 			}

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

@@ -140,7 +140,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 {
@@ -316,7 +316,7 @@ 
 	 * @throws IllegalIDChangeException
 	 */
 	private function generateShare($data) {
-		$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']);
@@ -408,7 +408,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());
 		}
 	}
 
@@ -426,8 +426,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]);
@@ -466,7 +466,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();
@@ -521,7 +521,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();
 		}
@@ -556,7 +556,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
 		);
@@ -599,7 +599,7 @@ 
 			$this->sendMailExistingShares($template, $author, $member->getUserId());
 			$this->sendPasswordExistingShares($author, $member->getUserId(), $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());
 		}
 	}
 
@@ -623,7 +623,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",
@@ -665,7 +665,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();
 		}
@@ -710,7 +710,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
 		);