nextcloud / circles

lib/Db/MembersRequest.php

Doc Comments +6 added lines, -3 removed lines

@@ -192,7 +192,7 @@ 
 	 * returns the index of a specific UserID in a Members List
 	 *
 	 * @param array $members
-	 * @param $userId
+	 * @param string $userId
 	 *
 	 * @return int
 	 */
@@ -359,7 +359,7 @@ 
 	 *
 	 * @param Member $member
 	 *
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function updateMember(Member $member) {
 		$qb = $this->getMembersUpdateSql($member->getCircleId(), $member->getUserId());
@@ -375,7 +375,7 @@ 
 	 *
 	 * Remove All members from a Circle. Used when deleting a Circle.
 	 *
-	 * @param $circleId
+	 * @param integer $circleId
 	 */
 	public function removeAllFromCircle($circleId) {
 		if ($circleId === 0) {
@@ -421,6 +421,9 @@ 
 	}
 
 
+	/**
+	 * @param string $groupId
+	 */
 	public function unlinkAllFromGroup($groupId) {
 		$qb = $this->getGroupsDeleteSql($groupId);
 		$qb->execute();

lib/Service/MembersService.php

Doc Comments +6 added lines, -6 removed lines

@@ -100,9 +100,9 @@ 
 
 	/**
 	 * @param $circleId
-	 * @param $name
+	 * @param string $name
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function addMember($circleId, $name) {
@@ -134,7 +134,7 @@ 
 	 * @param int $circleId
 	 * @param string $groupId
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function importMembersFromGroup($circleId, $groupId) {
@@ -273,7 +273,7 @@ 
 	 * @param string $name
 	 * @param int $level
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function levelMember($circleId, $name, $level) {
@@ -309,7 +309,7 @@ 
 	/**
 	 * @param Circle $circle
 	 * @param Member $member
-	 * @param $level
+	 * @param integer $level
 	 *
 	 * @throws \Exception
 	 */
@@ -359,7 +359,7 @@ 
 	 * @param $circleId
 	 * @param $name
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function removeMember($circleId, $name) {

Spacing +2 added lines, -2 removed lines

@@ -313,7 +313,7 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	private function editMemberLevel(Circle $circle, Member &$member, $level) {
+	private function editMemberLevel(Circle $circle, Member & $member, $level) {
 		try {
 			$isMod = $this->membersRequest->forceGetMember($circle->getId(), $this->userId);
 			$isMod->hasToBeModerator();
@@ -337,7 +337,7 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	public function switchOwner(Circle $circle, Member &$member) {
+	public function switchOwner(Circle $circle, Member & $member) {
 		try {
 			$isMod = $this->membersRequest->forceGetMember($circle->getId(), $this->userId);
 			$isMod->hasToBeOwner();

lib/Activity/Provider.php

Spacing +15 added lines, -15 removed lines

@@ -82,7 +82,7 @@ 
 	}
 
 
-	private function setIcon(IEvent &$event, Circle $circle) {
+	private function setIcon(IEvent & $event, Circle $circle) {
 		$event->setIcon(
 			CirclesService::getCircleIcon(
 				$circle->getType(),
@@ -99,7 +99,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;
 		}
@@ -134,7 +134,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseMemberAsMember(IEvent &$event, Circle $circle) {
+	private function parseMemberAsMember(IEvent & $event, Circle $circle) {
 		$params = $event->getSubjectParameters();
 		$member = Member::fromJSON($this->l10n, $params['member']);
 
@@ -182,7 +182,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;
 		}
@@ -210,7 +210,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseMemberAsModerator(IEvent &$event, Circle $circle) {
+	private function parseMemberAsModerator(IEvent & $event, Circle $circle) {
 
 		$params = $event->getSubjectParameters();
 		$member = Member::fromJSON($this->l10n, $params['member']);
@@ -261,7 +261,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseLinkAsModerator(IEvent &$event, Circle $circle) {
+	private function parseLinkAsModerator(IEvent & $event, Circle $circle) {
 
 		$params = $event->getSubjectParameters();
 		$link = FederatedLink::fromJSON($params['link']);
@@ -359,7 +359,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseCircleEvent(IEvent &$event, Circle $circle, $link, $ownEvent, $othersEvent
+	private function parseCircleEvent(IEvent & $event, Circle $circle, $link, $ownEvent, $othersEvent
 	) {
 		$data = [
 			'author' => $author = $this->generateUserParameter(
@@ -392,7 +392,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),
@@ -418,7 +418,7 @@ 
 	 *
 	 * @return IEvent
 	 */
-	private function parseLinkEvent(IEvent &$event, Circle $circle, FederatedLink $link, $line) {
+	private function parseLinkEvent(IEvent & $event, Circle $circle, FederatedLink $link, $line) {
 		$data = [
 			'circle' => $this->generateCircleParameter($circle),
 			'link'   => $this->generateLinkParameter($link)
@@ -440,7 +440,7 @@ 
 	 * @return IEvent
 	 */
 	private function parseCircleMemberEvent(
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent
 	) {
 		$data = [
 			'circle' => $this->generateCircleParameter($circle),
@@ -471,7 +471,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 = [
@@ -500,13 +500,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);
 			}
 		}
 
@@ -548,8 +548,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()
 		];
 //			'link' => Circles::generateRemoteLink($link)
 	}

lib/Db/CoreRequestBuilder.php

Spacing +17 added lines, -17 removed lines

@@ -58,7 +58,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $id
 	 */
-	protected function limitToId(IQueryBuilder &$qb, $id) {
+	protected function limitToId(IQueryBuilder & $qb, $id) {
 		$this->limitToDBField($qb, 'id', $id);
 	}
 
@@ -69,7 +69,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);
 	}
 
@@ -80,7 +80,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $token
 	 */
-	protected function limitToToken(IQueryBuilder &$qb, $token) {
+	protected function limitToToken(IQueryBuilder & $qb, $token) {
 		$this->limitToDBField($qb, 'token', $token);
 	}
 
@@ -93,7 +93,7 @@ 
 	 *
 	 * @internal param int $circleId
 	 */
-	protected function limitToUserId(IQueryBuilder &$qb, $userId) {
+	protected function limitToUserId(IQueryBuilder & $qb, $userId) {
 		$this->limitToDBField($qb, 'user_id', $userId);
 	}
 
@@ -104,7 +104,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $circleId
 	 */
-	protected function limitToCircleId(IQueryBuilder &$qb, $circleId) {
+	protected function limitToCircleId(IQueryBuilder & $qb, $circleId) {
 		$this->limitToDBField($qb, 'circle_id', $circleId);
 	}
 
@@ -115,7 +115,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);
 	}
 
@@ -125,7 +125,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToName(IQueryBuilder &$qb, $name) {
+	protected function limitToName(IQueryBuilder & $qb, $name) {
 		$this->limitToDBField($qb, 'name', $name);
 	}
 
@@ -137,13 +137,13 @@ 
 	 * @param int $level
 	 * @param string|array $pf
 	 */
-	protected function limitToLevel(IQueryBuilder &$qb, $level, $pf = '') {
+	protected function limitToLevel(IQueryBuilder & $qb, $level, $pf = '') {
 		$expr = $qb->expr();
 		$orX = $expr->orX();
 
 		if ($pf === '') {
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-			$orX->add($expr->gte($p . 'level', $qb->createNamedParameter($level)));
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+			$orX->add($expr->gte($p.'level', $qb->createNamedParameter($level)));
 
 		} else {
 
@@ -152,7 +152,7 @@ 
 			}
 
 			foreach ($pf as $p) {
-				$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
+				$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
 			}
 		}
 
@@ -167,8 +167,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)));
 	}
 
 
@@ -182,9 +182,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 {
@@ -205,10 +205,10 @@ 
 	 */
 	protected function rightJoinCircles(& $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('c.id', $pf . 'circle_id'));
+		   ->andWhere($expr->eq('c.id', $pf.'circle_id'));
 	}
 
 

lib/Db/CirclesRequestBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToNonPersonalCircle(IQueryBuilder &$qb) {
+	protected function limitToNonPersonalCircle(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->andWhere(
@@ -117,7 +117,7 @@ 
 	 *
 	 * @throws ConfigNoCircleAvailable
 	 */
-	protected function limitRegardingCircleType(IQueryBuilder &$qb, $userId, $circleId, $type, $name
+	protected function limitRegardingCircleType(IQueryBuilder & $qb, $userId, $circleId, $type, $name
 	) {
 		$orTypes = $this->generateLimit($qb, $circleId, $userId, $type, $name);
 		if (sizeof($orTypes) === 0) {
@@ -147,7 +147,7 @@ 
 	 *
 	 * @return array
 	 */
-	private function generateLimit(IQueryBuilder &$qb, $circleId, $userId, $type, $name) {
+	private function generateLimit(IQueryBuilder & $qb, $circleId, $userId, $type, $name) {
 		$orTypes = [];
 		array_push($orTypes, $this->generateLimitPersonal($qb, $userId, $type));
 		array_push($orTypes, $this->generateLimitHidden($qb, $circleId, $type, $name));
@@ -265,7 +265,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -274,7 +274,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_MEMBERS, '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))
 			   )
 		   );
@@ -292,7 +292,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -301,7 +301,7 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_MEMBERS, '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/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/AppInfo/Application.php

Spacing +4 added lines, -4 removed lines

@@ -89,7 +89,7 @@ 
 	 *
 	 * @param $container
 	 */
-	private function registerServices(IAppContainer &$container) {
+	private function registerServices(IAppContainer & $container) {
 
 		$container->registerService(
 			'MiscService', function(IAppContainer $c) {
@@ -183,7 +183,7 @@ 
 	 *
 	 * @param $container
 	 */
-	private static function registerControllers(IAppContainer &$container) {
+	private static function registerControllers(IAppContainer & $container) {
 
 		$container->registerService(
 			'SettingsController', function(IAppContainer $c) {
@@ -268,7 +268,7 @@ 
 	 *
 	 * @param IAppContainer $container
 	 */
-	private static function registerDatabaseRequesters(IAppContainer &$container) {
+	private static function registerDatabaseRequesters(IAppContainer & $container) {
 
 		$container->registerService(
 			'CirclesRequest', function(IAppContainer $c) {
@@ -307,7 +307,7 @@ 
 	 *
 	 * @param $container
 	 */
-	private static function registerCores(IAppContainer &$container) {
+	private static function registerCores(IAppContainer & $container) {
 
 		$container->registerService(
 			'Logger', function(IAppContainer $c) {

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 = $this->membersRequest->forceGetMember($circle->getId(), $this->userId);
 			$isMod->hasToBeAdmin();

lib/Service/CirclesService.php

Spacing +8 added lines, -8 removed lines

@@ -193,7 +193,7 @@ 
 	 *
 	 * @param Circle $circle
 	 */
-	private function detailsCircleMembers(Circle &$circle) {
+	private function detailsCircleMembers(Circle & $circle) {
 		$members =
 			$this->membersRequest->getMembers($circle->getId(), $circle->getHigherViewer());
 
@@ -206,7 +206,7 @@ 
 	 *
 	 * @param Circle $circle
 	 */
-	private function detailsCircleLinkedGroups(Circle &$circle) {
+	private function detailsCircleLinkedGroups(Circle & $circle) {
 		$groups = [];
 		if ($this->configService->isLinkedGroupsAllowed()) {
 			$groups =
@@ -222,7 +222,7 @@ 
 	 *
 	 * @param Circle $circle
 	 */
-	private function detailsCircleFederatedCircles(Circle &$circle) {
+	private function detailsCircleFederatedCircles(Circle & $circle) {
 		$links = [];
 
 		try {
@@ -415,23 +415,23 @@ 
 		switch ($type) {
 			case Circle::CIRCLES_PERSONAL:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath('circles', 'personal' . $ext)
+					$urlGen->imagePath('circles', 'personal'.$ext)
 				);
 			case Circle::CIRCLES_PRIVATE:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath('circles', 'private' . $ext)
+					$urlGen->imagePath('circles', 'private'.$ext)
 				);
 			case Circle::CIRCLES_HIDDEN:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath('circles', 'hidden' . $ext)
+					$urlGen->imagePath('circles', 'hidden'.$ext)
 				);
 			case Circle::CIRCLES_PUBLIC:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath('circles', 'public' . $ext)
+					$urlGen->imagePath('circles', 'public'.$ext)
 				);
 		}
 
-		return $urlGen->getAbsoluteURL($urlGen->imagePath('circles', 'black_circle' . $ext));
+		return $urlGen->getAbsoluteURL($urlGen->imagePath('circles', 'black_circle'.$ext));
 	}
 
 }
\ No newline at end of file