Inspection of "Merge pull request #317 from netzbegruenung/bugfix..." - nextcloud/circles - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 486cd9...8ab03e )

by Maxence

created 2019-07-24 12:35 UTC

Status

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

@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'share_with',
+				$pf.'share_with',
 				$qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY)
 			)
 		);
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 		$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)));
 	}
 
 
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
 		/** @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))
 			)
 		);
 	}
@@ -165,7 +165,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)
 			)
 		);
@@ -198,13 +198,13 @@  discard block
 block discarded – undo
 		$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))
 				)
 			);
 		}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
 
 		$tmpOrX = $expr->eq(
 			's.share_with',
-			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
+			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
 		);
 
 		if ($shareId === -1) {
@@ -257,7 +257,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::SHORT_UNIQUE_ID_LENGTH . ')')
+        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
 			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
 		)
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
 		return $qb->expr()->andX(
 			$expr->in(
 				$qb->createFunction(
-					'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+					'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 				),
 				$qb->createFunction($subQb->getSQL())
 			)
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
 		return $qb->expr()->andX(
 			$expr->in(
 				$qb->createFunction(
-					'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+					'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 				),
 				$qb->createFunction($subQb->getSQL())
 			)

Please login to merge, or discard this patch.

		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
77	77	$qb->andWhere(
78	78	$expr->in(
79		- $pf . 'share_with',
	79	+ $pf.'share_with',
80	80	$qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY)
81	81	)
82	82	);
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	$expr = $qb->expr();
94	94	$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
95	95
96		- $qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
	96	+ $qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
97	97	}
98	98
99	99
		@@ -142,8 +142,8 @@ discard block
		block discarded – undo
142	142	/** @noinspection PhpMethodParametersCountMismatchInspection */
143	143	$qb->andWhere(
144	144	$expr->orX(
145		- $expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
146		- $expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
	145	+ $expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
	146	+ $expr->eq($pf.'id', $qb->createNamedParameter($circleId))
147	147	)
148	148	);
149	149	}
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
166	166	$qb->andWhere(
167	167	$expr->in(
168		- $pf . 'file_source',
	168	+ $pf.'file_source',
169	169	$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
170	170	)
171	171	);
		@@ -198,13 +198,13 @@ discard block
		block discarded – undo
198	198	$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
199	199
200	200	if ($reShares === false) {
201		- $qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
	201	+ $qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
202	202	} else {
203	203	/** @noinspection PhpMethodParametersCountMismatchInspection */
204	204	$qb->andWhere(
205	205	$expr->orX(
206		- $expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
207		- $expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
	206	+ $expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
	207	+ $expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
208	208	)
209	209	);
210	210	}
		@@ -226,7 +226,7 @@ discard block
		block discarded – undo
226	226
227	227	$tmpOrX = $expr->eq(
228	228	's.share_with',
229		- $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
	229	+ $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
230	230	);
231	231
232	232	if ($shareId === -1) {
		@@ -257,7 +257,7 @@ discard block
		block discarded – undo
257	257	'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
258	258	$expr->eq(
259	259	'mo.circle_id',
260		- $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
	260	+ $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
261	261	), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
262	262	$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
263	263	)
		@@ -313,7 +313,7 @@ discard block
		block discarded – undo
313	313	return $qb->expr()->andX(
314	314	$expr->in(
315	315	$qb->createFunction(
316		- 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
	316	+ 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
317	317	),
318	318	$qb->createFunction($subQb->getSQL())
319	319	)
		@@ -351,7 +351,7 @@ discard block
		block discarded – undo
351	351	return $qb->expr()->andX(
352	352	$expr->in(
353	353	$qb->createFunction(
354		- 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
	354	+ 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
355	355	),
356	356	$qb->createFunction($subQb->getSQL())
357	357	)

nextcloud / circles

Push — master ( 486cd9...8ab03e )

Status

Category

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