nextcloud / circles

lib/Migration/ImportOwncloudCustomGroups.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 				continue;
 			}
 
-			$level = (int) $row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER;
+			$level = (int)$row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER;
 
 			if ($level === Member::LEVEL_OWNER) {
 				if (isset($this->circleHasAdmin[$this->circlesById[$row['group_id']]])) {

lib/Service/CirclesService.php

Doc Comments +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
 
 
 	/**
-	 * @param $circleName
+	 * @param string $circleName
 	 *
 	 * @return Circle|null
 	 */

Spacing +8 added lines, -8 removed lines

@@ -195,7 +195,7 @@ 
 	 *
 	 * @param Circle $circle
 	 */
-	private function detailsCircleMembers(Circle &$circle) {
+	private function detailsCircleMembers(Circle & $circle) {
 		$members =
 			$this->membersRequest->getMembers($circle->getUniqueId(), $circle->getHigherViewer());
 
@@ -208,7 +208,7 @@ 
 	 *
 	 * @param Circle $circle
 	 */
-	private function detailsCircleLinkedGroups(Circle &$circle) {
+	private function detailsCircleLinkedGroups(Circle & $circle) {
 		$groups = [];
 		if ($this->configService->isLinkedGroupsAllowed()) {
 			$groups =
@@ -226,7 +226,7 @@ 
 	 *
 	 * @param Circle $circle
 	 */
-	private function detailsCircleFederatedCircles(Circle &$circle) {
+	private function detailsCircleFederatedCircles(Circle & $circle) {
 		$links = [];
 
 		try {
@@ -407,23 +407,23 @@ 
 		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, 'public' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'public'.$ext)
 				);
 		}
 
-		return $urlGen->getAbsoluteURL($urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext));
+		return $urlGen->getAbsoluteURL($urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext));
 	}
 
 }
\ No newline at end of file

lib/Migration/GenerateUniqueIdOnCreatedCircle.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 
 			$update = $this->connection->getQueryBuilder();
 			$update->update('circles_circles')
-				   ->set('unique_id', $update->createNamedParameter('d' . $uniqueId))
+				   ->set('unique_id', $update->createNamedParameter('d'.$uniqueId))
 				   ->where(
 					   $update->expr()
 							  ->eq('id', $update->createNamedParameter($itemId))

lib/Service/EventsService.php

Doc Comments +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
 	 * generateEvent()
 	 * Create an Activity Event with the basic settings for the app.
 	 *
-	 * @param $type
+	 * @param string $type
 	 *
 	 * @return \OCP\Activity\IEvent
 	 */

lib/Service/FederatedService.php

Doc Comments +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 	 *
 	 * @param Circle $circle
 	 * @param FederatedLink $link
-	 * @param $status
+	 * @param integer $status
 	 *
 	 * @return bool
 	 */

Spacing +8 added lines, -8 removed lines

@@ -312,7 +312,7 @@ 
 	 * @return string
 	 */
 	private function generateLinkRemoteURL($remote) {
-		return $this->generateRemoteHost($remote) . self::REMOTE_URL_LINK;
+		return $this->generateRemoteHost($remote).self::REMOTE_URL_LINK;
 	}
 
 
@@ -322,7 +322,7 @@ 
 	 * @return string
 	 */
 	private function generatePayloadDeliveryURL($remote) {
-		return $this->generateRemoteHost($remote) . self::REMOTE_URL_PAYLOAD;
+		return $this->generateRemoteHost($remote).self::REMOTE_URL_PAYLOAD;
 	}
 
 
@@ -335,7 +335,7 @@ 
 		if ((!$this->configService->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
 			&& strpos($remote, 'https://') !== 0
 		) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
 		return rtrim($remote, '/');
@@ -352,7 +352,7 @@ 
 	 * @return boolean
 	 * @throws Exception
 	 */
-	private function requestLink(Circle $circle, FederatedLink &$link) {
+	private function requestLink(Circle $circle, FederatedLink & $link) {
 		$args = [
 			'apiVersion' => Circles::version(),
 			'token'      => $link->getToken(true),
@@ -609,7 +609,7 @@ 
 	 * @return bool
 	 * @throws Exception
 	 */
-	public function updateLinkRemote(FederatedLink &$link) {
+	public function updateLinkRemote(FederatedLink & $link) {
 		$args = [
 			'apiVersion' => Circles::version(),
 			'token'      => $link->getToken(true),
@@ -647,7 +647,7 @@ 
 	 *
 	 * @throws Exception
 	 */
-	public function initiateLink(Circle $circle, FederatedLink &$link) {
+	public function initiateLink(Circle $circle, FederatedLink & $link) {
 
 		try {
 			$this->checkLinkRequestValidity($circle, $link);
@@ -697,7 +697,7 @@ 
 	 * @return bool
 	 * @throws Exception
 	 */
-	public function receiveFrame($token, $uniqueId, SharingFrame &$frame) {
+	public function receiveFrame($token, $uniqueId, SharingFrame & $frame) {
 		try {
 			$link = $this->circlesRequest->getLinkFromToken((string)$token, (string)$uniqueId);
 		} catch (Exception $e) {
@@ -821,7 +821,7 @@ 
 
 			} catch (Exception $e) {
 				$this->miscService->log(
-					'Issue while sending sharing frame to ' . $link->getAddress() . ' - '
+					'Issue while sending sharing frame to '.$link->getAddress().' - '
 					. $e->getMessage()
 				);
 			}

lib/Db/CirclesRequest.php

Spacing +1 added lines, -1 removed lines

@@ -185,7 +185,7 @@
 	 *
 	 * @throws CircleAlreadyExistsException
 	 */
-	public function createCircle(Circle &$circle, $userId) {
+	public function createCircle(Circle & $circle, $userId) {
 
 		if (!$this->isCircleUnique($circle, $userId)) {
 			throw new CircleAlreadyExistsException(

lib/Service/GroupsService.php

Spacing +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
 	 *
 	 * @throws \Exception
 	 */
-	private function editGroupLevel(Circle $circle, Member &$group, $level) {
+	private function editGroupLevel(Circle $circle, Member & $group, $level) {
 		try {
 			$isMod = $circle->getHigherViewer();
 			$isMod->hasToBeAdmin();

Doc Comments +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
 	 * @param string $circleUniqueId
 	 * @param string $groupId
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function linkGroup($circleUniqueId, $groupId) {
@@ -112,8 +112,8 @@ 
 	/**
 	 * Check if a fresh member can be generated (by linkGroup)
 	 *
-	 * @param $circleId
-	 * @param $groupId
+	 * @param string $circleId
+	 * @param string $groupId
 	 *
 	 * @return null|Member
 	 * @throws MemberAlreadyExistsException
@@ -148,7 +148,7 @@ 
 	 * @param string $groupId
 	 * @param int $level
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function levelGroup($circleUniqueId, $groupId, $level) {
@@ -186,7 +186,7 @@ 
 	/**
 	 * @param Circle $circle
 	 * @param Member $group
-	 * @param $level
+	 * @param integer $level
 	 *
 	 * @throws \Exception
 	 */
@@ -213,7 +213,7 @@ 
 	 * @param string $circleUniqueId
 	 * @param string $groupId
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function unlinkGroup($circleUniqueId, $groupId) {

lib/ShareByCircleProvider.php

Doc Comments +7 added lines

@@ -432,6 +432,13 @@
 	}
 
 
+	/**
+	 * @param string $userId
+	 * @param integer $shareType
+	 * @param Node|null $node
+	 * @param integer $limit
+	 * @param integer $offset
+	 */
 	private function getSharedWithCircleMembers($userId, $shareType, $node, $limit, $offset) {
 
 		$qb = $this->getCompleteSelectSql();

Spacing +2 added lines, -2 removed lines

@@ -569,7 +569,7 @@ 
 	 * @param IShare $share
 	 * @param $data
 	 */
-	private function assignShareObjectPropertiesFromParent(IShare &$share, $data) {
+	private function assignShareObjectPropertiesFromParent(IShare & $share, $data) {
 		if (isset($data['f_permissions'])) {
 			$entryData = $data;
 			$entryData['permissions'] = $entryData['f_permissions'];
@@ -588,7 +588,7 @@ 
 	 * @param IShare $share
 	 * @param $data
 	 */
-	private function assignShareObjectSharesProperties(IShare &$share, $data) {
+	private function assignShareObjectSharesProperties(IShare & $share, $data) {
 		$shareTime = new \DateTime();
 		$shareTime->setTimestamp((int)$data['stime']);
 

lib/Db/CircleProviderRequestBuilder.php

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 	 * limit the request to the children of a share
 	 *
 	 * @param IQueryBuilder $qb
-	 * @param $userId
+	 * @param string $userId
 	 * @param int $parentId
 	 */
 	protected function limitToShareChildren(IQueryBuilder &$qb, $userId, $parentId = -1) {

Indentation +1 added lines, -1 removed lines

@@ -253,7 +253,7 @@
 			'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
 			$expr->eq(
 				'mo.circle_id',
-        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+		$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
 			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
 		)

Spacing +29 added lines, -29 removed lines

@@ -69,11 +69,11 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $circleId
 	 */
-	protected function limitToCircle(IQueryBuilder &$qb, $circleId) {
+	protected function limitToCircle(IQueryBuilder & $qb, $circleId) {
 		$expr = $qb->expr();
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'share_with', $qb->createNamedParameter($circleId)));
+		$qb->andWhere($expr->eq($pf.'share_with', $qb->createNamedParameter($circleId)));
 	}
 
 
@@ -83,11 +83,11 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param $shareId
 	 */
-	protected function limitToShare(IQueryBuilder &$qb, $shareId) {
+	protected function limitToShare(IQueryBuilder & $qb, $shareId) {
 		$expr = $qb->expr();
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
 	}
 
 
@@ -96,7 +96,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToShareParent(IQueryBuilder &$qb) {
+	protected function limitToShareParent(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->andWhere($expr->isNull('parent'));
@@ -110,7 +110,7 @@ 
 	 * @param $userId
 	 * @param int $parentId
 	 */
-	protected function limitToShareChildren(IQueryBuilder &$qb, $userId, $parentId = -1) {
+	protected function limitToShareChildren(IQueryBuilder & $qb, $userId, $parentId = -1) {
 		$expr = $qb->expr();
 		$qb->andWhere($expr->eq('share_with', $qb->createNamedParameter($userId)));
 
@@ -129,15 +129,15 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param $circleId
 	 */
-	protected function limitToShareAndChildren(IQueryBuilder &$qb, $circleId) {
+	protected function limitToShareAndChildren(IQueryBuilder & $qb, $circleId) {
 		$expr = $qb->expr();
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->andWhere(
 			$expr->orX(
-				$expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
-				$expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
+				$expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
+				$expr->eq($pf.'id', $qb->createNamedParameter($circleId))
 			)
 		);
 	}
@@ -151,7 +151,7 @@ 
 	 *
 	 * @internal param $fileId
 	 */
-	protected function limitToFiles(IQueryBuilder &$qb, $files) {
+	protected function limitToFiles(IQueryBuilder & $qb, $files) {
 
 		if (!is_array($files)) {
 			$files = array($files);
@@ -161,7 +161,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'file_source',
+				$pf.'file_source',
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
 			)
 		);
@@ -173,7 +173,7 @@ 
 	 * @param int $limit
 	 * @param int $offset
 	 */
-	protected function limitToPage(IQueryBuilder &$qb, $limit = -1, $offset = 0) {
+	protected function limitToPage(IQueryBuilder & $qb, $limit = -1, $offset = 0) {
 		if ($limit !== -1) {
 			$qb->setMaxResults($limit);
 		}
@@ -189,18 +189,18 @@ 
 	 * @param string $userId
 	 * @param bool $reShares
 	 */
-	protected function limitToShareOwner(IQueryBuilder &$qb, $userId, $reShares = false) {
+	protected function limitToShareOwner(IQueryBuilder & $qb, $userId, $reShares = false) {
 		$expr = $qb->expr();
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
 		if ($reShares === false) {
-			$qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
+			$qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
 		} else {
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
 			$qb->andWhere(
 				$expr->orX(
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
 				)
 			);
 		}
@@ -215,14 +215,14 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $shareId
 	 */
-	protected function linkCircleField(IQueryBuilder &$qb, $shareId = -1) {
+	protected function linkCircleField(IQueryBuilder & $qb, $shareId = -1) {
 		$expr = $qb->expr();
 
 		$qb->from(CoreRequestBuilder::TABLE_CIRCLES, 'c');
 
 		$tmpOrX = $expr->eq(
 			's.share_with',
-			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 		);
 
 		if ($shareId === -1) {
@@ -244,7 +244,7 @@ 
 	/**
 	 * @param IQueryBuilder $qb
 	 */
-	protected function linkToCircleOwner(IQueryBuilder &$qb) {
+	protected function linkToCircleOwner(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->selectAlias('mo.user_id', 'circle_owner');
@@ -253,7 +253,7 @@ 
 			'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
 			$expr->eq(
 				'mo.circle_id',
-        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
 		)
@@ -268,7 +268,7 @@ 
 	 * @param string $userId
 	 * @param bool $groupMemberAllowed
 	 */
-	protected function linkToMember(IQueryBuilder &$qb, $userId, $groupMemberAllowed) {
+	protected function linkToMember(IQueryBuilder & $qb, $userId, $groupMemberAllowed) {
 		$expr = $qb->expr();
 
 		$qb->from(CoreRequestBuilder::TABLE_MEMBERS, 'm');
@@ -292,7 +292,7 @@ 
 	 *
 	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
 	 */
-	private function exprLinkToMemberAsCircleMember(IQueryBuilder &$qb, $userId) {
+	private function exprLinkToMemberAsCircleMember(IQueryBuilder & $qb, $userId) {
 
 		$expr = $qb->expr();
 		$andX = $expr->andX();
@@ -303,7 +303,7 @@ 
 			$expr->eq(
 				'm.circle_id',
 				$qb->createFunction(
-					'SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 			)
 		);
@@ -321,7 +321,7 @@ 
 	 *
 	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
 	 */
-	private function exprLinkToMemberAsGroupMember(IQueryBuilder &$qb, $userId) {
+	private function exprLinkToMemberAsGroupMember(IQueryBuilder & $qb, $userId) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -330,7 +330,7 @@ 
 			$expr->andX(
 				$expr->eq(
 					'g.circle_id',
-					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 				),
 				$expr->gte('g.level', $qb->createNamedParameter(Member::LEVEL_MEMBER))
 			)
@@ -350,7 +350,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function leftJoinShareInitiator(IQueryBuilder &$qb) {
+	protected function leftJoinShareInitiator(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->selectAlias('src_m.level', 'initiator_circle_level');
@@ -386,7 +386,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function joinCircleMembers(IQueryBuilder &$qb) {
+	protected function joinCircleMembers(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -407,7 +407,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
 	 */
-	protected function linkToFileCache(IQueryBuilder &$qb, $userId) {
+	protected function linkToFileCache(IQueryBuilder & $qb, $userId) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -523,7 +523,7 @@ 
 	/**
 	 * @param IQueryBuilder $qb
 	 */
-	private function joinShare(IQueryBuilder &$qb) {
+	private function joinShare(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */