nextcloud / circles

lib/Command/CirclesCheck.php

Spacing +37 added lines, -37 removed lines

@@ -109,7 +109,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);
@@ -165,7 +165,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
@@ -200,8 +200,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);
@@ -272,8 +272,8 @@ 
 		$test = new FederatedEvent(LoopbackTest::class);
 		$this->federatedEventService->newEvent($test);
 		$output->writeln(
-			'<info>' . $test->getWrapperToken() . '</info> ' .
-			'(took ' . ((string)(round(microtime(true) * 1000.0) - $timer)) . 'ms)'
+			'<info>'.$test->getWrapperToken().'</info> '.
+			'(took '.((string)(round(microtime(true) * 1000.0) - $timer)).'ms)'
 		);
 
 		$output->writeln('- Waiting for async process to finish (5s)');
@@ -292,18 +292,18 @@ 
 
 		$checkVerify = $wrapper->getEvent()->getData()->gInt('verify');
 		if ($checkVerify === LoopbackTest::VERIFY) {
-			$output->write('<info>verify=' . ((string)$checkVerify) . '</info> ');
+			$output->write('<info>verify='.((string)$checkVerify).'</info> ');
 		} else {
-			$output->writeln('<error>verify=' . ((string)$checkVerify) . '</error>');
+			$output->writeln('<error>verify='.((string)$checkVerify).'</error>');
 
 			return false;
 		}
 
 		$checkManage = $wrapper->getResult()->gInt('manage');
 		if ($checkManage === LoopbackTest::MANAGE) {
-			$output->write('<info>manage=' . ((string)$checkManage) . '</info> ');
+			$output->write('<info>manage='.((string)$checkManage).'</info> ');
 		} else {
-			$output->writeln('<error>manage=' . ((string)$checkManage) . '</error>');
+			$output->writeln('<error>manage='.((string)$checkManage).'</error>');
 
 			return false;
 		}
@@ -342,7 +342,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>'
 		);
 	}
 
@@ -395,8 +395,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,
@@ -415,9 +415,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: ');
@@ -451,7 +451,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;
@@ -463,7 +463,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: ');
@@ -479,9 +479,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;
 				}
@@ -507,7 +507,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'
 		);
@@ -524,7 +524,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>');
 	}
 
 	/**
@@ -575,8 +575,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,
@@ -595,9 +595,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.'"'
 				);
 
 				$output->writeln('paste the result here: ');
@@ -631,7 +631,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;
@@ -643,7 +643,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: ');
@@ -659,9 +659,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;
 				}
@@ -687,7 +687,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'
 		);
@@ -704,7 +704,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>');
 	}
 
 	/**
@@ -729,7 +729,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);
@@ -740,7 +740,7 @@ 
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . ((string)$result->getStatusCode()) . '</' . $color . '>');
+			$output->writeln('<'.$color.'>'.((string)$result->getStatusCode()).'</'.$color.'>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -763,7 +763,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.'
 		);
 
 		/** @var QuestionHelper $helper */
@@ -781,8 +781,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'
 		);
 	}
 
@@ -809,7 +809,7 @@ 
 		$path = rtrim($path, '/');
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . ((string)$cloudIdPort);
+			$cloudId = $cloudId.':'.((string)$cloudIdPort);
 		}
 
 		return [$scheme, $cloudId, $path];

lib/Command/MembersAdd.php

Spacing +6 added lines, -6 removed lines

@@ -109,7 +109,7 @@ 
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 
@@ -148,10 +148,10 @@ 
 		try {
 			$users = $this->retrieveJson($request);
 		} catch (
-			RequestContentException|
-			RequestNetworkException|
-			RequestResultSizeException|
-			RequestServerException|
+			RequestContentException |
+			RequestNetworkException |
+			RequestResultSizeException |
+			RequestServerException |
 			RequestResultNotJsonException $e
 		) {
 			return '';
@@ -169,7 +169,7 @@ 
 				$instance = $host;
 			}
 
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
 		}
 
 		//		if ($userId === '') {

lib/Command/CirclesJoin.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/CirclesLeave.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/CirclesSetting.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/CirclesEdit.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/MembersLevel.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Command/CirclesDestroy.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
 				);
 			}
 

lib/Db/DeprecatedRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -344,8 +344,8 @@ 
 		$expr = $qb->expr();
 
 		if ($pf === '') {
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
 
 			return;
 		}
@@ -374,7 +374,7 @@ 
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
 				continue;
 			}
-			$orX[] = $expr->gte($p . '.level', $qb->createNamedParameter($level));
+			$orX[] = $expr->gte($p.'.level', $qb->createNamedParameter($level));
 		}
 
 		return $expr->orX(...$orX);
@@ -389,12 +389,12 @@ 
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
 		$qb->andWhere($expr->orX(
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)),
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)),
-			$expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)),
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)),
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)),
+			$expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)),
 		));
 	}
 
@@ -406,8 +406,8 @@ 
 	 */
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -418,8 +418,8 @@ 
 	 */
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -434,9 +434,9 @@ 
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
 		if ($userId !== '') {
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
 		} else {
@@ -459,7 +459,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -468,7 +468,7 @@ 
 			->selectAlias('lc.settings', 'circle_settings')
 			->leftJoin(
 				$this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
-				$expr->eq($pf . 'circle_id', 'lc.unique_id')
+				$expr->eq($pf.'circle_id', 'lc.unique_id')
 			);
 	}