Completed
Pull Request — master (#630)
by Maxence
03:01
created
lib/Command/MembersList.php 1 patch
Spacing   +14 added lines, -15 removed lines patch added patch discarded remove patch
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 			$this->federatedUserService->commandLineInitiator($initiator, $initiatorType, $circleId, true);
187 187
 			$circle = $this->circleService->getCircle($circleId);
188 188
 
189
-			$output->writeln('<info>Name</info>: ' . $circle->getName());
189
+			$output->writeln('<info>Name</info>: '.$circle->getName());
190 190
 			$owner = $circle->getOwner();
191
-			$output->writeln('<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance());
191
+			$output->writeln('<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance());
192 192
 			$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
193
-			$output->writeln('<info>Config</info>: ' . $type);
193
+			$output->writeln('<info>Config</info>: '.$type);
194 194
 			$output->writeln(' ');
195 195
 
196 196
 			$tree = new NC22TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -253,8 +253,7 @@  discard block
 block discarded – undo
253 253
 					$member->hasBasedOn() ? Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()] : '',
254 254
 					$this->configService->displayFederatedUser($member, $this->input->getOption('display-name')),
255 255
 					$this->configService->displayInstance($member->getInstance()),
256
-					($level > 0) ? Member::$DEF_LEVEL[$level] :
257
-						'(' . strtolower($member->getStatus()) . ')',
256
+					($level > 0) ? Member::$DEF_LEVEL[$level] : '('.strtolower($member->getStatus()).')',
258 257
 					($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
259 258
 						$member->getInvitedBy(), $this->input->getOption('display-name')
260 259
 					) : 'Unknown'
@@ -416,18 +415,18 @@  discard block
 block discarded – undo
416 415
 				$member = $data->gObj('member', Member::class);
417 416
 
418 417
 				if ($lineNumber === 1) {
419
-					$line .= '<info>' . $member->getSingleId() . '</info>';
418
+					$line .= '<info>'.$member->getSingleId().'</info>';
420 419
 					if (!$this->configService->isLocalInstance($member->getInstance())) {
421
-						$line .= '@' . $member->getInstance();
420
+						$line .= '@'.$member->getInstance();
422 421
 					}
423
-					$line .= ' (' . Member::$DEF_LEVEL[$member->getLevel()] . ')';
422
+					$line .= ' ('.Member::$DEF_LEVEL[$member->getLevel()].')';
424 423
 
425
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
424
+					$line .= ' <info>MemberId</info>: '.$member->getId();
426 425
 					$name = ($this->input->getOption('display-name')) ?
427 426
 						$member->getDisplayName() : $member->getUserId();
428
-					$line .= ' <info>Name</info>: ' . $name;
427
+					$line .= ' <info>Name</info>: '.$name;
429 428
 					$source = ($member->hasBasedOn()) ? $member->getBasedOn()->getSource() : '';
430
-					$line .= ' <info>Source</info>: ' . Circle::$DEF_SOURCE[$source];
429
+					$line .= ' <info>Source</info>: '.Circle::$DEF_SOURCE[$source];
431 430
 				}
432 431
 
433 432
 				if ($lineNumber === 2) {
@@ -439,16 +438,16 @@  discard block
 block discarded – undo
439 438
 						return $line;
440 439
 					}
441 440
 					$owner = $circle->getOwner();
442
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
441
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
443 442
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
444
-					$line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type;
443
+					$line .= ($type === '') ? '' : ' <info>Config</info>: '.$type;
445 444
 				}
446 445
 
447 446
 			} else {
448 447
 				if ($lineNumber === 1 && !is_null($circle)) {
449
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
448
+					$line .= '<info>'.$circle->getSingleId().'</info>';
450 449
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
451
-						$line .= '@' . $circle->getInstance();
450
+						$line .= '@'.$circle->getInstance();
452 451
 					}
453 452
 				}
454 453
 			}
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 			return $value;
187 187
 		}
188 188
 
189
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
189
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
190 190
 			return $value;
191 191
 		}
192 192
 
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 		}
441 441
 
442 442
 		if (array_key_exists('port', $loopback)) {
443
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
443
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
444 444
 		} else {
445 445
 			$loopbackCloudId = $loopback['host'];
446 446
 		}
@@ -469,12 +469,12 @@  discard block
 block discarded – undo
469 469
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
470 470
 		}
471 471
 
472
-		$base = $scheme . '://' . $instance;
472
+		$base = $scheme.'://'.$instance;
473 473
 		if ($route === '') {
474 474
 			return $base;
475 475
 		}
476 476
 
477
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
477
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
478 478
 	}
479 479
 
480 480
 
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 	public function displayFederatedUser(IFederatedUser $federatedUser, bool $displayName = false): string {
575 575
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
576 576
 
577
-		return $name . $this->displayInstance($federatedUser->getInstance(), true);
577
+		return $name.$this->displayInstance($federatedUser->getInstance(), true);
578 578
 	}
579 579
 
580 580
 	/**
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
588 588
 			return '';
589 589
 		}
590 590
 
591
-		return (($showAt) ? '@' : '') . $instance;
591
+		return (($showAt) ? '@' : '').$instance;
592 592
 	}
593 593
 
594 594
 
Please login to merge, or discard this patch.