nextcloud / circles

lib/Service/SharingFrameService.php

Doc Comments +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
 	 *
 	 * @param SharingFrame $frame
 	 * @param Circle $circle
-	 * @param $broadcast
+	 * @param string|null $broadcast
 	 */
 	private function generateHeaders(SharingFrame $frame, Circle $circle, $broadcast) {
 
@@ -189,7 +189,7 @@ 
 	 * Please use getFrameFromCircle();
 	 *
 	 * @param string $circleUniqueId
-	 * @param $viewerId
+	 * @param string $viewerId
 	 *
 	 * @return SharingFrame[]
 	 */

Spacing +7 added lines, -7 removed lines

@@ -147,7 +147,7 @@ 
 		}
 
 		$this->miscService->log(
-			'Create frame with payload ' . json_encode($frame->getPayload()) . ' as ' . $userId, 0
+			'Create frame with payload '.json_encode($frame->getPayload()).' as '.$userId, 0
 		);
 		try {
 			$circle = $this->circlesRequest->getCircle($circleUniqueId, $userId);
@@ -162,7 +162,7 @@ 
 			$this->initiateShare($circle->getUniqueId(), $frame->getUniqueId());
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to create frame for circle ' . $circleUniqueId . ' - ' . $e->getMessage()
+				'fail to create frame for circle '.$circleUniqueId.' - '.$e->getMessage()
 			);
 			throw $e;
 		}
@@ -301,7 +301,7 @@ 
 		];
 
 		$client = $this->clientService->newClient();
-		$addr = $this->configService->getLocalAddress() . \OC::$WEBROOT;
+		$addr = $this->configService->getLocalAddress().\OC::$WEBROOT;
 		$opts = [
 			'body'            => $args,
 			'timeout'         => Application::CLIENT_TIMEOUT,
@@ -318,8 +318,8 @@ 
 			return true;
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to initialise circle share to ' . $addr . ' for circle ' . $circleUniqueId . ' - '
-				. json_encode($opts) . ' - ' . $e->getMessage(), 3
+				'fail to initialise circle share to '.$addr.' for circle '.$circleUniqueId.' - '
+				. json_encode($opts).' - '.$e->getMessage(), 3
 			);
 			throw $e;
 		}
@@ -332,7 +332,7 @@ 
 	 * @return string
 	 */
 	private function generatePayloadDeliveryURL($remote) {
-		return $this->configService->generateRemoteHost($remote) .
+		return $this->configService->generateRemoteHost($remote).
 			   $this->urlGenerator->linkToRoute('circles.Shares.initShareDelivery');
 	}
 
@@ -407,7 +407,7 @@ 
 
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to send frame to ' . $link->getAddress() . ' - ' . $e->getMessage()
+				'fail to send frame to '.$link->getAddress().' - '.$e->getMessage()
 			);
 		}
 	}

lib/ShareByCircleProvider.php

Doc Comments +2 added lines, -2 removed lines

@@ -438,8 +438,8 @@
 
 	/**
 	 * @param string $userId
-	 * @param $shareType
-	 * @param Node $node
+	 * @param integer $shareType
+	 * @param Node|null $node
 	 * @param int $limit
 	 * @param int $offset
 	 *

Spacing +10 added lines, -10 removed lines

@@ -300,19 +300,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);
@@ -538,7 +538,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')
@@ -562,7 +562,7 @@ 
 			try {
 				$data = $this->getShareByPersonalToken($token);
 			} catch (Exception $e) {
-				$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'));
 			}
 		}
@@ -571,7 +571,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'));
 		}
@@ -620,7 +620,7 @@ 
 			throw new ShareNotFound('personal check not found');
 		}
 
-		\OC::$server->getLogger()->log(3, '#### ' . json_encode($data));
+		\OC::$server->getLogger()->log(3, '#### '.json_encode($data));
 		$member = null;
 		try {
 			$member = $this->membersService->getMemberById($data['personal_member_id']);

lib/Service/FederatedLinkService.php

Spacing +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
 	 * @return string
 	 */
 	public function generateLinkRemoteURL($remote) {
-		return $this->configService->generateRemoteHost($remote) . self::REMOTE_URL_LINK;
+		return $this->configService->generateRemoteHost($remote).self::REMOTE_URL_LINK;
 	}
 
 

lib/Model/Circle.php

Doc Comments +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 
 	/**
 	 * @param array $arr
-	 * @param $key
+	 * @param string $key
 	 * @param int $type
 	 *
 	 * @return null|Member

lib/Api/v1/Circles.php

Spacing +5 added lines, -5 removed lines

@@ -453,7 +453,7 @@ 
 	 */
 	public static function generateLink($circleUniqueId) {
 		return \OC::$server->getURLGenerator()
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId;
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$circleUniqueId;
 	}
 
 
@@ -468,7 +468,7 @@ 
 	 */
 	public static function generateAbsoluteLink($circleUniqueId) {
 		return \OC::$server->getURLGenerator()
-						   ->linkToRouteAbsolute('circles.Navigation.navigate') . '#' . $circleUniqueId;
+						   ->linkToRouteAbsolute('circles.Navigation.navigate').'#'.$circleUniqueId;
 	}
 
 
@@ -483,8 +483,8 @@ 
 	 */
 	public static function generateRemoteLink(FederatedLink $link) {
 		return \OC::$server->getURLGenerator()
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $link->getUniqueId()
-			   . '-' . $link->getToken();
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$link->getUniqueId()
+			   . '-'.$link->getToken();
 	}
 
 
@@ -496,7 +496,7 @@ 
 	public static function generateUserParameter(SharingFrame $frame) {
 
 		if ($frame->getCloudId() !== null) {
-			$name = $frame->getAuthor() . '@' . $frame->getCloudId();
+			$name = $frame->getAuthor().'@'.$frame->getCloudId();
 		} else {
 			$name = MiscService::getDisplay($frame->getAuthor(), Member::TYPE_USER);
 		}

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

@@ -148,7 +148,7 @@ 
 	 *
 	 * @param bool $force
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws Exception
 	 */
 	public function addMember($circleUniqueId, $ident, $type, string $instance, bool $force = false) {
@@ -313,8 +313,8 @@ 
 	/**
 	 * Verify if a local account is valid.
 	 *
-	 * @param $ident
-	 * @param $type
+	 * @param string $ident
+	 * @param integer $type
 	 *
 	 * @param string $instance
 	 *
@@ -339,7 +339,7 @@ 
 	 * Verify if a mail have a valid format.
 	 *
 	 * @param $ident
-	 * @param $type
+	 * @param integer $type
 	 *
 	 * @throws EmailAccountInvalidFormatException
 	 */
@@ -366,8 +366,8 @@ 
 	/**
 	 * Verify if a contact exist in current user address books.
 	 *
-	 * @param $ident
-	 * @param $type
+	 * @param string $ident
+	 * @param integer $type
 	 *
 	 * @throws NoUserException
 	 * @throws EmailAccountInvalidFormatException
@@ -458,8 +458,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
 	 *
@@ -501,7 +501,7 @@ 
 	 * @param int $level
 	 * @param bool $force
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws CircleDoesNotExistException
 	 * @throws CircleTypeNotValidException
 	 * @throws ConfigNoCircleAvailableException