@@ -176,19 +176,19 @@ discard block |
||
| 176 | 176 | |
| 177 | 177 | $webfinger = $this->getWebfinger($host, Application::APP_SUBJECT); |
| 178 | 178 | if ($this->input->getOption('all')) { |
| 179 | - $this->output->writeln('- Webfinger on <info>' . $host . '</info>'); |
|
| 179 | + $this->output->writeln('- Webfinger on <info>'.$host.'</info>'); |
|
| 180 | 180 | $this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
| 181 | 181 | $this->output->writeln(''); |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | if ($this->input->getOption('all')) { |
| 185 | 185 | $circleLink = $this->extractLink(Application::APP_REL, $webfinger); |
| 186 | - $this->output->writeln('- Information about Circles app on <info>' . $host . '</info>'); |
|
| 186 | + $this->output->writeln('- Information about Circles app on <info>'.$host.'</info>'); |
|
| 187 | 187 | $this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
| 188 | 188 | $this->output->writeln(''); |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - $this->output->writeln('- Available services on <info>' . $host . '</info>'); |
|
| 191 | + $this->output->writeln('- Available services on <info>'.$host.'</info>'); |
|
| 192 | 192 | foreach ($webfinger->getLinks() as $link) { |
| 193 | 193 | $app = $link->getProperty('name'); |
| 194 | 194 | $ver = $link->getProperty('version'); |
@@ -196,14 +196,14 @@ discard block |
||
| 196 | 196 | $app .= ' '; |
| 197 | 197 | } |
| 198 | 198 | if ($ver !== '') { |
| 199 | - $ver = 'v' . $ver; |
|
| 199 | + $ver = 'v'.$ver; |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - $this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver); |
|
| 202 | + $this->output->writeln(' * '.$link->getRel().' '.$app.$ver); |
|
| 203 | 203 | } |
| 204 | 204 | $this->output->writeln(''); |
| 205 | 205 | |
| 206 | - $this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>'); |
|
| 206 | + $this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>'); |
|
| 207 | 207 | $resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL); |
| 208 | 208 | $this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
| 209 | 209 | $this->output->writeln(''); |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | |
| 212 | 212 | $tempUid = $resource->g('uid'); |
| 213 | 213 | $this->output->writeln( |
| 214 | - '- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>' |
|
| 214 | + '- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>' |
|
| 215 | 215 | ); |
| 216 | 216 | |
| 217 | 217 | try { |
@@ -219,15 +219,15 @@ discard block |
||
| 219 | 219 | $this->output->writeln(' * No SignatureException: <info>Identity authed</info>'); |
| 220 | 220 | } catch (SignatureException $e) { |
| 221 | 221 | $this->output->writeln( |
| 222 | - '<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>' |
|
| 222 | + '<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>' |
|
| 223 | 223 | ); |
| 224 | 224 | |
| 225 | 225 | return; |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | - $this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>'); |
|
| 228 | + $this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>'); |
|
| 229 | 229 | if ($remoteSignatory->getUid(true) !== $tempUid) { |
| 230 | - $this->output->writeln('<error>looks like ' . $host . ' is faking its identity'); |
|
| 230 | + $this->output->writeln('<error>looks like '.$host.' is faking its identity'); |
|
| 231 | 231 | |
| 232 | 232 | return; |
| 233 | 233 | } |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | $this->output->writeln(''); |
| 236 | 236 | |
| 237 | 237 | $testUrl = $resource->g('test'); |
| 238 | - $this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>'); |
|
| 238 | + $this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>'); |
|
| 239 | 239 | |
| 240 | 240 | try { |
| 241 | 241 | $localSignatory = $this->remoteStreamService->getAppSignatory(); |
@@ -257,18 +257,18 @@ discard block |
||
| 257 | 257 | $this->output->writeln(''); |
| 258 | 258 | |
| 259 | 259 | $this->output->writeln(' * Clear Signature: '); |
| 260 | - $this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>'); |
|
| 260 | + $this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>'); |
|
| 261 | 261 | $this->output->writeln(''); |
| 262 | 262 | |
| 263 | 263 | $this->output->writeln(' * Signed Signature (base64 encoded): '); |
| 264 | 264 | $this->output->writeln( |
| 265 | - '<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>' |
|
| 265 | + '<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>' |
|
| 266 | 266 | ); |
| 267 | 267 | $this->output->writeln(''); |
| 268 | 268 | |
| 269 | 269 | $result = $signedRequest->getOutgoingRequest()->getResult(); |
| 270 | 270 | $code = $result->getStatusCode(); |
| 271 | - $this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code)); |
|
| 271 | + $this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.$code.'</info>' : $code)); |
|
| 272 | 272 | $this->output->writeln( |
| 273 | 273 | json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) |
| 274 | 274 | ); |
@@ -290,13 +290,13 @@ discard block |
||
| 290 | 290 | $stored = new RemoteInstance(); |
| 291 | 291 | $this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored); |
| 292 | 292 | $this->output->writeln( |
| 293 | - '<info>The remote instance ' . $host |
|
| 293 | + '<info>The remote instance '.$host |
|
| 294 | 294 | . ' is already known with this current identity</info>' |
| 295 | 295 | ); |
| 296 | 296 | |
| 297 | 297 | if ($remoteSignatory->getType() !== $stored->getType()) { |
| 298 | 298 | $this->output->writeln( |
| 299 | - '- updating type from ' . $stored->getType() . ' to ' |
|
| 299 | + '- updating type from '.$stored->getType().' to ' |
|
| 300 | 300 | . $remoteSignatory->getType() |
| 301 | 301 | ); |
| 302 | 302 | $this->remoteStreamService->update( |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | |
| 307 | 307 | if ($remoteSignatory->getInstance() !== $stored->getInstance()) { |
| 308 | 308 | $this->output->writeln( |
| 309 | - '- updating host from ' . $stored->getInstance() . ' to ' |
|
| 309 | + '- updating host from '.$stored->getInstance().' to ' |
|
| 310 | 310 | . $remoteSignatory->getInstance() |
| 311 | 311 | ); |
| 312 | 312 | $this->remoteStreamService->update( |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | } |
| 316 | 316 | if ($remoteSignatory->getId() !== $stored->getId()) { |
| 317 | 317 | $this->output->writeln( |
| 318 | - '- updating href/Id from ' . $stored->getId() . ' to ' |
|
| 318 | + '- updating href/Id from '.$stored->getId().' to ' |
|
| 319 | 319 | . $remoteSignatory->getId() |
| 320 | 320 | ); |
| 321 | 321 | $this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF); |
@@ -341,10 +341,10 @@ discard block |
||
| 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) ', |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | $helper = $this->getHelper('question'); |
| 370 | 370 | |
| 371 | 371 | $this->output->writeln( |
| 372 | - 'The remote instance <info>' . $remoteSignatory->getInstance() |
|
| 372 | + 'The remote instance <info>'.$remoteSignatory->getInstance() |
|
| 373 | 373 | . '</info> is known but <error>its identity has changed.</error>' |
| 374 | 374 | ); |
| 375 | 375 | $this->output->writeln( |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | return; |
| 448 | 448 | } |
| 449 | 449 | |
| 450 | - $this->output->write('Adding <comment>' . $instance . '</comment>: '); |
|
| 450 | + $this->output->write('Adding <comment>'.$instance.'</comment>: '); |
|
| 451 | 451 | try { |
| 452 | 452 | $this->remoteStreamService->addRemoteInstance( |
| 453 | 453 | $instance, |
@@ -457,8 +457,8 @@ discard block |
||
| 457 | 457 | ); |
| 458 | 458 | $this->output->writeln('<info>ok</info>'); |
| 459 | 459 | } catch (Exception $e) { |
| 460 | - $msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')'; |
|
| 461 | - $this->output->writeln('<error>' . get_class($e) . $msg . '</error>'); |
|
| 460 | + $msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')'; |
|
| 461 | + $this->output->writeln('<error>'.get_class($e).$msg.'</error>'); |
|
| 462 | 462 | } |
| 463 | 463 | } |
| 464 | 464 | |
@@ -476,12 +476,12 @@ discard block |
||
| 476 | 476 | try { |
| 477 | 477 | $current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance()); |
| 478 | 478 | if ($current->getUid(true) === $instance->getUid(true)) { |
| 479 | - $currentUid = '<info>' . $current->getUid(true) . '</info>'; |
|
| 479 | + $currentUid = '<info>'.$current->getUid(true).'</info>'; |
|
| 480 | 480 | } else { |
| 481 | - $currentUid = '<error>' . $current->getUid(true) . '</error>'; |
|
| 481 | + $currentUid = '<error>'.$current->getUid(true).'</error>'; |
|
| 482 | 482 | } |
| 483 | 483 | } catch (Exception $e) { |
| 484 | - $currentUid = '<error>' . $e->getMessage() . '</error>'; |
|
| 484 | + $currentUid = '<error>'.$e->getMessage().'</error>'; |
|
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | $table->appendRow( |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | } |
| 508 | 508 | } |
| 509 | 509 | |
| 510 | - throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE)); |
|
| 510 | + throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE)); |
|
| 511 | 511 | } |
| 512 | 512 | |
| 513 | 513 | /** |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | } |
| 521 | 521 | } |
| 522 | 522 | |
| 523 | - throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE)); |
|
| 523 | + throw new Exception('Unknown interface: '.implode(', ', InterfaceService::$LIST_IFACE)); |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | 526 | } |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | throw new Exception('Please specify a --type for the test'); |
| 174 | 174 | } |
| 175 | 175 | if ($test !== '' && !in_array($type, self::$checks)) { |
| 176 | - throw new Exception('Unknown type: ' . implode(', ', self::$checks)); |
|
| 176 | + throw new Exception('Unknown type: '.implode(', ', self::$checks)); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | // $this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test); |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | $output->writeln(''); |
| 281 | - $output->writeln('* testing current address: ' . $test); |
|
| 281 | + $output->writeln('* testing current address: '.$test); |
|
| 282 | 282 | |
| 283 | 283 | try { |
| 284 | 284 | $this->setupLoopback($input, $output, $test); |
@@ -314,8 +314,8 @@ discard block |
||
| 314 | 314 | continue; |
| 315 | 315 | } |
| 316 | 316 | |
| 317 | - $loopback = $scheme . '://' . $cloudId; |
|
| 318 | - $output->write('* testing address: ' . $loopback . ' '); |
|
| 317 | + $loopback = $scheme.'://'.$cloudId; |
|
| 318 | + $output->write('* testing address: '.$loopback.' '); |
|
| 319 | 319 | |
| 320 | 320 | if ($this->testLoopback($input, $output, $loopback)) { |
| 321 | 321 | $output->writeln('* <info>Loopback</info> address looks good'); |
@@ -385,9 +385,9 @@ discard block |
||
| 385 | 385 | $test = new FederatedEvent(LoopbackTest::class); |
| 386 | 386 | $this->federatedEventService->newEvent($test); |
| 387 | 387 | |
| 388 | - $output->writeln('<info>' . $test->getWrapperToken() . '</info>'); |
|
| 388 | + $output->writeln('<info>'.$test->getWrapperToken().'</info>'); |
|
| 389 | 389 | |
| 390 | - $output->writeln('- Waiting for async process to finish (' . $this->delay . 's)'); |
|
| 390 | + $output->writeln('- Waiting for async process to finish ('.$this->delay.'s)'); |
|
| 391 | 391 | sleep($this->delay); |
| 392 | 392 | |
| 393 | 393 | $output->write('- Checking status on FederatedEvent '); |
@@ -401,18 +401,18 @@ discard block |
||
| 401 | 401 | |
| 402 | 402 | $checkVerify = $wrapper->getEvent()->getData()->gInt('verify'); |
| 403 | 403 | if ($checkVerify === LoopbackTest::VERIFY) { |
| 404 | - $output->write('<info>verify=' . $checkVerify . '</info> '); |
|
| 404 | + $output->write('<info>verify='.$checkVerify.'</info> '); |
|
| 405 | 405 | } else { |
| 406 | - $output->writeln('<error>verify=' . $checkVerify . '</error>'); |
|
| 406 | + $output->writeln('<error>verify='.$checkVerify.'</error>'); |
|
| 407 | 407 | |
| 408 | 408 | return false; |
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | $checkManage = $wrapper->getResult()->gInt('manage'); |
| 412 | 412 | if ($checkManage === LoopbackTest::MANAGE) { |
| 413 | - $output->write('<info>manage=' . $checkManage . '</info> '); |
|
| 413 | + $output->write('<info>manage='.$checkManage.'</info> '); |
|
| 414 | 414 | } else { |
| 415 | - $output->writeln('<error>manage=' . $checkManage . '</error>'); |
|
| 415 | + $output->writeln('<error>manage='.$checkManage.'</error>'); |
|
| 416 | 416 | |
| 417 | 417 | return false; |
| 418 | 418 | } |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | [$scheme, $cloudId] = $this->parseAddress($loopback); |
| 435 | 435 | |
| 436 | 436 | $question = new ConfirmationQuestion( |
| 437 | - '- Do you want to save <info>'. $loopback . '</info> as your <info>loopback</info> address ? (y/N) ', false, '/^(y|Y)/i' |
|
| 437 | + '- Do you want to save <info>'.$loopback.'</info> as your <info>loopback</info> address ? (y/N) ', false, '/^(y|Y)/i' |
|
| 438 | 438 | ); |
| 439 | 439 | |
| 440 | 440 | $helper = $this->getHelper('question'); |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | $this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_SCHEME, $scheme); |
| 448 | 448 | $this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId); |
| 449 | 449 | $output->writeln( |
| 450 | - '- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>' |
|
| 450 | + '- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>' |
|
| 451 | 451 | ); |
| 452 | 452 | |
| 453 | 453 | } |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | continue; |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | - $frontal = $scheme . '://' . $cloudId; |
|
| 521 | + $frontal = $scheme.'://'.$cloudId; |
|
| 522 | 522 | break; |
| 523 | 523 | } |
| 524 | 524 | |
@@ -532,13 +532,13 @@ discard block |
||
| 532 | 532 | 'You will need to run this <info>curl</info> command from a remote terminal and paste its result: ' |
| 533 | 533 | ); |
| 534 | 534 | $output->writeln( |
| 535 | - ' curl ' . $frontal . '/.well-known/webfinger?resource=http://nextcloud.com/' |
|
| 535 | + ' curl '.$frontal.'/.well-known/webfinger?resource=http://nextcloud.com/' |
|
| 536 | 536 | ); |
| 537 | 537 | |
| 538 | 538 | $question = new Question('result: ', ''); |
| 539 | 539 | $pasteWebfinger = $helper->ask($input, $output, $question); |
| 540 | 540 | |
| 541 | - echo '__ ' . $pasteWebfinger; |
|
| 541 | + echo '__ '.$pasteWebfinger; |
|
| 542 | 542 | |
| 543 | 543 | $output->writeln('TESTING !!'); |
| 544 | 544 | $output->writeln('TESTING !!'); |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | $this->configService->configureLoopbackRequest($request, $route, $args); |
| 662 | 662 | $request->setFollowLocation(false); |
| 663 | 663 | |
| 664 | - $output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': '); |
|
| 664 | + $output->write('- '.$type.' request on '.$request->getCompleteUrl().': '); |
|
| 665 | 665 | |
| 666 | 666 | try { |
| 667 | 667 | $this->doRequest($request); |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | $color = 'info'; |
| 673 | 673 | } |
| 674 | 674 | |
| 675 | - $output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>'); |
|
| 675 | + $output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>'); |
|
| 676 | 676 | if ($result->getStatusCode() === 200) { |
| 677 | 677 | return true; |
| 678 | 678 | } |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | |
| 697 | 697 | $output->writeln(''); |
| 698 | 698 | $output->writeln( |
| 699 | - 'The address <info>' . $address . '</info> seems to reach your local Nextcloud.' |
|
| 699 | + 'The address <info>'.$address.'</info> seems to reach your local Nextcloud.' |
|
| 700 | 700 | ); |
| 701 | 701 | |
| 702 | 702 | $helper = $this->getHelper('question'); |
@@ -713,8 +713,8 @@ discard block |
||
| 713 | 713 | |
| 714 | 714 | $this->configService->setAppValue(ConfigService::FORCE_NC_BASE, $address); |
| 715 | 715 | $output->writeln( |
| 716 | - 'New configuration <info>' . Application::APP_ID . '.' . ConfigService::FORCE_NC_BASE . '=\'' |
|
| 717 | - . $address . '\'</info> stored in database' |
|
| 716 | + 'New configuration <info>'.Application::APP_ID.'.'.ConfigService::FORCE_NC_BASE.'=\'' |
|
| 717 | + . $address.'\'</info> stored in database' |
|
| 718 | 718 | ); |
| 719 | 719 | } |
| 720 | 720 | |
@@ -735,7 +735,7 @@ discard block |
||
| 735 | 735 | } |
| 736 | 736 | |
| 737 | 737 | if (!is_null($cloudIdPort)) { |
| 738 | - $cloudId = $cloudId . ':' . $cloudIdPort; |
|
| 738 | + $cloudId = $cloudId.':'.$cloudIdPort; |
|
| 739 | 739 | } |
| 740 | 740 | |
| 741 | 741 | return [$scheme, $cloudId]; |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | $tables = $schema->getTables(); |
| 79 | 79 | foreach ($tables as $table) { |
| 80 | 80 | $tableName = $table->getName(); |
| 81 | - if (substr($tableName, 0, 8 + strlen($prefix)) === $prefix . 'circles_') { |
|
| 81 | + if (substr($tableName, 0, 8 + strlen($prefix)) === $prefix.'circles_') { |
|
| 82 | 82 | $tableName = substr($tableName, strlen($prefix)); |
| 83 | 83 | $schema->dropTable($tableName); |
| 84 | 84 | } |
@@ -104,16 +104,16 @@ |
||
| 104 | 104 | } catch (Exception $e) { |
| 105 | 105 | $this->e($e); |
| 106 | 106 | |
| 107 | - return $membership->getSingleId() . ' is not ' . $inheritance . ' of ' |
|
| 108 | - . $membership->getCircleId() . ' anymore'; |
|
| 107 | + return $membership->getSingleId().' is not '.$inheritance.' of ' |
|
| 108 | + . $membership->getCircleId().' anymore'; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()] |
|
| 112 | - . ') is not ' . $inheritance . ' of ' . $membership->getCircleId() . ' anymore'; |
|
| 111 | + return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()] |
|
| 112 | + . ') is not '.$inheritance.' of '.$membership->getCircleId().' anymore'; |
|
| 113 | 113 | }, $event->getMemberships() |
| 114 | 114 | ); |
| 115 | 115 | |
| 116 | - $this->log(3, $prefix . implode('. ', $memberships)); |
|
| 116 | + $this->log(3, $prefix.implode('. ', $memberships)); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | } |
@@ -104,16 +104,16 @@ |
||
| 104 | 104 | } catch (Exception $e) { |
| 105 | 105 | $this->e($e); |
| 106 | 106 | |
| 107 | - return $membership->getSingleId() . ' is now ' . $inheritance . ' of ' |
|
| 107 | + return $membership->getSingleId().' is now '.$inheritance.' of ' |
|
| 108 | 108 | . $membership->getCircleId(); |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()] |
|
| 112 | - . ') is now ' . $inheritance . ' of ' . $membership->getCircleId(); |
|
| 111 | + return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()] |
|
| 112 | + . ') is now '.$inheritance.' of '.$membership->getCircleId(); |
|
| 113 | 113 | }, $event->getMemberships() |
| 114 | 114 | ); |
| 115 | 115 | |
| 116 | - $this->log(3, $prefix . implode('. ', $memberships)); |
|
| 116 | + $this->log(3, $prefix.implode('. ', $memberships)); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | } |
@@ -144,7 +144,7 @@ |
||
| 144 | 144 | $circle = new Circle(); |
| 145 | 145 | $circle->importFromDatabase( |
| 146 | 146 | $data, |
| 147 | - CoreQueryBuilder::HELPER . '_' . CoreQueryBuilder::CIRCLE . '_' |
|
| 147 | + CoreQueryBuilder::HELPER.'_'.CoreQueryBuilder::CIRCLE.'_' |
|
| 148 | 148 | ); |
| 149 | 149 | |
| 150 | 150 | return $circle; |
@@ -221,8 +221,8 @@ discard block |
||
| 221 | 221 | $qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter); |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | - $qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc'); |
|
| 225 | - $qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc'); |
|
| 224 | + $qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc'); |
|
| 225 | + $qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc'); |
|
| 226 | 226 | |
| 227 | 227 | return $this->getItemsFromRequest($qb); |
| 228 | 228 | } |
@@ -246,8 +246,8 @@ discard block |
||
| 246 | 246 | $qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId); |
| 247 | 247 | |
| 248 | 248 | $aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS); |
| 249 | - $qb->orderBy($aliasMembership . '.inheritance_depth', 'asc') |
|
| 250 | - ->addGroupBy($aliasMembership . '.inheritance_depth'); |
|
| 249 | + $qb->orderBy($aliasMembership.'.inheritance_depth', 'asc') |
|
| 250 | + ->addGroupBy($aliasMembership.'.inheritance_depth'); |
|
| 251 | 251 | |
| 252 | 252 | return $this->getItemsFromRequest($qb); |
| 253 | 253 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | $qb = $this->getMemberSelectSql(); |
| 284 | 284 | $qb->limitToCircleId($circleId); |
| 285 | 285 | |
| 286 | - $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance')); |
|
| 286 | + $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance')); |
|
| 287 | 287 | |
| 288 | 288 | return array_map( |
| 289 | 289 | function(Member $member): string { |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | */ |
| 340 | 340 | public function searchFederatedUsers(string $needle): array { |
| 341 | 341 | $qb = $this->getMemberSelectSql(); |
| 342 | - $qb->searchInDBField('user_id', '%' . $needle . '%'); |
|
| 342 | + $qb->searchInDBField('user_id', '%'.$needle.'%'); |
|
| 343 | 343 | |
| 344 | 344 | return $this->getItemsFromRequest($qb, true); |
| 345 | 345 | } |
@@ -251,16 +251,16 @@ |
||
| 251 | 251 | try { |
| 252 | 252 | $test = new ReflectionClass($class); |
| 253 | 253 | } catch (ReflectionException $e) { |
| 254 | - throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage()); |
|
| 254 | + throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage()); |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) { |
| 258 | - throw new FederatedEventException($class . ' does not implements IFederatedItem'); |
|
| 258 | + throw new FederatedEventException($class.' does not implements IFederatedItem'); |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | $item = OC::$server->get($class); |
| 262 | 262 | if (!($item instanceof IFederatedItem)) { |
| 263 | - throw new FederatedEventException($class . ' not an IFederatedItem'); |
|
| 263 | + throw new FederatedEventException($class.' not an IFederatedItem'); |
|
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | if ($item instanceof IFederatedItemHighSeverity) { |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | $this->miscService = OC::$server->query(MiscService::class); |
| 133 | 133 | } catch (QueryException $e) { |
| 134 | 134 | OC::$server->getLogger() |
| 135 | - ->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage()); |
|
| 135 | + ->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage()); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | try { |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | * @throws IllegalIDChangeException |
| 326 | 326 | */ |
| 327 | 327 | private function generateShare($data): IShare { |
| 328 | - $this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data)); |
|
| 328 | + $this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data)); |
|
| 329 | 329 | |
| 330 | 330 | $share = new Share($this->rootFolder, $this->userManager); |
| 331 | 331 | $share->setId($data['id']); |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | $this->sendPasswordByMail($share, $displayName, $email, $password); |
| 419 | 419 | } catch (Exception $e) { |
| 420 | 420 | OC::$server->getLogger() |
| 421 | - ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage()); |
|
| 421 | + ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage()); |
|
| 422 | 422 | } |
| 423 | 423 | } |
| 424 | 424 | |
@@ -436,8 +436,8 @@ discard block |
||
| 436 | 436 | $message = $this->mailer->createMessage(); |
| 437 | 437 | |
| 438 | 438 | $this->logger->log( |
| 439 | - 0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName |
|
| 440 | - . ' - link: ' . $link |
|
| 439 | + 0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName |
|
| 440 | + . ' - link: '.$link |
|
| 441 | 441 | ); |
| 442 | 442 | |
| 443 | 443 | $subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]); |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | |
| 477 | 477 | $message = $this->mailer->createMessage(); |
| 478 | 478 | |
| 479 | - $this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email); |
|
| 479 | + $this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email); |
|
| 480 | 480 | |
| 481 | 481 | $filename = $share->getNode() |
| 482 | 482 | ->getName(); |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); |
| 532 | 532 | if ($initiatorEmailAddress !== null) { |
| 533 | 533 | $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]); |
| 534 | - $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); |
|
| 534 | + $emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan()); |
|
| 535 | 535 | } else { |
| 536 | 536 | $emailTemplate->addFooter(); |
| 537 | 537 | } |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | $emailTemplate->addHeader(); |
| 567 | 567 | $emailTemplate->addHeading($subject, false); |
| 568 | 568 | $emailTemplate->addBodyText( |
| 569 | - htmlspecialchars($text) . '<br>' . htmlspecialchars( |
|
| 569 | + htmlspecialchars($text).'<br>'.htmlspecialchars( |
|
| 570 | 570 | $this->l10n->t('Click the button below to open it.') |
| 571 | 571 | ), $text |
| 572 | 572 | ); |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | $this->sendMailExistingShares($template, $author->getCachedName(), $recipient); |
| 613 | 613 | $this->sendPasswordExistingShares($author, $recipient, $password); |
| 614 | 614 | } catch (Exception $e) { |
| 615 | - $this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage()); |
|
| 615 | + $this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage()); |
|
| 616 | 616 | } |
| 617 | 617 | } |
| 618 | 618 | |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | $authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author; |
| 636 | 636 | $authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null; |
| 637 | 637 | |
| 638 | - $this->logger->log(0, "Sending password mail about existing files to '" . $email . "'"); |
|
| 638 | + $this->logger->log(0, "Sending password mail about existing files to '".$email."'"); |
|
| 639 | 639 | |
| 640 | 640 | $plainBodyPart = $this->l10n->t( |
| 641 | 641 | "%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n", |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); |
| 678 | 678 | if ($authorEmail !== null) { |
| 679 | 679 | $message->setReplyTo([$authorEmail => $authorName]); |
| 680 | - $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); |
|
| 680 | + $emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan()); |
|
| 681 | 681 | } else { |
| 682 | 682 | $emailTemplate->addFooter(); |
| 683 | 683 | } |
@@ -722,7 +722,7 @@ discard block |
||
| 722 | 722 | */ |
| 723 | 723 | protected function generateMailExitingShares($author, $circleName) { |
| 724 | 724 | $this->logger->log( |
| 725 | - 0, "Generating mail about existing share mail from '" . $author . "' in " |
|
| 725 | + 0, "Generating mail about existing share mail from '".$author."' in " |
|
| 726 | 726 | . $circleName |
| 727 | 727 | ); |
| 728 | 728 | |