nextcloud / circles

lib/Activity/Provider.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 			$this->parseAsNonMember($event, $circle);
 			$this->parseAsMember($event, $circle, $params);
 			$this->parseAsModerator($event, $circle, $params);
-		} catch (FakeException|InvalidItemException $e) {
+		} catch (FakeException | InvalidItemException $e) {
 			/** clean exit */
 		}
 

lib/Command/CirclesCheck.php

Spacing +37 added lines, -37 removed lines

@@ -130,7 +130,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);
@@ -186,7 +186,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('* testing current address: ' . $test);
+		$output->writeln('* testing current address: '.$test);
 
 		try {
 			$this->setupLoopback($input, $output, $test);
@@ -220,8 +220,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);
@@ -292,8 +292,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)');
@@ -312,18 +312,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;
 		}
@@ -361,7 +361,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>'
 		);
 	}
 
@@ -413,8 +413,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,
@@ -433,9 +433,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: ');
@@ -469,7 +469,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;
@@ -481,7 +481,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: ');
@@ -497,9 +497,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;
 				}
@@ -525,7 +525,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'
 		);
@@ -541,7 +541,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>');
 	}
 
 	/**
@@ -591,8 +591,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,
@@ -611,9 +611,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: ');
@@ -647,7 +647,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;
@@ -659,7 +659,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: ');
@@ -675,9 +675,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;
 				}
@@ -703,7 +703,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'
 		);
@@ -719,7 +719,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>');
 	}
 
 	/**
@@ -744,7 +744,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);
@@ -755,7 +755,7 @@ 
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+			$output->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -778,7 +778,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');
@@ -795,8 +795,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'
 		);
 	}
 
@@ -823,7 +823,7 @@ 
 		$path = rtrim($path, '/');
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . $cloudIdPort;
+			$cloudId = $cloudId.':'.$cloudIdPort;
 		}
 
 		return [$scheme, $cloudId, $path];

lib/Handlers/WebfingerHandler.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 				'version' => $this->configService->getAppValue('installed_version'),
 				'api' => Application::APP_API
 			];
-		} catch (UnknownInterfaceException|SignatoryException $e) {
+		} catch (UnknownInterfaceException | SignatoryException $e) {
 			return $response;
 		}
 

lib/Dashboard/TeamDashboardWidget.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 				->setItemsLimit($limit)
 				->setItemsOffset($since ? (int)$since : 0);
 
-			$circles = array_map(function (Circle $circle) {
+			$circles = array_map(function(Circle $circle) {
 				return new WidgetItem(
 					$circle->getDisplayName(),
 					'',

lib/FileSharingTeamResourceProvider.php

Spacing +6 added lines, -6 removed lines

@@ -59,18 +59,18 @@ 
 		}
 
 		$shares = $this->shareByCircleProvider->getSharesToCircle($teamId);
-		usort($shares, function ($a, $b) {
+		usort($shares, function($a, $b) {
 			return (int)($b->getItemType() === 'folder') - (int)($a->getItemType() === 'folder');
 		});
-		return array_map(function (ShareWrapper $shareWrapper) {
+		return array_map(function(ShareWrapper $shareWrapper) {
 			$isFolder = $shareWrapper->getItemType() === 'folder';
 			return new TeamResource(
 				$this,
 				(string)$shareWrapper->getFileSource(),
 				basename($shareWrapper->getFileTarget()),
-				$this->urlGenerator->getAbsoluteURL('/index.php/f/' . $shareWrapper->getFileSource()),
+				$this->urlGenerator->getAbsoluteURL('/index.php/f/'.$shareWrapper->getFileSource()),
 				iconSvg: $isFolder ? '<svg xmlns="http://www.w3.org/2000/svg" id="mdi-folder" viewBox="0 0 24 24"><path d="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z" /></svg>' : null,
-				iconURL: !$isFolder ?
+				iconURL : !$isFolder ?
 					$this->urlGenerator->linkToRouteAbsolute('core.preview.getPreviewByFileId', ['fileId' => $shareWrapper->getFileSource(), 'mimeFallback' => true, ])
 					: null,
 			);
@@ -82,7 +82,7 @@ 
 			return false;
 		}
 
-		return count(array_filter($this->getSharedWith($teamId), function (TeamResource $resource) use ($resourceId) {
+		return count(array_filter($this->getSharedWith($teamId), function(TeamResource $resource) use ($resourceId) {
 			return $resource->getId() === $resourceId;
 		})) !== 0;
 	}
@@ -94,7 +94,7 @@ 
 
 		$shares = $this->shareByCircleProvider->getSharesByFileId((int)$resourceId);
 
-		return array_map(function ($share) {
+		return array_map(function($share) {
 			return $share->getSharedWith();
 		}, $shares);
 	}

lib/Activity/ProviderParser.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 				continue;
 			}
 
-			$replace['{' . $k . '}'] = $data[$k]['_parsed'];
+			$replace['{'.$k.'}'] = $data[$k]['_parsed'];
 		}
 
 		$event->setParsedSubject(strtr($line, $replace));

lib/Command/CirclesMaintenance.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,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'
 			);
 
@@ -123,7 +123,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>: ', ''
 			);
 
@@ -140,7 +140,7 @@ 
 				$this->coreRequestBuilder->uninstall();
 			}
 
-			$output->writeln('<info>' . $action . ' done</info>');
+			$output->writeln('<info>'.$action.' done</info>');
 
 			return 0;
 		}
@@ -171,7 +171,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;
@@ -186,7 +186,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']);
 			}
 		}
 	}

lib/ShareByCircleProvider.php

Spacing +5 added lines, -5 removed lines

@@ -442,7 +442,7 @@ 
 
 		return array_filter(
 			array_map(
-				function (ShareWrapper $wrapper) {
+				function(ShareWrapper $wrapper) {
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
 				}, $wrappedShares
 			)
@@ -494,7 +494,7 @@ 
 
 		return array_filter(
 			array_map(
-				function (ShareWrapper $wrapper) {
+				function(ShareWrapper $wrapper) {
 					return $wrapper->getShare($this->rootFolder, $this->userManager, $this->urlGenerator);
 				}, $wrappedShares
 			)
@@ -543,7 +543,7 @@ 
 
 		return array_filter(
 			array_map(
-				function (ShareWrapper $wrapper) {
+				function(ShareWrapper $wrapper) {
 					return $wrapper->getShare(
 						$this->rootFolder, $this->userManager, $this->urlGenerator, true
 					);
@@ -574,7 +574,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;
@@ -684,7 +684,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(),

lib/Circles/FileSharingBroadcaster.php

Spacing +13 added lines, -13 removed lines

@@ -114,7 +114,7 @@ 
 			$this->miscService = OC::$server->query(MiscService::class);
 		} catch (QueryException $e) {
 			OC::$server->getLogger()
-				->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage());
+				->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage());
 		}
 
 		try {
@@ -259,7 +259,7 @@ 
 
 		$allShares = $this->fileSharesRequest->getSharesForCircle($member->getCircleId());
 		$knownShares = array_map(
-			function (SharesToken $shareToken) {
+			function(SharesToken $shareToken) {
 				return $shareToken->getShareId();
 			},
 			$this->tokensRequest->getTokensFromMember($member)
@@ -306,7 +306,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) {
 			OC::$server->getLogger()
-				->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
+				->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
 		}
 	}
 
@@ -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([\OCP\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([\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();
 		}
@@ -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
 		);