nextcloud / circles

lib/Controller/FederatedController.php

Spacing +1 added lines, -1 removed lines

@@ -265,7 +265,7 @@
 	 * @return DataResponse
 	 */
 	private function federatedFail($reason) {
-		$this->miscService->log(0, 'federated fail: ' . $reason);
+		$this->miscService->log(0, 'federated fail: '.$reason);
 
 		return new DataResponse(
 			[

lib/Service/CirclesService.php

Spacing +5 added lines, -5 removed lines

@@ -510,24 +510,24 @@
 		switch ($type) {
 			case Circle::CIRCLES_PERSONAL:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'personal' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'personal'.$ext)
 				);
 			case Circle::CIRCLES_CLOSED:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'closed' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'closed'.$ext)
 				);
 			case Circle::CIRCLES_SECRET:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'secret' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'secret'.$ext)
 				);
 			case Circle::CIRCLES_PUBLIC:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)
 				);
 		}
 
 		return $urlGen->getAbsoluteURL(
-			$urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)
+			$urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)
 		);
 	}
 

appinfo/autoload.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 
 namespace OCA\Circles\AppInfo;
 
-$composerDir = __DIR__ . '/../vendor/';
+$composerDir = __DIR__.'/../vendor/';
 
-if (is_dir($composerDir) && file_exists($composerDir . 'autoload.php')) {
-	require_once $composerDir . 'autoload.php';
+if (is_dir($composerDir) && file_exists($composerDir.'autoload.php')) {
+	require_once $composerDir.'autoload.php';
 }
 

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

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

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