Inspection of "Merge remote-tracking branch 'origin/master'" - nextcloud/circles - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 09c821...4990c6 )

by Maxence

created 2017-07-31 04:44 UTC

Status

Spacing +29 added lines, -29 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);
 	}
 
@@ -117,7 +117,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);
 
 	}
@@ -129,15 +129,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(
-					'LEFT(' . $pf . 'unique_id' . ', ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'LEFT('.$pf.'unique_id'.', '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 			)
 		);
@@ -151,7 +151,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);
 	}
 
@@ -162,7 +162,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);
 	}
 
@@ -174,12 +174,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;
 		}
@@ -194,7 +194,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);
@@ -206,15 +206,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);
 	}
@@ -225,10 +225,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)));
 	}
 
 
@@ -243,9 +243,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 {
@@ -264,15 +264,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('LEFT(c.unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+				   $pf.'circle_id',
+				   $qb->createFunction('LEFT(c.unique_id, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 			   )
 		   );
 	}
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
 				$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.')'
 				)
 				)
 			)

Please login to merge, or discard this patch.

		@@ -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
		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117	* @param IQueryBuilder $qb
118	118	* @param string $circleUniqueId
119	119	*/
120		- protected function limitToCircleId(IQueryBuilder &$qb, $circleUniqueId) {
	120	+ protected function limitToCircleId(IQueryBuilder & $qb, $circleUniqueId) {
121	121	$this->limitToDBField($qb, 'circle_id', $circleUniqueId);
122	122
123	123	}
		@@ -129,15 +129,15 @@ discard block
		block discarded – undo
129	129	* @param IQueryBuilder $qb
130	130	* @param string $circleUniqueId
131	131	*/
132		- protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId) {
	132	+ protected function limitToShortenUniqueId(IQueryBuilder & $qb, $circleUniqueId) {
133	133	$expr = $qb->expr();
134		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	134	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
135	135
136	136	$qb->andWhere(
137	137	$expr->eq(
138	138	$qb->createNamedParameter($circleUniqueId),
139	139	$qb->createFunction(
140		- 'LEFT(' . $pf . 'unique_id' . ', ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
	140	+ 'LEFT('.$pf.'unique_id'.', '.Circle::UNIQUEID_SHORT_LENGTH.')'
141	141	)
142	142	)
143	143	);
		@@ -151,7 +151,7 @@ discard block
		block discarded – undo
151	151	* @param IQueryBuilder $qb
152	152	* @param int $groupId
153	153	*/
154		- protected function limitToGroupId(IQueryBuilder &$qb, $groupId) {
	154	+ protected function limitToGroupId(IQueryBuilder & $qb, $groupId) {
155	155	$this->limitToDBField($qb, 'group_id', $groupId);
156	156	}
157	157
		@@ -162,7 +162,7 @@ discard block
		block discarded – undo
162	162	* @param IQueryBuilder $qb
163	163	* @param string $name
164	164	*/
165		- protected function limitToName(IQueryBuilder &$qb, $name) {
	165	+ protected function limitToName(IQueryBuilder & $qb, $name) {
166	166	$this->limitToDBField($qb, 'name', $name);
167	167	}
168	168
		@@ -174,12 +174,12 @@ discard block
		block discarded – undo
174	174	* @param int $level
175	175	* @param string\|array $pf
176	176	*/
177		- protected function limitToLevel(IQueryBuilder &$qb, $level, $pf = '') {
	177	+ protected function limitToLevel(IQueryBuilder & $qb, $level, $pf = '') {
178	178	$expr = $qb->expr();
179	179
180	180	if ($pf === '') {
181		- $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
182		- $qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
	181	+ $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
	182	+ $qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
183	183
184	184	return;
185	185	}
		@@ -194,7 +194,7 @@ discard block
		block discarded – undo
194	194	if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
195	195	continue;
196	196	}
197		- $orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
	197	+ $orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
198	198	}
199	199
200	200	$qb->andWhere($orX);
		@@ -206,15 +206,15 @@ discard block
		block discarded – undo
206	206	*
207	207	* @param IQueryBuilder $qb
208	208	*/
209		- protected function limitToMembersAndAlmost(IQueryBuilder &$qb) {
	209	+ protected function limitToMembersAndAlmost(IQueryBuilder & $qb) {
210	210	$expr = $qb->expr();
211	211
212		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	212	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
213	213
214	214	$orX = $expr->orX();
215		- $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
216		- $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
217		- $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
	215	+ $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
	216	+ $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
	217	+ $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
218	218
219	219	$qb->andWhere($orX);
220	220	}
		@@ -225,10 +225,10 @@ discard block
		block discarded – undo
225	225	* @param string $field
226	226	* @param string\|integer $value
227	227	*/
228		- private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
	228	+ private function limitToDBField(IQueryBuilder & $qb, $field, $value) {
229	229	$expr = $qb->expr();
230		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
231		- $qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
	230	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
	231	+ $qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
232	232	}
233	233
234	234
		@@ -243,9 +243,9 @@ discard block
		block discarded – undo
243	243	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
244	244	$expr = $qb->expr();
245	245
246		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	246	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
247	247
248		- $and = $expr->andX($expr->eq($pf . 'group_id', 'ncgu.gid'));
	248	+ $and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid'));
249	249	if ($userId !== '') {
250	250	$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
251	251	} else {
		@@ -264,15 +264,15 @@ discard block
		block discarded – undo
264	264	*
265	265	* @deprecated not used (14/07/17)
266	266	*/
267		- protected function rightJoinCircles(IQueryBuilder &$qb) {
	267	+ protected function rightJoinCircles(IQueryBuilder & $qb) {
268	268	$expr = $qb->expr();
269		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	269	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
270	270
271	271	$qb->from(self::TABLE_CIRCLES, 'c')
272	272	->andWhere(
273	273	$expr->eq(
274		- $pf . 'circle_id',
275		- $qb->createFunction('LEFT(c.unique_id, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
	274	+ $pf.'circle_id',
	275	+ $qb->createFunction('LEFT(c.unique_id, '.Circle::UNIQUEID_SHORT_LENGTH.')')
276	276	)
277	277	);
278	278	}
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303	$expr->eq('ncgu.gid', 'g.group_id'),
304	304	$expr->eq(
305	305	'g.circle_id', $qb->createFunction(
306		- 'LEFT(' . $field . ', ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
	306	+ 'LEFT('.$field.', '.Circle::UNIQUEID_SHORT_LENGTH.')'
307	307	)
308	308	)
309	309	)

nextcloud / circles

Push — master ( 09c821...4990c6 )

Status

Category

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