@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | throw new Exception('Please specify a --type for the test'); |
| 178 | 178 | } |
| 179 | 179 | if ($test !== '' && !in_array($type, self::$checks)) { |
| 180 | - throw new Exception('Unknown type: ' . implode(', ', self::$checks)); |
|
| 180 | + throw new Exception('Unknown type: '.implode(', ', self::$checks)); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | // $this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test); |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | $output->writeln(''); |
| 238 | - $output->writeln('* testing current address: ' . $test); |
|
| 238 | + $output->writeln('* testing current address: '.$test); |
|
| 239 | 239 | |
| 240 | 240 | try { |
| 241 | 241 | $this->setupLoopback($input, $output, $test); |
@@ -271,8 +271,8 @@ discard block |
||
| 271 | 271 | continue; |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - $loopback = rtrim($scheme . '://' . $cloudId . $path, '/'); |
|
| 275 | - $output->writeln('* testing address: ' . $loopback . ' '); |
|
| 274 | + $loopback = rtrim($scheme.'://'.$cloudId.$path, '/'); |
|
| 275 | + $output->writeln('* testing address: '.$loopback.' '); |
|
| 276 | 276 | |
| 277 | 277 | try { |
| 278 | 278 | $this->setupLoopback($input, $output, $loopback); |
@@ -345,8 +345,8 @@ discard block |
||
| 345 | 345 | $test = new FederatedEvent(LoopbackTest::class); |
| 346 | 346 | $this->federatedEventService->newEvent($test); |
| 347 | 347 | $output->writeln( |
| 348 | - '<info>' . $test->getWrapperToken() . '</info> ' . |
|
| 349 | - '(took ' . (round(microtime(true) * 1000) - $timer) . 'ms)' |
|
| 348 | + '<info>'.$test->getWrapperToken().'</info> '. |
|
| 349 | + '(took '.(round(microtime(true) * 1000) - $timer).'ms)' |
|
| 350 | 350 | ); |
| 351 | 351 | |
| 352 | 352 | $output->writeln('- Waiting for async process to finish (5s)'); |
@@ -365,18 +365,18 @@ discard block |
||
| 365 | 365 | |
| 366 | 366 | $checkVerify = $wrapper->getEvent()->getData()->gInt('verify'); |
| 367 | 367 | if ($checkVerify === LoopbackTest::VERIFY) { |
| 368 | - $output->write('<info>verify=' . $checkVerify . '</info> '); |
|
| 368 | + $output->write('<info>verify='.$checkVerify.'</info> '); |
|
| 369 | 369 | } else { |
| 370 | - $output->writeln('<error>verify=' . $checkVerify . '</error>'); |
|
| 370 | + $output->writeln('<error>verify='.$checkVerify.'</error>'); |
|
| 371 | 371 | |
| 372 | 372 | return false; |
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | $checkManage = $wrapper->getResult()->gInt('manage'); |
| 376 | 376 | if ($checkManage === LoopbackTest::MANAGE) { |
| 377 | - $output->write('<info>manage=' . $checkManage . '</info> '); |
|
| 377 | + $output->write('<info>manage='.$checkManage.'</info> '); |
|
| 378 | 378 | } else { |
| 379 | - $output->writeln('<error>manage=' . $checkManage . '</error>'); |
|
| 379 | + $output->writeln('<error>manage='.$checkManage.'</error>'); |
|
| 380 | 380 | |
| 381 | 381 | return false; |
| 382 | 382 | } |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | $this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId); |
| 416 | 416 | $this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_PATH, $path); |
| 417 | 417 | $output->writeln( |
| 418 | - '- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>' |
|
| 418 | + '- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>' |
|
| 419 | 419 | ); |
| 420 | 420 | } |
| 421 | 421 | |
@@ -467,8 +467,8 @@ discard block |
||
| 467 | 467 | continue; |
| 468 | 468 | } |
| 469 | 469 | |
| 470 | - $internal = rtrim($scheme . '://' . $cloudId, '/'); |
|
| 471 | - $fullInternal = rtrim($scheme . '://' . $cloudId . $path, '/'); |
|
| 470 | + $internal = rtrim($scheme.'://'.$cloudId, '/'); |
|
| 471 | + $fullInternal = rtrim($scheme.'://'.$cloudId.$path, '/'); |
|
| 472 | 472 | |
| 473 | 473 | $question = new ConfirmationQuestion( |
| 474 | 474 | '<comment>Do you want to check the validity of this internal address?</comment> (Y/n) ', true, |
@@ -487,9 +487,9 @@ discard block |
||
| 487 | 487 | 'You will need to run this <info>curl</info> command from a terminal on your local network and paste its result: ' |
| 488 | 488 | ); |
| 489 | 489 | $output->writeln( |
| 490 | - ' curl -L "' . $internal |
|
| 490 | + ' curl -L "'.$internal |
|
| 491 | 491 | . '/.well-known/webfinger?resource=http://nextcloud.com/&test=' |
| 492 | - . $testToken . '"' |
|
| 492 | + . $testToken.'"' |
|
| 493 | 493 | ); |
| 494 | 494 | |
| 495 | 495 | $output->writeln('paste the result here: '); |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | |
| 524 | 524 | if ($pastedHref !== $href) { |
| 525 | 525 | $output->writeln( |
| 526 | - '<error>The returned data (' . $pastedHref . ') are not the one expected: </error>' |
|
| 526 | + '<error>The returned data ('.$pastedHref.') are not the one expected: </error>' |
|
| 527 | 527 | . $href |
| 528 | 528 | ); |
| 529 | 529 | continue; |
@@ -535,7 +535,7 @@ discard block |
||
| 535 | 535 | 'Now, please run this <info>curl</info> command from a terminal on your local network and paste its result: ' |
| 536 | 536 | ); |
| 537 | 537 | $output->writeln( |
| 538 | - ' curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"' |
|
| 538 | + ' curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"' |
|
| 539 | 539 | ); |
| 540 | 540 | |
| 541 | 541 | $output->writeln('paste the result here: '); |
@@ -552,9 +552,9 @@ discard block |
||
| 552 | 552 | || $appSignatory->getRoot() !== $pastedSignatory->g('root')) { |
| 553 | 553 | $output->writeln( |
| 554 | 554 | '<error>The returned data (' |
| 555 | - . $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root') |
|
| 555 | + . $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root') |
|
| 556 | 556 | . ') are not the one expected: </error>' |
| 557 | - . $appSignatory->getUid(true) . '/' . $appSignatory->getRoot() |
|
| 557 | + . $appSignatory->getUid(true).'/'.$appSignatory->getRoot() |
|
| 558 | 558 | ); |
| 559 | 559 | continue; |
| 560 | 560 | } |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | $this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_PATH, $path); |
| 600 | 600 | |
| 601 | 601 | $output->writeln( |
| 602 | - '- Address <info>' . $internal . '</info> is now used as <info>internal</info>' |
|
| 602 | + '- Address <info>'.$internal.'</info> is now used as <info>internal</info>' |
|
| 603 | 603 | ); |
| 604 | 604 | } |
| 605 | 605 | |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | continue; |
| 653 | 653 | } |
| 654 | 654 | |
| 655 | - $frontal = rtrim($scheme . '://' . $cloudId . $path, '/'); |
|
| 655 | + $frontal = rtrim($scheme.'://'.$cloudId.$path, '/'); |
|
| 656 | 656 | break; |
| 657 | 657 | } |
| 658 | 658 | |
@@ -666,13 +666,13 @@ discard block |
||
| 666 | 666 | 'You will need to run this <info>curl</info> command from a remote terminal and paste its result: ' |
| 667 | 667 | ); |
| 668 | 668 | $output->writeln( |
| 669 | - ' curl ' . $frontal . '/.well-known/webfinger?resource=http://nextcloud.com/' |
|
| 669 | + ' curl '.$frontal.'/.well-known/webfinger?resource=http://nextcloud.com/' |
|
| 670 | 670 | ); |
| 671 | 671 | |
| 672 | 672 | $question = new Question('result: ', ''); |
| 673 | 673 | $pasteWebfinger = $helper->ask($input, $output, $question); |
| 674 | 674 | |
| 675 | - echo '__ ' . $pasteWebfinger; |
|
| 675 | + echo '__ '.$pasteWebfinger; |
|
| 676 | 676 | |
| 677 | 677 | $output->writeln('TESTING !!'); |
| 678 | 678 | $output->writeln('TESTING !!'); |
@@ -799,7 +799,7 @@ discard block |
||
| 799 | 799 | $request->setDataSerialize(new SimpleDataStore(['empty' => 1])); |
| 800 | 800 | } |
| 801 | 801 | |
| 802 | - $output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': '); |
|
| 802 | + $output->write('- '.$type.' request on '.$request->getCompleteUrl().': '); |
|
| 803 | 803 | |
| 804 | 804 | try { |
| 805 | 805 | $this->doRequest($request); |
@@ -810,7 +810,7 @@ discard block |
||
| 810 | 810 | $color = 'info'; |
| 811 | 811 | } |
| 812 | 812 | |
| 813 | - $output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>'); |
|
| 813 | + $output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>'); |
|
| 814 | 814 | if ($result->getStatusCode() === 200) { |
| 815 | 815 | return true; |
| 816 | 816 | } |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | |
| 835 | 835 | $output->writeln(''); |
| 836 | 836 | $output->writeln( |
| 837 | - 'The address <info>' . $address . '</info> seems to reach your local Nextcloud.' |
|
| 837 | + 'The address <info>'.$address.'</info> seems to reach your local Nextcloud.' |
|
| 838 | 838 | ); |
| 839 | 839 | |
| 840 | 840 | $helper = $this->getHelper('question'); |
@@ -851,8 +851,8 @@ discard block |
||
| 851 | 851 | |
| 852 | 852 | $this->configService->setAppValue(ConfigService::FORCE_NC_BASE, $address); |
| 853 | 853 | $output->writeln( |
| 854 | - 'New configuration <info>' . Application::APP_ID . '.' . ConfigService::FORCE_NC_BASE . '=\'' |
|
| 855 | - . $address . '\'</info> stored in database' |
|
| 854 | + 'New configuration <info>'.Application::APP_ID.'.'.ConfigService::FORCE_NC_BASE.'=\'' |
|
| 855 | + . $address.'\'</info> stored in database' |
|
| 856 | 856 | ); |
| 857 | 857 | } |
| 858 | 858 | |
@@ -880,7 +880,7 @@ discard block |
||
| 880 | 880 | $path = rtrim($path, '/'); |
| 881 | 881 | |
| 882 | 882 | if (!is_null($cloudIdPort)) { |
| 883 | - $cloudId = $cloudId . ':' . $cloudIdPort; |
|
| 883 | + $cloudId = $cloudId.':'.$cloudIdPort; |
|
| 884 | 884 | } |
| 885 | 885 | |
| 886 | 886 | return [$scheme, $cloudId, $path]; |