nextcloud / circles

lib/Command/CirclesRemote.php

Spacing +28 added lines, -28 removed lines

@@ -161,19 +161,19 @@ 
 
 		$webfinger = $this->getWebfinger($host, Application::APP_SUBJECT);
 		if ($this->input->getOption('all')) {
-			$this->output->writeln('- Webfinger on <info>' . $host . '</info>');
+			$this->output->writeln('- Webfinger on <info>'.$host.'</info>');
 			$this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$this->output->writeln('');
 		}
 
 		if ($this->input->getOption('all')) {
 			$circleLink = $this->extractLink(Application::APP_REL, $webfinger);
-			$this->output->writeln('- Information about Circles app on <info>' . $host . '</info>');
+			$this->output->writeln('- Information about Circles app on <info>'.$host.'</info>');
 			$this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 			$this->output->writeln('');
 		}
 
-		$this->output->writeln('- Available services on <info>' . $host . '</info>');
+		$this->output->writeln('- Available services on <info>'.$host.'</info>');
 		foreach ($webfinger->getLinks() as $link) {
 			$app = $link->getProperty('name');
 			$ver = $link->getProperty('version');
@@ -181,14 +181,14 @@ 
 				$app .= ' ';
 			}
 			if ($ver !== '') {
-				$ver = 'v' . $ver;
+				$ver = 'v'.$ver;
 			}
 
-			$this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver);
+			$this->output->writeln(' * '.$link->getRel().' '.$app.$ver);
 		}
 		$this->output->writeln('');
 
-		$this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>');
+		$this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>');
 		$resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL);
 		$this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 		$this->output->writeln('');
@@ -196,7 +196,7 @@ 
 
 		$tempUid = $resource->g('uid');
 		$this->output->writeln(
-			'- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>'
+			'- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>'
 		);
 
 		try {
@@ -204,15 +204,15 @@ 
 			$this->output->writeln(' * No SignatureException: <info>Identity authed</info>');
 		} catch (SignatureException $e) {
 			$this->output->writeln(
-				'<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>'
+				'<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>'
 			);
 
 			return;
 		}
 
-		$this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>');
+		$this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>');
 		if ($remoteSignatory->getUid(true) !== $tempUid) {
-			$this->output->writeln('<error>looks like ' . $host . ' is faking its identity');
+			$this->output->writeln('<error>looks like '.$host.' is faking its identity');
 
 			return;
 		}
@@ -220,7 +220,7 @@ 
 		$this->output->writeln('');
 
 		$testUrl = $resource->g('test');
-		$this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>');
+		$this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>');
 
 		try {
 			$localSignatory = $this->remoteStreamService->getAppSignatory();
@@ -242,18 +242,18 @@ 
 		$this->output->writeln('');
 
 		$this->output->writeln(' * Clear Signature: ');
-		$this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>');
+		$this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>');
 		$this->output->writeln('');
 
 		$this->output->writeln(' * Signed Signature (base64 encoded): ');
 		$this->output->writeln(
-			'<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>'
+			'<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>'
 		);
 		$this->output->writeln('');
 
 		$result = $signedRequest->getOutgoingRequest()->getResult();
 		$code = $result->getStatusCode();
-		$this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code));
+		$this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.$code.'</info>' : $code));
 		$this->output->writeln(
 			json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
 		);
@@ -274,13 +274,13 @@ 
 				$stored = new RemoteInstance();
 				$this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored);
 				$this->output->writeln(
-					'<info>The remote instance ' . $host
+					'<info>The remote instance '.$host
 					. ' is already known with this current identity</info>'
 				);
 
 				if ($remoteSignatory->getType() !== $stored->getType()) {
 					$this->output->writeln(
-						'- updating type from ' . $stored->getType() . ' to '
+						'- updating type from '.$stored->getType().' to '
 						. $remoteSignatory->getType()
 					);
 					$this->remoteStreamService->update(
@@ -290,7 +290,7 @@ 
 
 				if ($remoteSignatory->getInstance() !== $stored->getInstance()) {
 					$this->output->writeln(
-						'- updating host from ' . $stored->getInstance() . ' to '
+						'- updating host from '.$stored->getInstance().' to '
 						. $remoteSignatory->getInstance()
 					);
 					$this->remoteStreamService->update(
@@ -299,7 +299,7 @@ 
 				}
 				if ($remoteSignatory->getId() !== $stored->getId()) {
 					$this->output->writeln(
-						'- updating href/Id from ' . $stored->getId() . ' to '
+						'- updating href/Id from '.$stored->getId().' to '
 						. $remoteSignatory->getId()
 					);
 					$this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF);
@@ -325,10 +325,10 @@ 
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(
-			'The remote instance <info>' . $remoteSignatory->getInstance() . '</info> looks good.'
+			'The remote instance <info>'.$remoteSignatory->getInstance().'</info> looks good.'
 		);
 		$question = new ConfirmationQuestion(
-			'Would you like to identify this remote instance as \'' . $remoteSignatory->getType()
+			'Would you like to identify this remote instance as \''.$remoteSignatory->getType()
 			. '\' ? (y/N) ',
 			false,
 			'/^(y|Y)/i'
@@ -351,7 +351,7 @@ 
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(
-			'The remote instance <info>' . $remoteSignatory->getInstance()
+			'The remote instance <info>'.$remoteSignatory->getInstance()
 			. '</info> is known but <error>its identity has changed.</error>'
 		);
 		$this->output->writeln(
@@ -428,13 +428,13 @@ 
 		if ($this->configService->isLocalInstance($instance)) {
 			return;
 		}
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
+		$this->output->write('Adding <comment>'.$instance.'</comment>: ');
 		try {
 			$this->remoteStreamService->addRemoteInstance($instance, RemoteInstance::TYPE_GLOBAL_SCALE, true);
 			$this->output->writeln('<info>ok</info>');
 		} catch (Exception $e) {
-			$msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')';
-			$this->output->writeln('<error>' . get_class($e) . $msg . '</error>');
+			$msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')';
+			$this->output->writeln('<error>'.get_class($e).$msg.'</error>');
 		}
 	}
 
@@ -452,12 +452,12 @@ 
 			try {
 				$current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance());
 				if ($current->getUid(true) === $instance->getUid(true)) {
-					$currentUid = '<info>' . $current->getUid(true) . '</info>';
+					$currentUid = '<info>'.$current->getUid(true).'</info>';
 				} else {
-					$currentUid = '<error>' . $current->getUid(true) . '</error>';
+					$currentUid = '<error>'.$current->getUid(true).'</error>';
 				}
 			} catch (Exception $e) {
-				$currentUid = '<error>' . $e->getMessage() . '</error>';
+				$currentUid = '<error>'.$e->getMessage().'</error>';
 			}
 
 			$table->appendRow(
@@ -479,7 +479,7 @@ 
 		$type = ucfirst(strtolower($this->input->getOption('type')));
 
 		if (!in_array($type, RemoteInstance::$LIST_TYPE)) {
-			throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE));
+			throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE));
 		}
 
 		return $type;

lib/Model/Federated/RemoteInstance.php

Spacing +6 added lines, -6 removed lines

@@ -49,11 +49,11 @@ 
 
 	use TArrayTools;
 
-	const TYPE_UNKNOWN = 'Unknown';    // not trusted
-	const TYPE_PASSIVE = 'Passive';    // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
-	const TYPE_EXTERNAL = 'External';  // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
-	const TYPE_TRUSTED = 'Trusted';    // everything about Federated Circles are broadcasted.
-	const TYPE_GLOBAL_SCALE = 'GlobalScale';  // every Circle is broadcasted,
+	const TYPE_UNKNOWN = 'Unknown'; // not trusted
+	const TYPE_PASSIVE = 'Passive'; // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
+	const TYPE_EXTERNAL = 'External'; // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
+	const TYPE_TRUSTED = 'Trusted'; // everything about Federated Circles are broadcasted.
+	const TYPE_GLOBAL_SCALE = 'GlobalScale'; // every Circle is broadcasted,
 
 	public static $LIST_TYPE = [
 		self::TYPE_UNKNOWN,
@@ -407,7 +407,7 @@ 
 		];
 
 		if ($this->getAuthSigned() !== '') {
-			$data['auth-signed'] = $this->getAlgorithm() . ':' . $this->getAuthSigned();
+			$data['auth-signed'] = $this->getAlgorithm().':'.$this->getAuthSigned();
 		}
 
 		return array_filter(array_merge($data, parent::jsonSerialize()));

lib/Command/MembersList.php

Spacing +12 added lines, -12 removed lines

@@ -158,11 +158,11 @@ 
 		if ($input->getOption('tree')) {
 			$this->federatedUserService->commandLineInitiator($initiator, $circleId, true);
 			$circle = $this->circleService->getCircle($circleId);
-			$output->writeln('<info>Name</info>: ' . $circle->getName());
+			$output->writeln('<info>Name</info>: '.$circle->getName());
 			$owner = $circle->getOwner();
-			$output->writeln('<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance());
+			$output->writeln('<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance());
 			$type = implode(", ", Circle::getCircleTypes($circle, Circle::TYPES_LONG));
-			$output->writeln('<info>Config</info>: ' . $type);
+			$output->writeln('<info>Config</info>: '.$type);
 			$output->writeln(' ');
 
 			$tree = new NC21TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -184,7 +184,7 @@ 
 		}
 
 		if ($input->getOption('json')) {
-			echo json_encode($members, JSON_PRETTY_PRINT) . "\n";
+			echo json_encode($members, JSON_PRETTY_PRINT)."\n";
 
 			return 0;
 		}
@@ -343,14 +343,14 @@ 
 				$member = $data->gObj('member', Member::class);
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $member->getUserId() . '</info>';
+					$line .= '<info>'.$member->getUserId().'</info>';
 					if (!$this->configService->isLocalInstance($member->getInstance())) {
-						$line .= '@' . $member->getInstance();
+						$line .= '@'.$member->getInstance();
 					}
-					$line .= ' (' . Member::$DEF_LEVEL[$member->getLevel()] . ')';
+					$line .= ' ('.Member::$DEF_LEVEL[$member->getLevel()].')';
 
 					if (!is_null($circle)) {
-						$line .= ' <info>Name</info>: ' . $circle->getName();
+						$line .= ' <info>Name</info>: '.$circle->getName();
 					}
 				}
 
@@ -363,16 +363,16 @@ 
 						return $line;
 					}
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
 					$type = implode(", ", Circle::getCircleTypes($circle, Circle::TYPES_LONG));
-					$line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : ' <info>Config</info>: '.$type;
 				}
 
 			} else {
 				if ($lineNumber === 1 && !is_null($circle)) {
-					$line .= '<info>' . $circle->getId() . '</info>';
+					$line .= '<info>'.$circle->getId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
 				}
 			}

lib/Db/MemberRequest.php

Spacing +2 added lines, -2 removed lines

@@ -174,8 +174,8 @@
 			$qb->limitToRemoteInstance($remoteInstance->getInstance(), true);
 		}
 
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
 
 		return $this->getItemsFromRequest($qb);
 	}

lib/Command/CirclesConfig.php

Spacing +2 added lines, -2 removed lines

@@ -182,8 +182,8 @@
 			$value = array_search(strtoupper($item), $valid);
 			if (!$value) {
 				throw new InvalidArgumentException(
-					'Invalid config \'' . $item . '\'. Available values: '
-					. implode(', ', array_values($valid)) . '. '
+					'Invalid config \''.$item.'\'. Available values: '
+					. implode(', ', array_values($valid)).'. '
 					. 'To disable a config, start the value with an underscore'
 				);
 			}

lib/FederatedItems/MemberAdd.php

Spacing +9 added lines, -9 removed lines

@@ -164,15 +164,15 @@ 
 		$initiatorHelper = new MemberHelper($initiator);
 		$initiatorHelper->mustBeModerator();
 
