Inspection of "cleaning code" - nextcloud/circles - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 853863...462815 )

by Maxence

created 2017-08-29 06:54 UTC

Status

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);
 	}
 
@@ -119,7 +119,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);
 	}
 
@@ -130,7 +130,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);
 	}
 
@@ -141,15 +141,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.')'
 				)
 			)
 		);
@@ -163,7 +163,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);
 	}
 
@@ -174,7 +174,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;
 		}
@@ -221,7 +221,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)));
 		}
 
 		return $orX;
@@ -233,15 +233,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);
 	}
@@ -252,10 +252,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)));
 	}
 
 
@@ -270,9 +270,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 {
@@ -291,16 +291,16 @@  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',
+				   $pf.'circle_id',
 				   $qb->createFunction(
-					   'SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					   'SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				   )
 			   )
 		   );
@@ -332,7 +332,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.

		@@ -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
		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119	*
120	120	* @internal param int $circleId
121	121	*/
122		- protected function limitToUserType(IQueryBuilder &$qb, $type) {
	122	+ protected function limitToUserType(IQueryBuilder & $qb, $type) {
123	123	$this->limitToDBField($qb, 'user_type', $type);
124	124	}
125	125
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	* @param IQueryBuilder $qb
131	131	* @param string $circleUniqueId
132	132	*/
133		- protected function limitToCircleId(IQueryBuilder &$qb, $circleUniqueId) {
	133	+ protected function limitToCircleId(IQueryBuilder & $qb, $circleUniqueId) {
134	134	$this->limitToDBField($qb, 'circle_id', $circleUniqueId);
135	135	}
136	136
		@@ -141,15 +141,15 @@ discard block
		block discarded – undo
141	141	* @param IQueryBuilder $qb
142	142	* @param string $circleUniqueId
143	143	*/
144		- protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId) {
	144	+ protected function limitToShortenUniqueId(IQueryBuilder & $qb, $circleUniqueId) {
145	145	$expr = $qb->expr();
146		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`' . $this->default_select_alias . '`.' : '';
	146	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`'.$this->default_select_alias.'`.' : '';
147	147
148	148	$qb->andWhere(
149	149	$expr->eq(
150	150	$qb->createNamedParameter($circleUniqueId),
151	151	$qb->createFunction(
152		- 'SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
	152	+ 'SUBSTR('.$pf.'`unique_id`'.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
153	153	)
154	154	)
155	155	);
		@@ -163,7 +163,7 @@ discard block
		block discarded – undo
163	163	* @param IQueryBuilder $qb
164	164	* @param int $groupId
165	165	*/
166		- protected function limitToGroupId(IQueryBuilder &$qb, $groupId) {
	166	+ protected function limitToGroupId(IQueryBuilder & $qb, $groupId) {
167	167	$this->limitToDBField($qb, 'group_id', $groupId);
168	168	}
169	169
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	* @param IQueryBuilder $qb
175	175	* @param string $name
176	176	*/
177		- protected function limitToName(IQueryBuilder &$qb, $name) {
	177	+ protected function limitToName(IQueryBuilder & $qb, $name) {
178	178	$this->limitToDBField($qb, 'name', $name);
179	179	}
180	180
		@@ -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	}
		@@ -221,7 +221,7 @@ discard block
		block discarded – undo
221	221	if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
222	222	continue;
223	223	}
224		- $orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
	224	+ $orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
225	225	}
226	226
227	227	return $orX;
		@@ -233,15 +233,15 @@ discard block
		block discarded – undo
233	233	*
234	234	* @param IQueryBuilder $qb
235	235	*/
236		- protected function limitToMembersAndAlmost(IQueryBuilder &$qb) {
	236	+ protected function limitToMembersAndAlmost(IQueryBuilder & $qb) {
237	237	$expr = $qb->expr();
238	238
239		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	239	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
240	240
241	241	$orX = $expr->orX();
242		- $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
243		- $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
244		- $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
	242	+ $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
	243	+ $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
	244	+ $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
245	245
246	246	$qb->andWhere($orX);
247	247	}
		@@ -252,10 +252,10 @@ discard block
		block discarded – undo
252	252	* @param string $field
253	253	* @param string\|integer $value
254	254	*/
255		- private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
	255	+ private function limitToDBField(IQueryBuilder & $qb, $field, $value) {
256	256	$expr = $qb->expr();
257		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
258		- $qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
	257	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
	258	+ $qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
259	259	}
260	260
261	261
		@@ -270,9 +270,9 @@ discard block
		block discarded – undo
270	270	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
271	271	$expr = $qb->expr();
272	272
273		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	273	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
274	274
275		- $and = $expr->andX($expr->eq($pf . 'group_id', 'ncgu.gid'));
	275	+ $and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid'));
276	276	if ($userId !== '') {
277	277	$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
278	278	} else {
		@@ -291,16 +291,16 @@ discard block
		block discarded – undo
291	291	*
292	292	* @deprecated not used (14/07/17)
293	293	*/
294		- protected function rightJoinCircles(IQueryBuilder &$qb) {
	294	+ protected function rightJoinCircles(IQueryBuilder & $qb) {
295	295	$expr = $qb->expr();
296		- $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
	296	+ $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
297	297
298	298	$qb->from(self::TABLE_CIRCLES, 'c')
299	299	->andWhere(
300	300	$expr->eq(
301		- $pf . 'circle_id',
	301	+ $pf.'circle_id',
302	302	$qb->createFunction(
303		- 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
	303	+ 'SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
304	304	)
305	305	)
306	306	);
		@@ -332,7 +332,7 @@ discard block
		block discarded – undo
332	332	$expr->eq('ncgu.gid', 'g.group_id'),
333	333	$expr->eq(
334	334	'g.circle_id', $qb->createFunction(
335		- 'SUBSTR(' . $field . ', 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
	335	+ 'SUBSTR('.$field.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
336	336	)
337	337	)
338	338	)

nextcloud / circles

Push — master ( 853863...462815 )

Status

Category

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