Completed
Pull Request — master (#2056)
by
unknown
29s
created
lib/Search/GlobalScaleUsers.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
 			RequestResultNotJsonException $e
92 92
 		) {
93 93
 			$this->miscService->log(
94
-				'Issue while search users from lookup: ' . get_class($e) . ' ' . $e->getMessage()
94
+				'Issue while search users from lookup: '.get_class($e).' '.$e->getMessage()
95 95
 			);
96 96
 
97 97
 			return [];
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
@@ -346,8 +346,8 @@  discard block
 block discarded – undo
346 346
 		$expr = $qb->expr();
347 347
 
348 348
 		if ($pf === '') {
349
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
350
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
349
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
350
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
351 351
 
352 352
 			return;
353 353
 		}
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
377 377
 				continue;
378 378
 			}
379
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
379
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
380 380
 		}
381 381
 
382 382
 		return $orX;
@@ -391,12 +391,12 @@  discard block
 block discarded – undo
391 391
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
392 392
 		$expr = $qb->expr();
393 393
 
394
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
394
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
395 395
 
396 396
 		$orX = $expr->orX();
397
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
398
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
399
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
397
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
398
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
399
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
400 400
 
401 401
 		$qb->andWhere($orX);
402 402
 	}
@@ -409,8 +409,8 @@  discard block
 block discarded – undo
409 409
 	 */
410 410
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
411 411
 		$expr = $qb->expr();
412
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
413
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
412
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
413
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
414 414
 	}
415 415
 
416 416
 
@@ -421,8 +421,8 @@  discard block
 block discarded – undo
421 421
 	 */
422 422
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
423 423
 		$expr = $qb->expr();
424
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
425
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
424
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
425
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
426 426
 	}
427 427
 
428 428
 
@@ -437,9 +437,9 @@  discard block
 block discarded – undo
437 437
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
438 438
 		$expr = $qb->expr();
439 439
 
440
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
440
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
441 441
 
442
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
442
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
443 443
 		if ($userId !== '') {
444 444
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
445 445
 		} else {
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
 		}
463 463
 
464 464
 		$expr = $qb->expr();
465
-		$pf = $this->default_select_alias . '.';
465
+		$pf = $this->default_select_alias.'.';
466 466
 
467 467
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
468 468
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
 		   ->selectAlias('lc.settings', 'circle_settings')
472 472
 		   ->leftJoin(
473 473
 		   	$this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
474
-		   	$expr->eq($pf . 'circle_id', 'lc.unique_id')
474
+		   	$expr->eq($pf.'circle_id', 'lc.unique_id')
475 475
 		   );
476 476
 	}
477 477
 
Please login to merge, or discard this patch.
lib/Command/MembersList.php 1 patch
Spacing   +14 added lines, -15 removed lines patch added patch discarded remove patch
@@ -187,11 +187,11 @@  discard block
 block discarded – undo
187 187
 			$this->federatedUserService->commandLineInitiator($initiator, $initiatorType, $circleId, true);
188 188
 			$circle = $this->circleService->getCircle($circleId);
189 189
 
190
-			$output->writeln('<info>Name</info>: ' . $circle->getName());
190
+			$output->writeln('<info>Name</info>: '.$circle->getName());
191 191
 			$owner = $circle->getOwner();
192
-			$output->writeln('<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance());
192
+			$output->writeln('<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance());
193 193
 			$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
194
-			$output->writeln('<info>Config</info>: ' . $type);
194
+			$output->writeln('<info>Config</info>: '.$type);
195 195
 			$output->writeln(' ');
196 196
 
197 197
 			$tree = new TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -256,8 +256,7 @@  discard block
 block discarded – undo
256 256
 						$member,
257 257
 						$this->input->getOption('display-name')
258 258
 					),
259
-					($level > 0) ? Member::$DEF_LEVEL[$level] :
260
-						'(' . strtolower($member->getStatus()) . ')',
259
+					($level > 0) ? Member::$DEF_LEVEL[$level] : '('.strtolower($member->getStatus()).')',
261 260
 					($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
262 261
 						$member->getInvitedBy(),
263 262
 						$this->input->getOption('display-name')
@@ -423,14 +422,14 @@  discard block
 block discarded – undo
423 422
 				$member = $data->gObj('member', Member::class);
424 423
 
425 424
 				if ($lineNumber === 1) {
426
-					$line .= '<info>' . $member->getSingleId() . '</info>';
425
+					$line .= '<info>'.$member->getSingleId().'</info>';
427 426
 					if (!$this->configService->isLocalInstance($member->getInstance())) {
428
-						$line .= '@' . $member->getInstance();
427
+						$line .= '@'.$member->getInstance();
429 428
 					}
430
-					$line .= ' (' . Member::$DEF_LEVEL[$member->getLevel()] . ')';
429
+					$line .= ' ('.Member::$DEF_LEVEL[$member->getLevel()].')';
431 430
 
432
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
433
-					$line .= ' <info>Name</info>: ' . $this->configService->displayFederatedUser(
431
+					$line .= ' <info>MemberId</info>: '.$member->getId();
432
+					$line .= ' <info>Name</info>: '.$this->configService->displayFederatedUser(
434 433
 						$member,
435 434
 						$this->input->getOption('display-name')
436 435
 					);
@@ -438,7 +437,7 @@  discard block
 block discarded – undo
438 437
 						$line .= ' <info>Source</info>: '
439 438
 								 . Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()];
440 439
 					} else {
441
-						$line .= ' <info>Type</info>: ' . Member::$TYPE[$member->getUserType()];
440
+						$line .= ' <info>Type</info>: '.Member::$TYPE[$member->getUserType()];
442 441
 					}
443 442
 				}
444 443
 
@@ -451,15 +450,15 @@  discard block
 block discarded – undo
451 450
 						return $line;
452 451
 					}
453 452
 					$owner = $circle->getOwner();
454
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
453
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
455 454
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
456
-					$line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type;
455
+					$line .= ($type === '') ? '' : ' <info>Config</info>: '.$type;
457 456
 				}
458 457
 			} else {
459 458
 				if ($lineNumber === 1 && !is_null($circle)) {
460
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
459
+					$line .= '<info>'.$circle->getSingleId().'</info>';
461 460
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
462
-						$line .= '@' . $circle->getInstance();
461
+						$line .= '@'.$circle->getInstance();
463 462
 					}
464 463
 				}
465 464
 			}
Please login to merge, or discard this patch.
lib/Db/ShareWrapperRequest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 		if ($shallow) {
383 383
 			$qb->limitInt('parent', $node->getId(), $aliasFileCache);
384 384
 		} else {
385
-			$qb->like('path', $node->getInternalPath() . '/%', $aliasFileCache);
385
+			$qb->like('path', $node->getInternalPath().'/%', $aliasFileCache);
386 386
 		}
387 387
 		$qb->limitNull('parent', false);
388 388
 
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 		}
443 443
 
444 444
 		$ids = array_map(
445
-			function (ShareWrapper $share): string {
445
+			function(ShareWrapper $share): string {
446 446
 				return $share->getId();
447 447
 			},
448 448
 			$this->getItemsFromRequest($qb)
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
 		$expr = $qb->expr();
458 458
 		$qb->leftJoin(
459 459
 			CoreQueryBuilder::SHARE, CoreRequestBuilder::TABLE_SHARE, 'p',
460
-			$expr->andX($expr->eq('p.id', CoreQueryBuilder::SHARE . '.parent'))
460
+			$expr->andX($expr->eq('p.id', CoreQueryBuilder::SHARE.'.parent'))
461 461
 		);
462 462
 
463 463
 		$qb->filterNull('parent');
Please login to merge, or discard this patch.
lib/Service/CircleService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 
581 581
 		$i = 1;
582 582
 		while (true) {
583
-			$testDisplayName = $baseDisplayName . (($i > 1) ? ' (' . $i . ')' : '');
583
+			$testDisplayName = $baseDisplayName.(($i > 1) ? ' ('.$i.')' : '');
584 584
 			$test = new Circle();
585 585
 			$test->setDisplayName($testDisplayName);
586 586
 
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
 
614 614
 		$i = 1;
615 615
 		while (true) {
616
-			$testSanitizedName = $baseSanitizedName . (($i > 1) ? ' (' . $i . ')' : '');
616
+			$testSanitizedName = $baseSanitizedName.(($i > 1) ? ' ('.$i.')' : '');
617 617
 
618 618
 			$test = new Circle();
619 619
 			$test->setSanitizedName($testSanitizedName);
@@ -755,7 +755,7 @@  discard block
 block discarded – undo
755 755
 
756 756
 
757 757
 	private function generateGetCirclesCacheKey(FederatedUser $federatedUser, string $probeSum): string {
758
-		return $federatedUser->getSingleId() . '#' . $probeSum;
758
+		return $federatedUser->getSingleId().'#'.$probeSum;
759 759
 	}
760 760
 
761 761
 
Please login to merge, or discard this patch.
lib/Listeners/Files/RemovingMember.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 		$singleIds = array_merge(
99 99
 			[$circle->getSingleId()],
100 100
 			array_map(
101
-				function (Membership $membership) {
101
+				function(Membership $membership) {
102 102
 					return $membership->getCircleId();
103 103
 				}, $circle->getMemberships()
104 104
 			)
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 			try {
153 153
 				$this->shareWrapperService->deleteUserSharesToCircle($singleId, $member->getUserId());
154 154
 			} catch (\Exception $e) {
155
-				$this->logger->notice('issue while deleting user shares: ' . $e->getMessage());
155
+				$this->logger->notice('issue while deleting user shares: '.$e->getMessage());
156 156
 			}
157 157
 		}
158 158
 	}
Please login to merge, or discard this patch.
lib/Db/EventWrapperRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 				$qb->exprLimitInt('status', EventWrapper::STATUS_FAILED),
106 106
 				$expr->andX(
107 107
 					$qb->exprLimitInt('status', EventWrapper::STATUS_INIT),
108
-					$qb->exprGt('creation', time() - 86400),  // only freshly created; less than 3 hours
108
+					$qb->exprGt('creation', time() - 86400), // only freshly created; less than 3 hours
109 109
 					$qb->exprLt('creation', time() - 900)     // but not too fresh, at least 15 minutes
110 110
 				)
111 111
 			)
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 			return $value;
245 245
 		}
246 246
 
247
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
247
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
248 248
 			return $value;
249 249
 		}
250 250
 
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
 	 */
499 499
 	public function getTrustedDomains(): array {
500 500
 		return array_map(
501
-			function (string $address) {
501
+			function(string $address) {
502 502
 				return strtolower($address);
503 503
 			}, $this->config->getSystemValue('trusted_domains', [])
504 504
 		);
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 		}
535 535
 
536 536
 		if (array_key_exists('port', $loopback)) {
537
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
537
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
538 538
 		} else {
539 539
 			$loopbackCloudId = $loopback['host'];
540 540
 		}
@@ -573,13 +573,13 @@  discard block
 block discarded – undo
573 573
 			$path = $this->getAppValue(self::LOOPBACK_CLOUD_PATH);
574 574
 		}
575 575
 
576
-		$base = $scheme . '://' . $instance . $path;
576
+		$base = $scheme.'://'.$instance.$path;
577 577
 
578 578
 		if ($route === '') {
579 579
 			return $base;
580 580
 		}
581 581
 
582
-		return rtrim($base, '/') . $this->linkToRoute($route, $args);
582
+		return rtrim($base, '/').$this->linkToRoute($route, $args);
583 583
 	}
584 584
 
585 585
 
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 	): string {
685 685
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
686 686
 		if ($federatedUser->getUserType() === Member::TYPE_MAIL) {
687
-			return $name . ' ' . $this->displayInstance(
687
+			return $name.' '.$this->displayInstance(
688 688
 				$federatedUser->getInstance(),
689 689
 				self::DISPLAY_PARENTHESIS
690 690
 			);
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
 			return $name;
695 695
 		}
696 696
 
697
-		return $name . $this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
697
+		return $name.$this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT);
698 698
 	}
699 699
 
700 700
 	/**
@@ -710,9 +710,9 @@  discard block
 block discarded – undo
710 710
 
711 711
 		switch ($type) {
712 712
 			case self::DISPLAY_AT:
713
-				return '@' . $instance;
713
+				return '@'.$instance;
714 714
 			case self::DISPLAY_PARENTHESIS:
715
-				return '(' . $instance . ')';
715
+				return '('.$instance.')';
716 716
 		}
717 717
 
718 718
 		return $instance;
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
 			// when running from the occ command, /index.php is not removed by itself
765 765
 			if (str_starts_with($path, '/index.php/')
766 766
 				&& $this->config->getSystemValueString('htaccess.RewriteBase', '') !== '') {
767
-				$path = $this->config->getSystemValueString('htaccess.RewriteBase', '/') . substr($path, 11);
767
+				$path = $this->config->getSystemValueString('htaccess.RewriteBase', '/').substr($path, 11);
768 768
 			}
769 769
 
770 770
 			$knownPath = parse_url($this->config->getSystemValue('overwrite.cli.url'), PHP_URL_PATH);
Please login to merge, or discard this patch.
lib/Command/CirclesRemote.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -173,19 +173,19 @@  discard block
 block discarded – undo
173 173
 
174 174
 		$webfinger = $this->getWebfinger($host, Application::APP_SUBJECT);
175 175
 		if ($this->input->getOption('all')) {
176
-			$this->output->writeln('- Webfinger on <info>' . $host . '</info>');
176
+			$this->output->writeln('- Webfinger on <info>'.$host.'</info>');
177 177
 			$this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
178 178
 			$this->output->writeln('');
179 179
 		}
180 180
 
181 181
 		if ($this->input->getOption('all')) {
182 182
 			$circleLink = $this->extractLink(Application::APP_REL, $webfinger);
183
-			$this->output->writeln('- Information about Circles app on <info>' . $host . '</info>');
183
+			$this->output->writeln('- Information about Circles app on <info>'.$host.'</info>');
184 184
 			$this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
185 185
 			$this->output->writeln('');
186 186
 		}
187 187
 
188
-		$this->output->writeln('- Available services on <info>' . $host . '</info>');
188
+		$this->output->writeln('- Available services on <info>'.$host.'</info>');
189 189
 		foreach ($webfinger->getLinks() as $link) {
190 190
 			$app = $link->getProperty('name');
191 191
 			$ver = $link->getProperty('version');
@@ -193,14 +193,14 @@  discard block
 block discarded – undo
193 193
 				$app .= ' ';
194 194
 			}
195 195
 			if ($ver !== '') {
196
-				$ver = 'v' . $ver;
196
+				$ver = 'v'.$ver;
197 197
 			}
198 198
 
199
-			$this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver);
199
+			$this->output->writeln(' * '.$link->getRel().' '.$app.$ver);
200 200
 		}
201 201
 		$this->output->writeln('');
202 202
 
203
-		$this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>');
203
+		$this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>');
204 204
 		$resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL);
205 205
 		$this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
206 206
 		$this->output->writeln('');
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
 		$tempUid = $resource->g('uid');
210 210
 		$this->output->writeln(
211
-			'- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>'
211
+			'- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>'
212 212
 		);
213 213
 
214 214
 		try {
@@ -217,15 +217,15 @@  discard block
 block discarded – undo
217 217
 			$this->output->writeln(' * No SignatureException: <info>Identity authed</info>');
218 218
 		} catch (SignatureException $e) {
219 219
 			$this->output->writeln(
220
-				'<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>'
220
+				'<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>'
221 221
 			);
222 222
 
223 223
 			return;
224 224
 		}
225 225
 
226
-		$this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>');
226
+		$this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>');
227 227
 		if ($remoteSignatory->getUid(true) !== $tempUid) {
228
-			$this->output->writeln('<error>looks like ' . $host . ' is faking its identity');
228
+			$this->output->writeln('<error>looks like '.$host.' is faking its identity');
229 229
 
230 230
 			return;
231 231
 		}
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 		$this->output->writeln('');
234 234
 
235 235
 		$testUrl = $resource->g('test');
236
-		$this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>');
236
+		$this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>');
237 237
 
238 238
 		try {
239 239
 			$localSignatory = $this->remoteStreamService->getAppSignatory();
@@ -255,18 +255,18 @@  discard block
 block discarded – undo
255 255
 		$this->output->writeln('');
256 256
 
257 257
 		$this->output->writeln(' * Clear Signature: ');
258
-		$this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>');
258
+		$this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>');
259 259
 		$this->output->writeln('');
260 260
 
261 261
 		$this->output->writeln(' * Signed Signature (base64 encoded): ');
262 262
 		$this->output->writeln(
263
-			'<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>'
263
+			'<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>'
264 264
 		);
265 265
 		$this->output->writeln('');
266 266
 
267 267
 		$result = $signedRequest->getOutgoingRequest()->getResult();
268 268
 		$code = $result->getStatusCode();
269
-		$this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code));
269
+		$this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.$code.'</info>' : $code));
270 270
 		$this->output->writeln(
271 271
 			json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
272 272
 		);
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 				$stored = new RemoteInstance();
289 289
 				$this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored);
290 290
 				$this->output->writeln(
291
-					'<info>The remote instance ' . $host
291
+					'<info>The remote instance '.$host
292 292
 					. ' is already known with this current identity</info>'
293 293
 				);
294 294
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 
299 299
 				if ($remoteSignatory->getType() !== $stored->getType()) {
300 300
 					$this->output->writeln(
301
-						'- updating type from ' . $stored->getType() . ' to '
301
+						'- updating type from '.$stored->getType().' to '
302 302
 						. $remoteSignatory->getType()
303 303
 					);
304 304
 					$this->remoteStreamService->update(
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 
309 309
 				if ($remoteSignatory->getInstance() !== $stored->getInstance()) {
310 310
 					$this->output->writeln(
311
-						'- updating host from ' . $stored->getInstance() . ' to '
311
+						'- updating host from '.$stored->getInstance().' to '
312 312
 						. $remoteSignatory->getInstance()
313 313
 					);
314 314
 					$this->remoteStreamService->update(
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 				}
318 318
 				if ($remoteSignatory->getId() !== $stored->getId()) {
319 319
 					$this->output->writeln(
320
-						'- updating href/Id from ' . $stored->getId() . ' to '
320
+						'- updating href/Id from '.$stored->getId().' to '
321 321
 						. $remoteSignatory->getId()
322 322
 					);
323 323
 					$this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF);
@@ -341,10 +341,10 @@  discard block
 block discarded – undo
341 341
 		$helper = $this->getHelper('question');
342 342
 
343 343
 		$this->output->writeln(
344
-			'The remote instance <info>' . $remoteSignatory->getInstance() . '</info> looks good.'
344
+			'The remote instance <info>'.$remoteSignatory->getInstance().'</info> looks good.'
345 345
 		);
346 346
 		$question = new ConfirmationQuestion(
347
-			'Would you like to identify this remote instance as \'<comment>' . $remoteSignatory->getType()
347
+			'Would you like to identify this remote instance as \'<comment>'.$remoteSignatory->getType()
348 348
 			. '</comment>\' using interface \'<comment>'
349 349
 			. InterfaceService::$LIST_IFACE[$remoteSignatory->getInterface()]
350 350
 			. '</comment>\' ? (y/N) ',
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 		$helper = $this->getHelper('question');
373 373
 
374 374
 		$this->output->writeln(
375
-			'The remote instance <info>' . $remoteSignatory->getInstance()
375
+			'The remote instance <info>'.$remoteSignatory->getInstance()
376 376
 			. '</info> is known but <error>its identity has changed.</error>'
377 377
 		);
378 378
 		$this->output->writeln(
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 	private function verifyGSInstances(): void {
435 435
 		$instances = $this->globalScaleService->getGlobalScaleInstances();
436 436
 		$known = array_map(
437
-			function (RemoteInstance $instance): string {
437
+			function(RemoteInstance $instance): string {
438 438
 				return $instance->getInstance();
439 439
 			}, $this->remoteRequest->getFromType(RemoteInstance::TYPE_GLOBALSCALE)
440 440
 		);
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 	 * @param string $instance
451 451
 	 */
