nextcloud / circles

lib/Command/MigrateCustomGroups.php

Spacing +10 added lines, -10 removed lines

@@ -78,15 +78,15 @@ 
 
 			$name = $rowCG['display_name'];
 			while (strlen($name) < 3) {
-				$name = '_' . $name;
+				$name = '_'.$name;
 			}
 
-			$this->output->writeln('+ New Team <info>' . $name . '</info>, owned by <info>' . $ownerId . '</info>');
+			$this->output->writeln('+ New Team <info>'.$name.'</info>, owned by <info>'.$ownerId.'</info>');
 
 			// based on owner's userid, we create federateduser and a new circle
 			$owner = $this->cachedFed($ownerId);
 			if ($owner === null) {
-				$this->output->writeln('<error>unknown user</error> ' . $ownerId);
+				$this->output->writeln('<error>unknown user</error> '.$ownerId);
 				continue;
 			}
 
@@ -95,7 +95,7 @@ 
 			try {
 				$circle = $this->circlesManager->createCircle($name);
 			} catch (\Exception $e) {
-				$this->output->writeln('<error>' . get_class($e) . ' ' . $e->getMessage() . '</error> with data ' . json_encode($rowCG));
+				$this->output->writeln('<error>'.get_class($e).' '.$e->getMessage().'</error> with data '.json_encode($rowCG));
 				$this->logger->log(2, 'error while creating circle', ['exception' => $e]);
 				$this->circlesManager->stopSession();
 				continue;
@@ -124,17 +124,17 @@ 
 
 					$fedUser = $this->cachedFed($userId);
 					if ($fedUser === null) {
-						$this->output->writeln('<error>unknown user</error> ' . $userId);
+						$this->output->writeln('<error>unknown user</error> '.$userId);
 						continue;
 					}
-					$this->output->writeln(' - new member <info>' . $userId . '</info>');
+					$this->output->writeln(' - new member <info>'.$userId.'</info>');
 
 					$member = $this->circlesManager->addMember($circle->getSingleId(), $fedUser);
 					if ($rowM['role'] === '1') {
 						$this->circlesManager->levelMember($member->getId(), Member::LEVEL_ADMIN);
 					}
 				} catch (\Exception $e) {
-					$this->output->writeln('<error>' . get_class($e) . ' ' . $e->getMessage() . '</error>');
+					$this->output->writeln('<error>'.get_class($e).' '.$e->getMessage().'</error>');
 					$this->logger->log(2, 'error while migrating custom group member', ['exception' => $e]);
 				}
 			}
@@ -170,7 +170,7 @@ 
 			->where($update->expr()->in('id', $update->createNamedParameter($shareIds, IQueryBuilder::PARAM_INT_ARRAY)));
 
 		$count = $update->executeStatement();
-		$this->output->writeln('> ' . ((string)$count) . ' shares updated');
+		$this->output->writeln('> '.((string)$count).' shares updated');
 
 		$this->fixShareChildren($shareIds, $memberIds);
 	}
@@ -186,7 +186,7 @@ 
 			try {
 				$this->fedList[$userId] = $this->circlesManager->getLocalFederatedUser($userId);
 			} catch (\Exception $e) {
-				$this->logger->warning('unknown local user ' . $userId, ['exception' => $e]);
+				$this->logger->warning('unknown local user '.$userId, ['exception' => $e]);
 				$this->fedList[$userId] = null;
 			}
 		}
@@ -220,7 +220,7 @@ 
 			$count += $update->executeStatement();
 		}
 
-		$this->output->writeln('> ' . ((string)$count) . ' children shares updated');
+		$this->output->writeln('> '.((string)$count).' children shares updated');
 	}
 
 

lib/Command/CirclesMaintenance.php

Spacing +6 added lines, -6 removed lines

@@ -91,7 +91,7 @@ 
 				'<error>WARNING! You are about to delete all data related to the Circles App!</error>'
 			);
 			$question = new ConfirmationQuestion(
-				'<comment>Do you really want to ' . $action . ' Circles ?</comment> (y/N) ', false,
+				'<comment>Do you really want to '.$action.' Circles ?</comment> (y/N) ', false,
 				'/^(y|Y)/i'
 			);
 
