nextcloud / circles

lib/Db/CirclesRequest.php

Doc Comments +1 added lines, -1 removed lines

@@ -178,7 +178,7 @@
 	}
 
 	/**
-	 * @param $circleId
+	 * @param integer $circleId
 	 * @param int $level
 	 *
 	 * @return Member[]

lib/Db/CirclesRequestBuilder.php

Doc Comments +3 added lines, -2 removed lines

@@ -55,6 +55,7 @@ 
 	 * Join the Circles table
 	 *
 	 * @param IQueryBuilder $qb
+	 * @param string $field
 	 */
 	protected function joinCircles(& $qb, $field) {
 		$expr = $qb->expr();
@@ -110,7 +111,7 @@ 
 	 * Limit the request by its Token.
 	 *
 	 * @param IQueryBuilder $qb
-	 * @param $token
+	 * @param string $token
 	 */
 	protected function limitToToken(IQueryBuilder &$qb, $token) {
 		$expr = $qb->expr();
@@ -124,7 +125,7 @@ 
 	 * Limit the request to a minimum member level.
 	 *
 	 * @param IQueryBuilder $qb
-	 * @param $level
+	 * @param integer $level
 	 */
 	protected function limitToMemberLevel(IQueryBuilder &$qb, $level) {
 		$qb->where(

Spacing +19 added lines, -19 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))
 			)
 		);

lib/Service/FederatedService.php

Doc Comments +6 added lines, -7 removed lines

@@ -85,7 +85,6 @@ 
 	 * @param ConfigService $configService
 	 * @param DatabaseService $databaseService
 	 * @param CirclesService $circlesService
-	 * @param SharesService $sharesService
 	 * @param FederatedLinksRequest $federatedLinksRequest
 	 * @param string $serverHost
 	 * @param ClientService $clientService
@@ -166,8 +165,8 @@ 
 	 * in the database and send a request to the remote circle using requestLink()
 	 * If any issue, entry is removed from the database.
 	 *
-	 * @param $circleId
-	 * @param $remote
+	 * @param integer $circleId
+	 * @param string $remote
 	 *
 	 * @return FederatedLink
 	 * @throws Exception
@@ -237,7 +236,7 @@ 
 	 * @param Circle $circle
 	 * @param FederatedLink $link
 	 *
-	 * @return int
+	 * @return boolean
 	 * @throws Exception
 	 */
 	private function requestLink(Circle $circle, FederatedLink &$link) {
@@ -365,8 +364,8 @@ 
 	}
 
 	/**
-	 * @param $circleId
-	 * @param $uniqueId
+	 * @param integer $circleId
+	 * @param string $uniqueId
 	 *
 	 * @return FederatedLink
 	 */
@@ -376,7 +375,7 @@ 
 
 
 	/**
-	 * @param $circleId
+	 * @param integer $circleId
 	 *
 	 * @return FederatedLink[]
 	 */

Spacing +8 added lines, -8 removed lines

@@ -210,10 +210,10 @@ 
 	 */
 	private function generateLinkRemoteURL($remote) {
 		if (strpos($remote, 'http') !== 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/';
 	}
 
 	/**
@@ -223,10 +223,10 @@ 
 	 */
 	private function generatePayloadDeliveryURL($remote) {
 		if (strpos($remote, 'http') !== 0) {
-			$remote = 'http://' . $remote;
+			$remote = 'http://'.$remote;
 		}
 
-		return rtrim($remote, '/') . '/index.php/apps/circles/circles/payload/';
+		return rtrim($remote, '/').'/index.php/apps/circles/circles/payload/';
 	}
 
 
@@ -240,7 +240,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(),
@@ -315,7 +315,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function initiateLink(Circle $circle, FederatedLink &$link) {
+	public function initiateLink(Circle $circle, FederatedLink & $link) {
 
 		$link->setCircleId($circle->getId());
 
@@ -352,7 +352,7 @@ 
 //		$circle = $this->circlesRequest->getCircle($uniqueId);
 		$frame->setCircleId($link->getCircleId());
 		$this->miscService->log(
-			"RECEIVEFRAME: " . $frame->getCircleId() . ' '
+			"RECEIVEFRAME: ".$frame->getCircleId().' '
 			. $frame->getHeaders(true)
 		);
 
@@ -410,7 +410,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/Controller/FederatedController.php

Spacing +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 		ob_start();
 		echo($result);
 		$size = ob_get_length();
-		header('Content-Length: ' . $size);
+		header('Content-Length: '.$size);
 		ob_end_flush();
 		flush();
 	}