Completed
Pull Request — master (#2108)
by Maxence
32s
created
lib/Command/MembersAdd.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 		} catch (FederatedItemException $e) {
110 110
 			if ($input->getOption('status-code')) {
111 111
 				throw new FederatedItemException(
112
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
112
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
113 113
 				);
114 114
 			}
115 115
 
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
148 148
 		try {
149 149
 			$users = $this->retrieveJson($request);
150 150
 		} catch (
151
-			RequestContentException|
152
-			RequestNetworkException|
153
-			RequestResultSizeException|
154
-			RequestServerException|
151
+			RequestContentException |
152
+			RequestNetworkException |
153
+			RequestResultSizeException |
154
+			RequestServerException |
155 155
 			RequestResultNotJsonException $e
156 156
 		) {
157 157
 			return '';
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 				$instance = $host;
170 170
 			}
171 171
 
172
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
172
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
173 173
 		}
174 174
 
175 175
 		//		if ($userId === '') {
Please login to merge, or discard this patch.
lib/Command/CirclesJoin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Command/CirclesLeave.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Command/CirclesSetting.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Command/CirclesEdit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Command/MembersLevel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Command/CirclesDestroy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Db/DeprecatedRequestBuilder.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -344,8 +344,8 @@  discard block
 block discarded – undo
344 344
 		$expr = $qb->expr();
345 345
 
346 346
 		if ($pf === '') {
347
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
348
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
347
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
348
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
349 349
 
350 350
 			return;
351 351
 		}
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
375 375
 				continue;
376 376
 			}
377
-			$orX[] = $expr->gte($p . '.level', $qb->createNamedParameter($level));
377
+			$orX[] = $expr->gte($p.'.level', $qb->createNamedParameter($level));
378 378
 		}
379 379
 
380 380
 		return $expr->orX(...$orX);
@@ -389,12 +389,12 @@  discard block
 block discarded – undo
389 389
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
390 390
 		$expr = $qb->expr();
391 391
 
392
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
392
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
393 393
 
394 394
 		$qb->andWhere($expr->orX(
395
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)),
396
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)),
397
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)),
395
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)),
396
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)),
397
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)),
398 398
 		));
399 399
 	}
400 400
 
@@ -406,8 +406,8 @@  discard block
 block discarded – undo
406 406
 	 */
407 407
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
408 408
 		$expr = $qb->expr();
409
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
410
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
409
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
410
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
411 411
 	}
412 412
 
413 413
 
@@ -418,8 +418,8 @@  discard block
 block discarded – undo
418 418
 	 */
419 419
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
420 420
 		$expr = $qb->expr();
421
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
422
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
421
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
422
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
423 423
 	}
424 424
 
425 425
 
@@ -434,9 +434,9 @@  discard block
 block discarded – undo
434 434
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
435 435
 		$expr = $qb->expr();
436 436
 
437
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
437
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
438 438
 
439
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
439
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
440 440
 		if ($userId !== '') {
441 441
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
442 442
 		} else {
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 		}
460 460
 
461 461
 		$expr = $qb->expr();
462
-		$pf = $this->default_select_alias . '.';
462
+		$pf = $this->default_select_alias.'.';
463 463
 
464 464
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
465 465
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 			->selectAlias('lc.settings', 'circle_settings')
469 469
 			->leftJoin(
470 470
 				$this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
471
-				$expr->eq($pf . 'circle_id', 'lc.unique_id')
471
+				$expr->eq($pf.'circle_id', 'lc.unique_id')
472 472
 			);
473 473
 	}
474 474
 
Please login to merge, or discard this patch.
lib/Db/RemoteRequest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -173,10 +173,10 @@  discard block
 block discarded – undo
173 173
 			$qb->leftJoin(
174 174
 				CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember,
175 175
 				$expr->andX(
176
-					$expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())),
177
-					$expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'),
176
+					$expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())),
177
+					$expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'),
178 178
 					$expr->gte(
179
-						$aliasMember . '.level',
179
+						$aliasMember.'.level',
180 180
 						$qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT)
181 181
 					)
182 182
 				)
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 
185 185
 			$orX[] = $expr->andX(
186 186
 				$qb->exprLimit('type', RemoteInstance::TYPE_EXTERNAL, '', false),
187
-				$expr->isNotNull($aliasMember . '.instance'),
187
+				$expr->isNotNull($aliasMember.'.instance'),
188 188
 			);
189 189
 		}
190 190
 
Please login to merge, or discard this patch.