452 452
 	private function syncGSInstance(string $instance): void {
453
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
453
+		$this->output->write('Adding <comment>'.$instance.'</comment>: ');
454 454
 		if ($this->configService->isLocalInstance($instance)) {
455 455
 			$this->output->writeln('<comment>instance is local</comment>');
456 456
 			return;
@@ -465,8 +465,8 @@  discard block
 block discarded – undo
465 465
 			);
466 466
 			$this->output->writeln('<info>ok</info>');
467 467
 		} catch (Exception $e) {
468
-			$msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')';
469
-			$this->output->writeln('<error>' . get_class($e) . $msg . '</error>');
468
+			$msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')';
469
+			$this->output->writeln('<error>'.get_class($e).$msg.'</error>');
470 470
 		}
471 471
 	}
472 472
 
@@ -484,12 +484,12 @@  discard block
 block discarded – undo
484 484
 			try {
485 485
 				$current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance());
486 486
 				if ($current->getUid(true) === $instance->getUid(true)) {
487
-					$currentUid = '<info>' . $current->getUid(true) . '</info>';
487
+					$currentUid = '<info>'.$current->getUid(true).'</info>';
488 488
 				} else {
489
-					$currentUid = '<error>' . $current->getUid(true) . '</error>';
489
+					$currentUid = '<error>'.$current->getUid(true).'</error>';
490 490
 				}
491 491
 			} catch (Exception $e) {
492
-				$currentUid = '<error>' . $e->getMessage() . '</error>';
492
+				$currentUid = '<error>'.$e->getMessage().'</error>';
493 493
 			}
494 494
 
495 495
 			$table->appendRow(
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 			}
517 517
 		}
518 518
 
519
-		throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE));
519
+		throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE));
520 520
 	}
521 521
 
522 522
 	/**
@@ -529,6 +529,6 @@  discard block
 block discarded – undo
529 529
 			}
530 530
 		}
531 531
 
532
-		throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE));
532
+		throw new Exception('Unknown interface: '.implode(', ', InterfaceService::$LIST_IFACE));
533 533
 	}
534 534
 }
Please login to merge, or discard this patch.