@@ -107,7 +107,7 @@ 
 			$output->writeln('<error>WARNING! This operation is not reversible.</error>');
 
 			$question = new Question(
-				'<comment>Please confirm this destructive operation by typing \'' . $action
+				'<comment>Please confirm this destructive operation by typing \''.$action
 				. '\'</comment>: ', ''
 			);
 
@@ -125,7 +125,7 @@ 
 				$this->coreRequestBuilder->uninstall();
 			}
 
-			$output->writeln('<info>' . $action . ' done</info>');
+			$output->writeln('<info>'.$action.' done</info>');
 
 			return 0;
 		}
@@ -138,7 +138,7 @@ 
 				$this->maintenanceService->runMaintenance($i, $input->getOption('force-refresh'));
 			} catch (MaintenanceException $e) {
 				$this->logger->warning('issue while performing maintenance', ['level' => $i, ['exception' => $e]]);
-				$output->writeln('- <error>issue while performing maintenance</error> ' . $e->getMessage() . ' (more details in logs)');
+				$output->writeln('- <error>issue while performing maintenance</error> '.$e->getMessage().' (more details in logs)');
 			}
 		}
 
@@ -158,7 +158,7 @@ 
 		$federatedUser = $this->federatedUserService->getLocalFederatedUser($userId);
 		$displayName = $this->maintenanceService->updateDisplayName($federatedUser);
 		if ($displayName !== '') {
-			$output->writeln('Display name of ' . $federatedUser->getSingleId() . ' updated to ' . $displayName);
+			$output->writeln('Display name of '.$federatedUser->getSingleId().' updated to '.$displayName);
 		}
 
 		return 0;
@@ -173,7 +173,7 @@ 
 			try {
 				$this->refreshSingleDisplayName($row['uid'], $output);
 			} catch (Exception $e) {
-				$output->writeln(get_class($e) . ' while trying to update display name of ' . $row['uid']);
+				$output->writeln(get_class($e).' while trying to update display name of '.$row['uid']);
 			}
 		}
 	}

rector.php

