nextcloud / circles

lib/Service/MembersService.php

Doc Comments +7 added lines, -7 removed lines

@@ -103,7 +103,7 @@ 
 	 * @param string $circleUniqueId
 	 * @param string $name
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function addLocalMember($circleUniqueId, $name) {
@@ -137,7 +137,7 @@ 
 	 * @param string $circleUniqueId
 	 * @param string $email
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function addEmailAddress($circleUniqueId, $email) {
@@ -181,7 +181,7 @@ 
 	 * @param string $circleUniqueId
 	 * @param string $groupId
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function importMembersFromGroup($circleUniqueId, $groupId) {
@@ -293,7 +293,7 @@ 
 	/**
 	 * return the real userId, with its real case
 	 *
-	 * @param $userId
+	 * @param string $userId
 	 *
 	 * @return string
 	 * @throws NoUserException
@@ -327,7 +327,7 @@ 
 	 * @param string $name
 	 * @param int $level
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function levelLocalMember($circleUniqueId, $name, $level) {
@@ -367,7 +367,7 @@ 
 	/**
 	 * @param Circle $circle
 	 * @param Member $member
-	 * @param $level
+	 * @param integer $level
 	 *
 	 * @throws \Exception
 	 */
@@ -420,7 +420,7 @@ 
 	 * @param string $name
 	 * @param $type
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function removeMember($circleUniqueId, $name, $type) {

Spacing +4 added lines, -4 removed lines

@@ -142,7 +142,7 @@ 
 	 */
 	public function addEmailAddress($circleUniqueId, $email) {
 
-		$this->miscService->log('___' . $email);
+		$this->miscService->log('___'.$email);
 		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
 			throw new EmailAccountInvalidFormatException(
 				$this->l10n->t('Email format is not valid')
@@ -163,7 +163,7 @@ 
 			throw $e;
 		}
 
-		$this->miscService->log('___' . json_encode($member));
+		$this->miscService->log('___'.json_encode($member));
 
 //
 //		$member->inviteToCircle($circle->getType());
@@ -371,7 +371,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();
@@ -395,7 +395,7 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	private function switchOwner(Circle $circle, Member &$member) {
+	private function switchOwner(Circle $circle, Member & $member) {
 		try {
 			$isMod = $circle->getHigherViewer();
 			$isMod->hasToBeOwner();

lib/Activity/Provider.php

Spacing +20 added lines, -20 removed lines

@@ -74,7 +74,7 @@ 
 	}
 
 
-	private function setIcon(IEvent &$event, Circle $circle) {
+	private function setIcon(IEvent & $event, Circle $circle) {
 		$event->setIcon(
 			CirclesService::getCircleIcon(
 				$circle->getType(),
@@ -91,7 +91,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseAsMember(IEvent &$event, Circle $circle, $params) {
+	private function parseAsMember(IEvent & $event, Circle $circle, $params) {
 		if ($event->getType() !== 'circles_as_member') {
 			return $event;
 		}
@@ -126,7 +126,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseMemberAsMember(IEvent &$event, Circle $circle) {
+	private function parseMemberAsMember(IEvent & $event, Circle $circle) {
 		$params = $event->getSubjectParameters();
 		$member = Member::fromJSON($params['member']);
 
@@ -158,7 +158,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseSubjectMemberJoin(IEvent &$event, Circle $circle, Member $member) {
+	private function parseSubjectMemberJoin(IEvent & $event, Circle $circle, Member $member) {
 		if ($circle->getType() === Circle::CIRCLES_CLOSED) {
 			return $this->parseCircleMemberEvent(
 				$event, $circle, $member,
@@ -185,7 +185,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseSubjectMemberAdd(IEvent &$event, Circle $circle, Member $member) {
+	private function parseSubjectMemberAdd(IEvent & $event, Circle $circle, Member $member) {
 		if ($circle->getType() === Circle::CIRCLES_CLOSED) {
 			return $this->parseCircleMemberAdvancedEvent(
 				$event, $circle, $member,
@@ -215,7 +215,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseSubjectMemberLeft(IEvent &$event, Circle $circle, Member $member) {
+	private function parseSubjectMemberLeft(IEvent & $event, Circle $circle, Member $member) {
 		if ($circle->getType() === Circle::CIRCLES_CLOSED
 			&& $member->getLevel() === Member::LEVEL_NONE) {
 			return $this->parseCircleMemberEvent(
@@ -244,7 +244,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseSubjectMemberRemove(IEvent &$event, Circle $circle, Member $member) {
+	private function parseSubjectMemberRemove(IEvent & $event, Circle $circle, Member $member) {
 		if ($circle->getType() === Circle::CIRCLES_CLOSED
 			&& $member->getLevel() === Member::LEVEL_NONE) {
 			return $this->parseCircleMemberAdvancedEvent(
@@ -272,7 +272,7 @@ 
 	 * @return IEvent
 	 * @throws Exception
 	 */
-	private function parseAsModerator(IEvent &$event, Circle $circle, $params) {
+	private function parseAsModerator(IEvent & $event, Circle $circle, $params) {
 		if ($event->getType() !== 'circles_as_moderator') {
 			return $event;
 		}
@@ -303,7 +303,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseGroupAsModerator(IEvent &$event, Circle $circle) {
+	private function parseGroupAsModerator(IEvent & $event, Circle $circle) {
 
 		$params = $event->getSubjectParameters();
 		$group = Member::fromJSON($params['group']);
@@ -350,7 +350,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseMemberAsModerator(IEvent &$event, Circle $circle) {
+	private function parseMemberAsModerator(IEvent & $event, Circle $circle) {
 
 		$params = $event->getSubjectParameters();
 		$member = Member::fromJSON($params['member']);
@@ -398,7 +398,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseLinkAsModerator(IEvent &$event, Circle $circle) {
+	private function parseLinkAsModerator(IEvent & $event, Circle $circle) {
 
 		$params = $event->getSubjectParameters();
 		$remote = FederatedLink::fromJSON($params['link']);
@@ -497,7 +497,7 @@ 
 	 * @return IEvent
 	 */
 	private function parseCircleEvent(
-		IEvent &$event, Circle $circle, $remote, $ownEvent, $othersEvent
+		IEvent & $event, Circle $circle, $remote, $ownEvent, $othersEvent
 	) {
 		$data = [
 			'author' => $this->generateViewerParameter($circle),
@@ -525,7 +525,7 @@ 
 	 * @return IEvent
 	 */
 	private function parseMemberEvent(
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent
 	) {
 		$data = [
 			'circle' => $this->generateCircleParameter($circle),
@@ -551,7 +551,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseLinkEvent(IEvent &$event, Circle $circle, FederatedLink $remote, $line) {
+	private function parseLinkEvent(IEvent & $event, Circle $circle, FederatedLink $remote, $line) {
 		$data = [
 			'circle' => $this->generateCircleParameter($circle),
 			'remote' => $this->generateRemoteCircleParameter($remote)
@@ -573,7 +573,7 @@ 
 	 * @return IEvent
 	 */
 	private function parseCircleMemberEvent(
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent
 	) {
 		$data = [
 			'author' => $this->generateViewerParameter($circle),
@@ -604,7 +604,7 @@ 
 	 * @return IEvent
 	 */
 	private function parseCircleMemberAdvancedEvent(
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent
 	) {
 		$data = [
 			'author' => $this->generateViewerParameter($circle),
@@ -627,13 +627,13 @@ 
 	/**
 	 * @param IEvent $event
 	 */
-	private function generateParsedSubject(IEvent &$event) {
+	private function generateParsedSubject(IEvent & $event) {
 		$subject = $event->getRichSubject();
 		$params = $event->getRichSubjectParameters();
 		$ak = array_keys($params);
 		foreach ($ak as $k) {
 			if (is_array($params[$k])) {
-				$subject = str_replace('{' . $k . '}', $params[$k]['parsed'], $subject);
+				$subject = str_replace('{'.$k.'}', $params[$k]['parsed'], $subject);
 			}
 		}
 
@@ -716,8 +716,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/CoreRequestBuilder.php

Spacing +30 added lines, -30 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);
 	}
 
@@ -120,7 +120,7 @@ 
 	 *
 	 * @internal param int $circleId
 	 */
-	protected function limitToType(IQueryBuilder &$qb, $type) {
+	protected function limitToType(IQueryBuilder & $qb, $type) {
 		$this->limitToDBField($qb, 'type', $type);
 	}
 
@@ -132,7 +132,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);
 
 	}
@@ -144,15 +144,15 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $circleUniqueId
 	 */
-	protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId) {
+	protected function limitToShortenUniqueId(IQueryBuilder & $qb, $circleUniqueId) {
 		$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(
-					'LEFT(' . $pf . 'unique_id' . ', ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'LEFT('.$pf.'unique_id'.', '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 			)
 		);
@@ -166,7 +166,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);
 	}
 
@@ -177,7 +177,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $name
 	 */
-	protected function limitToName(IQueryBuilder &$qb, $name) {
+	protected function limitToName(IQueryBuilder & $qb, $name) {
 		$this->limitToDBField($qb, 'name', $name);
 	}
 
@@ -189,12 +189,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;
 		}
@@ -209,7 +209,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)));
 		}
 
 		$qb->andWhere($orX);
@@ -221,15 +221,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);
 	}
@@ -240,10 +240,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)));
 	}
 
 
@@ -258,9 +258,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 {
@@ -279,15 +279,15 @@ 
 	 *
 	 * @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',
-				   $qb->createFunction('LEFT(c.unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+				   $pf.'circle_id',
+				   $qb->createFunction('LEFT(c.unique_id, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 			   )
 		   );
 	}
@@ -318,7 +318,7 @@ 
 				$expr->eq('ncgu.gid', 'g.group_id'),
 				$expr->eq(
 					'g.circle_id', $qb->createFunction(
-					'LEFT(' . $field . ', ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'LEFT('.$field.', '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 				)
 			)