nextcloud / circles

lib/Model/SharingFrame.php

Doc Comments +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 	}
 
 	/**
-	 * @return mixed
+	 * @return string
 	 */
 	public function getCircleName() {
 		return $this->circleName;
@@ -209,7 +209,7 @@ 
 
 
 	/**
-	 * @param $k
+	 * @param string $k
 	 *
 	 * @return string
 	 */

lib/Model/FederatedLink.php

Spacing +8 added lines, -8 removed lines

@@ -77,7 +77,7 @@ 
 	 * @return FederatedLink
 	 */
 	public function setId($id) {
-		$this->id = (int) $id;
+		$this->id = (int)$id;
 
 		return $this;
 	}
@@ -96,7 +96,7 @@ 
 	 * @return $this
 	 */
 	public function setToken($token) {
-		$this->token = (string) $token;
+		$this->token = (string)$token;
 
 		return $this;
 	}
@@ -125,7 +125,7 @@ 
 	 * @return FederatedLink
 	 */
 	public function setAddress($address) {
-		$this->address = (string) $address;
+		$this->address = (string)$address;
 
 		return $this;
 	}
@@ -144,7 +144,7 @@ 
 	 * @return FederatedLink
 	 */
 	public function setLocalAddress($address) {
-		$this->localAddress = (string) $address;
+		$this->localAddress = (string)$address;
 
 		return $this;
 	}
@@ -182,7 +182,7 @@ 
 	 * @return FederatedLink
 	 */
 	public function setUniqueId($uniqueId) {
-		$this->uniqueId = (string) $uniqueId;
+		$this->uniqueId = (string)$uniqueId;
 
 		return $this;
 	}
@@ -201,7 +201,7 @@ 
 	 * @return FederatedLink
 	 */
 	public function setRemoteCircleName($circleName) {
-		$this->remoteCircleName = (string) $circleName;
+		$this->remoteCircleName = (string)$circleName;
 
 		return $this;
 	}
@@ -220,7 +220,7 @@ 
 	 * @return FederatedLink
 	 */
 	public function setCircleName($circleName) {
-		$this->localCircleName = (string) $circleName;
+		$this->localCircleName = (string)$circleName;
 
 		return $this;
 	}
@@ -239,7 +239,7 @@ 
 	 * @return FederatedLink
 	 */
 	public function setStatus($status) {
-		$this->status = (int) $status;
+		$this->status = (int)$status;
 
 		return $this;
 	}

lib/Model/BaseCircle.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	 * @return $this
 	 */
 	public function setUniqueId($uniqueId) {
-		$this->uniqueId = (string) $uniqueId;
+		$this->uniqueId = (string)$uniqueId;
 
 		return $this;
 	}

lib/Db/CirclesRequest.php

Spacing +5 added lines, -5 removed lines

@@ -127,7 +127,7 @@ 
 	 */
 	public function getCircle($uniqueId) {
 		$qb = $this->getCirclesSelectSql();
-		$this->limitToUniqueId($qb, (string) $uniqueId);
+		$this->limitToUniqueId($qb, (string)$uniqueId);
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
@@ -145,8 +145,8 @@ 
 	 */
 	public function getFrame($circleId, $uniqueId) {
 		$qb = $this->getSharesSelectSql();
-		$this->limitToUniqueId($qb, (string) $uniqueId);
-		$this->limitToCircleId($qb, (int) $circleId);
+		$this->limitToUniqueId($qb, (string)$uniqueId);
+		$this->limitToCircleId($qb, (int)$circleId);
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
@@ -165,8 +165,8 @@ 
 	 */
 	public function getLinkFromToken($token, $uniqueId) {
 		$qb = $this->getLinksSelectSql();
-		$this->limitToUniqueId($qb, (string) $uniqueId);
-		$this->limitToToken($qb, (string) $token);
+		$this->limitToUniqueId($qb, (string)$uniqueId);
+		$this->limitToToken($qb, (string)$token);
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();

lib/Db/FederatedLinksRequest.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 
 		$qb->where(
 			$expr->andX(
-				$expr->eq('f.circle_id', $qb->createNamedParameter((int) $circleId)),
+				$expr->eq('f.circle_id', $qb->createNamedParameter((int)$circleId)),
 				$expr->eq('f.status', $qb->createNamedParameter(9))
 			)
 		);
@@ -111,8 +111,8 @@ 
 
 		$qb->where(
 			$expr->andX(
-				$expr->eq('f.circle_id', $qb->createNamedParameter((int) $circleId)),
-				$expr->eq('f.unique_id', $qb->createNamedParameter((string) $uniqueId))
+				$expr->eq('f.circle_id', $qb->createNamedParameter((int)$circleId)),
+				$expr->eq('f.unique_id', $qb->createNamedParameter((string)$uniqueId))
 			)
 		);
 

lib/Db/CirclesRequestBuilder.php

Spacing +20 added lines, -20 removed lines

@@ -70,11 +70,11 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $circleId
 	 */
-	protected function limitToCircleId(IQueryBuilder &$qb, $circleId) {
+	protected function limitToCircleId(IQueryBuilder & $qb, $circleId) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'circle_id', $qb->createNamedParameter($circleId)));
+		$qb->andWhere($expr->eq($pf.'circle_id', $qb->createNamedParameter($circleId)));
 	}
 
 
@@ -84,11 +84,11 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $id
 	 */
-	protected function limitToId(IQueryBuilder &$qb, $id) {
+	protected function limitToId(IQueryBuilder & $qb, $id) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($id)));
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($id)));
 	}
 
 
