nextcloud / circles

lib/Model/BaseMember.php

Doc Comments +3 added lines

@@ -149,6 +149,9 @@
 	}
 
 
+	/**
+	 * @param string $display
+	 */
 	public function setDisplayName($display) {
 		$this->displayName = $display;
 

lib/Circles/FileSharingBroadcaster.php

Spacing +1 added lines, -1 removed lines

@@ -244,7 +244,7 @@
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($subject, false);
 		$emailTemplate->addBodyText(
-			$text . "\n " . $this->l10n->t('Click the button below to open it.'), $text
+			$text."\n ".$this->l10n->t('Click the button below to open it.'), $text
 		);
 		$emailTemplate->addBodyButton($this->l10n->t('Open »%s«', [$fileName]), $link);
 

Doc Comments +2 added lines, -2 removed lines

@@ -178,7 +178,7 @@ 
 
 
 	/**
-	 * @param $circleName
+	 * @param string $circleName
 	 * @param IShare $share
 	 * @param string $email
 	 */
@@ -233,7 +233,7 @@ 
 	 * @param $subject
 	 * @param $text
 	 * @param $fileName
-	 * @param $link
+	 * @param string $link
 	 * @param string $author
 	 * @param string $circleName
 	 *

lib/Service/BroadcastService.php

Spacing +2 added lines, -2 removed lines

@@ -134,7 +134,7 @@ 
 	/**
 	 * @param Member $member
 	 */
-	private function parseMember(Member &$member) {
+	private function parseMember(Member & $member) {
 		$this->parseMemberFromContact($member);
 	}
 
@@ -145,7 +145,7 @@ 
 	 *
 	 * @param Member $member
 	 */
-	private function parseMemberFromContact(Member &$member) {
+	private function parseMemberFromContact(Member & $member) {
 
 		if ($member->getType() !== Member::TYPE_CONTACT) {
 			return;

lib/Service/SearchService.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 			$searcher = \OC::$server->query((string)$container);
 
 			if (!($searcher instanceof ISearch)) {
-				$this->miscService->log('Search ' . $container . ' is not compatible exception');
+				$this->miscService->log('Search '.$container.' is not compatible exception');
 				continue;
 			}
 

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();

Doc Comments +12 added lines, -9 removed lines

@@ -101,9 +101,9 @@ 
 	 *
 	 * @param string $circleUniqueId
 	 * @param $ident
-	 * @param $type
+	 * @param integer $type
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function addMember($circleUniqueId, $ident, $type) {
@@ -244,8 +244,8 @@ 
 	/**
 	 * Verify if a local account is valid.
 	 *
-	 * @param $ident
-	 * @param $type
+	 * @param string $ident
+	 * @param integer $type
 	 *
 	 * @throws NoUserException
 	 */
@@ -266,7 +266,7 @@ 
 	 * Verify if a mail have a valid format.
 	 *
 	 * @param $ident
-	 * @param $type
+	 * @param integer $type
 	 *
 	 * @throws EmailAccountInvalidFormatException
 	 */
@@ -287,7 +287,7 @@ 
 	 * Verify if a contact exist in current user address books.
 	 *
 	 * @param $ident
-	 * @param $type
+	 * @param integer $type
 	 *
 	 * @throws NoUserException
 	 */
@@ -371,7 +371,7 @@ 
 	 * @param int $type
 	 * @param int $level
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function levelMember($circleUniqueId, $name, $type, $level) {
@@ -397,6 +397,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $level
+	 */
 	private function updateMemberLevel(Circle $circle, Member $member, $level) {
 		if ($member->getLevel() === $level) {
 			return;
@@ -466,9 +469,9 @@ 
 	/**
 	 * @param string $circleUniqueId
 	 * @param string $name
-	 * @param $type
+	 * @param integer $type
 	 *
-	 * @return array
+	 * @return Member[]
 	 * @throws \Exception
 	 */
 	public function removeMember($circleUniqueId, $name, $type) {

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/Service/SharingFrameService.php

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 	 *
 	 * @param SharingFrame $frame
 	 * @param Circle $circle
-	 * @param $broadcast
+	 * @param string|null $broadcast
 	 */
 	private function generateHeaders(SharingFrame $frame, Circle $circle, $broadcast) {
 

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/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.')'
 				)
 				)
 			)