nextcloud / circles

lib/Service/MiscService.php

Doc Comments +5 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 
 	/**
 	 * @param $arr
-	 * @param $k
+	 * @param string $k
 	 *
 	 * @param string $default
 	 *
@@ -79,6 +79,9 @@ 
 	}
 
 
+	/**
+	 * @param string[] $arr
+	 */
 	public static function mustContains($data, $arr) {
 		if (!is_array($arr)) {
 			$arr = [$arr];
@@ -188,7 +191,7 @@ 
 
 
 	/**
-	 * @param $ident
+	 * @param string $ident
 	 *
 	 * @return mixed|string
 	 */

Spacing +1 added lines, -1 removed lines

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

lib/Controller/TestController.php

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 
 
 	/**
-	 * @return DataResponse
+	 * @return string
 	 */
 	public function testAsyncStatus() {
 		return $this->miscService->success(

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 	 * @return string
 	 */
 	private function generateTestAsyncURL($remote) {
-		return $this->configService->generateRemoteHost($remote) . Application::TEST_URL_ASYNC;
+		return $this->configService->generateRemoteHost($remote).Application::TEST_URL_ASYNC;
 	}
 
 

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 +6 added lines, -6 removed lines

@@ -126,7 +126,7 @@ 
 	 * @throws MemberDoesNotExistException
 	 */
 	public function createFrame($circleUniqueId, SharingFrame $frame, $broadcast = null) {
-		$this->miscService->log('Create frame with payload ' . json_encode($frame->getPayload()), 0);
+		$this->miscService->log('Create frame with payload '.json_encode($frame->getPayload()), 0);
 
 		try {
 			$circle = $this->circlesRequest->getCircle($circleUniqueId, $this->userId);
@@ -140,7 +140,7 @@ 
 
 			$this->initiateShare($circle->getUniqueId(), $frame->getUniqueId());
 		} catch (Exception $e) {
-			$this->miscService->log('fail to create frame for circle ' . $circleUniqueId . ' - ' . $e->getMessage());
+			$this->miscService->log('fail to create frame for circle '.$circleUniqueId.' - '.$e->getMessage());
 			throw $e;
 		}
 	}
@@ -279,7 +279,7 @@ 
 
 		$client = $this->clientService->newClient();
 
-		$addr = $this->configService->getLocalAddress() . \OC::$WEBROOT;
+		$addr = $this->configService->getLocalAddress().\OC::$WEBROOT;
 
 		try {
 			$client->post(
@@ -294,7 +294,7 @@ 
 
 			return true;
 		} catch (Exception $e) {
-			$this->miscService->log('fail to initialise circle share to ' . $addr . ' for circle ' . $circleUniqueId . ' - ' . $e->getMessage(), 3);
+			$this->miscService->log('fail to initialise circle share to '.$addr.' for circle '.$circleUniqueId.' - '.$e->getMessage(), 3);
 			throw $e;
 		}
 	}
@@ -306,7 +306,7 @@ 
 	 * @return string
 	 */
 	private function generatePayloadDeliveryURL($remote) {
-		return $this->configService->generateRemoteHost($remote) . Application::REMOTE_URL_PAYLOAD;
+		return $this->configService->generateRemoteHost($remote).Application::REMOTE_URL_PAYLOAD;
 	}
 
 
@@ -380,7 +380,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);
@@ -537,7 +537,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')
@@ -561,7 +561,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'));
 			}
 		}
@@ -570,7 +570,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'));
 		}
@@ -932,7 +932,7 @@ 
 			);
 
 		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$share = $this->createShareObject($data);
 
 			yield $share;

lib/Activity/ProviderParser.php

Spacing +5 added lines, -5 removed lines

@@ -138,7 +138,7 @@ 
 				continue;
 			}
 
-			$replace['{' . $k . '}'] = $data[$k]['_parsed'];
+			$replace['{'.$k.'}'] = $data[$k]['_parsed'];
 		}
 
 		$line = strtr($line, $replace);
@@ -300,9 +300,9 @@ 
 	 */
 	protected function generateExternalMemberParameter(Member $member) {
 		return [
-			'type'    => 'member_' . $member->getType(),
+			'type'    => 'member_'.$member->getType(),
 			'id'      => $member->getUserId(),
-			'name'    => $member->getDisplayName() . ' (' . $member->getTypeString() . ')',
+			'name'    => $member->getDisplayName().' ('.$member->getTypeString().')',
 			'_parsed' => $member->getDisplayName()
 		];
 	}
