nextcloud / circles

lib/Api/v1/Circles.php

Spacing +4 added lines, -4 removed lines

@@ -379,7 +379,7 @@ 
 	 */
 	public static function generateLink($circleUniqueId) {
 		return \OC::$server->getURLGenerator()
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId;
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$circleUniqueId;
 	}
 
 
@@ -394,8 +394,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();
 	}
 
 
@@ -407,7 +407,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/Service/MembersService.php

Spacing +4 added lines, -4 removed lines

@@ -149,7 +149,7 @@ 
 	 * @param Circle $circle
 	 * @param Member $member
 	 */
-	private function addMemberBasedOnItsType(Circle $circle, Member &$member) {
+	private function addMemberBasedOnItsType(Circle $circle, Member & $member) {
 		$this->addLocalMember($circle, $member);
 		$this->addEmailAddress($member);
 		$this->addContact($member);
@@ -280,7 +280,7 @@ 
 			return;
 		}
 
-		$tmpContact = $this->userId . ':' . $ident;
+		$tmpContact = $this->userId.':'.$ident;
 		try {
 			MiscService::getContactData($tmpContact);
 		} catch (Exception $e) {
@@ -407,7 +407,7 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	private function editMemberLevel(Circle $circle, Member &$member, $level) {
+	private function editMemberLevel(Circle $circle, Member & $member, $level) {
 		try {
 			$isMod = $circle->getHigherViewer();
 			$isMod->hasToBeModerator();
@@ -431,7 +431,7 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	private function switchOwner(Circle $circle, Member &$member) {
+	private function switchOwner(Circle $circle, Member & $member) {
 		try {
 			$isMod = $circle->getHigherViewer();
 			$isMod->hasToBeOwner();

lib/Service/ConfigService.php

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
 		if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
 			&& strpos($remote, 'https://') !== 0
 		) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
 		return rtrim($remote, '/');

lib/Db/CoreRequestBuilder.php

Spacing +34 added lines, -34 removed lines

@@ -71,7 +71,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $id
 	 */
-	protected function limitToId(IQueryBuilder &$qb, $id) {
+	protected function limitToId(IQueryBuilder & $qb, $id) {
 		$this->limitToDBField($qb, 'id', $id);
 	}
 
@@ -82,7 +82,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $uniqueId
 	 */
-	protected function limitToUniqueId(IQueryBuilder &$qb, $uniqueId) {
+	protected function limitToUniqueId(IQueryBuilder & $qb, $uniqueId) {
 		$this->limitToDBField($qb, 'unique_id', $uniqueId);
 	}
 
@@ -93,7 +93,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $token
 	 */
-	protected function limitToToken(IQueryBuilder &$qb, $token) {
+	protected function limitToToken(IQueryBuilder & $qb, $token) {
 		$this->limitToDBField($qb, 'token', $token);
 	}
 
@@ -106,7 +106,7 @@ 
 	 *
 	 * @internal param int $circleId
 	 */
-	protected function limitToUserId(IQueryBuilder &$qb, $userId) {
+	protected function limitToUserId(IQueryBuilder & $qb, $userId) {
 		$this->limitToDBField($qb, 'user_id', $userId);
 	}
 
@@ -119,7 +119,7 @@ 
 	 *
 	 * @internal param int $circleId
 	 */
-	protected function limitToUserType(IQueryBuilder &$qb, $type) {
+	protected function limitToUserType(IQueryBuilder & $qb, $type) {
 		$this->limitToDBField($qb, 'user_type', $type);
 	}
 
@@ -130,7 +130,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $circleUniqueId
 	 */
-	protected function limitToCircleId(IQueryBuilder &$qb, $circleUniqueId) {
+	protected function limitToCircleId(IQueryBuilder & $qb, $circleUniqueId) {
 		$this->limitToDBField($qb, 'circle_id', $circleUniqueId);
 	}
 
@@ -142,14 +142,14 @@ 
 	 * @param string $circleUniqueId
 	 * @param $length
 	 */
-	protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId, $length) {
+	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.')')
 			)
 		);
 
@@ -162,7 +162,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $groupId
 	 */
-	protected function limitToGroupId(IQueryBuilder &$qb, $groupId) {
+	protected function limitToGroupId(IQueryBuilder & $qb, $groupId) {
 		$this->limitToDBField($qb, 'group_id', $groupId);
 	}
 
@@ -173,7 +173,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $name
 	 */
-	protected function limitToName(IQueryBuilder &$qb, $name) {
+	protected function limitToName(IQueryBuilder & $qb, $name) {
 		$this->limitToDBField($qb, 'name', $name);
 	}
 
@@ -184,7 +184,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $name
 	 */
-	protected function limitToStatus(IQueryBuilder &$qb, $name) {
+	protected function limitToStatus(IQueryBuilder & $qb, $name) {
 		$this->limitToDBFieldOrGreater($qb, 'status', $name);
 	}
 
@@ -198,12 +198,12 @@ 
 	 * @param int $level
 	 * @param string|array $pf
 	 */
-	protected function limitToLevel(IQueryBuilder &$qb, $level, $pf = '') {
+	protected function limitToLevel(IQueryBuilder & $qb, $level, $pf = '') {
 		$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;
 		}
@@ -231,7 +231,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;
@@ -243,15 +243,15 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToMembersAndAlmost(IQueryBuilder &$qb) {
+	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);
 	}
@@ -262,10 +262,10 @@ 
 	 * @param string $field
 	 * @param string|integer $value
 	 */
-	private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
+	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)));
 	}
 
 
@@ -274,10 +274,10 @@ 
 	 * @param string $field
 	 * @param string|integer $value
 	 */
-	private function limitToDBFieldOrGreater(IQueryBuilder &$qb, $field, $value) {
+	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)));
 	}
 
 
@@ -292,9 +292,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 {
@@ -313,16 +313,16 @@ 
 	 *
 	 * @deprecated not used (14/07/17)
 	 */
-	protected function rightJoinCircles(IQueryBuilder &$qb) {
+	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.')'
 				   )
 			   )
 		   );
@@ -354,7 +354,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/Db/CircleProviderRequestBuilder.php

Spacing +29 added lines, -29 removed lines

@@ -68,11 +68,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)));
 	}
 
 
@@ -82,11 +82,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)));
 	}
 
 
