nextcloud / circles

lib/Db/CircleProviderRequestBuilder.php

Doc Comments +2 added lines, -1 removed lines

@@ -107,7 +107,7 @@ 
 	 * limit the request to the children of a share
 	 *
 	 * @param IQueryBuilder $qb
-	 * @param $userId
+	 * @param string $userId
 	 * @param int $parentId
 	 */
 	protected function limitToShareChildren(IQueryBuilder &$qb, $userId, $parentId = -1) {
@@ -265,6 +265,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
+	 * @param boolean $groupMemberAllowed
 	 */
 	protected function linkToMember(IQueryBuilder &$qb, $userId, $groupMemberAllowed) {
 		$expr = $qb->expr();

Spacing +29 added lines, -29 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) ? 's.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'share_with', $qb->createNamedParameter($circleId)));
+		$qb->andWhere($expr->eq($pf.'share_with', $qb->createNamedParameter($circleId)));
 	}
 
 
@@ -83,11 +83,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)));
 	}
 
 
@@ -96,7 +96,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToShareParent(IQueryBuilder &$qb) {
+	protected function limitToShareParent(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->andWhere($expr->isNull('parent'));
@@ -110,7 +110,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)));
 
@@ -129,15 +129,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))
 			)
 		);
 	}
@@ -151,7 +151,7 @@ 
 	 *
 	 * @internal param $fileId
 	 */
-	protected function limitToFiles(IQueryBuilder &$qb, $files) {
+	protected function limitToFiles(IQueryBuilder & $qb, $files) {
 
 		if (!is_array($files)) {
 			$files = array($files);
@@ -161,7 +161,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'file_source',
+				$pf.'file_source',
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
 			)
 		);
@@ -173,7 +173,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);
 		}
@@ -189,18 +189,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))
 				)
 			);
 		}