@@ -338,8 +338,8 @@ 
 		return [
 			'type'    => 'circle',
 			'id'      => $link->getUniqueId(),
-			'name'    => $link->getToken() . '@' . $link->getAddress(),
-			'_parsed' => $link->getToken() . '@' . $link->getAddress()
+			'name'    => $link->getToken().'@'.$link->getAddress(),
+			'_parsed' => $link->getToken().'@'.$link->getAddress()
 		];
 	}
 

lib/Db/CirclesRequestBuilder.php

Spacing +6 added lines, -6 removed lines

@@ -181,7 +181,7 @@ 
 				$expr->eq(
 					$qb->createNamedParameter($circleUniqueId),
 					$qb->createFunction(
-						'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+						'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 					)
 				)
 			);
@@ -252,7 +252,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = '`' . $this->default_select_alias . '`.';
+		$pf = '`'.$this->default_select_alias.'`.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -264,7 +264,7 @@ 
 				   $expr->eq(
 					   'u.circle_id',
 					   $qb->createFunction(
-						   'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH
+						   'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH
 						   . ')'
 					   )
 				   ),
@@ -287,7 +287,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = '`' . $this->default_select_alias . '`.';
+		$pf = '`'.$this->default_select_alias.'`.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -298,7 +298,7 @@ 
 			   $expr->andX(
 				   $expr->eq(
 					   $qb->createFunction(
-						   'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH
+						   'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH
 						   . ')'
 					   )
 					   , 'o.circle_id'
@@ -359,7 +359,7 @@ 
 			   $qb->expr()
 				  ->eq(
 					  $qb->createFunction(
-						  'SUBSTR(`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+						  'SUBSTR(`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 					  ),
 					  $qb->createNamedParameter($circleUniqueId)
 				  )

lib/Db/CoreRequestBuilder.php

Spacing +22 added lines, -22 removed lines

@@ -140,12 +140,12 @@ 
 	 */
 	protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId, $length) {
 		$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(
 				$qb->createNamedParameter($circleUniqueId),
-				$qb->createFunction('SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . $length . ')')
+				$qb->createFunction('SUBSTR('.$pf.'`unique_id`'.', 1, '.$length.')')
 			)
 		);
 
@@ -198,8 +198,8 @@ 
 		$expr = $qb->expr();
 
 		if ($pf === '') {
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
 
 			return;
 		}
@@ -227,7 +227,7 @@ 
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
 				continue;
 			}
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
 		}
 
 		return $orX;
@@ -242,12 +242,12 @@ 
 	protected function limitToMembersAndAlmost(IQueryBuilder &$qb) {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
 		$orX = $expr->orX();
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
 
 		$qb->andWhere($orX);
 	}
@@ -260,8 +260,8 @@ 
 	 */
 	private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -272,8 +272,8 @@ 
 	 */
 	private function limitToDBFieldOrGreater(IQueryBuilder &$qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -288,9 +288,9 @@ 
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$and = $expr->andX($expr->eq($pf . 'group_id', 'ncgu.gid'));
+		$and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid'));
 		if ($userId !== '') {
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
 		} else {
@@ -311,14 +311,14 @@ 
 	 */
 	protected function rightJoinCircles(IQueryBuilder &$qb) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
 		$qb->from(self::TABLE_CIRCLES, 'c')
 		   ->andWhere(
 			   $expr->eq(
-				   $pf . 'circle_id',
+				   $pf.'circle_id',
 				   $qb->createFunction(
-					   'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+					   'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 				   )
 			   )
 		   );
@@ -338,7 +338,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -346,9 +346,9 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc',
 			   $expr->eq(
-				   $pf . 'circle_id',
+				   $pf.'circle_id',
 				   $qb->createFunction(
-					   'SUBSTR(`lc`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+					   'SUBSTR(`lc`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 				   )
 			   )
 		   );
@@ -381,7 +381,7 @@ 
 				$expr->eq('ncgu.gid', 'g.group_id'),
 				$expr->eq(
 					'g.circle_id', $qb->createFunction(
-					'SUBSTR(' . $field . ', 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+					'SUBSTR('.$field.', 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 				)
 				)
 			)

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