@@ -95,7 +95,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToShareParent(IQueryBuilder &$qb) {
+	protected function limitToShareParent(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->andWhere($expr->isNull('parent'));
@@ -109,7 +109,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)));
 
@@ -128,15 +128,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))
 			)
 		);
 	}
@@ -150,7 +150,7 @@ 
 	 *
 	 * @internal param $fileId
 	 */
-	protected function limitToFiles(IQueryBuilder &$qb, $files) {
+	protected function limitToFiles(IQueryBuilder & $qb, $files) {
 
 		if (!is_array($files)) {
 			$files = array($files);
@@ -160,7 +160,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'file_source',
+				$pf.'file_source',
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
 			)
 		);
@@ -172,7 +172,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);
 		}
@@ -188,18 +188,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))
 				)
 			);
 		}
@@ -214,14 +214,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::SHORT_UNIQUE_ID_LENGTH . ')')
+			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
 		);
 
 		if ($shareId === -1) {
@@ -243,7 +243,7 @@ 
 	/**
 	 * @param IQueryBuilder $qb
 	 */
-	protected function linkToCircleOwner(IQueryBuilder &$qb) {
+	protected function linkToCircleOwner(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->selectAlias('mo.user_id', 'circle_owner');
@@ -252,7 +252,7 @@ 
 			'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
 			$expr->eq(
 				'mo.circle_id',
-        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
+        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
 			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
 		)
@@ -267,7 +267,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');
@@ -291,7 +291,7 @@ 
 	 *
 	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
 	 */
-	private function exprLinkToMemberAsCircleMember(IQueryBuilder &$qb, $userId) {
+	private function exprLinkToMemberAsCircleMember(IQueryBuilder & $qb, $userId) {
 
 		$expr = $qb->expr();
 		$andX = $expr->andX();
@@ -302,7 +302,7 @@ 
 			$expr->eq(
 				'm.circle_id',
 				$qb->createFunction(
-					'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+					'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 				)
 			)
 		);
@@ -320,7 +320,7 @@ 
 	 *
 	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
 	 */
-	private function exprLinkToMemberAsGroupMember(IQueryBuilder &$qb, $userId) {
+	private function exprLinkToMemberAsGroupMember(IQueryBuilder & $qb, $userId) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -329,7 +329,7 @@ 
 			$expr->andX(
 				$expr->eq(
 					'g.circle_id',
-					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
+					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
 				),
 				$expr->gte('g.level', $qb->createNamedParameter(Member::LEVEL_MEMBER))
 			)
@@ -349,7 +349,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');
@@ -385,7 +385,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function joinCircleMembers(IQueryBuilder &$qb) {
+	protected function joinCircleMembers(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -406,7 +406,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
 	 */
-	protected function linkToFileCache(IQueryBuilder &$qb, $userId) {
+	protected function linkToFileCache(IQueryBuilder & $qb, $userId) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -522,7 +522,7 @@ 
 	/**
 	 * @param IQueryBuilder $qb
 	 */
-	private function joinShare(IQueryBuilder &$qb) {
+	private function joinShare(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */

lib/Db/CirclesRequestBuilder.php

Spacing +16 added lines, -16 removed lines

@@ -66,7 +66,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $field
 	 */
-	protected function leftJoinGroups(IQueryBuilder &$qb, $field) {
+	protected function leftJoinGroups(IQueryBuilder & $qb, $field) {
 		$expr = $qb->expr();
 
 		$qb->leftJoin(
@@ -80,7 +80,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToNonPersonalCircle(IQueryBuilder &$qb) {
+	protected function limitToNonPersonalCircle(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->andWhere(
@@ -99,7 +99,7 @@ 
 	 * @throws ConfigNoCircleAvailableException
 	 */
 	protected function limitRegardingCircleType(
-		IQueryBuilder &$qb, $userId, $circleUniqueId, $type, $name
+		IQueryBuilder & $qb, $userId, $circleUniqueId, $type, $name
 	) {
 		$orTypes = $this->generateLimit($qb, $circleUniqueId, $userId, $type, $name);
 		if (sizeof($orTypes) === 0) {
@@ -129,7 +129,7 @@ 
 	 *
 	 * @return array
 	 */
-	private function generateLimit(IQueryBuilder &$qb, $circleUniqueId, $userId, $type, $name) {
+	private function generateLimit(IQueryBuilder & $qb, $circleUniqueId, $userId, $type, $name) {
 		$orTypes = [];
 		array_push($orTypes, $this->generateLimitPersonal($qb, $userId, $type));
 		array_push($orTypes, $this->generateLimitSecret($qb, $circleUniqueId, $type, $name));
@@ -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.')'
 					)
 				)
 			);
@@ -245,14 +245,14 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
 	 */
-	protected function leftJoinUserIdAsViewer(IQueryBuilder &$qb, $userId) {
+	protected function leftJoinUserIdAsViewer(IQueryBuilder & $qb, $userId) {
 
 		if ($qb->getType() !== QueryBuilder::SELECT) {
 			return;
 		}
 
 		$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
 						   . ')'
 					   )
 				   ),
@@ -279,14 +279,14 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	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.'`.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -297,7 +297,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'
@@ -314,14 +314,14 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function leftJoinCircle(IQueryBuilder &$qb) {
+	protected function leftJoinCircle(IQueryBuilder & $qb) {
 
 		if ($qb->getType() !== QueryBuilder::SELECT) {
 			return;
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -329,9 +329,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.')'
 				   )
 			   )
 		   );
@@ -440,7 +440,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/Service/SharingFrameService.php

Spacing +3 added lines, -3 removed lines

@@ -197,7 +197,7 @@ 
 	 * @return bool
 	 * @throws Exception
 	 */
-	public function receiveFrame($token, $uniqueId, SharingFrame &$frame) {
+	public function receiveFrame($token, $uniqueId, SharingFrame & $frame) {
 		try {
 			$link = $this->federatedLinksRequest->getLinkFromToken((string)$token, (string)$uniqueId);
 			$circle = $this->circlesRequest->forceGetCircle($link->getCircleId());
@@ -256,7 +256,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;
 	}
 
 
@@ -330,7 +330,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/Service/FederatedLinkService.php

Spacing +5 added lines, -5 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;
 	}
 
 
@@ -322,7 +322,7 @@ 
 	 * @return bool
 	 * @throws Exception
 	 */
-	private function updateLinkRemote(FederatedLink &$link) {
+	private function updateLinkRemote(FederatedLink & $link) {
 
 		try {
 			$client = $this->clientService->newClient();
@@ -378,7 +378,7 @@ 
 	 * @param Circle $circle
 	 * @param FederatedLink $link
 	 */
-	private function checkUpdateLinkFromRemoteLinkRequestSent(Circle $circle, FederatedLink &$link) {
+	private function checkUpdateLinkFromRemoteLinkRequestSent(Circle $circle, FederatedLink & $link) {
 
 		if ($link->getStatus() !== FederatedLink::STATUS_REQUEST_SENT) {
 			return;
@@ -393,7 +393,7 @@ 
 	 * @param Circle $circle
 	 * @param FederatedLink $link
 	 */
-	private function checkUpdateLinkFromRemoteLinkRequested(Circle $circle, FederatedLink &$link) {
+	private function checkUpdateLinkFromRemoteLinkRequested(Circle $circle, FederatedLink & $link) {
 
 		if ($link->getStatus() !== FederatedLink::STATUS_LINK_REQUESTED) {
 			return;
@@ -408,7 +408,7 @@ 
 	 * @param Circle $circle
 	 * @param FederatedLink $link
 	 */
-	private function checkUpdateLinkFromRemoteLinkDown(Circle $circle, FederatedLink &$link) {
+	private function checkUpdateLinkFromRemoteLinkDown(Circle $circle, FederatedLink & $link) {
 
 		if ($link->getStatus() < FederatedLink::STATUS_LINK_DOWN) {
 			return;

lib/Service/FederatedLinkCreationService.php

Spacing +3 added lines, -3 removed lines

@@ -164,7 +164,7 @@ 
 	 *
 	 * @throws Exception
 	 */
-	public function requestedLinkFromRemoteCircle(Circle $circle, FederatedLink &$link) {
+	public function requestedLinkFromRemoteCircle(Circle $circle, FederatedLink & $link) {
 
 		try {
 			$this->checkLinkRequestValidity($circle, $link);
@@ -282,7 +282,7 @@ 
 	 * @return boolean
 	 * @throws Exception
 	 */
-	private function forceRequestNewLink(Circle $circle, FederatedLink &$link) {
+	private function forceRequestNewLink(Circle $circle, FederatedLink & $link) {
 		try {
 			$client = $this->clientService->newClient();
 			$args = ['sourceName' => $circle->getName()];
@@ -317,7 +317,7 @@ 
 	 *
 	 * @throws Exception
 	 */
-	private function eventOnRequestLink(Circle $circle, FederatedLink &$link, $status, $reason) {
+	private function eventOnRequestLink(Circle $circle, FederatedLink & $link, $status, $reason) {
 
 		switch ($status) {
 			case FederatedLink::STATUS_LINK_UP: