nextcloud / circles

lib/Command/CirclesCheck.php

Spacing +37 added lines, -37 removed lines

@@ -177,7 +177,7 @@ 
 			throw new Exception('Please specify a --type for the test');
 		}
 		if ($test !== '' && !in_array($type, self::$checks)) {
-			throw new Exception('Unknown type: ' . implode(', ', self::$checks));
+			throw new Exception('Unknown type: '.implode(', ', self::$checks));
 		}
 
 //		$this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test);
@@ -235,7 +235,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
@@ -271,8 +271,8 @@ 
 				continue;
 			}
 
-			$loopback = rtrim($scheme . '://' . $cloudId . $path, '/');
-			$output->writeln('* testing address: ' . $loopback . ' ');
+			$loopback = rtrim($scheme.'://'.$cloudId.$path, '/');
+			$output->writeln('* testing address: '.$loopback.' ');
 
 			try {
 				$this->setupLoopback($input, $output, $loopback);
@@ -345,8 +345,8 @@ 
 		$test = new FederatedEvent(LoopbackTest::class);
 		$this->federatedEventService->newEvent($test);
 		$output->writeln(
-			'<info>' . $test->getWrapperToken() . '</info> ' .
-			'(took ' . (round(microtime(true) * 1000) - $timer) . 'ms)'
+			'<info>'.$test->getWrapperToken().'</info> '.
+			'(took '.(round(microtime(true) * 1000) - $timer).'ms)'
 		);
 
 		$output->writeln('- Waiting for async process to finish (5s)');
@@ -365,18 +365,18 @@ 
 
 		$checkVerify = $wrapper->getEvent()->getData()->gInt('verify');
 		if ($checkVerify === LoopbackTest::VERIFY) {
-			$output->write('<info>verify=' . $checkVerify . '</info> ');
+			$output->write('<info>verify='.$checkVerify.'</info> ');
 		} else {
-			$output->writeln('<error>verify=' . $checkVerify . '</error>');
+			$output->writeln('<error>verify='.$checkVerify.'</error>');
 
 			return false;
 		}
 
 		$checkManage = $wrapper->getResult()->gInt('manage');
 		if ($checkManage === LoopbackTest::MANAGE) {
-			$output->write('<info>manage=' . $checkManage . '</info> ');
+			$output->write('<info>manage='.$checkManage.'</info> ');
 		} else {
-			$output->writeln('<error>manage=' . $checkManage . '</error>');
+			$output->writeln('<error>manage='.$checkManage.'</error>');
 
 			return false;
 		}
@@ -415,7 +415,7 @@ 
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::LOOPBACK_CLOUD_PATH, $path);
 		$output->writeln(
-			'- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>'
+			'- Address <info>'.$loopback.'</info> is now used as <info>loopback</info>'
 		);
 	}
 
@@ -467,8 +467,8 @@ 
 				continue;
 			}
 
-			$internal = rtrim($scheme . '://' . $cloudId, '/');
-			$fullInternal = rtrim($scheme . '://' . $cloudId . $path, '/');
+			$internal = rtrim($scheme.'://'.$cloudId, '/');
+			$fullInternal = rtrim($scheme.'://'.$cloudId.$path, '/');
 
 			$question = new ConfirmationQuestion(
 				'<comment>Do you want to check the validity of this internal address?</comment> (Y/n) ', true,
@@ -487,9 +487,9 @@ 
 					'You will need to run this <info>curl</info> command from a terminal on your local network and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $internal
+					'     curl -L "'.$internal
 					. '/.well-known/webfinger?resource=http://nextcloud.com/&test='
-					. $testToken . '"'
+					. $testToken.'"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -523,7 +523,7 @@ 
 
 				if ($pastedHref !== $href) {
 					$output->writeln(
-						'<error>The returned data (' . $pastedHref . ') are not the one expected: </error>'
+						'<error>The returned data ('.$pastedHref.') are not the one expected: </error>'
 						. $href
 					);
 					continue;
@@ -535,7 +535,7 @@ 
 					'Next step, please run this <info>curl</info> command from a terminal on your local network and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"'
+					'     curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -552,9 +552,9 @@ 
 					|| $appSignatory->getRoot() !== $pastedSignatory->g('root')) {
 					$output->writeln(
 						'<error>The returned data ('
-						. $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root')
+						. $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root')
 						. ') are not the one expected: </error>'
-						. $appSignatory->getUid(true) . '/' . $appSignatory->getRoot()
+						. $appSignatory->getUid(true).'/'.$appSignatory->getRoot()
 					);
 					continue;
 				}
@@ -581,7 +581,7 @@ 
 
 		$output->writeln('');
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>' . $internal
+			'- Do you want to save <info>'.$internal
 			. '</info> as your <info>internal</info> address ? (y/N) ',
 			false, '/^(y|Y)/i'
 		);
@@ -597,7 +597,7 @@ 
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::INTERNAL_CLOUD_PATH, $path);
 
-		$output->writeln('- Address <info>' . $internal . '</info> is now used as <info>internal</info>');
+		$output->writeln('- Address <info>'.$internal.'</info> is now used as <info>internal</info>');
 	}
 
 
@@ -649,8 +649,8 @@ 
 				continue;
 			}
 
-			$frontal = rtrim($scheme . '://' . $cloudId, '/');
-			$fullFrontal = rtrim($scheme . '://' . $cloudId . $path, '/');
+			$frontal = rtrim($scheme.'://'.$cloudId, '/');
+			$fullFrontal = rtrim($scheme.'://'.$cloudId.$path, '/');
 
 			$question = new ConfirmationQuestion(
 				'<comment>Do you want to check the validity of this frontal address?</comment> (y/N) ', false,
@@ -669,9 +669,9 @@ 
 					'You will need to run this <info>curl</info> command from a remote terminal and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $frontal
+					'     curl -L "'.$frontal
 					. '/.well-known/webfinger?resource=http://nextcloud.com/&test='
-					. $testToken . '"'
+					. $testToken.'"'
 				);
 
 
@@ -706,7 +706,7 @@ 
 
 				if ($pastedHref !== $href) {
 					$output->writeln(
-						'<error>The returned data (' . $pastedHref . ') are not the one expected: </error>'
+						'<error>The returned data ('.$pastedHref.') are not the one expected: </error>'
 						. $href
 					);
 					continue;
@@ -718,7 +718,7 @@ 
 					'Next step, please run this <info>curl</info> command from a remote terminal and paste its result: '
 				);
 				$output->writeln(
-					'     curl -L "' . $pastedHref . '?test=' . $testToken . '" -H "Accept: application/json"'
+					'     curl -L "'.$pastedHref.'?test='.$testToken.'" -H "Accept: application/json"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -736,9 +736,9 @@ 
 					|| $appSignatory->getRoot() !== $pastedSignatory->g('root')) {
 					$output->writeln(
 						'<error>The returned data ('
-						. $pastedSignatory->g('uid') . '/' . $pastedSignatory->g('root')
+						. $pastedSignatory->g('uid').'/'.$pastedSignatory->g('root')
 						. ') are not the one expected: </error>'
-						. $appSignatory->getUid(true) . '/' . $appSignatory->getRoot()
+						. $appSignatory->getUid(true).'/'.$appSignatory->getRoot()
 					);
 					continue;
 				}
@@ -765,7 +765,7 @@ 
 
 		$output->writeln('');
 		$question = new ConfirmationQuestion(
-			'- Do you want to save <info>' . $frontal
+			'- Do you want to save <info>'.$frontal
 			. '</info> as your <info>frontal</info> address ? (y/N) ',
 			false, '/^(y|Y)/i'
 		);
@@ -781,7 +781,7 @@ 
 		$this->configService->setAppValue(ConfigService::FRONTAL_CLOUD_ID, $cloudId);
 		$this->configService->setAppValue(ConfigService::FRONTAL_CLOUD_PATH, $path);
 
-		$output->writeln('- Address <info>' . $frontal . '</info> is now used as <info>frontal</info>');
+		$output->writeln('- Address <info>'.$frontal.'</info> is now used as <info>frontal</info>');
 	}
 
 
@@ -807,7 +807,7 @@ 
 			$request->setDataSerialize(new SimpleDataStore(['empty' => 1]));
 		}
 
-		$output->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': ');
+		$output->write('- '.$type.' request on '.$request->getCompleteUrl().': ');
 
 		try {
 			$this->doRequest($request);
@@ -818,7 +818,7 @@ 
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+			$output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -842,7 +842,7 @@ 
 
 		$output->writeln('');
 		$output->writeln(
-			'The address <info>' . $address . '</info> seems to reach your local Nextcloud.'
+			'The address <info>'.$address.'</info> seems to reach your local Nextcloud.'
 		);
 
 		$helper = $this->getHelper('question');
@@ -859,8 +859,8 @@ 
 
 		$this->configService->setAppValue(ConfigService::FORCE_NC_BASE, $address);
 		$output->writeln(
-			'New configuration <info>' . Application::APP_ID . '.' . ConfigService::FORCE_NC_BASE . '=\''
-			. $address . '\'</info> stored in database'
+			'New configuration <info>'.Application::APP_ID.'.'.ConfigService::FORCE_NC_BASE.'=\''
+			. $address.'\'</info> stored in database'
 		);
 	}
 
@@ -888,7 +888,7 @@ 
 		$path = rtrim($path, '/');
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . $cloudIdPort;
+			$cloudId = $cloudId.':'.$cloudIdPort;
 		}
 
 		return [$scheme, $cloudId, $path];