Spacing +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@
 
 return RectorConfig::configure()
 	->withPaths([
-		__DIR__ . '/appinfo',
-		__DIR__ . '/lib',
-		__DIR__ . '/tests/unit',
+		__DIR__.'/appinfo',
+		__DIR__.'/lib',
+		__DIR__.'/tests/unit',
 	])
 	->withImportNames(importShortClasses: false)
 	->withSets([

lib/Service/FederatedEventService.php

Spacing +5 added lines, -5 removed lines

@@ -241,16 +241,16 @@ 
 		try {
 			$test = new ReflectionClass($class);
 		} catch (ReflectionException $e) {
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
 		}
 
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
 		}
 
 		$item = Server::get($class);
 		if (!($item instanceof IFederatedItem)) {
-			throw new FederatedEventException($class . ' not an IFederatedItem');
+			throw new FederatedEventException($class.' not an IFederatedItem');
 		}
 
 		if ($item instanceof IFederatedItemHighSeverity) {
@@ -448,7 +448,7 @@ 
 			$knownInstances = $this->memberRequest->getMemberInstances($circle->getSingleId());
 			$instances = array_filter(
 				array_map(
-					function (RemoteInstance $instance) use ($knownInstances) {
+					function(RemoteInstance $instance) use ($knownInstances) {
 						if (!in_array($instance->getInstance(), $knownInstances)) {
 							return null;
 						}
@@ -463,7 +463,7 @@ 
 		if ($event->hasMember()
 			&& !$this->configService->isLocalInstance($event->getMember()->getInstance())) {
 			$currentInstances = array_map(
-				function (RemoteInstance $instance): string {
+				function(RemoteInstance $instance): string {
 					return $instance->getInstance();
 				}, $instances
 			);

lib/Model/ShareWrapper.php

Spacing +19 added lines, -19 removed lines

@@ -451,7 +451,7 @@ 
 			$l10n = Server::get(IFactory::class)->get('circles');
 			$display = $l10n->t('%s (Team owned by %s)', [$display, $circle->getOwner()->getDisplayName()]);
 		} else {
-			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
+			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')';
 		}
 
 		$share->setSharedWithDisplayName($display);
@@ -541,22 +541,22 @@ 
 
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
 		$shareTime = new DateTime();
-		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data));
-
-		$this->setId($this->get($prefix . 'id', $data))
-			->setShareType($this->getInt($prefix . 'share_type', $data))
-			->setPermissions($this->getInt($prefix . 'permissions', $data))
-			->setItemType($this->get($prefix . 'item_type', $data))
-			->setItemSource($this->getInt($prefix . 'item_source', $data))
-			->setItemTarget($this->get($prefix . 'item_target', $data))
-			->setFileSource($this->getInt($prefix . 'file_source', $data))
-			->setFileTarget($this->get($prefix . 'file_target', $data))
-			->setSharedWith($this->get($prefix . 'share_with', $data))
-			->setSharedBy($this->get($prefix . 'uid_initiator', $data))
-			->setShareOwner($this->get($prefix . 'uid_owner', $data))
-			->setToken($this->get($prefix . 'token', $data))
+		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data));
+
+		$this->setId($this->get($prefix.'id', $data))
+			->setShareType($this->getInt($prefix.'share_type', $data))
+			->setPermissions($this->getInt($prefix.'permissions', $data))
+			->setItemType($this->get($prefix.'item_type', $data))
+			->setItemSource($this->getInt($prefix.'item_source', $data))
+			->setItemTarget($this->get($prefix.'item_target', $data))
+			->setFileSource($this->getInt($prefix.'file_source', $data))
+			->setFileTarget($this->get($prefix.'file_target', $data))
+			->setSharedWith($this->get($prefix.'share_with', $data))
+			->setSharedBy($this->get($prefix.'uid_initiator', $data))
+			->setShareOwner($this->get($prefix.'uid_owner', $data))
+			->setToken($this->get($prefix.'token', $data))
 			->setShareTime($shareTime)
-			->setShareNote($this->get($prefix . 'note', $data));
+			->setShareNote($this->get($prefix.'note', $data));
 
 		$this->importAttributesFromDatabase($this->get('attributes', $data));
 
@@ -566,9 +566,9 @@ 
 		//			$share->setPassword($this->get('password', $data, ''));
 		//		}
 
-		$this->setChildId($this->getInt($prefix . 'child_id', $data))
-			->setChildFileTarget($this->get($prefix . 'child_file_target', $data))
-			->setChildPermissions($this->getInt($prefix . 'child_permissions', $data))
+		$this->setChildId($this->getInt($prefix.'child_id', $data))
+			->setChildFileTarget($this->get($prefix.'child_file_target', $data))
+			->setChildPermissions($this->getInt($prefix.'child_permissions', $data))
 			->setProviderId(ShareByCircleProvider::IDENTIFIER)
 			->setStatus(Ishare::STATUS_ACCEPTED);
 

lib/Circles/FileSharingBroadcaster.php

Spacing +13 added lines, -13 removed lines

@@ -115,7 +115,7 @@ 
 			$this->configService = Server::get(ConfigService::class);
 			$this->miscService = Server::get(MiscService::class);
 		} catch (QueryException $e) {
-			$this->logger->info('Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage(), ['exception' => $e]);
+			$this->logger->info('Circles: cannot init FileSharingBroadcaster - '.$e->getMessage(), ['exception' => $e]);
 		}
 
 		try {
@@ -260,7 +260,7 @@ 
 
 		$allShares = $this->fileSharesRequest->getSharesForCircle($member->getCircleId());
 		$knownShares = array_map(
-			function (SharesToken $shareToken) {
+			function(SharesToken $shareToken) {
 				return $shareToken->getShareId();
 			},
 			$this->tokensRequest->getTokensFromMember($member)
@@ -307,7 +307,7 @@ 
 	 * @throws IllegalIDChangeException
 	 */
 	private function generateShare($data): IShare {
-		$this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data));
+		$this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data));
 
 		$share = new Share($this->rootFolder, $this->userManager);
 		$share->setId($data['id']);
@@ -399,7 +399,7 @@ 
 			);
 			$this->sendPasswordByMail($share, $displayName, $email, $password);
 		} catch (Exception $e) {
-			$this->logger->info('Circles::sharedByMail - mail were not sent: ' . $e->getMessage(), ['exception' => $e]);
+			$this->logger->info('Circles::sharedByMail - mail were not sent: '.$e->getMessage(), ['exception' => $e]);
 		}
 	}
 
