Inspection of "type -> user_type" - nextcloud/circles - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 5e570b...9fa777 )

by Maxence

created 2017-08-13 08:56 UTC

Status

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -253,7 +253,7 @@
 block discarded – undo
 			'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
 			$expr->eq(
 				'mo.circle_id',
-        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+		$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
 			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
 		)

Please login to merge, or discard this patch.

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -69,11 +69,11 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 		);
 
 		if ($shareId === -1) {
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
 	/**
 	 * @param IQueryBuilder $qb
 	 */
-	protected function linkToCircleOwner(IQueryBuilder &$qb) {
+	protected function linkToCircleOwner(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->selectAlias('mo.user_id', 'circle_owner');
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
 			'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
 			$expr->eq(
 				'mo.circle_id',
-        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
 		)
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
 	 * @param string $userId
 	 * @param bool $groupMemberAllowed
 	 */
-	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 @@  discard block
 block discarded – undo
 	 *
 	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
 	 */
-	private function exprLinkToMemberAsCircleMember(IQueryBuilder &$qb, $userId) {
+	private function exprLinkToMemberAsCircleMember(IQueryBuilder & $qb, $userId) {
 
 		$expr = $qb->expr();
 		$andX = $expr->andX();
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
 			$expr->eq(
 				'm.circle_id',
 				$qb->createFunction(
-					'SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 			)
 		);
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
 	 *
 	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
 	 */
-	private function exprLinkToMemberAsGroupMember(IQueryBuilder &$qb, $userId) {
+	private function exprLinkToMemberAsGroupMember(IQueryBuilder & $qb, $userId) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
 			$expr->andX(
 				$expr->eq(
 					'g.circle_id',
-					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 				),
 				$expr->gte('g.level', $qb->createNamedParameter(Member::LEVEL_MEMBER))
 			)
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function leftJoinShareInitiator(IQueryBuilder &$qb) {
+	protected function leftJoinShareInitiator(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->selectAlias('src_m.level', 'initiator_circle_level');
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function joinCircleMembers(IQueryBuilder &$qb) {
+	protected function joinCircleMembers(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
 	 */
-	protected function linkToFileCache(IQueryBuilder &$qb, $userId) {
+	protected function linkToFileCache(IQueryBuilder & $qb, $userId) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
 	/**
 	 * @param IQueryBuilder $qb
 	 */
-	private function joinShare(IQueryBuilder &$qb) {
+	private function joinShare(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */

Please login to merge, or discard this patch.

lib/Db/CoreRequestBuilder.php 1 patch

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @internal param int $circleId
 	 */
-	protected function limitToUserType(IQueryBuilder &$qb, $type) {
+	protected function limitToUserType(IQueryBuilder & $qb, $type) {
 		$this->limitToDBField($qb, 'user_type', $type);
 	}
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
 	 * @param IQueryBuilder $qb
 	 * @param string $circleUniqueId
 	 */
-	protected function limitToCircleId(IQueryBuilder &$qb, $circleUniqueId) {
+	protected function limitToCircleId(IQueryBuilder & $qb, $circleUniqueId) {
 		$this->limitToDBField($qb, 'circle_id', $circleUniqueId);
 	}
 
@@ -143,15 +143,15 @@  discard block
 block discarded – undo
 	 * @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(
-					'SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'SUBSTR('.$pf.'`unique_id`'.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 			)
 		);
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
 	 * @param IQueryBuilder $qb
 	 * @param int $groupId
 	 */
-	protected function limitToGroupId(IQueryBuilder &$qb, $groupId) {
+	protected function limitToGroupId(IQueryBuilder & $qb, $groupId) {
 		$this->limitToDBField($qb, 'group_id', $groupId);
 	}
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
 	 * @param IQueryBuilder $qb
 	 * @param string $name
 	 */
-	protected function limitToName(IQueryBuilder &$qb, $name) {
+	protected function limitToName(IQueryBuilder & $qb, $name) {
 		$this->limitToDBField($qb, 'name', $name);
 	}
 
@@ -188,12 +188,12 @@  discard block
 block discarded – undo
 	 * @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;
 		}
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
 			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);
@@ -220,15 +220,15 @@  discard block
 block discarded – undo
 	 *
 	 * @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);
 	}
@@ -239,10 +239,10 @@  discard block
 block discarded – undo
 	 * @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)));
 	}
 
 
@@ -257,9 +257,9 @@  discard block
 block discarded – undo
 	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 {
@@ -278,15 +278,15 @@  discard block
 block discarded – undo
 	 *
 	 * @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('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+				   $pf.'circle_id',
+				   $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 			   )
 		   );
 	}
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
 				$expr->eq('ncgu.gid', 'g.group_id'),
 				$expr->eq(
 					'g.circle_id', $qb->createFunction(
-					'SUBSTR(' . $field . ', 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'SUBSTR('.$field.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 				)
 			)

Please login to merge, or discard this patch.

		@@ -253,7 +253,7 @@
		block discarded – undo
253	253	'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
254	254	$expr->eq(
255	255	'mo.circle_id',
256		- $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
	256	+ $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
257	257	), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
258	258	$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
259	259	)

		@@ -69,11 +69,11 @@ discard block
		block discarded – undo
69	69	* @param IQueryBuilder $qb
70	70	* @param int $circleId
71	71	*/
72		- protected function limitToCircle(IQueryBuilder &$qb, $circleId) {
	72	+ protected function limitToCircle(IQueryBuilder & $qb, $circleId) {
73	73	$expr = $qb->expr();
74	74	$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
75	75
76		- $qb->andWhere($expr->eq($pf . 'share_with', $qb->createNamedParameter($circleId)));
	76	+ $qb->andWhere($expr->eq($pf.'share_with', $qb->createNamedParameter($circleId)));
77	77	}
78	78
79	79
		@@ -83,11 +83,11 @@ discard block
		block discarded – undo
83	83	* @param IQueryBuilder $qb
84	84	* @param $shareId
85	85	*/
86		- protected function limitToShare(IQueryBuilder &$qb, $shareId) {
	86	+ protected function limitToShare(IQueryBuilder & $qb, $shareId) {
87	87	$expr = $qb->expr();
88	88	$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
89	89
90		- $qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
	90	+ $qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
91	91	}
92	92
93	93
		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	*
97	97	* @param IQueryBuilder $qb
98	98	*/
99		- protected function limitToShareParent(IQueryBuilder &$qb) {
	99	+ protected function limitToShareParent(IQueryBuilder & $qb) {
100	100	$expr = $qb->expr();
101	101
102	102	$qb->andWhere($expr->isNull('parent'));
		@@ -110,7 +110,7 @@ discard block
		block discarded – undo
110	110	* @param $userId
111	111	* @param int $parentId
112	112	*/
113		- protected function limitToShareChildren(IQueryBuilder &$qb, $userId, $parentId = -1) {
	113	+ protected function limitToShareChildren(IQueryBuilder & $qb, $userId, $parentId = -1) {
114	114	$expr = $qb->expr();
115	115	$qb->andWhere($expr->eq('share_with', $qb->createNamedParameter($userId)));
116	116
		@@ -129,15 +129,15 @@ discard block
		block discarded – undo
129	129	* @param IQueryBuilder $qb
130	130	* @param $circleId
131	131	*/
132		- protected function limitToShareAndChildren(IQueryBuilder &$qb, $circleId) {
	132	+ protected function limitToShareAndChildren(IQueryBuilder & $qb, $circleId) {
133	133	$expr = $qb->expr();
134	134	$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
135	135
136	136	/** @noinspection PhpMethodParametersCountMismatchInspection */
137	137	$qb->andWhere(
138	138	$expr->orX(
139		- $expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
140		- $expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
	139	+ $expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
	140	+ $expr->eq($pf.'id', $qb->createNamedParameter($circleId))
141	141	)
142	142	);
143	143	}
		@@ -151,7 +151,7 @@ discard block
		block discarded – undo
151	151	*
152	152	* @internal param $fileId
153	153	*/
154		- protected function limitToFiles(IQueryBuilder &$qb, $files) {
	154	+ protected function limitToFiles(IQueryBuilder & $qb, $files) {
155	155
156	156	if (!is_array($files)) {
157	157	$files = array($files);
		@@ -161,7 +161,7 @@ discard block
		block discarded – undo
161	161	$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
162	162	$qb->andWhere(
163	163	$expr->in(
164		- $pf . 'file_source',
	164	+ $pf.'file_source',
165	165	$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
166	166	)
167	167	);
		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173	* @param int $limit
174	174	* @param int $offset
175	175	*/
176		- protected function limitToPage(IQueryBuilder &$qb, $limit = -1, $offset = 0) {
	176	+ protected function limitToPage(IQueryBuilder & $qb, $limit = -1, $offset = 0) {
177	177	if ($limit !== -1) {
178	178	$qb->setMaxResults($limit);
179	179	}
		@@ -189,18 +189,18 @@ discard block
		block discarded – undo
189	189	* @param string $userId
190	190	* @param bool $reShares
191	191	*/
192		- protected function limitToShareOwner(IQueryBuilder &$qb, $userId, $reShares = false) {
	192	+ protected function limitToShareOwner(IQueryBuilder & $qb, $userId, $reShares = false) {
193	193	$expr = $qb->expr();
194	194	$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
195	195
196	196	if ($reShares === false) {
197		- $qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
	197	+ $qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
198	198	} else {
199	199	/** @noinspection PhpMethodParametersCountMismatchInspection */
200	200	$qb->andWhere(
201	201	$expr->orX(
202		- $expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
203		- $expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
	202	+ $expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
	203	+ $expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
204	204	)
205	205	);
206	206	}
		@@ -215,14 +215,14 @@ discard block
		block discarded – undo
215	215	* @param IQueryBuilder $qb
216	216	* @param int $shareId
217	217	*/
218		- protected function linkCircleField(IQueryBuilder &$qb, $shareId = -1) {
	218	+ protected function linkCircleField(IQueryBuilder & $qb, $shareId = -1) {
219	219	$expr = $qb->expr();
220	220
221	221	$qb->from(CoreRequestBuilder::TABLE_CIRCLES, 'c');
222	222
223	223	$tmpOrX = $expr->eq(
224	224	's.share_with',
225		- $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
	225	+ $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
226	226	);
227	227
228	228	if ($shareId === -1) {
		@@ -244,7 +244,7 @@ discard block
		block discarded – undo
244	244	/**
245	245	* @param IQueryBuilder $qb
246	246	*/
247		- protected function linkToCircleOwner(IQueryBuilder &$qb) {
	247	+ protected function linkToCircleOwner(IQueryBuilder & $qb) {
248	248	$expr = $qb->expr();
249	249
250	250	$qb->selectAlias('mo.user_id', 'circle_owner');
		@@ -253,7 +253,7 @@ discard block
		block discarded – undo
253	253	'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
254	254	$expr->eq(
255	255	'mo.circle_id',
256		- $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
	256	+ $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
257	257	), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
258	258	$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
259	259	)
		@@ -268,7 +268,7 @@ discard block
		block discarded – undo
268	268	* @param string $userId
269	269	* @param bool $groupMemberAllowed
270	270	*/
271		- protected function linkToMember(IQueryBuilder &$qb, $userId, $groupMemberAllowed) {
	271	+ protected function linkToMember(IQueryBuilder & $qb, $userId, $groupMemberAllowed) {
272	272	$expr = $qb->expr();
273	273
274	274	$qb->from(CoreRequestBuilder::TABLE_MEMBERS, 'm');
		@@ -292,7 +292,7 @@ discard block
		block discarded – undo
292	292	*
293	293	* @return \OCP\DB\QueryBuilder\ICompositeExpression
294	294	*/
295		- private function exprLinkToMemberAsCircleMember(IQueryBuilder &$qb, $userId) {
	295	+ private function exprLinkToMemberAsCircleMember(IQueryBuilder & $qb, $userId) {
296	296
297	297	$expr = $qb->expr();
298	298	$andX = $expr->andX();
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303	$expr->eq(
304	304	'm.circle_id',
305	305	$qb->createFunction(
306		- 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
	306	+ 'SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
307	307	)
308	308	)
309	309	);
		@@ -321,7 +321,7 @@ discard block
		block discarded – undo
321	321	*
322	322	* @return \OCP\DB\QueryBuilder\ICompositeExpression
323	323	*/
324		- private function exprLinkToMemberAsGroupMember(IQueryBuilder &$qb, $userId) {
	324	+ private function exprLinkToMemberAsGroupMember(IQueryBuilder & $qb, $userId) {
325	325	$expr = $qb->expr();
326	326
327	327	/** @noinspection PhpMethodParametersCountMismatchInspection */
		@@ -330,7 +330,7 @@ discard block
		block discarded – undo
330	330	$expr->andX(
331	331	$expr->eq(
332	332	'g.circle_id',
333		- $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
	333	+ $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
334	334	),
335	335	$expr->gte('g.level', $qb->createNamedParameter(Member::LEVEL_MEMBER))
336	336	)
		@@ -350,7 +350,7 @@ discard block
		block discarded – undo
350	350	*
351	351	* @param IQueryBuilder $qb
352	352	*/
353		- protected function leftJoinShareInitiator(IQueryBuilder &$qb) {
	353	+ protected function leftJoinShareInitiator(IQueryBuilder & $qb) {
354	354	$expr = $qb->expr();
355	355
356	356	$qb->selectAlias('src_m.level', 'initiator_circle_level');
		@@ -386,7 +386,7 @@ discard block
		block discarded – undo
386	386	*
387	387	* @param IQueryBuilder $qb
388	388	*/
389		- protected function joinCircleMembers(IQueryBuilder &$qb) {
	389	+ protected function joinCircleMembers(IQueryBuilder & $qb) {
390	390	$expr = $qb->expr();
391	391
392	392	/** @noinspection PhpMethodParametersCountMismatchInspection */
		@@ -407,7 +407,7 @@ discard block
		block discarded – undo
407	407	* @param IQueryBuilder $qb
408	408	* @param string $userId
409	409	*/
410		- protected function linkToFileCache(IQueryBuilder &$qb, $userId) {
	410	+ protected function linkToFileCache(IQueryBuilder & $qb, $userId) {
411	411	$expr = $qb->expr();
412	412
413	413	/** @noinspection PhpMethodParametersCountMismatchInspection */
		@@ -523,7 +523,7 @@ discard block
		block discarded – undo
523	523	/**
524	524	* @param IQueryBuilder $qb
525	525	*/
526		- private function joinShare(IQueryBuilder &$qb) {
	526	+ private function joinShare(IQueryBuilder & $qb) {
527	527	$expr = $qb->expr();
528	528
529	529	/** @noinspection PhpMethodParametersCountMismatchInspection */

		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	* @param IQueryBuilder $qb
72	72	* @param int $id
73	73	*/
74		- protected function limitToId(IQueryBuilder &$qb, $id) {
	74	+ protected function limitToId(IQueryBuilder & $qb, $id) {
75	75	$this->limitToDBField($qb, 'id', $id);
76	76	}
77	77
		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82	* @param IQueryBuilder $qb
83	83	* @param int $uniqueId
84	84	*/
85		- protected function limitToUniqueId(IQueryBuilder &$qb, $uniqueId) {
	85	+ protected function limitToUniqueId(IQueryBuilder & $qb, $uniqueId) {
86	86	$this->limitToDBField($qb, 'unique_id', $uniqueId);
87	87	}
88	88
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	* @param IQueryBuilder $qb
94	94	* @param string $token
95	95	*/
96		- protected function limitToToken(IQueryBuilder &$qb, $token) {
	96	+ protected function limitToToken(IQueryBuilder & $qb, $token) {
97	97	$this->limitToDBField($qb, 'token', $token);
98	98	}
99	99
		@@ -106,7 +106,7 @@ discard block
		block discarded – undo
106	106	*
107	107	* @internal param int $circleId
108	108	*/
109		- protected function limitToUserId(IQueryBuilder &$qb, $userId) {
	109	+ protected function limitToUserId(IQueryBuilder & $qb, $userId) {
110	110	$this->limitToDBField($qb, 'user_id', $userId);
111	111	}
112	112
		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120	*
121	121	* @internal param int $circleId
122	122	*/
123		- protected function limitToUserType(IQueryBuilder &$qb, $type) {
	123	+ protected function limitToUserType(IQueryBuilder & $qb, $type) {
124	124	$this->limitToDBField($qb, 'user_type', $type);
125	125	}
126	126
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	* @param IQueryBuilder $qb
133	133	* @param string $circleUniqueId
134	134	*/
135		- protected function limitToCircleId(IQueryBuilder &$qb, $circleUniqueId) {
	135	+ protected function limitToCircleId(IQueryBuilder & $qb, $circleUniqueId) {
136	136	$this->limitToDBField($qb, 'circle_id', $circleUniqueId);
137	137	}
138	138
		@@ -143,15 +143,15 @@ discard block
		block discarded – undo
143	143	* @param IQueryBuilder $qb
144	144	* @param string $circleUniqueId
145	145	*/
146		- protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId) {
	146	+ protected function limitToShortenUniqueId(IQueryBuilder & $qb, $circleUniqueId) {
147	147	$expr = $qb->expr();
148		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`' . $this->default_select_alias . '`.' : '';
	148	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`'.$this->default_select_alias.'`.' : '';
149	149
150	150	$qb->andWhere(
151	151	$expr->eq(
152	152	$qb->createNamedParameter($circleUniqueId),
153	153	$qb->createFunction(
154		- 'SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
	154	+ 'SUBSTR('.$pf.'`unique_id`'.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
155	155	)
156	156	)
157	157	);
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	* @param IQueryBuilder $qb
166	166	* @param int $groupId
167	167	*/
168		- protected function limitToGroupId(IQueryBuilder &$qb, $groupId) {
	168	+ protected function limitToGroupId(IQueryBuilder & $qb, $groupId) {
169	169	$this->limitToDBField($qb, 'group_id', $groupId);
170	170	}
171	171
		@@ -176,7 +176,7 @@ discard block
		block discarded – undo
176	176	* @param IQueryBuilder $qb
177	177	* @param string $name
178	178	*/
179		- protected function limitToName(IQueryBuilder &$qb, $name) {
	179	+ protected function limitToName(IQueryBuilder & $qb, $name) {
180	180	$this->limitToDBField($qb, 'name', $name);
181	181	}
182	182
		@@ -188,12 +188,12 @@ discard block
		block discarded – undo
188	188	* @param int $level
189	189	* @param string\|array $pf
190	190	*/
191		- protected function limitToLevel(IQueryBuilder &$qb, $level, $pf = '') {
	191	+ protected function limitToLevel(IQueryBuilder & $qb, $level, $pf = '') {
192	192	$expr = $qb->expr();
193	193
194	194	if ($pf === '') {
195		- $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
196		- $qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
	195	+ $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
	196	+ $qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
197	197
198	198	return;
199	199	}
		@@ -208,7 +208,7 @@ discard block
		block discarded – undo
208	208	if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
209	209	continue;
210	210	}
211		- $orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
	211	+ $orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
212	212	}
213	213
214	214	$qb->andWhere($orX);
		@@ -220,15 +220,15 @@ discard block
		block discarded – undo
220	220	*
221	221	* @param IQueryBuilder $qb
222	222	*/
223		- protected function limitToMembersAndAlmost(IQueryBuilder &$qb) {
	223	+ protected function limitToMembersAndAlmost(IQueryBuilder & $qb) {
224	224	$expr = $qb->expr();
225	225
226		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	226	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
227	227
228	228	$orX = $expr->orX();
229		- $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
230		- $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
231		- $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
	229	+ $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
	230	+ $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
	231	+ $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
232	232
233	233	$qb->andWhere($orX);
234	234	}
		@@ -239,10 +239,10 @@ discard block
		block discarded – undo
239	239	* @param string $field
240	240	* @param string\|integer $value
241	241	*/
242		- private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
	242	+ private function limitToDBField(IQueryBuilder & $qb, $field, $value) {
243	243	$expr = $qb->expr();
244		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
245		- $qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
	244	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
	245	+ $qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
246	246	}
247	247
248	248
		@@ -257,9 +257,9 @@ discard block
		block discarded – undo
257	257	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
258	258	$expr = $qb->expr();
259	259
260		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	260	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
261	261
262		- $and = $expr->andX($expr->eq($pf . 'group_id', 'ncgu.gid'));
	262	+ $and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid'));
263	263	if ($userId !== '') {
264	264	$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
265	265	} else {
		@@ -278,15 +278,15 @@ discard block
		block discarded – undo
278	278	*
279	279	* @deprecated not used (14/07/17)
280	280	*/
281		- protected function rightJoinCircles(IQueryBuilder &$qb) {
	281	+ protected function rightJoinCircles(IQueryBuilder & $qb) {
282	282	$expr = $qb->expr();
283		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	283	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
284	284
285	285	$qb->from(self::TABLE_CIRCLES, 'c')
286	286	->andWhere(
287	287	$expr->eq(
288		- $pf . 'circle_id',
289		- $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
	288	+ $pf.'circle_id',
	289	+ $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
290	290	)
291	291	);
292	292	}
		@@ -317,7 +317,7 @@ discard block
		block discarded – undo
317	317	$expr->eq('ncgu.gid', 'g.group_id'),
318	318	$expr->eq(
319	319	'g.circle_id', $qb->createFunction(
320		- 'SUBSTR(' . $field . ', 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
	320	+ 'SUBSTR('.$field.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
321	321	)
322	322	)
323	323	)

nextcloud / circles

Push — master ( 5e570b...9fa777 )

Status

Category

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch