nextcloud / circles

lib/Service/MembersService.php

Spacing +1 added lines, -1 removed lines

@@ -323,7 +323,7 @@
 			return;
 		}
 
-		$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 +11 added lines, -11 removed lines

@@ -119,7 +119,7 @@ 
 	 * @param $ident
 	 * @param int $type
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws Exception
 	 */
 	public function addMember($circleUniqueId, $ident, $type) {
@@ -278,8 +278,8 @@ 
 	/**
 	 * Verify if a local account is valid.
 	 *
-	 * @param $ident
-	 * @param $type
+	 * @param string $ident
+	 * @param integer $type
 	 *
 	 * @throws NoUserException
 	 */
@@ -300,7 +300,7 @@ 
 	 * Verify if a mail have a valid format.
 	 *
 	 * @param $ident
-	 * @param $type
+	 * @param integer $type
 	 *
 	 * @throws EmailAccountInvalidFormatException
 	 */
@@ -321,7 +321,7 @@ 
 	 * Verify if a contact exist in current user address books.
 	 *
 	 * @param $ident
-	 * @param $type
+	 * @param integer $type
 	 *
 	 * @throws NoUserException
 	 */
@@ -403,8 +403,8 @@ 
 	 * Will return any data of a user related to a circle (as a Member). User can be a 'non-member'
 	 * Viewer needs to be at least Member of the Circle
 	 *
-	 * @param $circleId
-	 * @param $userId
+	 * @param string $circleId
+	 * @param string $userId
 	 * @param $type
 	 * @param bool $forceAll
 	 *
@@ -433,7 +433,7 @@ 
 	 * @param int $type
 	 * @param int $level
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws Exception
 	 */
 	public function levelMember($circleUniqueId, $name, $type, $level) {
@@ -464,7 +464,7 @@ 
 	/**
 	 * @param Circle $circle
 	 * @param Member $member
-	 * @param $level
+	 * @param integer $level
 	 *
 	 * @throws Exception
 	 */
@@ -539,9 +539,9 @@ 
 	/**
 	 * @param string $circleUniqueId
 	 * @param string $name
-	 * @param $type
+	 * @param integer $type
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws Exception
 	 */
 	public function removeMember($circleUniqueId, $name, $type) {

lib/Circles/FileSharingBroadcaster.php

Doc Comments +2 added lines, -2 removed lines

@@ -230,7 +230,7 @@ 
 	 * @param $fileName
 	 * @param string $link
 	 * @param string $author
-	 * @param $circleName
+	 * @param string $circleName
 	 * @param string $email
 	 */
 	protected function sendMail($fileName, $link, $author, $circleName, $email) {
@@ -264,7 +264,7 @@ 
 	 * @param $subject
 	 * @param $text
 	 * @param $fileName
-	 * @param $link
+	 * @param string $link
 	 * @param string $author
 	 * @param string $circleName
 	 *

Spacing +4 added lines, -4 removed lines

@@ -186,7 +186,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']);
@@ -237,8 +237,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]);
@@ -285,7 +285,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
 		);

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';
 }
 

appinfo/app.php

Spacing +1 added lines, -1 removed lines

@@ -32,5 +32,5 @@
 $app->registerFilesNavigation();
 $app->registerFilesPlugin();
 
-require_once __DIR__ . '/autoload.php';
+require_once __DIR__.'/autoload.php';
 

lib/ShareByCircleProvider.php

Spacing +9 added lines, -9 removed lines

@@ -281,19 +281,19 @@ 
 	 */
 	private function createShare($share) {
 		$this->miscService->log(
-			'Creating share (1/4) - type: ' . $share->getShareType() . ' - token: '
-			. $share->getToken() . ' - type: ' . $share->getShareType() . ' - with: '
-			. $share->getSharedWith() . ' - permissions: ' . $share->getPermissions(), 0
+			'Creating share (1/4) - type: '.$share->getShareType().' - token: '
+			. $share->getToken().' - type: '.$share->getShareType().' - with: '
+			. $share->getSharedWith().' - permissions: '.$share->getPermissions(), 0
 		);
 
 		$qb = $this->getBaseInsertSql($share);
-		$this->miscService->log('Share creation (2/4) : ' . json_encode($qb->getSQL()), 0);
+		$this->miscService->log('Share creation (2/4) : '.json_encode($qb->getSQL()), 0);
 
 		$result = $qb->execute();
-		$this->miscService->log('Share creation result (3/4) : ' . json_encode($result), 0);
+		$this->miscService->log('Share creation result (3/4) : '.json_encode($result), 0);
 
 		$id = $qb->getLastInsertId();
-		$this->miscService->log('Share created ID (4/4) : ' . $id, 0);
+		$this->miscService->log('Share created ID (4/4) : '.$id, 0);
 
 		try {
 			$share->setId($id);
@@ -518,7 +518,7 @@ 
 	public function getShareByToken($token) {
 		$qb = $this->dbConnection->getQueryBuilder();
 
-		$this->miscService->log("Opening share by token '#" . $token . "'", 0);
+		$this->miscService->log("Opening share by token '#".$token."'", 0);
 
 		$cursor = $qb->select('*')
 					 ->from('share')
@@ -538,7 +538,7 @@ 
 		$data = $cursor->fetch();
 
 		if ($data === false) {
-			$this->miscService->log("Share '#" . $token . "' not found.", 0);
+			$this->miscService->log("Share '#".$token."' not found.", 0);
 			throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
 		}
 
@@ -546,7 +546,7 @@ 
 			$share = $this->createShareObject($data);
 		} catch (InvalidShare $e) {
 			$this->miscService->log(
-				"Share Object '#" . $token . "' not created. " . json_encode($data), 0
+				"Share Object '#".$token."' not created. ".json_encode($data), 0
 			);
 			throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
 		}

lib/Db/TokensRequest.php

Doc Comments +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 	 * @param Member $member
 	 * @param int $shareId
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function generateTokenForMember(Member $member, int $shareId) {
 		$token = $this->uuid(15);

lib/Controller/SharesController.php

Spacing +2 added lines, -2 removed lines

@@ -220,12 +220,12 @@
 			$token = $this->sharesRequest->getTokenByShareId($shareToken->getShareId());
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'token ' . $token . ' not found - ' . get_class($e) . ' - ' . $e->getMessage()
+				'token '.$token.' not found - '.get_class($e).' - '.$e->getMessage()
 			);
 			$token = $this->uuid(15);
 		}
 
-		return new RedirectResponse($this->urlGenerator->getAbsoluteURL('/s/' . $token));
+		return new RedirectResponse($this->urlGenerator->getAbsoluteURL('/s/'.$token));
 	}