@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function getShare(int $id, ?string $user = null): array|false |
|
| 64 | + public function getShare(int $id, ?string $user = null): array | false |
|
| 65 | 65 | { |
| 66 | 66 | } |
| 67 | 67 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * @param string $token |
| 72 | 72 | * @return array|false |
| 73 | 73 | */ |
| 74 | - public function getShareByToken(string $token): array|false |
|
| 74 | + public function getShareByToken(string $token): array | false |
|
| 75 | 75 | { |
| 76 | 76 | } |
| 77 | 77 | |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | * |
| 239 | 239 | * @return $this |
| 240 | 240 | */ |
| 241 | - public function setDefinition(array|InputDefinition $definition): static |
|
| 241 | + public function setDefinition(array | InputDefinition $definition): static |
|
| 242 | 242 | { |
| 243 | 243 | } |
| 244 | 244 | |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | * |
| 289 | 289 | * @throws InvalidArgumentException If option mode is invalid or incompatible |
| 290 | 290 | */ |
| 291 | - public function addOption(string $name, string|array|null $shortcut = null, ?int $mode = null, string $description = '', mixed $default = null): static |
|
| 291 | + public function addOption(string $name, string | array | null $shortcut = null, ?int $mode = null, string $description = '', mixed $default = null): static |
|
| 292 | 292 | { |
| 293 | 293 | } |
| 294 | 294 | |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | * @param string $search |
| 99 | 99 | * @return int|bool |
| 100 | 100 | */ |
| 101 | - public function count($search = ''): int|bool |
|
| 101 | + public function count($search = ''): int | bool |
|
| 102 | 102 | { |
| 103 | 103 | } |
| 104 | 104 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | * |
| 108 | 108 | * @return int|bool |
| 109 | 109 | */ |
| 110 | - public function countDisabled(): int|bool |
|
| 110 | + public function countDisabled(): int | bool |
|
| 111 | 111 | { |
| 112 | 112 | } |
| 113 | 113 | |
@@ -46,8 +46,8 @@ |
||
| 46 | 46 | public const TIMEOUT_PRECISION = 0.2; |
| 47 | 47 | |
| 48 | 48 | public const ITER_NON_BLOCKING = 1; // By default, iterating over outputs is a blocking call, use this flag to make it non-blocking |
| 49 | - public const ITER_KEEP_OUTPUT = 2; // By default, outputs are cleared while iterating, use this flag to keep them in memory |
|
| 50 | - public const ITER_SKIP_OUT = 4; // Use this flag to skip STDOUT while iterating |
|
| 49 | + public const ITER_KEEP_OUTPUT = 2; // By default, outputs are cleared while iterating, use this flag to keep them in memory |
|
| 50 | + public const ITER_SKIP_OUT = 4; // Use this flag to skip STDOUT while iterating |
|
| 51 | 51 | public const ITER_SKIP_ERR = 8; |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | * |
| 40 | 40 | * @return void |
| 41 | 41 | */ |
| 42 | - public function write(string|iterable $messages, bool $newline = false, int $options = 0) |
|
| 42 | + public function write(string | iterable $messages, bool $newline = false, int $options = 0) |
|
| 43 | 43 | { |
| 44 | 44 | } |
| 45 | 45 | |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | * |
| 52 | 52 | * @return void |
| 53 | 53 | */ |
| 54 | - public function writeln(string|iterable $messages, int $options = 0) |
|
| 54 | + public function writeln(string | iterable $messages, int $options = 0) |
|
| 55 | 55 | { |
| 56 | 56 | } |
| 57 | 57 | |
@@ -158,7 +158,7 @@ |
||
| 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 | |
@@ -154,19 +154,19 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | $webfinger = $this->getWebfinger($host, Application::APP_SUBJECT); |
| 156 | 156 | if ($this->input->getOption('all')) { |
| 157 | - $this->output->writeln('- Webfinger on <info>' . $host . '</info>'); |
|
| 157 | + $this->output->writeln('- Webfinger on <info>'.$host.'</info>'); |
|
| 158 | 158 | $this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
| 159 | 159 | $this->output->writeln(''); |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | if ($this->input->getOption('all')) { |
| 163 | 163 | $circleLink = $this->extractLink(Application::APP_REL, $webfinger); |
| 164 | - $this->output->writeln('- Information about Circles app on <info>' . $host . '</info>'); |
|
| 164 | + $this->output->writeln('- Information about Circles app on <info>'.$host.'</info>'); |
|
| 165 | 165 | $this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
| 166 | 166 | $this->output->writeln(''); |
| 167 | 167 | } |
| 168 | 168 | |
| 169 | - $this->output->writeln('- Available services on <info>' . $host . '</info>'); |
|
| 169 | + $this->output->writeln('- Available services on <info>'.$host.'</info>'); |
|
| 170 | 170 | foreach ($webfinger->getLinks() as $link) { |
| 171 | 171 | $app = $link->getProperty('name'); |
| 172 | 172 | $ver = $link->getProperty('version'); |
@@ -174,14 +174,14 @@ discard block |
||
| 174 | 174 | $app .= ' '; |
| 175 | 175 | } |
| 176 | 176 | if ($ver !== '') { |
| 177 | - $ver = 'v' . $ver; |
|
| 177 | + $ver = 'v'.$ver; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - $this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver); |
|
| 180 | + $this->output->writeln(' * '.$link->getRel().' '.$app.$ver); |
|
| 181 | 181 | } |
| 182 | 182 | $this->output->writeln(''); |
| 183 | 183 | |
| 184 | - $this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>'); |
|
| 184 | + $this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>'); |
|
| 185 | 185 | $resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL); |
| 186 | 186 | $this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
| 187 | 187 | $this->output->writeln(''); |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | $tempUid = $resource->g('uid'); |
| 191 | 191 | $this->output->writeln( |
| 192 | - '- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>' |
|
| 192 | + '- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>' |
|
| 193 | 193 | ); |
| 194 | 194 | |
| 195 | 195 | try { |
@@ -198,15 +198,15 @@ discard block |
||
| 198 | 198 | $this->output->writeln(' * No SignatureException: <info>Identity authed</info>'); |
| 199 | 199 | } catch (SignatureException $e) { |
| 200 | 200 | $this->output->writeln( |
| 201 | - '<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>' |
|
| 201 | + '<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>' |
|
| 202 | 202 | ); |
| 203 | 203 | |
| 204 | 204 | return; |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - $this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>'); |
|
| 207 | + $this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>'); |
|
| 208 | 208 | if ($remoteSignatory->getUid(true) !== $tempUid) { |
| 209 | - $this->output->writeln('<error>looks like ' . $host . ' is faking its identity'); |
|
| 209 | + $this->output->writeln('<error>looks like '.$host.' is faking its identity'); |
|
| 210 | 210 | |
| 211 | 211 | return; |
| 212 | 212 | } |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | $this->output->writeln(''); |
| 215 | 215 | |
| 216 | 216 | $testUrl = $resource->g('test'); |
| 217 | - $this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>'); |
|
| 217 | + $this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>'); |
|
| 218 | 218 | |
| 219 | 219 | try { |
| 220 | 220 | $localSignatory = $this->remoteStreamService->getAppSignatory(); |
@@ -236,18 +236,18 @@ discard block |
||
| 236 | 236 | $this->output->writeln(''); |
| 237 | 237 | |
| 238 | 238 | $this->output->writeln(' * Clear Signature: '); |
| 239 | - $this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>'); |
|
| 239 | + $this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>'); |
|
| 240 | 240 | $this->output->writeln(''); |
| 241 | 241 | |
| 242 | 242 | $this->output->writeln(' * Signed Signature (base64 encoded): '); |
| 243 | 243 | $this->output->writeln( |
| 244 | - '<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>' |
|
| 244 | + '<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>' |
|
| 245 | 245 | ); |
| 246 | 246 | $this->output->writeln(''); |
| 247 | 247 | |
| 248 | 248 | $result = $signedRequest->getOutgoingRequest()->getResult(); |
| 249 | 249 | $code = $result->getStatusCode(); |
| 250 | - $this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . ((string)$code) . '</info>' : $code)); |
|
| 250 | + $this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.((string)$code).'</info>' : $code)); |
|
| 251 | 251 | $this->output->writeln( |
| 252 | 252 | json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) |
| 253 | 253 | ); |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | $stored = new RemoteInstance(); |
| 270 | 270 | $this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored); |
| 271 | 271 | $this->output->writeln( |
| 272 | - '<info>The remote instance ' . $host |
|
| 272 | + '<info>The remote instance '.$host |
|
| 273 | 273 | . ' is already known with this current identity</info>' |
| 274 | 274 | ); |
| 275 | 275 | |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | |
| 280 | 280 | if ($remoteSignatory->getType() !== $stored->getType()) { |
| 281 | 281 | $this->output->writeln( |
| 282 | - '- updating type from ' . $stored->getType() . ' to ' |
|
| 282 | + '- updating type from '.$stored->getType().' to ' |
|
| 283 | 283 | . $remoteSignatory->getType() |
| 284 | 284 | ); |
| 285 | 285 | $this->remoteStreamService->update( |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | |
| 290 | 290 | if ($remoteSignatory->getInstance() !== $stored->getInstance()) { |
| 291 | 291 | $this->output->writeln( |
| 292 | - '- updating host from ' . $stored->getInstance() . ' to ' |
|
| 292 | + '- updating host from '.$stored->getInstance().' to ' |
|
| 293 | 293 | . $remoteSignatory->getInstance() |
| 294 | 294 | ); |
| 295 | 295 | $this->remoteStreamService->update( |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | } |
| 299 | 299 | if ($remoteSignatory->getId() !== $stored->getId()) { |
| 300 | 300 | $this->output->writeln( |
| 301 | - '- updating href/Id from ' . $stored->getId() . ' to ' |
|
| 301 | + '- updating href/Id from '.$stored->getId().' to ' |
|
| 302 | 302 | . $remoteSignatory->getId() |
| 303 | 303 | ); |
| 304 | 304 | $this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF); |
@@ -323,10 +323,10 @@ discard block |
||
| 323 | 323 | $helper = $this->getHelper('question'); |
| 324 | 324 | |
| 325 | 325 | $this->output->writeln( |
| 326 | - 'The remote instance <info>' . $remoteSignatory->getInstance() . '</info> looks good.' |
|
| 326 | + 'The remote instance <info>'.$remoteSignatory->getInstance().'</info> looks good.' |
|
| 327 | 327 | ); |
| 328 | 328 | $question = new ConfirmationQuestion( |
| 329 | - 'Would you like to identify this remote instance as \'<comment>' . $remoteSignatory->getType() |
|
| 329 | + 'Would you like to identify this remote instance as \'<comment>'.$remoteSignatory->getType() |
|
| 330 | 330 | . '</comment>\' using interface \'<comment>' |
| 331 | 331 | . InterfaceService::$LIST_IFACE[$remoteSignatory->getInterface()] |
| 332 | 332 | . '</comment>\' ? (y/N) ', |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | $helper = $this->getHelper('question'); |
| 356 | 356 | |
| 357 | 357 | $this->output->writeln( |
| 358 | - 'The remote instance <info>' . $remoteSignatory->getInstance() |
|
| 358 | + 'The remote instance <info>'.$remoteSignatory->getInstance() |
|
| 359 | 359 | . '</info> is known but <error>its identity has changed.</error>' |
| 360 | 360 | ); |
| 361 | 361 | $this->output->writeln( |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | private function verifyGSInstances(): void { |
| 418 | 418 | $instances = $this->globalScaleService->getGlobalScaleInstances(); |
| 419 | 419 | $known = array_map( |
| 420 | - function (RemoteInstance $instance): string { |
|
| 420 | + function(RemoteInstance $instance): string { |
|
| 421 | 421 | return $instance->getInstance(); |
| 422 | 422 | }, $this->remoteRequest->getFromType(RemoteInstance::TYPE_GLOBALSCALE) |
| 423 | 423 | ); |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | * @param string $instance |
| 434 | 434 | */ |
| 435 | 435 | private function syncGSInstance(string $instance): void { |
| 436 | - $this->output->write('Adding <comment>' . $instance . '</comment>: '); |
|
| 436 | + $this->output->write('Adding <comment>'.$instance.'</comment>: '); |
|
| 437 | 437 | if ($this->configService->isLocalInstance($instance)) { |
| 438 | 438 | $this->output->writeln('<comment>instance is local</comment>'); |
| 439 | 439 | return; |
@@ -448,8 +448,8 @@ discard block |
||
| 448 | 448 | ); |
| 449 | 449 | $this->output->writeln('<info>ok</info>'); |
| 450 | 450 | } catch (Exception $e) { |
| 451 | - $msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')'; |
|
| 452 | - $this->output->writeln('<error>' . get_class($e) . $msg . '</error>'); |
|
| 451 | + $msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')'; |
|
| 452 | + $this->output->writeln('<error>'.get_class($e).$msg.'</error>'); |
|
| 453 | 453 | } |
| 454 | 454 | } |
| 455 | 455 | |
@@ -467,12 +467,12 @@ discard block |
||
| 467 | 467 | try { |
| 468 | 468 | $current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance()); |
| 469 | 469 | if ($current->getUid(true) === $instance->getUid(true)) { |
| 470 | - $currentUid = '<info>' . $current->getUid(true) . '</info>'; |
|
| 470 | + $currentUid = '<info>'.$current->getUid(true).'</info>'; |
|
| 471 | 471 | } else { |
| 472 | - $currentUid = '<error>' . $current->getUid(true) . '</error>'; |
|
| 472 | + $currentUid = '<error>'.$current->getUid(true).'</error>'; |
|
| 473 | 473 | } |
| 474 | 474 | } catch (Exception $e) { |
| 475 | - $currentUid = '<error>' . $e->getMessage() . '</error>'; |
|
| 475 | + $currentUid = '<error>'.$e->getMessage().'</error>'; |
|
| 476 | 476 | } |
| 477 | 477 | |
| 478 | 478 | $table->appendRow( |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | } |
| 500 | 500 | } |
| 501 | 501 | |
| 502 | - throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE)); |
|
| 502 | + throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE)); |
|
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | /** |
@@ -512,6 +512,6 @@ discard block |
||
| 512 | 512 | } |
| 513 | 513 | } |
| 514 | 514 | |
| 515 | - throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE)); |
|
| 515 | + throw new Exception('Unknown interface: '.implode(', ', InterfaceService::$LIST_IFACE)); |
|
| 516 | 516 | } |
| 517 | 517 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } catch (FederatedItemException $e) { |
| 105 | 105 | if ($input->getOption('status-code')) { |
| 106 | 106 | throw new FederatedItemException( |
| 107 | - ' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage() |
|
| 107 | + ' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage() |
|
| 108 | 108 | ); |
| 109 | 109 | } |
| 110 | 110 | |
@@ -116,9 +116,9 @@ discard block |
||
| 116 | 116 | } elseif (strtolower($input->getOption('output')) !== 'none') { |
| 117 | 117 | /** @var Circle $circle */ |
| 118 | 118 | $circle = $this->deserialize($outcome, Circle::class); |
| 119 | - $output->writeln('Id: <info>' . $circle->getSingleId() . '</info>'); |
|
| 120 | - $output->writeln('Name: <info>' . $circle->getDisplayName() . '</info>'); |
|
| 121 | - $output->writeln('Owner: <info>' . $circle->getOwner()->getDisplayName() . '</info>'); |
|
| 119 | + $output->writeln('Id: <info>'.$circle->getSingleId().'</info>'); |
|
| 120 | + $output->writeln('Name: <info>'.$circle->getDisplayName().'</info>'); |
|
| 121 | + $output->writeln('Owner: <info>'.$circle->getOwner()->getDisplayName().'</info>'); |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | return 0; |
@@ -237,9 +237,9 @@ |
||
| 237 | 237 | Circle::$DEF_SOURCE[$circle->getSource()], |
| 238 | 238 | $this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40), |
| 239 | 239 | $this->configService->displayInstance($owner->getInstance()), |
| 240 | - ((string)$circle->getPopulation()) . '/' |
|
| 240 | + ((string)$circle->getPopulation()).'/' |
|
| 241 | 241 | . ((string)$this->getInt('members_limit', $circle->getSettings(), -1)) |
| 242 | - . ' (' . ((string)$circle->getPopulationInherited()) . ')' |
|
| 242 | + . ' ('.((string)$circle->getPopulationInherited()).')' |
|
| 243 | 243 | ] |
| 244 | 244 | ); |
| 245 | 245 | } |