@@ -215,14 +215,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('LEFT(c.unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+			$qb->createFunction('LEFT(c.unique_id, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 		);
 
 		if ($shareId === -1) {
@@ -244,7 +244,7 @@ 
 	/**
 	 * @param IQueryBuilder $qb
 	 */
-	protected function linkToCircleOwner(IQueryBuilder &$qb) {
+	protected function linkToCircleOwner(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -252,7 +252,7 @@ 
 			'c', 'circles_members', 'mo', $expr->andX(
 			$expr->eq(
 				'mo.circle_id',
-				$qb->createFunction('LEFT(c.unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+				$qb->createFunction('LEFT(c.unique_id, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 			),
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
 		)
@@ -266,7 +266,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
 	 */
-	protected function linkToMember(IQueryBuilder &$qb, $userId, $groupMemberAllowed) {
+	protected function linkToMember(IQueryBuilder & $qb, $userId, $groupMemberAllowed) {
 		$expr = $qb->expr();
 
 		$qb->from(CoreRequestBuilder::TABLE_MEMBERS, 'm');
@@ -292,7 +292,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(
-					'LEFT(c.unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'LEFT(c.unique_id, '.Circle::UNIQUEID_SHORT_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();
 		$andX = $expr->andX();
 
@@ -331,7 +331,7 @@ 
 			$expr->eq(
 				'g.circle_id',
 				$qb->createFunction(
-					'LEFT(c.unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'LEFT(c.unique_id, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 			)
 		);
@@ -345,7 +345,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function leftJoinShareInitiator(IQueryBuilder &$qb) {
+	protected function leftJoinShareInitiator(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 
@@ -404,7 +404,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function joinCircleMembers(IQueryBuilder &$qb) {
+	protected function joinCircleMembers(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->from(CoreRequestBuilder::TABLE_MEMBERS, 'm');
@@ -433,7 +433,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
 	 */
-	protected function linkToFileCache(IQueryBuilder &$qb, $userId) {
+	protected function linkToFileCache(IQueryBuilder & $qb, $userId) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -554,7 +554,7 @@ 
 	/**
 	 * @param IQueryBuilder $qb
 	 */
-	private function joinShare(IQueryBuilder &$qb) {
+	private function joinShare(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */

lib/Db/CirclesRequestBuilder.php

Spacing +12 added lines, -12 removed lines

@@ -67,7 +67,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $field
 	 */
-	protected function leftJoinGroups(IQueryBuilder &$qb, $field) {
+	protected function leftJoinGroups(IQueryBuilder & $qb, $field) {
 		$expr = $qb->expr();
 
 		$qb->leftJoin(
@@ -81,7 +81,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToNonPersonalCircle(IQueryBuilder &$qb) {
+	protected function limitToNonPersonalCircle(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->andWhere(
@@ -100,7 +100,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) {
@@ -130,7 +130,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->generateLimitHidden($qb, $circleUniqueId, $type, $name));
@@ -181,7 +181,7 @@ 
 			->add(
 				$expr->eq(
 					$qb->createNamedParameter($circleUniqueId),
-					$qb->createFunction('LEFT(c.unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+					$qb->createFunction('LEFT(c.unique_id, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 				)
 			);
 
@@ -244,14 +244,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')
@@ -263,7 +263,7 @@ 
 				   $expr->eq(
 					   'u.circle_id',
 					   $qb->createFunction(
-						   'LEFT(' . $pf . 'unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+						   'LEFT('.$pf.'unique_id, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 					   )
 				   ),
 				   $expr->eq('u.user_id', $qb->createNamedParameter($userId))
@@ -276,14 +276,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')
@@ -294,7 +294,7 @@ 
 			   $expr->andX(
 				   $expr->eq(
 					   $qb->createFunction(
-						   'LEFT(' . $pf . 'unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+						   'LEFT('.$pf.'unique_id, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 					   )
 					   , 'o.circle_id'
 				   ),
@@ -422,7 +422,7 @@ 
 		   ->where(
 			   $qb->expr()
 				  ->eq(
-					  $qb->createFunction('LEFT(unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH),
+					  $qb->createFunction('LEFT(unique_id, '.Circle::UNIQUEID_SHORT_LENGTH),
 					  $qb->createNamedParameter($circleUniqueId)
 				  )
 		   );

lib/Db/CoreRequestBuilder.php

Spacing +24 added lines, -24 removed lines

@@ -70,7 +70,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $id
 	 */
-	protected function limitToId(IQueryBuilder &$qb, $id) {
+	protected function limitToId(IQueryBuilder & $qb, $id) {
 		$this->limitToDBField($qb, 'id', $id);
 	}
 
@@ -81,7 +81,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);
 	}
 
@@ -92,7 +92,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $token
 	 */
-	protected function limitToToken(IQueryBuilder &$qb, $token) {
+	protected function limitToToken(IQueryBuilder & $qb, $token) {
 		$this->limitToDBField($qb, 'token', $token);
 	}
 
@@ -105,7 +105,7 @@ 
 	 *
 	 * @internal param int $circleId
 	 */
-	protected function limitToUserId(IQueryBuilder &$qb, $userId) {
+	protected function limitToUserId(IQueryBuilder & $qb, $userId) {
 		$this->limitToDBField($qb, 'user_id', $userId);
 	}
 
@@ -116,7 +116,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);
 
 	}
@@ -128,15 +128,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.')'
 				)
 			)
 		);
@@ -150,7 +150,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);
 	}
 
@@ -161,7 +161,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $name
 	 */
-	protected function limitToName(IQueryBuilder &$qb, $name) {
+	protected function limitToName(IQueryBuilder & $qb, $name) {
 		$this->limitToDBField($qb, 'name', $name);
 	}
 
@@ -173,12 +173,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;
 		}
@@ -193,7 +193,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);
@@ -205,10 +205,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)));
 	}
 
 
@@ -223,9 +223,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 {
@@ -244,15 +244,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.')')
 			   )
 		   );
 	}
@@ -283,7 +283,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.')'
 				)
 				)
 			)