-		$federatedId = $member->getUserId() . '@' . $member->getInstance();
+		$federatedId = $member->getUserId().'@'.$member->getInstance();
 
 		try {
 			$federatedUser =
 				$this->federatedUserService->getFederatedUser($federatedId, $member->getUserType());
 		} catch (MemberNotFoundException $e) {
 			throw new MemberNotFoundException(
-				ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' %s not found',
-				['member' => $member->getUserId() . '@' . $member->getInstance()]
+				ucfirst(Member::$DEF_TYPE[$member->getUserType()]).' %s not found',
+				['member' => $member->getUserId().'@'.$member->getInstance()]
 			);
 		}
 
@@ -182,8 +182,8 @@ 
 			$knownMember = $this->memberRequest->searchMember($member);
 			// TODO: maybe member is requesting access
 			throw new MemberAlreadyExistsException(
-				ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' %s is already a member',
-				['member' => $member->getUserId() . '@' . $member->getInstance()]
+				ucfirst(Member::$DEF_TYPE[$member->getUserType()]).' %s is already a member',
+				['member' => $member->getUserId().'@'.$member->getInstance()]
 			);
 		} catch (MemberNotFoundException $e) {
 		}
@@ -201,7 +201,7 @@ 
 
 		// TODO: check if it is a member or a mail or a circle and fix the returned message
 		$event->setReadingOutcome(
-			ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' ' . '\'%s\' have been added to Circle',
+			ucfirst(Member::$DEF_TYPE[$member->getUserType()]).' '.'\'%s\' have been added to Circle',
 			['userId' => $member->getUserId()]
 		);
 
@@ -501,7 +501,7 @@ 
 			$this->sendMailExistingShares($template, $author, $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -653,7 +653,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -695,7 +695,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}

lib/Service/ConfigService.php

Doc Comments +2 added lines, -2 removed lines

@@ -172,7 +172,7 @@ 
 	/**
 	 * returns if this type of circle is allowed by the current configuration.
 	 *
-	 * @param $type
+	 * @param integer $type
 	 *
 	 * @return int
 	 */
@@ -509,7 +509,7 @@ 
 	/**
 	 * @param string $type
 	 *
-	 * @return array|bool|mixed
+	 * @return string
 	 * @throws GSStatusException
 	 */
 	public function getGSStatus(string $type = '') {

Spacing +6 added lines, -6 removed lines

@@ -254,7 +254,7 @@ 
 		if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
 			&& strpos($remote, 'https://') !== 0
 		) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
 		return rtrim($remote, '/');
@@ -524,7 +524,7 @@ 
 
 			if ($type !== self::GS_MOCKUP) {
 				throw new GSStatusException(
-					'GS and lookup are not configured : ' . $lookup . ', ' . $enabled
+					'GS and lookup are not configured : '.$lookup.', '.$enabled
 				);
 			}
 		}
@@ -593,7 +593,7 @@ 
 			}
 
 			if (array_key_exists('port', $local)) {
-				return $local['host'] . ':' . $local['port'];
+				return $local['host'].':'.$local['port'];
 			} else {
 				return $local['host'];
 			}
@@ -615,13 +615,13 @@ 
 	 * @return string
 	 */
 	public function getRemotePath(string $route = 'circles.Remote.appService', array $args = []): string {
-		$base = $this->getAppValue(self::LOCAL_CLOUD_SCHEME) . '://' . $this->getLocalInstance();
+		$base = $this->getAppValue(self::LOCAL_CLOUD_SCHEME).'://'.$this->getLocalInstance();
 
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}
 
 	/**
@@ -724,7 +724,7 @@ 
 			$ncBase = substr($ncBase, 0, -strlen($forcedPath));
 		}
 
-		return rtrim($ncBase, '/') . $link;
+		return rtrim($ncBase, '/').$link;
 	}
 
 }

lib/Service/ShareService.php

Doc Comments -1 removed lines

@@ -64,7 +64,6 @@
 
 	/**
 	 * @param Circle $circle
-	 * @param string $instance
 	 */
 	public function syncRemoteShares(Circle $circle) {
 		$event = new FederatedEvent(SharedItemsSync::class);

lib/Db/CoreQueryBuilder.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 
 
 	/**
-	 * @param array $ids
+	 * @param string[] $ids
 	 *
 	 * @throws InvalidIdException
 	 */