@@ -417,8 +417,8 @@ 
 		$message = $this->mailer->createMessage();
 
 		$this->logger->log(
-			0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
-			   . ' - link: ' . $link
+			0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
+			   . ' - link: '.$link
 		);
 
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -456,7 +456,7 @@ 
 
 		$message = $this->mailer->createMessage();
 
-		$this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email);
+		$this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email);
 
 		$filename = $share->getNode()
 			->getName();
@@ -511,7 +511,7 @@ 
 		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($initiatorEmailAddress !== null) {
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}
@@ -546,7 +546,7 @@ 
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($subject, false);
 		$emailTemplate->addBodyText(
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
 				$this->l10n->t('Click the button below to open it.')
 			), $text
 		);
@@ -592,7 +592,7 @@ 
 			$this->sendMailExistingShares($template, $author->getCachedName(), $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage());
+			$this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -615,7 +615,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->logger->log(0, "Sending password mail about existing files to '" . $email . "'");
+		$this->logger->log(0, "Sending password mail about existing files to '".$email."'");
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n",
@@ -657,7 +657,7 @@ 
 		$message->setFrom([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();
 		}
@@ -702,7 +702,7 @@ 
 	 */
 	protected function generateMailExitingShares($author, $circleName) {
 		$this->logger->log(
-			0, "Generating mail about existing share mail from '" . $author . "' in "
+			0, "Generating mail about existing share mail from '".$author."' in "
 			   . $circleName
 		);
 

lib/AppInfo/Application.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 	public function boot(IBootContext $context): void {
 		$serverContainer = $context->getServerContainer();
 
-		$context->injectFn(function (IShareManager $shareManager) {
+		$context->injectFn(function(IShareManager $shareManager) {
 			$shareManager->registerShareProvider(ShareByCircleProvider::class);
 		});
 

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -14,10 +14,10 @@
 	define('PHPUNIT_RUN', 1);
 }
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../../../lib/base.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
-require_once __DIR__ . '/../../../tests/autoload.php';
+require_once __DIR__.'/../../../tests/autoload.php';
 
 Server::get(IAppManager::class)->loadApp('circles');
 

lib/ShareByCircleProvider.php

Spacing +7 added lines, -7 removed lines

@@ -276,7 +276,7 @@ 
 			$initiatorEmail = $initiatorUser->getEMailAddress();
 			if ($initiatorEmail !== null) {
 				$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+				$emailTemplate->addFooter($instanceName.($this->defaults->getSlogan() !== '' ? ' - '.$this->defaults->getSlogan() : ''));
 			} else {
 				$emailTemplate->addFooter();
 			}
@@ -289,7 +289,7 @@ 
 		$failedRecipients = $this->mailer->send($message);
 
 		if (!empty($failedRecipients)) {
-			$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
+			$this->logger->error('Share notification mail could not be sent to: '.implode(', ', $failedRecipients));
 			return;
 		}
 	}
@@ -545,7 +545,7 @@ 
 
 		return array_filter(
 			array_map(
-				function (ShareWrapper $wrapper) {
+				function(ShareWrapper $wrapper) {
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
 				}, $wrappedShares
 			)
@@ -597,7 +597,7 @@ 
 
 		return array_filter(
 			array_map(
-				function (ShareWrapper $wrapper) {
+				function(ShareWrapper $wrapper) {
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
 				}, $wrappedShares
 			)
@@ -646,7 +646,7 @@ 
 
 		return array_filter(
 			array_map(
-				function (ShareWrapper $wrapper) {
+				function(ShareWrapper $wrapper) {
 					return $wrapper->getShare(
 						$this->rootFolder, $this->userManager, $this->urlGenerator, true
 					);
@@ -677,7 +677,7 @@ 
 
 		$share = $wrappedShare->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
 		if ($share->getPassword() !== '') {
-			$this->logger->notice('share is protected by a password, hash: ' . $share->getPassword());
+			$this->logger->notice('share is protected by a password, hash: '.$share->getPassword());
 		}
 
 		return $share;
@@ -787,7 +787,7 @@ 
 							];
 						} else {
 							// we only store temp value, as token is unknown at this point
-							$remote[$member->getUserid() . '@' . $member->getInstance()] = [
+							$remote[$member->getUserid().'@'.$member->getInstance()] = [
 								'node_id' => $share->getFileSource(),
 								'shareId' => $share->getId(),
 								'memberId' => $member->getId(),