@@ -98,11 +98,11 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $uniqueId
 	 */
-	protected function limitToUniqueId(IQueryBuilder &$qb, $uniqueId) {
+	protected function limitToUniqueId(IQueryBuilder & $qb, $uniqueId) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'unique_id', $qb->createNamedParameter($uniqueId)));
+		$qb->andWhere($expr->eq($pf.'unique_id', $qb->createNamedParameter($uniqueId)));
 	}
 
 
@@ -112,11 +112,11 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param $token
 	 */
-	protected function limitToToken(IQueryBuilder &$qb, $token) {
+	protected function limitToToken(IQueryBuilder & $qb, $token) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'token', $qb->createNamedParameter($token)));
+		$qb->andWhere($expr->eq($pf.'token', $qb->createNamedParameter($token)));
 	}
 
 
@@ -126,7 +126,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param $level
 	 */
-	protected function limitToMemberLevel(IQueryBuilder &$qb, $level) {
+	protected function limitToMemberLevel(IQueryBuilder & $qb, $level) {
 		$qb->where(
 			$qb->expr()
 			   ->gte('m.level', $qb->createNamedParameter($level))
@@ -141,20 +141,20 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
 	 */
-	protected function leftJoinUserIdAsMember(IQueryBuilder &$qb, $userId) {
+	protected function leftJoinUserIdAsMember(IQueryBuilder & $qb, $userId) {
 
 		if ($qb->getType() !== QueryBuilder::SELECT) {
 			return;
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		$qb->selectAlias('u.level', 'user_level');
 		$qb->leftJoin(
 			$this->default_select_alias, MembersMapper::TABLENAME, 'u',
 			$expr->andX(
-				$expr->eq($pf . 'id', 'u.circle_id'),
+				$expr->eq($pf.'id', 'u.circle_id'),
 				$expr->eq('u.user_id', $qb->createNamedParameter($userId))
 			)
 		);
@@ -166,19 +166,19 @@ 
 	 * @deprecated
 	 * never used in fact.
 	 */
-	protected function leftJoinOwner(IQueryBuilder &$qb) {
+	protected function leftJoinOwner(IQueryBuilder & $qb) {
 
 		if ($qb->getType() !== QueryBuilder::SELECT) {
 			return;
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		$qb->leftJoin(
 			$this->default_select_alias, MembersMapper::TABLENAME, 'o',
 			$expr->andX(
-				$expr->eq($pf . 'id', 'o.circle_id'),
+				$expr->eq($pf.'id', 'o.circle_id'),
 				$expr->eq('o.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
 			)
 		);
@@ -247,7 +247,7 @@ 
 		$qb->update('circles_shares')
 		   ->where(
 			   $qb->expr()
-				  ->eq('unique_id', $qb->createNamedParameter((string) $uniqueId))
+				  ->eq('unique_id', $qb->createNamedParameter((string)$uniqueId))
 		   );
 
 		return $qb;

lib/Service/FederatedService.php

Spacing +8 added lines, -8 removed lines

@@ -211,10 +211,10 @@ 
 	 */
 	private function generateLinkRemoteURL($remote) {
 		if (strpos($remote, 'https') !== 0) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
-		return rtrim($remote, '/') . '/index.php/apps/circles/circles/link/';
+		return rtrim($remote, '/').'/index.php/apps/circles/circles/link/';
 	}
 
 	/**
@@ -224,10 +224,10 @@ 
 	 */
 	private function generatePayloadDeliveryURL($remote) {
 		if (strpos($remote, 'https') !== 0) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
-		return rtrim($remote, '/') . '/index.php/apps/circles/circles/payload/';
+		return rtrim($remote, '/').'/index.php/apps/circles/circles/payload/';
 	}
 
 
@@ -241,7 +241,7 @@ 
 	 * @return int
 	 * @throws Exception
 	 */
-	private function requestLink(Circle $circle, FederatedLink &$link) {
+	private function requestLink(Circle $circle, FederatedLink & $link) {
 		$args = [
 			'token'      => $link->getToken(),
 			'uniqueId'   => $circle->getUniqueId(),
@@ -316,7 +316,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function initiateLink(Circle $circle, FederatedLink &$link) {
+	public function initiateLink(Circle $circle, FederatedLink & $link) {
 
 		$link->setCircleId($circle->getId());
 
@@ -338,7 +338,7 @@ 
 	 * @return bool
 	 * @throws Exception
 	 */
-	public function receiveFrame($token, $uniqueId, SharingFrame &$frame) {
+	public function receiveFrame($token, $uniqueId, SharingFrame & $frame) {
 
 		$link = $this->circlesRequest->getLinkFromToken((string)$token, (string)$uniqueId);
 		if ($link === null) {
@@ -413,7 +413,7 @@ 
 
 			$result = json_decode($request->getBody(), true);
 			$this->miscService->log(
-				"initiateRemoteShare result: " . $uniqueId . '  ----  ' . var_export($result, true)
+				"initiateRemoteShare result: ".$uniqueId.'  ----  '.var_export($result, true)
 			);
 
 			return true;

lib/Service/SharesService.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 		FederatedService $federatedService,
 		MiscService $miscService
 	) {
-		$this->userId = (string) $userId;
+		$this->userId = (string)$userId;
 		$this->configService = $configService;
 		$this->circlesRequest = $circlesRequest;
 		$this->broadcastService = $broadcastService;
@@ -107,7 +107,7 @@ 
 		$frame->setAuthor($this->userId);
 		$frame->setHeader('author', $this->userId);
 		$frame->setHeader('circleName', $circle->getName());
-		$frame->setHeader('broadcast', (string) $broadcast);
+		$frame->setHeader('broadcast', (string)$broadcast);
 		$frame->generateUniqueId();
 		$frame->setCircleName($circle->getName());
 
@@ -132,7 +132,7 @@ 
 			return null;
 		}
 
-		return $this->circlesRequest->getFrame((int) $circleId, (string) $uniqueId);
+		return $this->circlesRequest->getFrame((int)$circleId, (string)$uniqueId);
 	}
 
 

lib/Service/BroadcastService.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 		CirclesRequest $circlesRequest,
 		MiscService $miscService
 	) {
-		$this->userId = (string) $userId;
+		$this->userId = (string)$userId;
 		$this->configService = $configService;
 		$this->circlesRequest = $circlesRequest;
 		$this->miscService = $miscService;
@@ -86,7 +86,7 @@ 
 			return;
 		}
 
-		$broadcaster = \OC::$server->query((string) $broadcast);
+		$broadcaster = \OC::$server->query((string)$broadcast);
 		if (!($broadcaster instanceof IBroadcaster)) {
 			throw new BroadcasterIsNotCompatible();
 		}