@@ -187,11 +187,11 @@ discard block |
||
| 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 NC22TreeNode(null, new SimpleDataStore(['circle' => $circle])); |
@@ -256,8 +256,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | return $value; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | - if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') { |
|
| 238 | + if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') { |
|
| 239 | 239 | return $value; |
| 240 | 240 | } |
| 241 | 241 | |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | */ |
| 474 | 474 | public function getTrustedDomains(): array { |
| 475 | 475 | return array_map( |
| 476 | - function (string $address) { |
|
| 476 | + function(string $address) { |
|
| 477 | 477 | return strtolower($address); |
| 478 | 478 | }, $this->config->getSystemValue('trusted_domains', []) |
| 479 | 479 | ); |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | } |
| 510 | 510 | |
| 511 | 511 | if (array_key_exists('port', $loopback)) { |
| 512 | - $loopbackCloudId = $loopback['host'] . ':' . $loopback['port']; |
|
| 512 | + $loopbackCloudId = $loopback['host'].':'.$loopback['port']; |
|
| 513 | 513 | } else { |
| 514 | 514 | $loopbackCloudId = $loopback['host']; |
| 515 | 515 | } |
@@ -548,13 +548,13 @@ discard block |
||
| 548 | 548 | $path = $this->getAppValue(self::LOOPBACK_CLOUD_PATH); |
| 549 | 549 | } |
| 550 | 550 | |
| 551 | - $base = $scheme . '://' . $instance . $path; |
|
| 551 | + $base = $scheme.'://'.$instance.$path; |
|
| 552 | 552 | |
| 553 | 553 | if ($route === '') { |
| 554 | 554 | return $base; |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | - return rtrim($base, '/') . $this->linkToRoute($route, $args); |
|
| 557 | + return rtrim($base, '/').$this->linkToRoute($route, $args); |
|
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | |
@@ -659,7 +659,7 @@ discard block |
||
| 659 | 659 | ): string { |
| 660 | 660 | $name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId(); |
| 661 | 661 | if ($federatedUser->getUserType() === Member::TYPE_MAIL) { |
| 662 | - return $name . ' ' . $this->displayInstance( |
|
| 662 | + return $name.' '.$this->displayInstance( |
|
| 663 | 663 | $federatedUser->getInstance(), |
| 664 | 664 | self::DISPLAY_PARENTHESIS |
| 665 | 665 | ); |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | return $name; |
| 670 | 670 | } |
| 671 | 671 | |
| 672 | - return $name . $this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT); |
|
| 672 | + return $name.$this->displayInstance($federatedUser->getInstance(), self::DISPLAY_AT); |
|
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | /** |
@@ -685,9 +685,9 @@ discard block |
||
| 685 | 685 | |
| 686 | 686 | switch ($type) { |
| 687 | 687 | case self::DISPLAY_AT: |
| 688 | - return '@' . $instance; |
|
| 688 | + return '@'.$instance; |
|
| 689 | 689 | case self::DISPLAY_PARENTHESIS: |
| 690 | - return '(' . $instance . ')'; |
|
| 690 | + return '('.$instance.')'; |
|
| 691 | 691 | } |
| 692 | 692 | |
| 693 | 693 | return $instance; |