nextcloud / circles

lib/Db/MembersMapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 	 * getMembersFromCircleSql()
 	 * getMemberFromCircleSql()
 	 *
-	 * @param $circleId
+	 * @param integer $circleId
 	 *
 	 * @return \OCP\DB\QueryBuilder\IQueryBuilder
 	 */

lib/AppInfo/Application.php

Spacing +5 added lines, -5 removed lines

@@ -84,7 +84,7 @@ 
 	 *
 	 * @param $container
 	 */
-	private function registerServices(IAppContainer &$container) {
+	private function registerServices(IAppContainer & $container) {
 
 		$container->registerService(
 			'MiscService', function(IAppContainer $c) {
@@ -143,7 +143,7 @@ 
 	 *
 	 * @param $container
 	 */
-	private static function registerControllers(IAppContainer &$container) {
+	private static function registerControllers(IAppContainer & $container) {
 
 		$container->registerService(
 			'NavigationController', function(IAppContainer $c) {
@@ -193,7 +193,7 @@ 
 	 *
 	 * @param IAppContainer $container
 	 */
-	private static function registerDatabaseRequesters(IAppContainer &$container) {
+	private static function registerDatabaseRequesters(IAppContainer & $container) {
 
 		$container->registerService(
 			'CirclesRequest', function(IAppContainer $c) {
@@ -211,7 +211,7 @@ 
 	 *
 	 * @param $container
 	 */
-	private static function registerMappers(IAppContainer &$container) {
+	private static function registerMappers(IAppContainer & $container) {
 
 		$container->registerService(
 			'CirclesMapper', function(IAppContainer $c) {
@@ -239,7 +239,7 @@ 
 	 *
 	 * @param $container
 	 */
-	private static function registerCores(IAppContainer &$container) {
+	private static function registerCores(IAppContainer & $container) {
 
 		$container->registerService(
 			'Logger', function(IAppContainer $c) {

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/Db/CircleProviderRequestBuilder.php

Spacing +9 added lines, -9 removed lines

@@ -73,7 +73,7 @@ 
 		$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)));
 	}
 
 
@@ -87,7 +87,7 @@ 
 		$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)));
 	}
 
 
@@ -136,8 +136,8 @@ 
 		/** @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))
 			)
 		);
 	}
@@ -159,7 +159,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'file_source',
+				$pf.'file_source',
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
 			)
 		);
@@ -191,13 +191,13 @@ 
 		$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))
 				)
 			);
 		}
@@ -253,7 +253,7 @@ 
 	protected function linkToMember(& $qb, $userId) {
 		$expr = $qb->expr();
 
-		$qb->leftJoin('s',MembersMapper::TABLENAME, 'm', $expr->andX(
+		$qb->leftJoin('s', MembersMapper::TABLENAME, 'm', $expr->andX(
 		   $expr->eq('s.share_with', 'm.circle_id'),
 		   $expr->eq('m.user_id', $qb->createNamedParameter($userId)),
 		   $expr->gte('m.level', $qb->createNamedParameter(Member::LEVEL_MEMBER))

lib/Db/CirclesRequest.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 
 
 	/**
-	 * @param $circleId
+	 * @param integer $circleId
 	 * @param int $level
 	 *
 	 * @return Member[]

Braces +3 added lines, -2 removed lines

@@ -64,8 +64,9 @@
 		$qb = $this->getCirclesSelectSql();
 
 		$this->limitToId($qb, $circleId);
-		if ($userId !== '')
-			$this->leftJoinUserIdAsMember($qb, $userId);
+		if ($userId !== '') {
+					$this->leftJoinUserIdAsMember($qb, $userId);
+		}
 
 //		$this->leftjoinOwner($qb);
 //		$this->buildWithMemberLevel($qb, 'u.level', $level);

lib/Model/SharingFrame.php

Doc Comments +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 	}
 
 	/**
-	 * @return mixed
+	 * @return string
 	 */
 	public function getCircleName() {
 		return $this->circleName;

lib/Db/CirclesRequestBuilder.php

Doc Comments +2 added lines, -1 removed lines

@@ -54,6 +54,7 @@ 
 	 * Join the Circles table
 	 *
 	 * @param IQueryBuilder $qb
+	 * @param string $field
 	 */
 	protected function joinCircles(& $qb, $field) {
 		$expr = $qb->expr();
@@ -109,7 +110,7 @@ 
 	 * Limit the request to a minimum member level.
 	 *
 	 * @param IQueryBuilder $qb
-	 * @param $level
+	 * @param integer $level
 	 */
 	protected function limitToMemberLevel(IQueryBuilder &$qb, $level) {
 		$qb->where(

Spacing +16 added lines, -16 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) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'circle_id', $qb->createNamedParameter($circleId)));
+		$qb->andWhere($expr->eq($pf.'circle_id', $qb->createNamedParameter($circleId)));
 	}
 
 
@@ -83,11 +83,11 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $id
 	 */
-	protected function limitToId(IQueryBuilder &$qb, $id) {
+	protected function limitToId(IQueryBuilder & $qb, $id) {
 		$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($pf . 'id', $qb->createNamedParameter($id)));
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($id)));
 	}
 
 
@@ -97,11 +97,11 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $uniqueId
 	 */
-	protected function limitToUniqueId(IQueryBuilder &$qb, $uniqueId) {
+	protected function limitToUniqueId(IQueryBuilder & $qb, $uniqueId) {
 		$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($pf . 'unique_id', $qb->createNamedParameter($uniqueId)));
+		$qb->andWhere($expr->eq($pf.'unique_id', $qb->createNamedParameter($uniqueId)));
 	}
 
 
@@ -111,7 +111,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param $level
 	 */
-	protected function limitToMemberLevel(IQueryBuilder &$qb, $level) {
+	protected function limitToMemberLevel(IQueryBuilder & $qb, $level) {
 		$qb->where(
 			$qb->expr()
 			   ->gte('m.level', $qb->createNamedParameter($level))
@@ -126,20 +126,20 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
 	 */
-	protected function leftJoinUserIdAsMember(IQueryBuilder &$qb, $userId) {
+	protected function leftJoinUserIdAsMember(IQueryBuilder & $qb, $userId) {
 
 		if ($qb->getType() !== QueryBuilder::SELECT) {
 			return;
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		$qb->selectAlias('u.level', 'user_level');
 		$qb->leftJoin(
 			$this->default_select_alias, MembersMapper::TABLENAME, '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))
 			)
 		);
@@ -151,19 +151,19 @@ 
 	 * @deprecated
 	 * never used in fact.
 	 */
-	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.'.';
 
 		$qb->leftJoin(
 			$this->default_select_alias, MembersMapper::TABLENAME, '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/Service/FederatedService.php

Doc Comments +8 added lines, -5 removed lines

@@ -163,8 +163,8 @@ 
 	 * in the database and send a request to the remote circle using requestLink()
 	 * If any issue, entry is removed from the database.
 	 *
-	 * @param $circleId
-	 * @param $remote
+	 * @param integer $circleId
+	 * @param string $remote
 	 *
 	 * @return FederatedLink
 	 * @throws Exception
@@ -234,7 +234,7 @@ 
 	 * @param Circle $circle
 	 * @param FederatedLink $link
 	 *
-	 * @return int
+	 * @return boolean
 	 * @throws Exception
 	 */
 	private function requestLink(Circle $circle, FederatedLink &$link) {
@@ -328,8 +328,8 @@ 
 
 
 	/**
-	 * @param $circleId
-	 * @param $uniqueId
+	 * @param integer $circleId
+	 * @param string $uniqueId
 	 *
 	 * @return FederatedLink
 	 */
@@ -338,6 +338,9 @@ 
 	}
 
 
+	/**
+	 * @param string $uniqueId
+	 */
 	public function initiateRemoteShare($uniqueId) {
 		$args = [
 			'uniqueId' => $uniqueId,

Spacing +7 added lines, -7 removed lines

@@ -207,10 +207,10 @@ 
 	 */
 	private function generateLinkRemoteURL($remote) {
 		if (strpos($remote, 'http') !== 0) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
-		return rtrim($remote, '/') . '/index.php/apps/circles/circles/link/';
+		return rtrim($remote, '/').'/index.php/apps/circles/circles/link/';
 	}
 
 	/**
@@ -220,10 +220,10 @@ 
 	 */
 	private function generatePayloadDeliveryURL($remote) {
 		if (strpos($remote, 'http') !== 0) {
-			$remote = 'http://' . $remote;
+			$remote = 'http://'.$remote;
 		}
 
-		return rtrim($remote, '/') . '/index.php/apps/circles/circles/payload/';
+		return rtrim($remote, '/').'/index.php/apps/circles/circles/payload/';
 	}
 
 
@@ -237,7 +237,7 @@ 
 	 * @return int
 	 * @throws Exception
 	 */
-	private function requestLink(Circle $circle, FederatedLink &$link) {
+	private function requestLink(Circle $circle, FederatedLink & $link) {
 		$args = [
 			'token'      => $link->getToken(),
 			'uniqueId'   => $circle->getUniqueId(),
@@ -313,7 +313,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function initiateLink(Circle $circle, FederatedLink &$link) {
+	public function initiateLink(Circle $circle, FederatedLink & $link) {
 
 		$link->setCircleId($circle->getId());
 
@@ -354,7 +354,7 @@ 
 			);
 
 			$result = json_decode($request->getBody(), true);
-			$this->miscService->log("initiateRemoteShare result: " . $result);
+			$this->miscService->log("initiateRemoteShare result: ".$result);
 
 			return true;
 		} catch (Exception $e) {

lib/Controller/FederatedController.php

Spacing +2 added lines, -2 removed lines

@@ -132,11 +132,11 @@
 	 */
 	public function initFederatedDelivery($uniqueId) {
 
-		$this->miscService->log("initFederatedDelivery start " . $uniqueId);
+		$this->miscService->log("initFederatedDelivery start ".$uniqueId);
 
 		$frame = $this->sharesService->getFrameFromUniqueId($uniqueId);
 
-		$this->miscService->log("____" . var_export(frame, true));
+		$this->miscService->log("____".var_export(frame, true));
 		// We don't want to keep the connection with the client up and running
 		// as he might have others things to do
 		$this->asyncAndLeaveClientOutOfThis('done');